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

Merge from mit-trunk

Browse Source 
bzr revid: mit@openerp.com-20120828180459-3ttpcs0qjzbi803z
This commit is contained in:
Minh Tran
2012-08-28 20:04:59 +02:00
parent d8eb1234a6 3ae5a108ab
commit 9575df09ee
2 changed files with 67 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+38 -16
View File
@@ -239,30 +239,52 @@
</ul>
</div>
<div class="oe_kanban_content">
<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>
<h4><field name="name"/></h4>
<div class="oe_kanban_project_list">
<a t-if="record.use_tasks.raw_value"
name="%(act_project_project_2_project_task_all)d" type="action">
Tasks(<field name="task_count"/>)</a>
</div>
<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">
<div>Deadline</div>
<div><field name="date"/></div>
</div>
<div class="oe_kanban_project_fields oe_kanban_project_progress">
<div>Progress</div>
<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>
</div>
<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">
<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>
<a t-if="record.use_tasks.raw_value" name="%(act_project_project_2_project_task_all)d" type="action"> <field name="task_count"/> Tasks</a>
</div>
<table>
<tr t-if="record.date.raw_value">
<th class="oe_kanban_project_fields oe_kanban_project_deadline">Deadline</th>
<td><field name="date"/></td>
</tr>
<tr class="oe_kanban_project_fields oe_kanban_project_progress">
<th>Progress</th>
<td><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></td>
</tr>
</table>
<div class="oe_kanban_project_avatars">
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>
</t>
</div>
<!--<h3 class="oe_kanban_ellipsis"><field name="name"/></h3>-->
<!--<div class="oe_kanban_project_list">-->
<!--<a t-if="record.use_tasks.raw_value"-->
<!--name="%(act_project_project_2_project_task_all)d" type="action">-->
<!--Tasks(<field name="task_count"/>)</a>-->
<!--</div>-->
<!--<div class="oe_kanban_project_fields oe_kanban_project_deadline" t-if="record.date.raw_value">-->
<!--<div>Deadline</div>-->
<!--<div><field name="date"/></div>-->
<!--</div>-->
<!--<div class="oe_kanban_project_fields oe_kanban_project_progress">-->
<!--<div>Progress</div>-->
<!--<div><t t-esc="Math.round(record.effective_hours.raw_value)"/> / <t t-esc="Math.round(record.planned_hours.raw_value)"/> <field name="company_uom_id"/></div>-->
<!--</div>-->
<!--<div name="alias_box" t-if="record.alias_domain.raw_value" class="oe_kanban_ellipsis">-->
<!--<a t-attf-href="mailto:#{record.alias_id.value}"><field name="alias_id"/></a>-->
<!--</div>-->
<!--<div class="oe_kanban_project_avatars">-->
<!--<t t-foreach="record.members.raw_value" t-as="member">-->
<!--<img t-att-src="kanban_image('res.users', 'image_small', member)" t-att-data-member_id="member"/>-->
<!--</t>-->
<!--</div>-->
</div>
</div>
</t>
addons/project/static/src/css/project.css
+29 -10
View File
@@ -1,23 +1,41 @@
.oe_kanban_card {
margin: 2px;
}
.oe_kanban_project {
width: 300px;
width: 250px;
min-height: 160px;
}
.oe_kanban_project_list {
margin: 8px 0 8px 0;
margin: 4px 0;
}
/*.oe_kanban_project_list a:not(:first-child):before {
content: ' - ';
}*/
.oe_kanban_project_fields div {
display: inline-block;
width: 49%;
box-sizing: border-box;
padding: 2px 0 2px 0;
.openerp .oe_kanban_content h4 {
margin: 0 0 8px;
}
.oe_kanban_content > table {
width: 100%;
}
.oe_kanban_content > table > th {
padding: 0;
border-right: 1px solid #DDD;
vertical-align: top;
font-weight: normal;
}
.oe_kanban_content > table > td {
padding: 2px 0 2px 8px;
color: #888;
}
.oe_kanban_project_fields div:nth-child(odd) {
border-right: 1px solid #dddddd;
vertical-align: top;
padding-right: 8px;
}
.oe_kanban_project_fields div:nth-child(even) {
padding-left: 8px;
color: #888888;
@@ -27,6 +45,7 @@
padding-top: 1em;
margin-top: 8px;
}
.oe_kanban_project_avatars img {
width: 30px;
height: 30px;