[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)
commit
efddb3a904
|
|
@ -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
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -120,7 +120,7 @@ $sheet-max-width: 860px
|
|||
font-size: 1px
|
||||
letter-spacing: -1px
|
||||
color: transparent
|
||||
font-weight: normal
|
||||
font-weight: normal
|
||||
&:before
|
||||
font: 21px "mnmliconsRegular"
|
||||
content: $icon-name
|
||||
|
|
@ -130,7 +130,7 @@ $sheet-max-width: 860px
|
|||
font-size: 1px
|
||||
letter-spacing: -1px
|
||||
color: transparent
|
||||
font-weight: normal
|
||||
font-weight: normal
|
||||
&:before
|
||||
font: $size "entypoRegular"
|
||||
content: $icon-name
|
||||
|
|
@ -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
|
||||
|
|
@ -608,7 +611,7 @@ $sheet-max-width: 860px
|
|||
vertical-align: top
|
||||
margin-top: 8px
|
||||
//margin-left set at 3px to avoid a strange overflow
|
||||
margin-left: 3px
|
||||
margin-left: 3px
|
||||
border-left: 4px solid transparent
|
||||
border-right: 4px solid transparent
|
||||
border-top: 4px solid#404040
|
||||
|
|
@ -801,7 +804,7 @@ $sheet-max-width: 860px
|
|||
display: none
|
||||
// }}}
|
||||
// Top Menu {{{
|
||||
|
||||
|
||||
.oe_topbar
|
||||
width: 100%
|
||||
height: 32px
|
||||
|
|
@ -974,7 +977,7 @@ $sheet-max-width: 860px
|
|||
.oe_menu_counter
|
||||
float: right
|
||||
text-shadow: 0 1px 1px rgba(0,0,0,0.2)
|
||||
margin: 1px
|
||||
margin: 1px
|
||||
padding: 1px 4px
|
||||
border: none
|
||||
&:hover
|
||||
|
|
@ -1066,7 +1069,7 @@ $sheet-max-width: 860px
|
|||
// ViewManager common {{{
|
||||
.oe_view_manager
|
||||
.oe_view_manager_body
|
||||
height: inherit
|
||||
height: inherit
|
||||
.oe_view_manager_view_kanban
|
||||
height: inherit
|
||||
|
||||
|
|
@ -1576,7 +1579,7 @@ $sheet-max-width: 860px
|
|||
display: none !important
|
||||
.oe_form .oe_form_field_date
|
||||
width: auto
|
||||
// Sheet and padding
|
||||
// Sheet and padding
|
||||
.oe_form_nosheet
|
||||
margin: 16px
|
||||
> header
|
||||
|
|
@ -1622,7 +1625,7 @@ $sheet-max-width: 860px
|
|||
margin-left: 6px
|
||||
// }}}
|
||||
// FormView.custom tags and classes {{{
|
||||
.oe_form
|
||||
.oe_form
|
||||
header
|
||||
.oe_tags
|
||||
margin: 5px 0 0 5px
|
||||
|
|
@ -1785,7 +1788,7 @@ $sheet-max-width: 860px
|
|||
display: none
|
||||
.oe_datepicker_root
|
||||
display: inline-block
|
||||
.oe_form_required
|
||||
.oe_form_required
|
||||
input:not([disabled]):not([readonly]), select:not([disabled]):not([readonly]), textarea:not([disabled]):not([readonly])
|
||||
background-color: #D2D2FF !important
|
||||
.oe_form_invalid
|
||||
|
|
@ -1821,10 +1824,10 @@ $sheet-max-width: 860px
|
|||
position: relative
|
||||
width: 600px
|
||||
margin-left: 130px
|
||||
margin-top: 32px
|
||||
margin-top: 32px
|
||||
margin-bottom: 32px
|
||||
text-align: justify
|
||||
|
||||
|
||||
.oe_form_editable
|
||||
.oe_form
|
||||
.oe_form_field_integer input
|
||||
|
|
@ -1902,7 +1905,7 @@ $sheet-max-width: 860px
|
|||
display: inline-block
|
||||
margin: 0
|
||||
padding: 0 18px 0 0
|
||||
li
|
||||
li
|
||||
display: inline-block
|
||||
list-style-type: none
|
||||
// It is probably a bad idea to modify this margin
|
||||
|
|
@ -1932,7 +1935,7 @@ $sheet-max-width: 860px
|
|||
vertical-align: top
|
||||
overflow: hidden
|
||||
margin-left: -5px
|
||||
span
|
||||
span
|
||||
position: relative
|
||||
width: 24px
|
||||
height: 24px
|
||||
|
|
@ -1945,7 +1948,7 @@ $sheet-max-width: 860px
|
|||
@include transform(rotate(45deg))
|
||||
li.oe_active
|
||||
@include vertical-gradient(#729fcf, #3465a4)
|
||||
.arrow span
|
||||
.arrow span
|
||||
@include skew-gradient(#729fcf, #3465a4)
|
||||
.label
|
||||
color: white
|
||||
|
|
@ -1953,20 +1956,20 @@ $sheet-max-width: 860px
|
|||
ul.oe_form_status_clickable
|
||||
li
|
||||
cursor: pointer
|
||||
&:hover
|
||||
&:hover
|
||||
@include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
|
||||
.label
|
||||
text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede
|
||||
.arrow span
|
||||
.arrow span
|
||||
@include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%))
|
||||
.label
|
||||
color: $link-color
|
||||
li.oe_active
|
||||
&:hover
|
||||
&:hover
|
||||
@include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
|
||||
.label
|
||||
text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4
|
||||
.arrow span
|
||||
.arrow span
|
||||
@include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%))
|
||||
// }}}
|
||||
// FormView.one2many {{{
|
||||
|
|
@ -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 !!!
|
||||
|
|
@ -2300,7 +2301,7 @@ div.ui-widget-overlay
|
|||
width: 100%
|
||||
padding: 0
|
||||
a
|
||||
padding: 1px 16px
|
||||
padding: 1px 16px
|
||||
a.ui-corner-all
|
||||
@include radius(0)
|
||||
a.ui-state-active
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -3120,8 +3119,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc
|
|||
if (!this.get("effective_readonly")) {
|
||||
this.$input.val(str.split("\n")[0]);
|
||||
this.current_display = this.$input.val();
|
||||
if(this.is_false()){
|
||||
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")
|
||||
|
|
|
|||
|
|
@ -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 () {
|
||||
// reload view
|
||||
self.getParent().reload();
|
||||
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();
|
||||
|
|
|
|||
|
|
@ -117,12 +117,27 @@ instance.web.DiagramView = instance.web.View.extend({
|
|||
|
||||
on_diagram_loaded: function(record) {
|
||||
var id_record = record['id'];
|
||||
if(id_record) {
|
||||
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();
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// Set-up the drawing elements of the diagram
|
||||
draw_diagram: function(result) {
|
||||
var self = this;
|
||||
|
|
|
|||
Loading…
Reference in New Issue