[IMP] make it beautiful

bzr revid: mat@openerp.com-20130425101759-y3cwymvey8i9mwie
This commit is contained in:
Martin Trigaux 2013-04-25 12:17:59 +02:00
parent 5794e60f14
commit e920347b01
2 changed files with 63 additions and 38 deletions

View File

@ -66,11 +66,12 @@
display: inline-block;
vertical-align: top;
width: 280px;
background: #EDEDF6;
/*background: #EDEDF6;*/
background-color: #f8f8f8;
border: solid 1px rgba(0,0,0,0.03);
border-radius: 2px;
}
.openerp .oe_mail_wall_aside > div {
background: #EDEDF6;
padding: 5px 5px 0 15px;
}
.openerp .oe_mail_wall_aside h3 {
@ -81,32 +82,31 @@
line-height: 1em;
}
.openerp .oe_mail_wall_aside .oe_goal {
width: 95%;
}
.openerp .oe_mail_wall_aside ul.oe_goals_list {
width: 100%;
}
/*.openerp .oe_mail_wall_aside .oe_goal a {
color: #4c4c4c;;
}*/
.openerp .oe_mail_wall_aside .oe_goals_list {
list-style-type: none;
/*list-style-type: disc;*/
padding-left: 0;
/*margin-left: 15px;*/
margin-top: 0;
margin-top: 5px;
margin-bottom: 15px;
}
.openerp .oe_mail_wall_aside table.oe_goals_list {
/*width: 95%;*/
border: 1px dotted rgb(221, 221, 221);
border-color: rgba(133, 133, 133, 0.3);
width: 95%;
/*border: 1px dotted rgb(221, 221, 221);
border-color: rgba(133, 133, 133, 0.3);*/
border: solid 1px rgba(0,0,0,0.05);
}
.openerp .oe_mail_wall_aside .oe_goals_list > li::before {
content: "\0BB \020";
width: 15px;
}
.openerp .oe_mail_wall_aside .oe_goals_list > li.oe_goal_reached::before {
color: rgb(27, 70, 7);
content: "✓";
font-size: 65%; /* reduce font to have the same size as "\0BB \020" */
/*font-size: 65%;*/ /* reduce font to have the same size as "\0BB \020" */
margin-right: -4px;
}
.openerp .oe_mail_wall_aside .oe_gamification_goal .oe_goal_reached .oe_goal_inner_box {
text-decoration: line-through;
@ -116,34 +116,42 @@
display: inline-block;
position: relative;
height: 100%;
min-height: 12px;
width: 94%;
width: 90%;
z-index: 0;
vertical-align: top;
padding-bottom: 5px;
}
.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
.openerp .oe_mail_wall .oe_mail_wall_aside table .oe_goal_outer_box {
width: 100%;
}
/*.openerp .oe_mail_wall .oe_mail_wall_aside li .oe_goal_outer_box {
border: 1px dotted rgb(221, 221, 221);
border-color: rgba(133, 133, 133, 0.3);
}*/
.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress_background {
background-color: rgb(231, 190, 190);
position: absolute;
height: 4px;
width: 100%;
z-index: -2;
top: 0; left: 0;
}
.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal_progress {
background: rgb(183, 231, 179);
background: rgba(183, 231, 179, 0.5);
display: inline-block;
/*background: rgb(183, 231, 179);*/
/*background: rgba(183, 231, 179, 0.5);*/
/*background-color: #7c7bad;*/
background-color: rgb(88, 155, 91);
position: absolute;
height: 100%;
height: 3px;
width: 0;
z-index: -1;
top: 0; left: 0;
}
.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box {
display: inline-block;
/*position: absolute;*/
/*width: 200px;*/
/*min-height: 32px;*/
/*vertical-align: middle;*/
z-index: 2;
/*top: 0; left: 0;*/
height: 100%;
padding-top: 3px;
line-height: 1em;
}
.openerp .oe_mail_wall_aside .oe_goals_list .oe_goal_inner_box strong {
padding-left: 5px;
@ -162,14 +170,18 @@
padding: 5px;
}
.openerp .oe_mail_wall_aside .oe_goals_list tbody tr {
height: 32px;
height: 24px;
}
.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
/*.oe_mail_wall_aside .oe_goals_list tbody tr:nth-child(even) {
background-color: #fff;
}
*/
.openerp .oe_mail_wall_aside .oe_goals_list tbody td {
padding-bottom: 5px;
}
.openerp .oe_mail_wall_aside .oe_goals_list tbody th {
padding-left: 5px;
height: 32px;
height: 24px;
}
.openerp .oe_mail_wall_aside table.oe_goals_list .col0 {
font-size: 160%;
@ -179,10 +191,10 @@
padding: 0 5px;
}
.openerp .oe_mail_wall_aside table.oe_goals_list .col2 {
width: 200px;
width: 100%;
}
.openerp .oe_mail_wall .oe_mail_wall_aside .oe_user_avatar {
width: 32px;
width: 24px;
padding-right: 5px;
}
.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal .oe_update_plan.oe_e,
@ -190,6 +202,7 @@
visibility: hidden;
font-size: 25px;
float: right;
margin-right: 15px;
position: relative;
}
.openerp .oe_mail_wall .oe_mail_wall_aside .oe_goal div:hover > .oe_update_plan,

View File

@ -15,7 +15,10 @@
<ul class="oe_goals_list">
<li t-foreach="plan.goals" t-as="goal" t-attf-class="#{goal.state == 'reached' ? 'oe_goal_reached' : ''}">
<div class="oe_goal_outer_box">
<div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
<t t-if="goal.type_display == 'progress'">
<div class="oe_goal_progress_background"></div>
<div class="oe_goal_progress" t-attf-style="#{goal.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
</t>
<div class="oe_goal_inner_box">
<t t-if="goal.computation_mode != 'manually' and !goal.type_action">
<span t-att-title="goal.type_description"><t t-esc="goal.type_name" /></span>
@ -50,9 +53,15 @@
<table t-foreach="plan.planlines" t-as="planline" class="oe_goals_list">
<thead>
<tr>
<th colspan="4" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
<strong><t t-esc="planline.type_name"/></strong>
<t t-if="planline.type_computation_mode == 'manually' or planline.type_action">
<th colspan="3" t-attf-title="#{planline.type_description ? planline.type_description : ''}">
<t t-if="planline.computation_mode != 'manually' and !planline.type_action">
<strong><t t-esc="planline.type_name"/></strong>
</t>
<t t-if="planline.type_action">
<strong><a class="oe_goal_action" t-att-id="planline.own_goal_id"><t t-esc="planline.type_name"/></a></strong>
</t>
<t t-if="planline.computation_mode == 'manually' and !planline.type_action">
<strong><t t-esc="planline.type_name"/></strong>
<a class="oe_goal_action oe_e" t-att-id="planline.own_goal_id">&amp;</a>
</t>
<br/>
@ -68,12 +77,15 @@
</thead>
<tbody>
<tr t-foreach="planline.goals" t-as="goal" t-attf-class="#{goal.id == planline.own_goal_id ? 'oe_bold' : ''}">
<div style="background: #fff;">
<div>
<th class="col0"><t t-esc="goal.rank" /></th>
<td class="col1"><img class="oe_user_avatar" t-attf-alt="#{goal.user_name}" t-attf-data-id="#{goal.user_id}"/></td>
<td class="col2">
<div class="oe_goal_outer_box">
<div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
<t t-if="planline.type_display == 'progress'">
<div class="oe_goal_progress_background"></div>
<div class="oe_goal_progress" t-attf-style="#{planline.type_display == 'progress' ? 'width: '+goal.completeness+'%;' : 'width:0;'}"></div>
</t>
<div class="oe_goal_inner_box">
<t t-esc="goal.user_name"/><br/>
<span t-attf-class="#{planline.type_monetary ? 'oe_goal_field_monetary' : ''}"><t t-esc="goal.current" /></span><t t-if="planline.type_unit"> <t t-esc="planline.type_unit"/></t>