bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou
This commit is contained in:
Amit Patel (OpenERP) 2012-04-04 11:39:33 +05:30
parent e6fb926358
commit 43b46a1623
5 changed files with 75 additions and 70 deletions

View File

@ -181,37 +181,51 @@
}
</script>
<!--<div class="content">-->
<div class="project_vignettes">
<li class="oe_project_kanban_vignette">
<a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
<ul class="dropdown-menu">
<li ><a type="edit" >Edit...</a></li>
<li ><a type="delete">Delete</a></li>
<li>
<ul class="color-chooser">
<li><a><span class="steelblue square"></span></a></li>
<li><a><span class="firebrick square"></span></a></li>
<li><a><span class="khaki square"></span></a></li>
<li><a><span class="thistle square"></span></a></li>
<li><a><span class="orange square"></span></a></li>
<li class="oe_project_kanban_vignette">
<a href="#" class="oe_project_kanban_action dropdown-toggle" onclick="javascript:showElement()"><span class="i">B</span></a>
<ul class="dropdown-menu">
<li ><a type="edit" >Edit...</a></li>
<li ><a type="delete">Delete</a></li>
<li>
<ul class="color-chooser">
<li><a><span class="steelblue square"></span></a></li>
<li><a><span class="firebrick square"></span></a></li>
<li><a><span class="khaki square"></span></a></li>
<li><a><span class="thistle square"></span></a></li>
<li><a><span class="orange square"></span></a></li>
</ul>
</li>
</ul>
</li>
</ul>
<h4><a><t t-esc="record.name.value"/></a></h4>
<h4 id="list" height="10px"><a><t t-if="record.task.raw_value">
<button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
</t></a></h4>
<table class="project_fields">
<tr 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">Progress</th><td align="left"><t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days</td> </tr>
</table>
<t t-foreach="record.members.raw_value" t-as="member"><img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/></t>
</li>
<h4><t t-esc="record.name.value.substr(0,32)"/><t t-if="record.name.value.length > 32">...</t></h4>
<h4 id="list" height="10px">
<a>
<t t-if="record.task.raw_value">
<button name="open_tasks" class="oe_project_buttons" type="object"><field name="open_task"/> Tasks</button>
</t>
</a>
</h4>
<table class="project_fields">
<tr 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">Progress</th>
<td align="left">
<t t-esc="Math.round(record.effective_hours.raw_value)"/>/<t t-esc="Math.round(record.total_hours.raw_value)"/> days
</td>
</tr>
</table>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" class="project_avatar"/>
</t>
</li>
</div>
<!--</div>-->
</t>
<!--<t t-name="tasks">

View File

@ -8,7 +8,7 @@
font-style: normal; }
.project_fields {
margin-top: 1px;
margin-top: 10px;
margin-bottom: 1px;
}
.project_fields td {
@ -30,9 +30,9 @@ table {
.project_vignettes li {
float: left; }
.project_vignettes .project_avatar {
margin-right: 2px;
width: 32px;
height: 32px; }
margin-top: 20px;
width: 30px;
height: 30px; }
.project_vignettes .project_fields {
width: 100%; }
.project_vignettes .project_fields th {
@ -59,6 +59,10 @@ table {
}
.oe_project_buttons:hover {
cursor: pointer;
}
.project_avatar {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
@ -215,4 +219,4 @@ a.oe_project_kanban_action {
.oe_project_kanban_vignette .dropdown-menu .color-chooser li {
float: left; }
.oe_project_kanban_vignette .dropdown-menu .color-chooser li a {
padding: 2px; }
padding: 2px; }

View File

@ -389,19 +389,12 @@
<field name="issues"/>
<field name="total_issues" invisible="1"/>
</field>
<!-- <xpath expr="//t[@t-name='tasks']" position="after">
<t t-name="issues">
<ul class="oe_kanban_tooltip">
<li><b>Issues:</b> <field name="total_issues"/></li>
</ul>
</t>
</xpath>-->
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.issues.raw_value">
<button name="open_issues" class="oe_project_buttons" type="object">,<field name="total_issues"/> Issue</button>
</t>
</a>
<a>
<t t-if="record.issues.raw_value">
<button name="open_issues" class="oe_project_buttons" type="object">,<field name="total_issues"/> Issues</button>
</t>
</a>
</xpath>
</field>
</record>

View File

@ -119,19 +119,12 @@
<field name="task" position="after">
<field name="phases"/>
</field>
<!-- <xpath expr="//t[@t-name='tasks']" position="after">
<t t-name="phases">
<ul class="oe_kanban_tooltip">
<li><b>Phases</b></li>
</ul>
</t>
</xpath> -->
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.phases.raw_value">
<button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phase</button>
</t>
</a>
<a>
<t t-if="record.phases.raw_value">
<button name="open_phase" class="oe_project_buttons" type="object">,<field name="open_phases"/> Phases</button>
</t>
</a>
</xpath>
</field>
</record>

View File

@ -35,25 +35,26 @@
<field name="timesheets"/>
<field name="currency_id"/>
</field>
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.timesheets.raw_value">
<button name="open_timesheets" class="oe_project_buttons" type="object">, Timesheet</button>
</t>
</a>
</xpath>
<xpath expr="//h4[@id='list']" position="inside">
<a>
<t t-if="record.timesheets.raw_value">
<button name="open_timesheets" class="oe_project_buttons" type="object">, Timesheets</button>
</t>
</a>
</xpath>
<xpath expr="//table[@class='project_fields']" position="inside">
<tr ><th align="left">To invoiced</th>
<td align="left">
<tr >
<th align="left">To invoice</th>
<td align="left">
<field name="amt_to_invoice"/> <t t-esc="record.currency_id.raw_value[1].split(' ')[1][1]"/>
</td>
</tr>
<tr >
</td>
</tr>
<tr>
<th align="left">To hours</th>
<td align="left">
<field name="hrs_to_invoice"/> h
</td>
</tr>
</tr>
</xpath>
</field>
</record>