From 43b46a1623afa8d17601e0bd7965048e16db1f0f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Wed, 4 Apr 2012 11:39:33 +0530
Subject: [PATCH] [IMP]

bzr revid: apa@tinyerp.com-20120404060933-ejaapcvswhrisoou
---
 addons/project/project_view.xml               | 70 +++++++++++--------
 addons/project/static/src/css/project.css     | 14 ++--
 addons/project_issue/project_issue_view.xml   | 17 ++---
 .../project_long_term_view.xml                | 17 ++---
 .../project_timesheet_view.xml                | 27 +++----
 5 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 8ef5306fb79..227eb754e2f 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -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">
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index ff99ed53207..4d695424e45 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -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; }
\ No newline at end of file
+      padding: 2px; }
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 8ca57ed6b4a..afe31603619 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -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>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 914e1b8d600..6951aee790a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -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>
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 6fbec2d84f2..7630f91fd8b 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -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>