[merge]

bzr revid: nicolas.vanhoren@openerp.com-20120217101731-3g9hrhs65qb32pkv

1 files changed, 76 insertions, 31 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index ce86eb889ea..2a27e61eb3d 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,9 +1,12 @@
-body { padding: 0; margin: 0; }
+body.openerp {
+    padding: 0;
+    margin: 0;
+    overflow-y: scroll;
+}
 .openerp {
     padding: 0;
     margin: 0;
     height: 100%;
-    overflow-y: scroll;
     font-size: 80%;
     font-family: Ubuntu, Helvetica, sans-serif;
 }
@@ -382,6 +385,14 @@ label.error {
     height: 100%;
 }
 
+/* IE Hack - for IE < 9
+ * Avoids footer to be placed statically at 100% cutting the middle of the views
+ * */
+.openerp .oe-application-container {
+    height: auto\9;
+    min-height: 100%\9;
+}
+
 /* Menu */
 .openerp .menu {
     height: 34px;
@@ -747,6 +758,7 @@ label.error {
 }
 .openerp .filter_label.enabled, .openerp .filter_icon.enabled {
     background: #aaa;
+    filter: none;
     -moz-box-shadow: none;
     -webkit-box-shadow: none;
     -o-box-shadow: none;
@@ -1172,7 +1184,20 @@ label.error {
 
 
 /* Form */
-
+.openerp .oe_form_button_save_dirty {
+    display: none;
+}
+.openerp .oe_form_dirty > .oe_form_header > .oe_form_buttons > .oe_form_button_save {
+    color: white;
+    background: #dc5f59;
+    background: -moz-linear-gradient(#dc5f59, #b33630);
+    background: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630));
+    background: -webkit-linear-gradient(#dc5f59, #b33630);
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    -box-shadow: none;
+    font-weight: bold;
+}
 .openerp .oe_form_frame_cell input[type="checkbox"] {
     margin-top: 3px;
     vertical-align: middle;
@@ -1208,6 +1233,11 @@ label.error {
 .openerp td.oe_form_frame_cell {
     padding: 2px;
     position: relative;
+}
+.openerp td.oe_form_field_translatable,
+.openerp td.oe_form_field_many2one,
+.openerp td.oe_form_field_date,
+.openerp td.oe_form_field_datetime {
     white-space: nowrap;
 }
 .openerp td.oe_form_field_boolean {
@@ -1307,6 +1337,10 @@ label.error {
     white-space: normal;
 }
 
+.openerp .oe_forms .oe_form_paragraph.oe_multilines {
+    white-space: pre;
+}
+
 .openerp .oe_form_field_one2many .oe-actions h3.oe_view_title,
 .openerp .oe_form_field_one2many_list .oe-actions h3.oe_view_title{
     display: inline;
@@ -1319,6 +1353,9 @@ label.error {
     margin-top: -9px;
 }
 
+.openerp table.oe_frame .oe-listview-content td {
+    color: inherit;
+}
 
 /* Uneditable Form View */
 .openerp .oe_form_readonly {
@@ -1421,10 +1458,14 @@ label.error {
 .openerp .oe_forms select{
     padding-top: 2px;
 }
+.openerp .oe_forms input[readonly],
+.openerp .oe_forms select[readonly],
+.openerp .oe_forms textarea[readonly],
 .openerp .oe_forms input[disabled],
 .openerp .oe_forms select[disabled],
 .openerp .oe_forms textarea[disabled]{
-    background: #E0E0E0;
+    background: #E5E5E5 !important;
+    color: #666;
 }
 .openerp .oe_forms textarea {
     resize:vertical;
@@ -1446,15 +1487,21 @@ label.error {
     min-width: 100%;
     width: 100%;
 }
-.openerp .oe_forms .button {
-    height: 22px;
-}
 @-moz-document url-prefix() {
     /* Strange firefox behaviour on width: 100% + white-space: nowrap */
     .openerp .oe_forms .oe_form_button .oe_button {
         width: auto;
     }
 }
+/* IE Hack - for IE < 9
+ * Avoids buttons overflow
+ * */
+.openerp .oe_forms .oe_form_button .oe_button {
+    min-width: auto\9;
+}
+.openerp .oe_forms .button {
+    height: 22px;
+}
 .openerp .oe_forms .oe_button span {
     position: relative;
     vertical-align: top;
@@ -1888,6 +1935,7 @@ label.error {
     width: 100%;
     background-color : #FFFFFF;
     border-spacing: 0;
+    
 }
 .openerp .oe-treeview-table tr:hover{
     color: blue;
@@ -1908,14 +1956,14 @@ label.error {
     white-space: nowrap;
     display: block;
     }
-.treeview-tr:first-of-type {
+.treeview-tr.oe-treeview-first {
     background: transparent url(/web/static/src/img/expand.gif) 0 50% no-repeat;
 }
-.oe-open .treeview-tr:first-of-type {
+.oe-open .treeview-tr.oe-treeview-first {
     background-image: url(/web/static/src/img/collapse.gif);
 }
-.treeview-tr:first-of-type span,
-.treeview-td:first-of-type span {
+.treeview-tr.oe-treeview-first span,
+.treeview-td.oe-treeview-first span {
     margin-left: 16px;
 }
 
@@ -2031,34 +2079,31 @@ ul.oe-arrow-list li.oe-arrow-list-selected .oe-arrow-list-after {
     border-bottom-right-radius: 3px;
 }
 .openerp .oe_view_editor {
-    border-collapse: collapse;
-    padding: 0;
-    align: left;
+    width:100%;
+    border-collapse : collapse;
+    margin-left: -12px;
+    
     width: 100%;
+    background-color : white;
+    border-spacing: 0;
 }
-.openerp .oe_view_editor_colum{
+.openerp .oe_view_editor td{
+    text-align: center;
+    white-space: nowrap;
+    border: 1px solid #D8D8D8;
+    
+    cursor: pointer;
     font-size: 90%;
-    font-weight: normal;
-    padding: 0;
-    border-bottom: 1px solid #CFCCCC;
 }
-.openerp .oe_view_editor_row:hover {
-    background-color: #F3F3F3;
+.openerp .oe_view_editor_field td{
+    border: 0px !important;
 }
 
-.openerp .oe_view_editor_tree_grid{
-    text-align: left;
-    white-space: nowrap;
-    border-collapse: collapse;
-    width: 100%;
-}
-.openerp .oe_view_editor_tree_grid a:hover {
-    color: blue;
-}
-.openerp .oe_view_editor_tree_grid a {
-    display: block;
+.openerp .oe_view_editor tr:hover {
+    background-color: #ecebf2;
 }
 
+
 /* Dialog traceback cases */
 .openerp .oe_error_detail{
     display: block;