diff options
| author | Christophe Matthieu <chm@openerp.com> | 2013-06-07 12:15:17 +0200 |
|---|---|---|
| committer | Christophe Matthieu <chm@openerp.com> | 2013-06-07 12:15:17 +0200 |
| commit | a941c199c19279c6a2fd947dca3d1a80b9aa35c9 (patch) | |
| tree | 9702ecc1410a06c92899a2a1ddd9c4954366932d /addons/web | |
| parent | 06b74bc47ccb5350c1d88d5dfc2a45616cf40eea (diff) | |
[FIX] translation button or icon not displayed with html widget. Bug 1179505
bzr revid: chm@openerp.com-20130607101517-zilu97d4akhho72v
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/css/base.css | 10 | ||||
| -rw-r--r-- | addons/web/static/src/css/base.sass | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a0b2d90e45e..c364bc7bb84 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1270,7 +1270,7 @@ color: white; padding: 2px 4px; margin: 1px 6px 0 0; - border: 1px solid lightGray; + border: 1px solid lightgrey; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-border-radius: 4px; -webkit-border-radius: 4px; @@ -1302,7 +1302,7 @@ transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - border-top: 1px solid lightGray; + border-top: 1px solid lightgrey; border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); @@ -2284,7 +2284,7 @@ } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; - color: darkGreen; + color: darkgreen; vertical-align: top; position: relative; top: -4px; @@ -2464,6 +2464,10 @@ margin-bottom: 32px; text-align: justify; } +.openerp .oe_form .oe_form_field_html .oe_input_icon { + float: right; + margin: 4px 7px; +} .openerp .oe_form_editable .oe_form .oe_form_field_integer input { width: 6em; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 000342ba82a..415dd3e81cb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1949,6 +1949,9 @@ $sheet-padding: 16px margin-top: 32px margin-bottom: 32px text-align: justify + .oe_form_field_html .oe_input_icon + float: right + margin: 4px 7px .oe_form_editable .oe_form diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cd6ed39b924..f242bf50cc9 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2721,6 +2721,11 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc self.internal_set_value(self.$textarea.val()); } }); + if (this.field.translate) { + var $img = $('<img class="oe_field_translate oe_input_icon" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>') + .click(this.on_translate); + this.$cleditor.$toolbar.append($img); + } } }, render_value: function() { |