[MRG] merge with lp:openerp-web

bzr revid: tpa@tinyerp.com-20130417062715-d5tza49c2uooultg

2 files changed, 67 insertions, 1 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 439757eb5be..6fc6813b854 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -2111,6 +2111,9 @@
 .openerp .oe_form_invisible {
   display: none !important;
 }
+.openerp .oe_form_editable .oe_read_only {
+  display: none !important;
+}
 .openerp .oe_form_readonly .oe_edit_only, .openerp .oe_form_readonly .oe_form_field:empty {
   display: none !important;
 }
@@ -2315,6 +2318,30 @@
   display: inline-block;
   min-width: 70px;
 }
+.openerp .oe_form_field_radio.oe_horizontal {
+  white-space: nowrap;
+}
+.openerp .oe_form_field_radio.oe_form_required .oe_radio_input {
+  border: 1px solid transparent;
+  display: inline-block;
+  height: 12px;
+  width: 12px;
+  vertical-align: bottom;
+  border-radius: 10px;
+  margin: 1px 0;
+}
+.openerp .oe_form_field_radio.oe_form_required.oe_form_invalid .oe_radio_input {
+  border-color: red;
+}
+.openerp .oe_form_field_radio.oe_horizontal label,
+.openerp .oe_form_field_radio.oe_horizontal div {
+  display: inline-block;
+  text-align: center;
+  height: 16px;
+}
+.openerp .oe_form_field_radio.oe_vertical label {
+  margin-left: 4px;
+}
 .openerp .oe_form_field_progressbar.ui-progressbar {
   height: 22px;
   font-size: 10px;
@@ -2385,6 +2412,7 @@
   background: white;
   min-width: 60px;
   color: #1f1f1f;
+  font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif;
 }
 .openerp .oe_form input[readonly], .openerp .oe_form select[readonly], .openerp .oe_form textarea[readonly], .openerp .oe_form input[disabled], .openerp .oe_form select[disabled] {
   background: #e5e5e5 !important;
@@ -2399,6 +2427,7 @@
   -moz-border-radius: 0px;
   -webkit-border-radius: 0px;
   border-radius: 0px;
+  color: #4c4c4c;
 }
 .openerp .oe_form textarea.oe_inline[disabled] {
   border-left: 8px solid #eeeeee;
@@ -3158,6 +3187,14 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
+.loading-kitten {
+  -moz-border-radius: 15px;
+  -webkit-border-radius: 15px;
+  border-radius: 15px;
+  -moz-box-shadow: 0 0 5px 5px #999999;
+  -webkit-box-shadow: 0 0 5px 5px #999999;
+  box-shadow: 0 0 5px 5px #999999;
+}
 
 div.ui-widget-overlay {
   background: black;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 962b66d8d98..621a09b28e4 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -480,7 +480,28 @@ $sheet-padding: 16px
     .oe_tag_dark
         background: $tag-bg-dark
         color: #eee
-
+    .oe_form_field_radio
+        &.oe_horizontal
+            white-space: nowrap
+            label
+                display: inline-block
+                text-align: center
+                height: 16px
+        &.oe_vertical
+            label
+                margin-left: 4px
+        &.oe_form_required
+            .oe_radio_input
+                border: 2px solid transparent
+                display: inline-block
+                height: 12px
+                width: 12px
+                vertical-align: bottom
+                border-radius: 10px
+                margin: 1px 0
+            &.oe_form_invalid
+                .oe_radio_input
+                    border-color: red
     .oe_tags
         &.oe_inline
             min-width: 250px
@@ -1668,6 +1689,9 @@ $sheet-padding: 16px
             @include box-shadow((0 1px 2px rgba(0, 0, 0, .1), 0 1px 1px rgba(255, 255, 255, .8) inset))
     .oe_form_invisible
         display: none !important
+    .oe_form_editable
+        .oe_read_only
+            display: none !important
     .oe_form_readonly
         .oe_edit_only, .oe_form_field:empty
             display: none !important
@@ -1888,6 +1912,7 @@ $sheet-padding: 16px
             background: white
             min-width: 60px
             color: #1f1f1f
+            font-family: "Lucida Grande", Helvetica, Verdana, Arial, sans-serif
         input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled]
             background: #E5E5E5 !important
             color: #666
@@ -1896,6 +1921,7 @@ $sheet-padding: 16px
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
+            color: #4c4c4c
         textarea.oe_inline[disabled]
             border-left: 8px solid #eee
         .oe_form_field_url button img
@@ -2486,6 +2512,9 @@ $sheet-padding: 16px
     background-attachment: fixed
     >*
         opacity: 0.70
+.loading-kitten
+    @include radius(15px)
+    @include box-shadow(0 0 5px 5px #999)
 // }}}
 
 // jQueryUI top level {{{