[MERGE] trunk

bzr revid: al@openerp.com-20120424205008-5gohaqegqhrrug99
bzr revid: al@openerp.com-20120427214023-fafdxkx01nx43usa

2 files changed, 90 insertions, 27 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index deb677151a0..7d5893a39f3 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1365,10 +1365,6 @@
   padding: 2px;
   height: 25px;
 }
-.openerp .oe_form_autolayout .oe_form_group_cell .oe_form_button {
-  width: 100%;
-  white-space: nowrap;
-}
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_many2one input,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_char input,
@@ -1377,31 +1373,38 @@
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_email input,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_url input,
-.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_date input,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_float input,
 .openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_field_selection select,
-.openerp .oe_form_autolayout .oe_form_group_cell > .oe_datepicker_root {
+.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root,
+.openerp .oe_form_autolayout .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master {
   width: 100%;
 }
 .openerp .oe_form_autolayout .oe_form_button.oe_button {
   color: #4c4c4c;
-  white-space: nowrap;
-  min-width: 100%;
-  width: 100%;
-  height: 22px;
 }
 .openerp .oe_form_autolayout .oe_form_button.oe_button span {
   position: relative;
   vertical-align: top;
 }
+.openerp .oe_form_autolayout .oe_form_group_cell > .oe_form_button.oe_button {
+  white-space: nowrap;
+  min-width: 100%;
+  width: 100%;
+}
 .openerp .oe_form_autolayout .oe_form_group_cell.oe_form_group_nested {
   padding: 0;
 }
-.openerp .oe_form label {
-  font-weight: bold;
-}
-.openerp .oe_form_label_help[for], .openerp .oe_form_label[for] {
+.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   white-space: nowrap;
+  padding-right: 8px;
+}
+.openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
+  font-size: 80%;
+  color: darkGreen;
+  vertical-align: top;
+  position: relative;
+  top: -4px;
+  padding: 0 2px;
 }
 .openerp .oe_form textarea {
   resize: vertical;
@@ -1589,6 +1592,9 @@
   border-bottom-color: transparent;
   cursor: default;
 }
+.openerp .oe_form_notebook_page {
+  padding: 0;
+}
 .openerp .ui-tabs-hide {
   display: none;
 }
@@ -1629,6 +1635,23 @@
   height: auto;
   line-height: 16px;
 }
+.openerp .oe_form .oe_form_title, .openerp .oe_form .oe_form_title input {
+  font-size: 20px;
+  font-weight: bold;
+}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label {
+  border-right: 1px solid #dddddd;
+}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd) label,
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label label {
+  display: block;
+  min-width: 120px;
+}
+.openerp .oe_form .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
+.openerp .oe_form .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell {
+  padding: 2px 2px 2px 8px !important;
+}
 .openerp .oe_listview_nocontent > img {
   float: left;
   margin-right: 1.5em;
@@ -1815,6 +1838,17 @@
 .openerp .oe_layout_debugging .oe_form_group:hover, .openerp .oe_layout_debugging .oe_form_group_cell:hover {
   outline-color: red;
 }
+.openerp .oe_layout_debugging .oe_form_group_row_incomplete > td:last-child:after {
+  content: "[Incomplete Row]";
+  background: red;
+  padding: 2px;
+  font-weight: bold;
+  color: white;
+  float: right;
+}
+.openerp .oe_layout_debugging .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after {
+  content: "[newline]";
+}
 .openerp .oe_debug_view {
   float: left;
 }
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 96025c2461e..acc2ab59a3d 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1122,9 +1122,6 @@ $colour4: #8a89ba
             line-height: 18px
             padding: 2px
             height: 25px
-            .oe_form_button
-                width: 100%
-                white-space: nowrap
         .oe_form_group_cell > .oe_form_field_many2one,
         .oe_form_group_cell > .oe_form_field_many2one input,
         .oe_form_group_cell > .oe_form_field_char input,
@@ -1133,29 +1130,35 @@ $colour4: #8a89ba
         .oe_form_group_cell > .oe_form_field_email input,
         .oe_form_group_cell > .oe_form_field_url,
         .oe_form_group_cell > .oe_form_field_url input,
-        .oe_form_group_cell > .oe_form_field_date input,
         .oe_form_group_cell > .oe_form_field_float input,
         .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > .oe_datepicker_root
+        .oe_form_group_cell > div > .oe_datepicker_root,
+        .oe_form_group_cell > div > .oe_datepicker_root > input.oe_datepicker_master
             width: 100%
         .oe_form_button.oe_button
             color: #4c4c4c
-            white-space: nowrap
-            min-width: 100%
-            width: 100%
-            height: 22px
             span
                 position: relative
                 vertical-align: top
+        .oe_form_group_cell > .oe_form_button.oe_button
+            white-space: nowrap
+            min-width: 100%
+            width: 100%
         .oe_form_group_cell.oe_form_group_nested
             padding: 0
     // }}}
     // FormView.label {{{
     .oe_form
-        label
-            font-weight: bold
-    .oe_form_label_help[for], .oe_form_label[for]
-        white-space: nowrap
+        .oe_form_label_help[for], .oe_form_label[for]
+            white-space: nowrap
+            padding-right: 8px
+            span
+                font-size: 80%
+                color: darkGreen
+                vertical-align: top
+                position: relative
+                top: -4px
+                padding: 0 2px
     // }}}
     // FormView.fields {{{
     .oe_form
@@ -1328,6 +1331,8 @@ $colour4: #8a89ba
         border: 1px solid #ddd
         border-bottom-color: transparent
         cursor: default
+    .oe_form_notebook_page
+        padding: 0
     .ui-tabs-hide
         display: none
 
@@ -1372,6 +1377,21 @@ $colour4: #8a89ba
                         line-height: 16px
 
     // }}}
+    // FormView.classes for openerp views {{{
+    .oe_form
+        .oe_form_title, .oe_form_title input
+            font-size: 20px
+            font-weight: bold
+        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell:nth-child(odd),
+        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell_label
+            border-right: 1px solid #ddd
+            label
+                display: block
+                min-width: 120px
+        .oe_form_group_odd_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell,
+        .oe_form_group_label_border > tbody > tr.oe_form_group_row > td.oe_form_group_cell
+            padding: 2px 2px 2px 8px !important
+    // }}}
     // ListView {{{
     .oe_listview_nocontent
         > img
@@ -1518,6 +1538,15 @@ $colour4: #8a89ba
             outline: 1px solid blue
         .oe_form_group:hover, .oe_form_group_cell:hover
             outline-color: red
+        .oe_form_group_row_incomplete > td:last-child:after
+            content: "[Incomplete Row]"
+            background: red
+            padding: 2px
+            font-weight: bold
+            color: white
+            float: right
+        .oe_form_group_row_incomplete.oe_form_group_row_newline > td:last-child:after
+            content: "[newline]"
 
     .oe_debug_view
         float: left