[MERGE] Merged from openerp-web.

bzr revid: psa@tinyerp.com-20120709085635-g0tcm7nlqe7wd3n3

addons/web/static/src/css/base.css

@@ -34,7 +34,7 @@
   background: white;
   /* http://www.quirksmode.org/dom/inputfile.html
    * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */
+   */ */
 }
 .openerp a {
   text-decoration: none;
@@ -91,7 +91,7 @@
   list-style-type: none;
 }
 .openerp input, .openerp textarea, .openerp select {
-  padding: 1px 4px;
+  padding: 2px 4px;
   border: 1px solid #cccccc;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -186,6 +186,99 @@
 .openerp .ui-menu .ui-menu-item a.ui-state-active {
   background: #f0f0fa;
 }
+.openerp.ui-dialog {
+  display: none;
+  position: fixed;
+  padding: 6px;
+  top: 50%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin: -150px 0 0 -280px;
+  background-color: rgba(60, 60, 60, 0.7);
+  border: 1px solid;
+  border-color: #888888 #555555 #444444;
+  -moz-border-radius: 8px;
+  -webkit-border-radius: 8px;
+  border-radius: 8px;
+  -moz-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  box-shadow: 0 1px 12px rgba(0, 0, 0, 0.6);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
+  padding: 16px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar {
+  border-bottom: 1px solid #cacaca;
+  -moz-border-radius: 2px 2px 0 0;
+  -webkit-border-radius: 2px 2px 0 0;
+  border-radius: 2px 2px 0 0;
+  background-color: #fcfcfc;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede));
+  background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -moz-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -ms-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: -o-linear-gradient(top, #fcfcfc, #dedede);
+  background-image: linear-gradient(to bottom, #fcfcfc, #dedede);
+}
+.openerp.ui-dialog .ui-dialog-titlebar .ui-dialog-title {
+  margin: 0;
+  padding: 0;
+}
+.openerp.ui-dialog .ui-widget-header {
+  border: none;
+}
+.openerp.ui-dialog .ui-dialog-content {
+  background: white;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane {
+  border-top: 1px solid #e0e0e0;
+  background: #f5f7f9;
+  padding: 8px;
+  margin: 0;
+  -moz-border-radius: 0 0 2px 2px;
+  -webkit-border-radius: 0 0 2px 2px;
+  border-radius: 0 0 2px 2px;
+}
+.openerp.ui-dialog .ui-dialog-buttonpane button {
+  margin-left: 8px;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close {
+  padding: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close .ui-icon-closethick {
+  display: none;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before {
+  content: "×";
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 16px;
+  color: black;
+  text-shadow: 0 1px 0 white;
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+}
+.openerp.ui-dialog .ui-dialog-titlebar-close:before:hover {
+  color: black;
+  text-decoration: none;
+}
+.openerp .modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
+}
 .openerp .oe_i {
   font-family: "mnmliconsRegular" !important;
   font-size: 21px;
@@ -283,7 +376,7 @@
   background: #ed6f6a;
 }
 .openerp .oe_title {
-  width: 55%;
+  width: 60%;
 }
 .openerp .oe_title:after {
   content: ".";
@@ -341,6 +434,19 @@
 .openerp .oe_button.oe_link span:hover {
   text-decoration: underline;
 }
+.openerp .oe_webclient .oe_star_on, .openerp .oe_webclient .oe_star_off {
+  color: #cccccc;
+  text-shadow: 0 0 2px black;
+  vertical-align: top;
+  position: relative;
+  top: -5px;
+}
+.openerp .oe_webclient .oe_star_on:hover, .openerp .oe_webclient .oe_star_off:hover {
+  text-decoration: none;
+}
+.openerp .oe_webclient .oe_star_on {
+  color: gold;
+}
 .openerp.oe_tooltip {
   font-size: 12px;
 }
@@ -368,6 +474,11 @@
   list-style: none;
   zoom: 1;
 }
+.openerp .oe_notebook.ui-corner-all {
+  -moz-border-radius: 0;
+  -webkit-border-radius: 0;
+  border-radius: 0;
+}
 .openerp .oe_notebook:before, .openerp .oe_notebook:after {
   display: table;
   content: "";
@@ -424,18 +535,22 @@
   position: relative;
   cursor: pointer;
 }
+.openerp .oe_dropdown_toggle {
+  color: #888888;
+  font-weight: normal;
+}
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
   display: block;
 }
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 28px;
+  top: 32px;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
-  padding: 8px;
-  min-width: 120px;
+  padding: 6px 0;
+  min-width: 140px;
   text-align: left;
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
@@ -465,7 +580,7 @@
 .openerp .oe_dropdown_menu > li > a {
   white-space: nowrap;
   display: block;
-  padding: 3px 6px;
+  padding: 4px 15px;
   color: #4c4c4c;
   text-decoration: none;
 }
@@ -779,6 +894,7 @@
   border-top: 4px solid white;
 }
 .openerp .oe_topbar .oe_dropdown_menu {
+  top: 32px;
   background: #333333;
   background: rgba(37, 37, 37, 0.9);
   border-color: #999999;
@@ -1161,10 +1277,10 @@
 .openerp .oe_view_manager .oe_view_manager_switch .oe_vm_switch_diagram:after {
   content: "f";
 }
-.openerp .oe_view_manager_global {
+.openerp .oe_view_manager_current {
   height: 100%;
 }
-.openerp .oe_view_manager_global > .oe_view_manager_header {
+.openerp .oe_view_manager_current > .oe_view_manager_header {
   border-top: 1px solid #cacaca;
   border-bottom: 1px solid #cacaca;
   background-color: #fcfcfc;
@@ -1178,12 +1294,18 @@
   -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 0 rgba(255, 255, 255, 0.4), 0 0 9px rgba(0, 0, 0, 0.1);
 }
-.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row td {
+.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row td {
   padding: 8px;
 }
-.openerp .oe_view_manager_global > .oe_view_manager_header .oe_header_row:first-child td {
+.openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td {
   padding-top: 8px;
 }
+.openerp .oe_view_manager_inline {
+  height: 100%;
+}
+.openerp .oe_view_manager_inline > .oe_view_manager_header {
+  display: none;
+}
 .openerp .oe_popup_form > .oe_formview > .oe_form_pager {
   display: none !important;
 }
@@ -1206,7 +1328,7 @@
 .openerp .oe_searchview input, .openerp .oe_searchview textarea {
   padding: 3px;
   height: 14px;
-  font-size: 11px;
+  font-size: 12px;
   line-height: 18px;
 }
 .openerp .oe_searchview.oe_focused {
@@ -1565,11 +1687,11 @@
   background-color: #ff6666 !important;
   border: 1px solid #dd0000 !important;
 }
-.openerp .oe_form_editable .oe_highlight {
+.openerp .oe_view_manager_current .oe_form_editable .oe_highlight {
   color: #404040;
   background: none;
 }
-.openerp .oe_form_editable button.oe_highlight {
+.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight {
   background-color: #efefef;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
   background-image: -webkit-linear-gradient(top, #efefef, #d8d8d8);
@@ -1581,7 +1703,7 @@
   -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
 }
-.openerp .oe_form_editable button.oe_highlight:active {
+.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:active {
   background-color: #e3e3e3;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#e3e3e3), to(#f6f6f6));
   background-image: -webkit-linear-gradient(top, #e3e3e3, #f6f6f6);
@@ -1593,7 +1715,7 @@
   -webkit-box-shadow: none;
   box-shadow: none;
 }
-.openerp .oe_form_editable button.oe_highlight:hover {
+.openerp .oe_view_manager_current .oe_form_editable button.oe_highlight:hover {
   background-color: #f6f6f6;
   background-image: -webkit-gradient(linear, left top, left bottom, from(#f6f6f6), to(#e3e3e3));
   background-image: -webkit-linear-gradient(top, #f6f6f6, #e3e3e3);
@@ -1611,9 +1733,13 @@
 .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
   display: none !important;
 }
-.openerp .oe_form_nosheet > *:not(header) {
-  margin-left: 10px !important;
-  margin-right: 10px !important;
+.openerp .oe_form_nosheet {
+  margin-left: 10px;
+  margin-right: 10px;
+}
+.openerp .oe_form_nosheet > header {
+  margin-left: -10px;
+  margin-right: -10px;
 }
 .openerp .oe_form header {
   position: relative;
@@ -1634,7 +1760,7 @@
 }
 .openerp .oe_form footer {
   min-width: 650px;
-  max-width: 960px;
+  max-width: 860px;
   margin: 0 auto;
 }
 .openerp ul.oe_form_steps {
@@ -1703,7 +1829,7 @@
 }
 .openerp .oe_application .oe_form_sheet_width {
   min-width: 650px;
-  max-width: 960px;
+  max-width: 860px;
   margin: 0 auto;
 }
 .openerp .oe_application .oe_form_sheet {
@@ -2013,7 +2139,10 @@
   display: none;
 }
 .openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save {
-  background-image: url(/web/static/src/img/iconset-b-remove.png);
+  background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat;
+}
+.openerp .oe_form_field_one2many .oe_list .oe_list_edit_row_save:before {
+  visibility: hidden;
 }
 .openerp .oe_form_field_one2many > .oe_view_manager .oe_header_row_top {
   display: none;
@@ -2083,7 +2212,6 @@
 }
 .openerp .oe_list_content > tbody {
   cursor: pointer;
-  background: white;
 }
 .openerp .oe_list_content > tbody > tr {
   border-top: 1px solid #dddddd;
@@ -2143,6 +2271,9 @@
 .openerp .oe_list_content .numeric input {
   text-align: right;
 }
+.openerp .oe_list_content .oe_list_edit_row_save:before {
+  content: "S";
+}
 .openerp .oe_trad_field.touched {
   border: 1px solid green !important;
 }

addons/web/static/src/css/base.sass

@@ -6,6 +6,7 @@ $facets-border: #afafb6
 $facets-border-selected: #a6a6fe
 $hover-background: #f0f0fa
 $colour4: #8a89ba
+$sheet-max-width: 860px
 // }}}
 // Mixins {{{
 @font-face
@@ -143,7 +144,7 @@ $colour4: #8a89ba
     li
         list-style-type: none
     input, textarea, select
-        padding: 1px 4px
+        padding: 2px 4px
         border: 1px solid #ccc
         @include radius(3px)
         background: white
@@ -200,6 +201,75 @@ $colour4: #8a89ba
             width: auto
             a.ui-state-active
                 background: #f0f0fa
+
+    // Modal box
+    &.ui-dialog
+        display: none
+        position: fixed
+        padding: 6px
+        top: 50%
+        left: 50%
+        z-index: 1050
+        width: 560px
+        margin: -150px 0 0 -280px
+        //overflow: hidden
+        background-color: rgba(60,60,60,0.7)
+        border: 1px solid
+        border-color: #888 #555 #444
+        //overflow: hidden
+        @include radius(8px)
+        @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6))
+        @include background-clip()
+        .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
+            padding: 16px
+        .ui-dialog-titlebar
+            border-bottom: 1px solid #cacaca
+            @include radius(2px 2px 0 0)
+            @include vertical-gradient(#FCFCFC, #DEDEDE)
+            .ui-dialog-title
+                margin: 0
+                padding: 0
+        .ui-widget-header
+            border: none
+        .ui-dialog-content
+            background: white
+        .ui-dialog-buttonpane
+            border-top: 1px solid #e0e0e0
+            background: #f5f7f9
+            padding: 8px
+            margin: 0
+            @include radius(0 0 2px 2px)
+            button
+                margin-left: 8px
+        .ui-dialog-titlebar-close
+            padding: 0
+            .ui-icon-closethick
+                display: none
+            &:before
+                content: "×"
+                font-size: 18px
+                font-weight: bold
+                line-height: 16px
+                color: black
+                text-shadow: 0 1px 0 white
+                padding: 0
+                cursor: pointer
+                background: transparent
+                border: 0
+                &:hover
+                    color: black
+                    text-decoration: none
+
+    .modal-backdrop
+        position: fixed
+        top: 0
+        right: 0
+        bottom: 0
+        left: 0
+        z-index: 1040
+        background-color: black
+        @include opacity(.3)
+
     // }}}
     // Generic classes {{{
     .oe_i
@@ -252,7 +322,7 @@ $colour4: #8a89ba
             &:hover
                 background: #ED6F6A
     .oe_title
-        width: 55%
+        width: 60%
     .oe_title:after
         content: "."
         display: block
@@ -279,6 +349,17 @@ $colour4: #8a89ba
             font-weight: bold
             &:hover
                 text-decoration: underline
+    .oe_webclient
+        .oe_star_on, .oe_star_off
+            color: #cccccc
+            text-shadow: 0 0 2px black
+            vertical-align: top
+            position: relative
+            top: -5px
+        .oe_star_on:hover, .oe_star_off:hover
+            text-decoration: none
+        .oe_star_on
+            color: gold
 
     //.oe_edit_only 
     // }}}
@@ -305,6 +386,8 @@ $colour4: #8a89ba
         padding: 0 16px
         list-style: none
         zoom: 1
+    .oe_notebook.ui-corner-all
+        @include radius(0)
     .oe_notebook:before, .oe_notebook:after
         display: table
         content: ""
@@ -348,17 +431,20 @@ $colour4: #8a89ba
     .oe_dropdown, .oe_dropdown_hover, .oe_dropdown_toggle
         position: relative
         cursor: pointer
+    .oe_dropdown_toggle
+        color: #888
+        font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 28px
+        top: 32px
         z-index: 1
         border: 1px solid #afafb6
         background: white
-        padding: 8px
-        min-width: 120px
+        padding: 6px 0
+        min-width: 140px
         text-align: left
         @include radius(3px)
         @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
@@ -373,7 +459,7 @@ $colour4: #8a89ba
             > a
                 white-space: nowrap
                 display: block
-                padding: 3px 6px
+                padding: 4px 15px
                 color: #4c4c4c
                 text-decoration: none
                 &:hover
@@ -391,7 +477,6 @@ $colour4: #8a89ba
         border-right: 4px solid transparent
         border-top: 4px solid#404040
         @include opacity(0.5)
-
     .oe_sidebar
         white-space: nowrap
         .oe_dropdown_menu
@@ -612,6 +697,7 @@ $colour4: #8a89ba
         .oe_dropdown_arrow:after
             border-top: 4px solid white
         .oe_dropdown_menu
+            top: 32px
             background: #333
             background: rgba(37,37,37,0.9)
             border-color: #999
@@ -627,6 +713,7 @@ $colour4: #8a89ba
                     &:hover
                         @include vertical-gradient(#292929, #191919)
                         @include box-shadow(none)
+
     // }}}
     // Webclient.leftbar {{{
     .oe_leftbar
@@ -912,7 +999,7 @@ $colour4: #8a89ba
                 content: "f"
         // }}}
     // ViewManager application {{{
-    .oe_view_manager_global
+    .oe_view_manager_current
         height: 100%
         > .oe_view_manager_header
             border-top: 1px solid #cacaca
@@ -926,6 +1013,12 @@ $colour4: #8a89ba
                 td
                     padding-top: 8px
     // }}}
+    // ViewManager inline {{{
+    .oe_view_manager_inline
+        height: 100%
+        > .oe_view_manager_header
+            display: none
+    // }}}
     // Viewmanager popup {{{
     .oe_popup_form > .oe_formview > .oe_form_pager
         display: none !important
@@ -945,7 +1038,7 @@ $colour4: #8a89ba
         input, textarea
             padding: 3px
             height: 14px
-            font-size: 11px
+            font-size: 12px
             line-height: 18px
         &.oe_focused
             border-color: $facets-border-selected
@@ -1240,7 +1333,7 @@ $colour4: #8a89ba
         input, select, textarea
             background-color: #F66 !important
             border: 1px solid #D00 !important
-    .oe_form_editable
+    .oe_view_manager_current .oe_form_editable
         .oe_highlight
             color: #404040
             background: none
@@ -1258,9 +1351,12 @@ $colour4: #8a89ba
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
-    .oe_form_nosheet > *:not(header)
-        margin-left: 10px !important
-        margin-right: 10px !important
+    .oe_form_nosheet 
+        margin-left: 10px
+        margin-right: 10px
+    .oe_form_nosheet > header
+        margin-left: -10px
+        margin-right: -10px
     // }}}
     // FormView.custom tags and classes {{{
     .oe_form 
@@ -1275,7 +1371,7 @@ $colour4: #8a89ba
                 float: right
         footer
             min-width: 650px
-            max-width: 960px
+            max-width: $sheet-max-width
             margin: 0 auto
     ul.oe_form_steps
         height: 30px
@@ -1330,7 +1426,7 @@ $colour4: #8a89ba
             border-bottom: 1px solid #ddd 
         .oe_form_sheet_width
             min-width: 650px
-            max-width: 960px
+            max-width: $sheet-max-width
             margin: 0 auto
         .oe_form_sheet
             background: white
@@ -1589,7 +1685,9 @@ $colour4: #8a89ba
     .oe_form_field_one2many
         // TODO: oe_form_field_one2many_list?
         .oe_list .oe_list_edit_row_save
-            background-image: url(/web/static/src/img/iconset-b-remove.png)
+            background: url(/web/static/src/img/iconset-b-remove.png) 50% 50% no-repeat
+            &:before
+                visibility: hidden
 
         &> .oe_view_manager
             .oe_header_row_top
@@ -1649,7 +1747,6 @@ $colour4: #8a89ba
             @include opacity(0.6)
         > tbody
             cursor: pointer
-            background: white
             > tr
                 border-top: 1px solid #ddd
                 > td.oe_list_field_cell
@@ -1684,6 +1781,8 @@ $colour4: #8a89ba
             width: 82px
             input
                 text-align: right
+        .oe_list_edit_row_save:before
+            content: "S"
     // }}}
     // Translation {{{
     .oe_trad_field.touched