[FIX] translation button or icon not displayed with html widget. Bug 1179505

bzr revid: chm@openerp.com-20130607101517-zilu97d4akhho72v
This commit is contained in:
Christophe Matthieu 2013-06-07 12:15:17 +02:00
parent 06b74bc47c
commit a941c199c1
3 changed files with 15 additions and 3 deletions

View File

@ -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;
}

View File

@ -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

View File

@ -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() {