pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] dialogs

Browse Source 
bzr revid: fp@openerp.com-20120714000519-ksf14svlnp6xljri
This commit is contained in:
Fabien Pinckaers
2012-07-14 02:05:19 +02:00
parent 8f95b17d27
commit 01d15a2812
4 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/css/base.css
+16 -13
View File
@@ -205,7 +205,7 @@
.openerp.ui-dialog .ui-dialog-content {
padding: 0px;
}
.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-buttonpane {
.openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane {
padding: 16px;
}
.openerp.ui-dialog .ui-dialog-titlebar {
@@ -268,6 +268,9 @@
color: black;
text-decoration: none;
}
.openerp.ui-dialog.oe_act_window .ui-dialog-content {
padding: 0px;
}
.openerp .modal-backdrop {
position: fixed;
top: 0;
@@ -1983,18 +1986,6 @@
.openerp .oe_form .oe_form_field input {
margin: 0px;
}
.openerp .oe_form .oe_form_field_integer {
width: 7em;
}
.openerp .oe_form .oe_form_field_float {
width: 8em;
}
.openerp .oe_form .oe_form_field_date {
width: 7.5em;
}
.openerp .oe_form .oe_form_field_datetime {
width: 11em;
}
.openerp .oe_form input[type="text"], .openerp .oe_form input[type="password"], .openerp .oe_form input[type="file"], .openerp .oe_form select {
height: 22px;
padding-top: 2px;
@@ -2087,6 +2078,18 @@
position: relative;
overflow: hidden;
}
.openerp .oe_form_editable .oe_form .oe_form_field_integer {
width: 7em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_float {
width: 8em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_date {
width: 7.5em !important;
}
.openerp .oe_form_editable .oe_form .oe_form_field_datetime {
width: 11em !important;
}
.openerp .oe_hidden_input_file {
overflow: hidden;
position: relative;
addons/web/static/src/css/base.sass
+15 -9
View File
@@ -216,7 +216,7 @@ $sheet-max-width: 860px
@include background-clip()
.ui-dialog-content
padding: 0px
.ui-dialog-titlebar, .ui-dialog-buttonpane
.ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane
padding: 16px
.ui-dialog-titlebar
border-bottom: 1px solid #cacaca
@@ -258,6 +258,10 @@ $sheet-max-width: 860px
color: black
text-decoration: none
&.ui-dialog.oe_act_window
.ui-dialog-content
padding: 0px
.modal-backdrop
position: fixed
top: 0
@@ -1551,14 +1555,6 @@ $sheet-max-width: 860px
line-height: 18px
input
margin: 0px
.oe_form_field_integer
width: 7em
.oe_form_field_float
width: 8em
.oe_form_field_date
width: 7.5em
.oe_form_field_datetime
width: 11em
input[type="text"], input[type="password"], input[type="file"], select
height: 22px
padding-top: 2px
@@ -1628,6 +1624,16 @@ $sheet-max-width: 860px
> div
position: relative
overflow: hidden
.oe_form_editable
.oe_form
.oe_form_field_integer
width: 7em !important
.oe_form_field_float
width: 8em !important
.oe_form_field_date
width: 7.5em !important
.oe_form_field_datetime
width: 11em !important
// }}}
// FormView.fields_binary {{{
/* http://www.quirksmode.org/dom/inputfile.html
addons/web/static/src/js/view_form.js
+1
View File
@@ -3869,6 +3869,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
this.renderElement();
new instance.web.Dialog(this, {
min_width: '800px',
dialogClass: 'oe_act_window',
close: function() {
self.check_exit(true);
},
addons/web/static/src/js/views.js
+3 -1
View File
@@ -222,7 +222,8 @@ instance.web.ActionManager = instance.web.Widget.extend({
if (this.dialog === null) {
// These buttons will be overwrited by <footer> if any
this.dialog = new instance.web.Dialog(this, {
buttons: { "Close": function() { $(this).dialog("close"); }}
buttons: { "Close": function() { $(this).dialog("close"); }},
dialogClass: 'oe_act_window'
});
if(on_close)
this.dialog.on_close.add(on_close);
@@ -407,6 +408,7 @@ instance.web.ViewManager = instance.web.Widget.extend({
container.hide();
controller.do_hide();
}
// put the <footer> in the dialog's buttonpane
if (self.$element.parent('.ui-dialog-content') && self.$element.find('footer')) {
self.$element.parent('.ui-dialog-content').parent().find('div.ui-dialog-buttonset').hide()
self.$element.find('footer').appendTo(