odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] css 

bzr revid: fp@tinyerp.com-20120716111324-xi5x9w0broortnls
This commit is contained in:
Fabien Pinckaers 2012-07-16 13:13:24 +02:00
parent f004544c4b
commit 402d455f5b
3 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/css/base.css
View File

@ -34,7 +34,7 @@
background: white; background: white;
/* http://www.quirksmode.org/dom/inputfile.html /* http://www.quirksmode.org/dom/inputfile.html
* http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
*/ */ */
} }
.openerp a { .openerp a {
text-decoration: none; text-decoration: none;
@ -1897,8 +1897,8 @@
width: 100%; width: 100%;
margin: 4px 0 4px 0; margin: 4px 0 4px 0;
} }
.openerp .oe_form .oe_form_group .oe_group_right { .openerp .oe_form .oe_form_group .oe_form_group_cell.oe_group_right {
margin-left: 18px; padding-left: 20px;
} }
.openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
font-weight: bold; font-weight: bold;

4
addons/web/static/src/css/base.sass
View File

@ -1479,8 +1479,8 @@ $sheet-max-width: 860px
.oe_form_group .oe_form_group
width: 100% width: 100%
margin: 4px 0 4px 0 margin: 4px 0 4px 0
.oe_group_right .oe_form_group_cell.oe_group_right
margin-left: 18px padding-left: 20px
// }}} // }}}
// FormView.label {{{ // FormView.label {{{
.oe_form .oe_form

61
addons/web/static/src/js/view_form.js
View File

@ -802,13 +802,13 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
}); });
}, },
get_fields_values: function(blacklist) { get_fields_values: function(blacklist) {
blacklist = blacklist || []; blacklist = blacklist || [];
var values = {}; var values = {};
var ids = this.get_selected_ids(); var ids = this.get_selected_ids();
values["id"] = ids.length > 0 ? ids[0] : false; values["id"] = ids.length > 0 ? ids[0] : false;
_.each(this.fields, function(value_, key) { _.each(this.fields, function(value_, key) {
if (_.include(blacklist, key)) if (_.include(blacklist, key))
return; return;
var val = value_.get_value(); var val = value_.get_value();
values[key] = val; values[key] = val;
}); });
@ -1186,8 +1186,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
row_cols = cols; row_cols = cols;
} else if (tagName==='group') { } else if (tagName==='group') {
// When <group> <group/><group/> </group>, we need a spacing between the two groups // When <group> <group/><group/> </group>, we need a spacing between the two groups
$child.addClass('oe_group_right') $td.addClass('oe_group_right')
} }
row_cols -= colspan; row_cols -= colspan;
@ -1587,7 +1586,7 @@ instance.web.form.FormWidget = instance.web.Widget.extend(instance.web.form.Invi
parent: {} parent: {}
}); });
if (a_dataset.parent_view) { if (a_dataset.parent_view) {
fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]); fields_values.parent = a_dataset.parent_view.get_fields_values([a_dataset.child_name]);
} }
return fields_values; return fields_values;
}, },
@ -3084,30 +3083,30 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
save_any_view: function() { save_any_view: function() {
if (this.doing_on_change) if (this.doing_on_change)
return false; return false;
return this.session.synchronized_mode(_.bind(function() { return this.session.synchronized_mode(_.bind(function() {
if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view && if (this.viewmanager && this.viewmanager.views && this.viewmanager.active_view &&
this.viewmanager.views[this.viewmanager.active_view] && this.viewmanager.views[this.viewmanager.active_view] &&
this.viewmanager.views[this.viewmanager.active_view].controller) { this.viewmanager.views[this.viewmanager.active_view].controller) {
var view = this.viewmanager.views[this.viewmanager.active_view].controller; var view = this.viewmanager.views[this.viewmanager.active_view].controller;
if (this.viewmanager.active_view === "form") { if (this.viewmanager.active_view === "form") {
if (!view.is_initialized.isResolved()) { if (!view.is_initialized.isResolved()) {
return false; return false;
} }
var res = $.when(view.do_save()); var res = $.when(view.do_save());
if (!res.isResolved() && !res.isRejected()) { if (!res.isResolved() && !res.isRejected()) {
console.warn("Asynchronous get_value() is not supported in form view."); console.warn("Asynchronous get_value() is not supported in form view.");
} }
return res; return res;
} else if (this.viewmanager.active_view === "list") { } else if (this.viewmanager.active_view === "list") {
var res = $.when(view.ensure_saved()); var res = $.when(view.ensure_saved());
if (!res.isResolved() && !res.isRejected()) { if (!res.isResolved() && !res.isRejected()) {
console.warn("Asynchronous get_value() is not supported in list view."); console.warn("Asynchronous get_value() is not supported in list view.");
} }
return res; return res;
} }
} }
return false; return false;
}, this)); }, this));
}, },
is_syntax_valid: function() { is_syntax_valid: function() {
if (!this.viewmanager.views[this.viewmanager.active_view]) if (!this.viewmanager.views[this.viewmanager.active_view])
@ -3869,7 +3868,7 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
this.renderElement(); this.renderElement();
new instance.web.Dialog(this, { new instance.web.Dialog(this, {
min_width: '800px', min_width: '800px',
dialogClass: 'oe_act_window', dialogClass: 'oe_act_window',
close: function() { close: function() {
self.check_exit(true); self.check_exit(true);
}, },