From 052dedaf2c7c8f5ac804714ba73abc74b6934a47 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 26 Oct 2012 11:37:04 +0200
Subject: [PATCH] [IMP] restyled timesheets

bzr revid: fp@tinyerp.com-20121026093704-b5q54rwtrkx73igg
---
 .../static/src/css/Makefile                   |  3 +
 .../static/src/css/timesheet.css              | 91 ++++++++-----------
 .../static/src/css/timesheet.sass             | 49 ++++++++++
 .../static/src/xml/timesheet.xml              | 12 +--
 4 files changed, 95 insertions(+), 60 deletions(-)
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/Makefile
 create mode 100644 addons/hr_timesheet_sheet/static/src/css/timesheet.sass

diff --git a/addons/hr_timesheet_sheet/static/src/css/Makefile b/addons/hr_timesheet_sheet/static/src/css/Makefile
new file mode 100644
index 00000000000..e60087d9b33
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/Makefile
@@ -0,0 +1,3 @@
+timesheet.css: timesheet.sass
+	sass -t expanded timesheet.sass timesheet.css
+
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.css b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
index b486f76694d..f504a0f4f10 100644
--- a/addons/hr_timesheet_sheet/static/src/css/timesheet.css
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.css
@@ -1,79 +1,62 @@
-
+@charset "utf-8";
+.openerp .oe_form_readonly .oe_timesheet_button_add {
+  display: none;
+}
 .openerp .oe_timesheet_weekly {
-    overflow-x: auto;
+  overflow-x: auto;
 }
-
 .openerp .oe_timesheet_weekly table {
-    width: 100%;
+  width: 100%;
 }
-
 .openerp .oe_timesheet_weekly td {
-    padding-top: 15px;
+  padding: 3px;
+  text-align: right;
 }
-
 .openerp .oe_timesheet_weekly th {
-    text-align: right;
-    color: #069;
-    font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif;
-    font-size: 10px;
+  text-align: center;
+  color: #006699;
+  font-family: "Helvetica Neue", Arial, Verdana, "Nimbus Sans L", sans-serif;
+  font-size: 10px;
+  background: #eeeeee;
+  min-width: 47px;
 }
-
-.openerp .oe_timesheet_weekly th.oe_timesheet_weekly_date_head {
-    width: 60px;
+.openerp .oe_timesheet_weekly .oe_timesheet_total {
+  background: #eeeeee;
 }
-
-.openerp .oe_timesheet_weekly td {
-    text-align: right;
-    vertical-align: middle;
-}
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_account {
-    text-align: left;
-    padding-right: 30px;
+  text-align: left;
+}
+.openerp .oe_timesheet_weekly .oe_timesheet_first_col {
+  min-width: 130px;
 }
-
 .openerp .oe_timesheet_weekly td input.oe_timesheet_weekly_input {
-    border: 1px solid #CCC;
-    padding: 5px 2px !important;
-    color: #666 !important;
-    font-size: 14px;
-    font-weight: bold;
-    width: 38px;
-    text-align: right;
-    min-width: 0 !important;
+  padding: 5px 2px !important;
+  width: 40px;
+  text-align: right;
+  min-width: 0 !important;
 }
-
-.openerp .oe_timesheet_weekly td .oe_timesheet_weekly_box {
-    padding: 5px 2px !important;
-    color: #666 !important;
-    font-size: 14px;
-    font-weight: bold;
-    width: 38px;
-    display: inline-block;
+.openerp .oe_timesheet_weekly td.oe_timesheet_total {
+  font-weight: bold;
+  padding: 5px 3px !important;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding_tot {
-    display: table;
-    width: 100%;
+  display: table;
+  width: 100%;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_adding {
-    display: table-cell;
-    text-align: left;
+  display: table-cell;
+  text-align: left;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_tottot {
-    display: table-cell;
+  display: table-cell;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row td {
-    text-align: left;
+  text-align: left;
 }
-
 .openerp .oe_timesheet_weekly .oe_timesheet_weekly_add_row .oe_form_field_many2one {
-    display: inline-block;
-    width: 200px;
+  display: inline-block;
+  width: 200px;
 }
-
-.openerp .oe_timesheet_weekly_today {
+.openerp .oe_timesheet_weekly .oe_timesheet_weekly_today {
+  background: #ffddee;
 }
diff --git a/addons/hr_timesheet_sheet/static/src/css/timesheet.sass b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
new file mode 100644
index 00000000000..9c986517508
--- /dev/null
+++ b/addons/hr_timesheet_sheet/static/src/css/timesheet.sass
@@ -0,0 +1,49 @@
+@charset "utf-8"
+
+.openerp
+    .oe_form_readonly
+        .oe_timesheet_button_add
+            display: none
+    .oe_timesheet_weekly
+        overflow-x: auto
+        table
+            width: 100%
+        td
+            padding: 3px
+            text-align: right
+        th
+            text-align: center
+            color: #069
+            font-family: 'Helvetica Neue', Arial, Verdana, 'Nimbus Sans L', sans-serif
+            font-size: 10px
+            background: #eee
+            min-width: 47px
+        .oe_timesheet_total
+            background: #eee
+        .oe_timesheet_weekly_account
+            text-align: left
+        .oe_timesheet_first_col
+            min-width: 130px
+        td input.oe_timesheet_weekly_input
+            padding: 5px 2px !important
+            width: 40px
+            text-align: right
+            min-width: 0 !important
+        td.oe_timesheet_total
+            font-weight: bold
+            padding: 5px 3px !important
+        .oe_timesheet_weekly_adding_tot
+            display: table
+            width: 100%
+        .oe_timesheet_weekly_adding
+            display: table-cell
+            text-align: left
+        .oe_timesheet_weekly_tottot
+            display: table-cell
+        .oe_timesheet_weekly_add_row td
+            text-align: left
+        .oe_timesheet_weekly_add_row .oe_form_field_many2one
+            display: inline-block
+            width: 200px
+        .oe_timesheet_weekly_today
+            background: #fde
diff --git a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
index 43c23951514..3bfca4c4aa2 100644
--- a/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
+++ b/addons/hr_timesheet_sheet/static/src/xml/timesheet.xml
@@ -5,7 +5,7 @@
         <div class="oe_timesheet_weekly">
             <table>
                 <tr>
-                    <th> </th>
+                    <th class="oe_timesheet_first_col"> </th>
                     <t t-foreach="widget.dates" t-as="date">
                         <th t-att-class="'oe_timesheet_weekly_date_head' + (Date.compare(date, Date.today()) === 0 ? ' oe_timesheet_weekly_today' : '')">
                             <t t-esc="date.toString('ddd')"/><br />
@@ -26,29 +26,29 @@
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td t-att-data-account-total="account.account"> </td>
+                    <td t-att-data-account-total="account.account" class="oe_timesheet_total"> </td>
                 </tr>
                 <tr class="oe_timesheet_weekly_add_row" style="display: none">
                     <td t-att-colspan="widget.dates.length + 2">
                         <button class="oe_highlight">Add</button>
                     </td>
                 </tr>
-                <tr>
+                <tr class="oe_timesheet_total">
                     <td>
                         <div class="oe_timesheet_weekly_adding_tot">
-                            <div class="oe_timesheet_weekly_adding"><button class="oe_link">Add a Project</button></div>
+                            <div class="oe_timesheet_weekly_adding"><button class="oe_timesheet_button_add">Add a Line</button></div>
                             <div class="oe_timesheet_weekly_tottot"><span>Total</span></div>
                         </div>
                     </td>
                     <t t-set="day_count" t-value="0"/>
                     <t t-foreach="widget.dates" t-as="date">
-                        <td t-att-class="(Date.compare(date, Date.today()) === 0 ? 'oe_timesheet_weekly_today' : '')">
+                        <td class="oe_timesheet_total">
                             <span class="oe_timesheet_weekly_box" t-att-data-day-total="day_count">
                             </span>
                             <t t-set="day_count" t-value="day_count + 1"/>
                         </td>
                     </t>
-                    <td class="oe_timesheet_weekly_supertotal"> </td>
+                    <td class="oe_timesheet_weekly_supertotal oe_timesheet_total"> </td>
                 </tr>
             </table>
         </div>