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

[MERGE] merge lp:~openerp-dev/openerp-web/trunk-improve-css-printing. 

bzr revid: bth@tinyerp.com-20121023121813-ivw4e4sfxp3x75y5
This commit is contained in:
Bhumi Thakkar (Open ERP) 2012-10-23 17:48:13 +05:30
parent edc3869ca2 e106b1cff8
commit efddb3a904
7 changed files with 2415 additions and 2942 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
addons/web/i18n/it.po
View File

@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openerp-web\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2012-07-02 09:06+0200\n"
"PO-Revision-Date: 2012-02-16 21:49+0000\n"
"Last-Translator: Davide Corio - agilebg.com <davide.corio@agilebg.com>\n"
"PO-Revision-Date: 2012-10-22 14:36+0000\n"
"Last-Translator: Marius Marolla <mariusmarolla@areablu.net>\n"
"Language-Team: Italian <it@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2012-10-21 05:02+0000\n"
"X-Generator: Launchpad (build 16165)\n"
"X-Launchpad-Export-Date: 2012-10-23 05:05+0000\n"
"X-Generator: Launchpad (build 16179)\n"
#. openerp-web
#: addons/web/static/src/js/chrome.js:176
@ -129,56 +129,56 @@ msgstr "OpenERP - Unsupported/Community Version"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:619
msgid "less than a minute ago"
msgstr ""
msgstr "meno di un minuto fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:620
msgid "about a minute ago"
msgstr ""
msgstr "circa un minuto fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:621
#, python-format
msgid "%d minutes ago"
msgstr ""
msgstr "%d minuti fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:622
msgid "about an hour ago"
msgstr ""
msgstr "circa un'ora fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:623
#, python-format
msgid "%d hours ago"
msgstr ""
msgstr "%d ore fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:624
msgid "a day ago"
msgstr ""
msgstr "un giorno fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:625
#, python-format
msgid "%d days ago"
msgstr ""
msgstr "%d giorni fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:626
msgid "about a month ago"
msgstr ""
msgstr "circa un mese fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:627
#, python-format
msgid "%d months ago"
msgstr ""
msgstr "%d mesi fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:628
msgid "about a year ago"
msgstr ""
msgstr "circa un anno fa"
#. openerp-web
#: addons/web/static/src/js/coresetup.js:629

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

File diff suppressed because it is too large Load Diff

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

@ -144,7 +144,6 @@ $sheet-max-width: 860px
.openerp.openerp_webclient_container
height: 100%
position: relative
// jQueryUI css bug fixing
.text-tag .text-button
@ -253,6 +252,10 @@ $sheet-max-width: 860px
.oe_bounce_container
display: inline-block
// bug noted in jquery ui CSS doesn't seem to occur in IE9,
// so remove position:relative
.ui-tabs
position: static
// Modal box
&.ui-dialog
display: none
@ -2078,7 +2081,6 @@ $sheet-max-width: 860px
visibility: visible
.oe_list
position: relative
.oe_form
.oe_form_nosheet
margin: 0 // FIXME: either class or border should not be by default
@ -2176,7 +2178,9 @@ $sheet-max-width: 860px
.oe_list_handle
@include text-to-entypo-icon("}",#E0E0E0,18px)
margin-right: 7px
.oe_list_cannot_create
.oe_view_nocontent_create
display: none
.oe_list_cannot_edit
.oe_list_header_handle, .oe_list_field_handle
display: none !important
@ -2184,7 +2188,6 @@ $sheet-max-width: 860px
.oe_list_cannot_delete
.oe_list_record_delete
display: none !important
// }}}
// Tree view {{{
.tree_header
@ -2235,7 +2238,6 @@ $sheet-max-width: 860px
background-image: url(/web/static/src/img/collapse.gif)
.treeview-tr.oe-treeview-first span, .treeview-td.oe-treeview-first span
margin-left: 16px
// }}}
// Debugging stuff {{{
.oe_layout_debugging
@ -2278,7 +2280,6 @@ $sheet-max-width: 860px
background-attachment: fixed
>*
opacity: 0.70
// }}}
// The jQuery-ui overlay and Autocomplete are outside the .openerp div, please don't add indentation !!!

2
addons/web/static/src/js/data.js
View File

@ -135,6 +135,8 @@ instance.web.Query = instance.web.Class.extend({
}).pipe(function (results) {
return _(results).map(function (result) {
// FIX: querygroup initialization
result.__context = result.__context || {};
result.__context.group_by = result.__context.group_by || [];
_.defaults(result.__context, ctx);
return new instance.web.QueryGroup(
self._model.name, grouping[0], result);

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

@ -168,7 +168,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.$buttons = $(QWeb.render("FormView.buttons", {'widget':self}));
if (this.options.$buttons) {
this.options.$buttons.children().remove();
this.$buttons.appendTo(this.options.$buttons);
} else {
this.$el.find('.oe_form_buttons').replaceWith(this.$buttons);
@ -3122,6 +3121,8 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
this.current_display = this.$input.val();
if (this.is_false()) {
this.$('.oe_m2o_cm_button').css({'display':'none'});
} else {
this.$('.oe_m2o_cm_button').css({'display':'inline'});
}
} else {
var lines = _.escape(str).split("\n");
@ -3351,23 +3352,13 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({
controller.on('edit:before', self, function (e) {
e.cancel = true;
});
var has_handle = _(controller.columns).find(function (column) {
_(controller.columns).find(function (column) {
if (!column instanceof instance.web.list.Handle) {
return false;
}
column.modifiers.tree_invisible = true;
column.invisible = '1';
// remove from visibles
controller.visible_columns.splice(
controller.visible_columns.indexOf(column),
1);
column.modifiers.invisible = true;
return true;
});
if (has_handle) {
// recompute aggregates
controller.aggregate_columns =
_(controller.visible_columns).invoke('to_aggregate');
}
}
} else if (view_type === "form") {
if (self.get("effective_readonly")) {
@ -4170,6 +4161,9 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
}
this._super(value_);
},
get_value: function() {
return [commands.replace_with(this.get('value'))];
},
load_view: function() {
var self = this;
this.kanban_view = new instance.web.form.Many2ManyKanbanView(this, this.dataset, false, {
@ -4203,7 +4197,7 @@ instance.web.form.FieldMany2ManyKanban = instance.web.form.AbstractField.extend(
});
},
dataset_changed: function() {
this.set({'value': [commands.replace_with(this.dataset.ids)]});
this.set({'value': this.dataset.ids});
},
open_popup: function(type, unused) {
if (type !== "form")

9
addons/web/static/src/js/views.js
View File

@ -300,7 +300,6 @@ instance.web.ActionManager = instance.web.Widget.extend({
this.dialog_widget.destroy();
if (this.dialog === null || this.dialog.isDestroyed()) {
this.dialog = new instance.web.Dialog(this, {
buttons: {"Close": function() {$(this).dialog("close")}},
dialogClass: executor.klass,
});
this.dialog.on("closing", null, options.on_close);
@ -1068,9 +1067,11 @@ instance.web.Sidebar = instance.web.Widget.extend({
additional_context);
result.flags = result.flags || {};
result.flags.new_window = true;
self.do_action(result, function () {
self.do_action(result, {
on_close: function() {
// reload view
self.getParent().reload();
},
});
});
});
@ -1216,7 +1217,9 @@ instance.web.View = instance.web.Widget.extend({
/* niv: previously we were overriding once more with action_data.context,
* I assumed this was not a correct behavior and removed it
*/
return self.do_action(action, result_handler);
return self.do_action(action, {
on_close: result_handler,
});
}, null);
} else {
return result_handler();

15
addons/web_diagram/static/src/js/diagram.js
View File

@ -120,6 +120,21 @@ instance.web.DiagramView = instance.web.View.extend({
if (id_record) {
this.id = id_record;
this.get_diagram_info();
this.do_push_state({id: id_record});
} else {
this.do_push_state({});
}
},
do_load_state: function(state, warm) {
if (state && state.id) {
if (!this.dataset.get_id_index(state.id)) {
this.dataset.ids.push(state.id);
}
this.dataset.select_id(state.id);
if (warm) {
this.do_show();
}
}
},