odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP/MERGE] 

bzr revid: apa@tinyerp.com-20120405103800-0usd5k72lxsilnnz
This commit is contained in:
Amit Patel (OpenERP) 2012-04-05 16:08:00 +05:30
parent 1616333862 d3c4b80fb8
commit e699f7d3b7
3 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
addons/project/project_view.xml
View File

@ -196,39 +196,39 @@
<h4 id="list" height="10px">
<a>
<t t-if="record.task.raw_value">
<button name="open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
<button name="open_tasks" id = "open_tasks" class="oe_project_buttons" type="object"><t t-if="record.open_task.value &lt;= 1"> Task</t><t t-if="record.open_task.value &gt; 1"> Tasks</t>(<t t-esc="record.open_task.value"/>)</button>
</t>
</a>
</h4>
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
<th align="left">Deadline</th>
<td align="left">
<t t-esc="record.date.raw_value.toString('MMMM')"/>
<t t-esc="record.date.raw_value.getDate()"/>,
<t t-esc="record.date.raw_value.getFullYear()"/>
</td>
</tr>
<tr>
<th align="left" width="70px">Progress</th>
<td align="left">
<t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
</td>
</tr>
</table>
<t t-if="record.members.raw_value.length > 7">
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
<button class="click_button" type="object">
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
<th align="left">Deadline</th>
<td align="left">
<t t-esc="record.date.raw_value.toString('MMMM')"/>
<t t-esc="record.date.raw_value.getDate()"/>,
<t t-esc="record.date.raw_value.getFullYear()"/>
</td>
</tr>
<tr>
<th align="left" width="70px">Progress</th>
<td align="left">
<t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
</td>
</tr>
</table>
<t t-if="record.members.raw_value.length > 7">
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
</t>
<t t-if="record.members.raw_value.length &lt;= 7">
<br/><br/>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
<t t-if="record.members.raw_value.length &lt;= 7">
<br/><br/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
</t>
</button>
</li>
</div>
</t>

14
addons/project/static/src/css/project.css
View File

@ -43,7 +43,7 @@ table {
color: #4c4c4c; }
.project_vignettes > li {
height: 160px;
height: 170px;
width: 250px;
padding: 8px;
margin: 4px; }
@ -76,6 +76,18 @@ table {
font-family: "mnmliconsRegular" !important;
font-size: 21px;
font-weight: 300 !important; }
.click_button {
display: inline-block;
background-color: transparent;
min-height: 140px;
min-width: 265px;
border: hidden;
margin-left: -6px !important;
margin-top: -3px !important;
text-align: left;
font-size: 11px;
}
.dropdown-menu {
display: none;

1
addons/project/static/src/js/project.js
View File

@ -19,6 +19,7 @@ openerp.project = function(openerp) {
});
});
$('.click_button').attr('data-name','open_tasks');
}
});
}