diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po index 2e6f36cb2cf..cea5493c029 100644 --- a/addons/web/i18n/hu.po +++ b/addons/web/i18n/hu.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-08-24 09:16+0000\n" +"PO-Revision-Date: 2012-10-26 12:17+0000\n" "Last-Translator: Herczeg Péter \n" "Language-Team: Hungarian \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-27 05:15+0000\n" +"X-Generator: Launchpad (build 16194)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -755,7 +755,7 @@ msgstr "Választani kell legalább egy rekordot!" #. openerp-web #: addons/web/static/src/js/views.js:875 msgid "Uploading..." -msgstr "" +msgstr "Feltöltés" #. openerp-web #: addons/web/static/src/js/views.js:885 diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 33c90b9eda8..17b65ae91be 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2518,6 +2518,9 @@ .openerp .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page, .openerp .oe_form_field_many2many > .oe_view_manager .oe_list_pager_single_page { display: none !important; } +.openerp .oe_form_field_one2many > .oe_view_manager .oe_view_manager_view_list, .openerp .oe_form_field_many2many > .oe_view_manager .oe_view_manager_view_list { + min-height: 132px; +} .openerp .oe_form_field_one2many .oe_form_field_one2many_list_row_add, .openerp .oe_form_field_many2many .oe_form_field_one2many_list_row_add { font-weight: bold; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5d0446b6366..15e1898883d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1985,6 +1985,9 @@ $sheet-padding: 16px > .oe_view_manager .oe_list_pager_single_page display: none !important + .oe_view_manager_view_list + min-height: 132px + .oe_form_field_one2many_list_row_add font-weight: bold .oe_list_content diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 1f1112df2f2..220b9b63d5c 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -530,7 +530,8 @@ instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which o instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, - '_t' : instance.web._t + '_t' : instance.web._t, + 'JSON': JSON, }; instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 9351f621324..520dcd9169f 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -788,6 +788,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea instance.web.search.fields = new instance.web.Registry({ 'char': 'instance.web.search.CharField', 'text': 'instance.web.search.CharField', + 'html': 'instance.web.search.CharField', 'boolean': 'instance.web.search.BooleanField', 'integer': 'instance.web.search.IntegerField', 'id': 'instance.web.search.IntegerField', diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 67c5fa0292e..92e636b2216 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2539,7 +2539,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc if (! this.get("effective_readonly")) { self._updating_editor = false; this.$textarea = this.$el.find('textarea'); - var width = ((this.node.attrs || {}).editor_width || 468); + var width = ((this.node.attrs || {}).editor_width || '100%'); var height = ((this.node.attrs || {}).editor_height || 250); this.$textarea.cleditor({ width: width, // width not including margins, borders or padding @@ -3110,7 +3110,6 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc type: 'ir.actions.act_window', res_model: self.field.relation, res_id: self.get("value"), - context: self.build_context(), views: [[false, 'form']], target: 'current' }); diff --git a/addons/web_diagram/i18n/ru.po b/addons/web_diagram/i18n/ru.po index b65d79005a2..14062840b2f 100644 --- a/addons/web_diagram/i18n/ru.po +++ b/addons/web_diagram/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-08 07:13+0000\n" -"Last-Translator: Aleksei Motsik \n" +"PO-Revision-Date: 2012-10-25 06:42+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \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:03+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-26 05:19+0000\n" +"X-Generator: Launchpad (build 16194)\n" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:11 @@ -25,7 +25,7 @@ msgstr "Диаграмма" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:165 msgid "Are you sure?" -msgstr "" +msgstr "Вы уверены?" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:195 @@ -35,6 +35,10 @@ msgid "" "\n" "Are you sure ?" msgstr "" +"Удаление этого узла не может быть отменено.\n" +"Будут удалены все связанные переходы.\n" +"\n" +"Вы уверены ?" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:213 @@ -43,6 +47,9 @@ msgid "" "\n" "Are you sure ?" msgstr "" +"Удаление этого перехода не может быть отменено.\n" +"\n" +"Вы уверены ?" #. openerp-web #: addons/web_diagram/static/src/js/diagram.js:224 diff --git a/addons/web_kanban/i18n/ru.po b/addons/web_kanban/i18n/ru.po index f8e2f6454d6..a30f7c53997 100644 --- a/addons/web_kanban/i18n/ru.po +++ b/addons/web_kanban/i18n/ru.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-17 07:42+0000\n" -"Last-Translator: Aleksei Motsik \n" +"PO-Revision-Date: 2012-10-26 09:02+0000\n" +"Last-Translator: Chertykov Denis \n" "Language-Team: Russian \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:03+0000\n" -"X-Generator: Launchpad (build 16165)\n" +"X-Launchpad-Export-Date: 2012-10-27 05:15+0000\n" +"X-Generator: Launchpad (build 16194)\n" #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:10 @@ -35,7 +35,7 @@ msgstr "Вы действительно хотите удалить эту за #. openerp-web #: addons/web_kanban/static/src/js/kanban.js:839 msgid "Create: " -msgstr "" +msgstr "Создать: " #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:41 @@ -50,17 +50,17 @@ msgstr "осталось)" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "Add" -msgstr "" +msgstr "Добавить" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:71 msgid "or" -msgstr "" +msgstr "или" #. openerp-web #: addons/web_kanban/static/src/xml/web_kanban.xml:72 msgid "Cancel" -msgstr "" +msgstr "Отмена" #~ msgid "Create" #~ msgstr "Создать" diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 39df8123aed..76920da6a47 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1040,6 +1040,7 @@ instance.web_kanban.QuickCreate = instance.web.Widget.extend({ }); $(".oe_kanban_quick_create_add", this.$el).click(function () { self.quick_add(); + self.focus(); }); $(".oe_kanban_quick_create_close", this.$el).click(function (ev) { ev.preventDefault();