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 ba6211ccceb..6ce93bc76bd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1326,9 +1326,6 @@ .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } -.openerp .oe_view_manager .oe_view_manager_body .oe_view_manager_view_list { - min-height: 132px; -} .openerp .oe_view_manager .oe_view_manager_view_kanban { height: inherit; } @@ -2522,6 +2519,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 1f1993ff74d..733bd9c0845 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1070,8 +1070,6 @@ $sheet-max-width: 860px .oe_view_manager .oe_view_manager_body height: inherit - .oe_view_manager_view_list - min-height: 132px .oe_view_manager_view_kanban height: inherit @@ -1985,6 +1983,9 @@ $sheet-max-width: 860px > .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/view_form.js b/addons/web/static/src/js/view_form.js index 2819be453fb..bc381df4b2f 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 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 "Создать"