[IMP] better form css

bzr revid: fp@tinyerp.com-20120710101205-y0im0xzehzw6jm9p

3 files changed, 39 insertions, 36 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 36d26d10741..0c4362f4436 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1857,7 +1857,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 110px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -1929,9 +1929,10 @@
 }
 .openerp .oe_form .oe_form_field_char input,
 .openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_email input,
 .openerp .oe_form .oe_form_field_text textarea,
 .openerp .oe_form .oe_form_field_selection select {
-  width: inherit;
+  width: 100%;
 }
 .openerp .oe_form .oe_form_field_text.oe_inline, .openerp .oe_form .oe_form_field_text.oe_inline > textarea {
   width: 500px;
@@ -2001,15 +2002,6 @@
   -webkit-border-radius: 0px;
   border-radius: 0px;
 }
-.openerp .oe_form .oe_form_field_many2one input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_binary input, .openerp .oe_form .oe_form_field_url input {
-  border-right: none;
-  -webkit-border-top-right-radius: 0px;
-  -webkit-border-bottom-right-radius: 0px;
-  -moz-border-radius-topright: 0px;
-  -moz-border-radius-bottomright: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
 .openerp .oe_form .oe_form_field_url button img {
   vertical-align: top;
 }
@@ -2073,10 +2065,19 @@
   right: 5px;
   top: 3px;
 }
-.openerp .oe_form .oe_form_field_with_button input {
-  width: 100%;
+.openerp .oe_form .oe_form_field_with_button.oe_no_button > .oe_button {
+  display: none;
 }
-.openerp .oe_form .oe_form_field_with_button > .oe_button {
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) input {
+  border-right: none;
+  -webkit-border-top-right-radius: 0px;
+  -webkit-border-bottom-right-radius: 0px;
+  -moz-border-radius-topright: 0px;
+  -moz-border-radius-bottomright: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+.openerp .oe_form .oe_form_field_with_button:not(.oe_no_button) > .oe_button {
   float: right;
   -moz-border-radius: 0;
   -webkit-border-radius: 0;
@@ -2084,6 +2085,9 @@
   border-bottom-left-radius: 0px;
   height: 22px;
 }
+.openerp .oe_form .oe_form_field_with_button input {
+  width: 100%;
+}
 .openerp .oe_form .oe_form_field_with_button > div {
   position: relative;
   overflow: hidden;
@@ -2138,8 +2142,8 @@
 }
 .openerp .oe_form_field_many2one span.oe_m2o_drop_down_button {
   position: absolute;
-  top: 3px;
-  right: 2px;
+  top: 1px;
+  right: 0px;
 }
 .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page {
   display: none;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 2ba3b79c411..fa71942c9da 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1449,7 +1449,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 110px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1512,9 +1512,10 @@ $sheet-max-width: 860px
             width: 100%
         .oe_form_field_char input,
         .oe_form_field_url input,
+        .oe_form_field_email input,
         .oe_form_field_text textarea,
         .oe_form_field_selection select
-            width: inherit
+            width: 100%
         .oe_form_field_text.oe_inline, .oe_form_field_text.oe_inline > textarea
             width: 500px
         .oe_form_field_float input
@@ -1560,14 +1561,6 @@ $sheet-max-width: 860px
             padding-left: 8px
             @include box-shadow(none)
             @include radius(0px)
-        .oe_form_field_many2one input, .oe_form_field_binary input, .oe_form_field_binary input, .oe_form_field_url input
-            border-right: none
-            -webkit-border-top-right-radius: 0px
-            -webkit-border-bottom-right-radius: 0px
-            -moz-border-radius-topright: 0px
-            -moz-border-radius-bottomright: 0px
-            border-top-right-radius: 0px
-            border-bottom-right-radius: 0px
         .oe_form_field_url button img
             vertical-align: top
         .oe_form_field_date,
@@ -1618,14 +1611,25 @@ $sheet-max-width: 860px
             filter: alpha(opacity=50)
             right: 5px
             top: 3px
-        .oe_form_field_with_button
+        .oe_form_field_with_button.oe_no_button > .oe_button
+            display: none
+        .oe_form_field_with_button:not(.oe_no_button)
             input
-                width: 100%
+                border-right: none
+                -webkit-border-top-right-radius: 0px
+                -webkit-border-bottom-right-radius: 0px
+                -moz-border-radius-topright: 0px
+                -moz-border-radius-bottomright: 0px
+                border-top-right-radius: 0px
+                border-bottom-right-radius: 0px
             > .oe_button
                 float: right
                 @include radius(0)
                 border-bottom-left-radius: 0px
                 height: 22px
+        .oe_form_field_with_button
+            input
+                width: 100%
             > div
                 position: relative
                 overflow: hidden
@@ -1680,8 +1684,8 @@ $sheet-max-width: 860px
             position: relative
         span.oe_m2o_drop_down_button
             position: absolute
-            top: 3px
-            right: 2px
+            top: 1px
+            right: 0px
     // }}}
     // FormView.one2many {{{
     .oe_form .oe_form_field_one2many > .oe_view_manager
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index ee0f22cc07d..a8d7a061a81 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -875,7 +875,7 @@
     </span>
 </t>
 <t t-name="FieldEmail">
-    <span class="oe_form_field oe_form_field_email oe_form_field_with_button" t-att-style="widget.node.attrs.style">
+    <span class="oe_form_field oe_form_field_email" t-att-style="widget.node.attrs.style">
         <a t-if="widget.get('effective_readonly')" href="#" class="oe_form_uri" target="_blank"/>
         <t t-if="!widget.get('effective_readonly')">
             <div>
@@ -893,11 +893,6 @@
     <t t-jquery="span:first">
         this.removeClass('oe_form_field_email').addClass('oe_form_field_url');
     </t>
-    <t t-jquery="button.oe_button" t-operation="replace">
-        <button class="oe_button" tabindex="-1" type="button" title="Open this resource">
-            <img t-att-src='_s + "/web/static/src/img/icons/gtk-ok.png"'/>
-        </button>
-    </t>
 </t>
 <t t-name="FieldText">
     <div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">