← Back to team overview

openerp-community-reviewer team mailing list archive

[Merge] lp:~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views into lp:ocb-web

 

Stefan Rijnhart (Therp) has proposed merging lp:~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views into lp:ocb-web.

Requested reviews:
  OpenERP Community Backports Team (ocb)
Related bugs:
  Bug #1293085 in OpenERP Community Backports (Web): "[7.0] Binary field widget in list view usability"
  https://bugs.launchpad.net/ocb-web/+bug/1293085

For more details, see:
https://code.launchpad.net/~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views/+merge/211489

Automatically derived from https://code.launchpad.net/~therp-nl/openerp-web/7.0-lp1293085-binary_field_widget_in_list_views for https://code.launchpad.net/~openerp/openerp-web/7.0. Below is a copy of the original description.

Aligning the binary field upload with the corresponding button. Because the buttons where then still overlapping, I'm preventing the button text from showing up in list views (but not in form views).

Tested in IE 11, Firefox 27 and Chrome 32.

-- 
https://code.launchpad.net/~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views/+merge/211489
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~stefan-therp/ocb-web/7.0-lp1293085-binary_field_widget_in_list_views into lp:ocb-web.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-02-13 14:57:55 +0000
+++ addons/web/static/src/css/base.css	2014-03-18 11:15:38 +0000
@@ -2500,6 +2500,7 @@
   line-height: 0;
   font-size: 12px;
   position: absolute;
+  width: 100%;
   top: 1px;
   left: 0;
   right: 0;
@@ -2536,6 +2537,9 @@
 .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
   display: block;
 }
+.openerp .oe_list td.oe_form_binary button span {
+  display: none;
+}
 .openerp .oe_fileupload {
   display: inline-block;
   clear: both;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-02-13 14:57:55 +0000
+++ addons/web/static/src/css/base.sass	2014-03-18 11:15:38 +0000
@@ -1990,6 +1990,7 @@
             line-height: 0
             font-size: 12px
             position: absolute
+            width: 100%
             top: 1px
             left: 0
             right: 0
@@ -2018,6 +2019,11 @@
                 @include box-sizing(border)
             &:hover .oe_form_field_image_controls
                 display: block
+    .oe_list
+        td.oe_form_binary
+            button
+                span
+                    display: none
     .oe_fileupload
         display: inline-block
         clear: both

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-10-22 16:25:19 +0000
+++ addons/web/static/src/xml/base.xml	2014-03-18 11:15:38 +0000
@@ -1240,7 +1240,6 @@
                     <td>
                         <t t-call="HiddenInputFile">
                             <t t-set="fileupload_id" t-value="widget.fileupload_id"/>
-                            <t t-set="fileupload_style" t-translation="off">width: 83px;</t>
                             <button class="oe_button oe_field_button" type="button">
                                 <img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
                                 <span>Select</span>


Follow ups