[FIX] Fixed some hidden classes problem, improved binary image field's styling
bzr revid: fme@openerp.com-20120612081812-5w6e2bmg0pl6ou12
This commit is contained in:
@@ -1616,10 +1616,10 @@
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_editable .oe_form_editable_hidden {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form_readonly .oe_form_readonly_hidden, .openerp .oe_form_readonly .oe_form_field:empty {
|
||||
display: none;
|
||||
display: none !important;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_text {
|
||||
width: 100%;
|
||||
@@ -1894,8 +1894,7 @@
|
||||
top: 1px;
|
||||
padding: 3px 0 0 0;
|
||||
margin: 0 1px;
|
||||
filter: alpha(opacity=70);
|
||||
opacity: 0.7;
|
||||
display: none;
|
||||
width: 99%;
|
||||
text-align: center;
|
||||
background: url(/web/static/src/img/form_sheetbg.png);
|
||||
@@ -1906,8 +1905,7 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls {
|
||||
filter: alpha(opacity=100);
|
||||
opacity: 1;
|
||||
display: block;
|
||||
}
|
||||
.openerp .oe_horizontal_border {
|
||||
border-bottom: 1px solid black;
|
||||
|
||||
@@ -1294,10 +1294,10 @@ $colour4: #8a89ba
|
||||
.oe_form_invisible
|
||||
display: none !important
|
||||
.oe_form_editable .oe_form_editable_hidden
|
||||
display: none
|
||||
display: none !important
|
||||
.oe_form_readonly
|
||||
.oe_form_readonly_hidden, .oe_form_field:empty
|
||||
display: none
|
||||
display: none !important
|
||||
.oe_form
|
||||
.oe_form_field_text
|
||||
width: 100%
|
||||
@@ -1556,7 +1556,7 @@ $colour4: #8a89ba
|
||||
top: 1px
|
||||
padding: 3px 0 0 0
|
||||
margin: 0 1px
|
||||
@include opacity(0.7)
|
||||
display: none
|
||||
width: 99%
|
||||
text-align: center
|
||||
background: url(/web/static/src/img/form_sheetbg.png)
|
||||
@@ -1566,7 +1566,7 @@ $colour4: #8a89ba
|
||||
-ms-box-sizing: border-box
|
||||
box-sizing: border-box
|
||||
&:hover .oe_form_field_image_controls
|
||||
@include opacity(1)
|
||||
display: block
|
||||
// }}}
|
||||
// FormView.separator {{{
|
||||
.oe_horizontal_border
|
||||
|
||||
@@ -4096,14 +4096,6 @@ instance.web.form.FieldBinaryFile = instance.web.form.FieldBinary.extend({
|
||||
|
||||
instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
|
||||
template: 'FieldBinaryImage',
|
||||
initialize_content: function() {
|
||||
this._super();
|
||||
if (!this.get("effective_readonly")) {
|
||||
this.$element.find('.oe_form_field_image_controls').show();
|
||||
} else {
|
||||
this.$element.find('.oe_form_field_image_controls').hide();
|
||||
}
|
||||
},
|
||||
set_value: function(value_) {
|
||||
this._super.apply(this, arguments);
|
||||
this.render_value();
|
||||
|
||||
@@ -1049,7 +1049,7 @@
|
||||
</t>
|
||||
<t t-name="FieldBinaryImage">
|
||||
<span class="oe_form_field oe_form_field_image">
|
||||
<div class="oe_form_field_image_controls">
|
||||
<div class="oe_form_field_image_controls oe_form_readonly_hidden">
|
||||
<div class="oe-binary-file-set">
|
||||
<form class="oe-binary-form" t-att-target="widget.iframe"
|
||||
method="post" enctype="multipart/form-data" action="/web/binary/upload">
|
||||
|
||||
Reference in New Issue
Block a user