pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] hr: improve hr_employee kanban view

Browse Source 
Mainly fixes for the follow button and move css to less
This commit is contained in:
Martin Geubelle
2015-08-06 11:40:07 +02:00
parent eb2f2071df
commit 00fa979264
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/hr_view.xml
+4 -4
View File
@@ -161,7 +161,7 @@
<field name="message_unread_counter"/>
<templates>
<t t-name="kanban-box">
<div class="o_kanban_two_column oe_kanban_global_click oe_employee_details">
<div class="o_kanban_two_column oe_kanban_global_click">
<div class="o_kanban_image">
<img t-att-src="kanban_image('hr.employee', 'image_medium', record.id.value)"/>
<div class="o_employee_summary_icons">
@@ -188,12 +188,12 @@
<li t-if="record.work_phone.raw_value"><i class="fa fa-phone"></i> <field name="work_phone"/></li>
<li t-if="record.mobile_phone.raw_value"><i class="fa fa-mobile"></i> <field name="mobile_phone"/></li>
</ul>
<div class="oe_followers o_kanban_button">
<button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="o_follow_btn o_following btn btn-primary">
<div class="o_kanban_button">
<button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="o_follow_btn o_following btn btn-default">
<span class="o_unfollow">Unfollow</span>
<span class="o_following">Following</span>
</button>
<button t-if="!record.message_is_follower.raw_value" name="action_follow" type="object" class="o_follow_btn o_not_following btn btn-primary">Follow</button>
<button t-if="!record.message_is_follower.raw_value" name="action_follow" type="object" class="o_follow_btn o_follow btn btn-primary">Follow</button>
</div>
</div>
</div>
addons/hr/static/src/css/hr.css
-21
View File
@@ -1,21 +0,0 @@
.oe_employee_details{
min-height: 168px !important;
width: 350px;
}
.oe_employee_image {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
-o-border-radius: 3px;
-ms-border-radius: 3px;
border-radius: 3px;
border-collapse: separate;
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
-o-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4);
}
.openerp .oe_employee_details .oe_followers {
float: none;
}
addons/hr/static/src/less/hr.less
+17
View File
@@ -0,0 +1,17 @@
.o_web_client .o_hr_employee_kanban {
.o_follow_btn.o_following {
.o_unfollow {
display: none;
}
&:hover {
.o_following {
display: none;
}
.o_unfollow {
display: inline;
}
}
}
}
addons/hr/views/hr.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<data>
<template id="assets_backend" name="hr assets" inherit_id="web.assets_backend">
<xpath expr="." position="inside">
<link rel="stylesheet" href="/hr/static/src/css/hr.css"/>
<link rel="stylesheet" href="/hr/static/src/less/hr.less"/>
<link rel="stylesheet" href="/hr/static/src/less/hr_dashboard.less"/>
</xpath>
</template>