Merge lp:~openerp-dev/openerp-web/7.0-bug-1179505-bth into lp:openerp-web/7.0

[Bhumi Thakkar (Open ERP)]

Hello,

    Fixed issue of translation button or icon not displayed with html widget.

Thanks.

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
Wrong fix, the rendering is ugly. It must be the icon in the toolbar.
I fixed this.
Thanks.

review: Disapprove

Unmerged revisions

3921. By Bhumi Thakkar (Open ERP) on 2013-05-15

[FIX] Translator button/icon in html widget.--fixes:lp1179505

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2013-04-04 10:23:06 +0000
+++ addons/web/static/src/css/base.css	2013-05-15 05:43:19 +0000
@@ -2427,6 +2427,9 @@
   margin: 3px 0 0 -21px;
   vertical-align: top;
 }
+.openerp .oe_form .oe_form_field_html img.oe_input_icon {
+    float: right;
+}
 .openerp .oe_form .oe_input_icon_disabled {
   position: absolute;
   cursor: default;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2013-04-04 10:23:06 +0000
+++ addons/web/static/src/css/base.sass	2013-05-15 05:43:19 +0000
@@ -1947,7 +1947,8 @@
             margin-top: 32px
             margin-bottom: 32px
             text-align: justify
-
+        .oe_form_field_html img.oe_input_icon
+            float: right
     .oe_form_editable
         .oe_form
             .oe_form_field_integer input

=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2013-04-02 14:40:39 +0000
+++ addons/web/static/src/xml/base.xml	2013-05-15 05:43:19 +0000
@@ -1074,6 +1074,8 @@
         <t t-if="! widget.get('effective_readonly')">
             <textarea/>
         </t>
+        <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate and !widget.get('effective_readonly')"
+            t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
     </div>
 </t>
 <t t-name="web.datepicker">