diff options
| author | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-03-29 17:49:31 +0530 |
|---|---|---|
| committer | Amit Patel (OpenERP) <apa@tinyerp.com> | 2012-03-29 17:49:31 +0530 |
| commit | 9aa3b59b2f1d0f471cfd27b6ca6e91c77b4e1881 (patch) | |
| tree | 90de82d887cccf997b80e6a9ded32fdd01e220ce | |
| parent | 2f042dc4330c86e6546c7c6f2b8250788d287573 (diff) | |
[IMP]
bzr revid: apa@tinyerp.com-20120329121931-w3e4bclwmuhhzsg2
| -rw-r--r-- | addons/project/project_view.xml | 12 | ||||
| -rw-r--r-- | addons/project/static/src/css/project.css | 6 | ||||
| -rw-r--r-- | addons/project_timesheet/project_timesheet_view.xml | 7 |
3 files changed, 14 insertions, 11 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 535766fade0..b27e9dcbd1d 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -186,6 +186,10 @@ <td width="60px" align="center" valign="top"> <button name = "open_users" type="object" class="oe_project_buttons"><img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" height="40px" width="40px" /></button><br/> <div class="manager"><field name="user_id"/></div> + <t t-if="record.date.raw_value"> + <kbd class="user">Deadline</kbd> + <div class="manager"><field name="date"/></div> + </t> </td> <td align="left" valign="middle" width="220px"> <div class="oe_project_border"> @@ -204,12 +208,10 @@ </div> </td> <td width="70px" valign="top" align="right"> - <t t-if="record.date.raw_value"> - <div class="sequence"> - <kbd class="user">Deadline</kbd> - <div class="manager"><field name="date"/></div> + <div id="sequence"> + <!--<kbd class="user">Deadline</kbd>--> + <!--<div class="manager"><field name="date"/></div>--> </div> - </t> </td> </tr> </table> diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index 28bc351df28..7e5869d80fe 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -1,7 +1,8 @@ .oe_to_invoice_buttons { - min-height: 30px; + min-height: 60px; min-width: 50px; - vertical-align: baseline; + vertical-align: top; + } .oe_to_invoice_buttons:hover { @@ -26,6 +27,7 @@ } .sequence { + padding-bottom: 4px !important; border-bottom: groove; /*font-size: 20px;*/ text-align: center; diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index c396935610f..c945223cd10 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -44,14 +44,13 @@ <button name="open_timesheets" class="oe_project_buttons" type="object" tooltip="timesheets"><img src="/project_timesheet/static/src/img/timesheet_icon.png" class="project_icon"/></button> </t> </xpath> - <xpath expr="//div[@class='sequence']" position="after"> + <xpath expr="//div[@id='sequence']" position="inside"> <div class="sequence"> <button name="open_timesheets" class="oe_to_invoice_buttons" type="object"> - <!--<kbd class="to_invoice">To invoice</kbd>--> + <small>To invoice</small> <div class="manager"> - <code>To invoice</code> - <strong><field name="amount_invoiced"/></strong> + <field name="amount_invoiced"/> </div> </button> </div> |