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/i18n/ru.po b/addons/web/i18n/ru.po index fa80053a306..ed5735602d0 100644 --- a/addons/web/i18n/ru.po +++ b/addons/web/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-10-23 14:30+0000\n" +"PO-Revision-Date: 2012-11-01 12:07+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-24 05:20+0000\n" -"X-Generator: Launchpad (build 16179)\n" +"X-Launchpad-Export-Date: 2012-11-02 05:20+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -306,7 +306,7 @@ msgstr "Группировать по: %s" #. openerp-web #: addons/web/static/src/js/search.js:1132 msgid "GroupBy" -msgstr "" +msgstr "Группировать по" #. openerp-web #: addons/web/static/src/js/search.js:1267 @@ -535,7 +535,7 @@ msgstr "Удалить" #. openerp-web #: addons/web/static/src/xml/base.xml:762 msgid "Duplicate" -msgstr "Клонировать" +msgstr "Дублировать" #. openerp-web #: addons/web/static/src/js/view_form.js:133 @@ -867,13 +867,13 @@ msgstr "Удалить" #: addons/web/static/src/xml/base.xml:166 #: addons/web/static/src/xml/base.xml:329 msgid "Backup" -msgstr "Резервное копирование" +msgstr "Резервная копия" #. openerp-web #: addons/web/static/src/xml/base.xml:195 #: addons/web/static/src/xml/base.xml:330 msgid "Restore" -msgstr "Востановить" +msgstr "Восстановить" #. openerp-web #: addons/web/static/src/xml/base.xml:332 @@ -908,7 +908,7 @@ msgstr "Язык по умолчанию:" #. openerp-web #: addons/web/static/src/xml/base.xml:91 msgid "Admin password:" -msgstr "Пароль Администратора:" +msgstr "Пароль администратора:" #. openerp-web #: addons/web/static/src/xml/base.xml:95 @@ -1080,7 +1080,7 @@ msgstr "Изменить действие" #. openerp-web #: addons/web/static/src/xml/base.xml:486 msgid "Edit Workflow" -msgstr "Редактировать Процесс" +msgstr "Редактировать процесс" #. openerp-web #: addons/web/static/src/xml/base.xml:491 @@ -1222,7 +1222,7 @@ msgstr "При изменении:" #. openerp-web #: addons/web/static/src/xml/base.xml:981 msgid "Relation:" -msgstr "Отношение:" +msgstr "Связь:" #. openerp-web #: addons/web/static/src/xml/base.xml:985 @@ -1411,12 +1411,12 @@ msgstr "Применить" #. openerp-web #: addons/web/static/src/xml/base.xml:1509 msgid "Save & New" -msgstr "Сохранить и Создать" +msgstr "Сохранить и создать" #. openerp-web #: addons/web/static/src/xml/base.xml:1510 msgid "Save & Close" -msgstr "Сохранить и Закрыть" +msgstr "Сохранить и закрыть" #. openerp-web #: addons/web/static/src/xml/base.xml:1617 @@ -1556,7 +1556,7 @@ msgid "" "For use if CSV files have titles on multiple lines, skips more than a single " "line during import" msgstr "" -"Применимо если в CSV файле заголовки расположены в нескольких строках и из " +"Применимо если в CSV файле заголовки расположены в нескольких строках и их " "необходимо пропустить" #. openerp-web @@ -1669,9 +1669,6 @@ msgstr "Предпросмотр файла, который система не #~ msgid "Activate the developper mode" #~ msgstr "Активировать режим разработчика" -#~ msgid "Notebook Page \"" -#~ msgstr "Страница Блокнота \"" - #~ msgid "Filter disabled due to invalid syntax" #~ msgstr "Фильтр отключен из-за неверного синтаксиса" @@ -1686,3 +1683,6 @@ msgstr "Предпросмотр файла, который система не #~ msgid "Advanced Filters" #~ msgstr "Расширенные фильтры" + +#~ msgid "Notebook Page \"" +#~ msgstr "Страница блокнота \"" diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po index e15e7b572bc..687742a1775 100644 --- a/addons/web/i18n/sl.po +++ b/addons/web/i18n/sl.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-01-31 06:25+0000\n" -"Last-Translator: ERP Basing \n" +"PO-Revision-Date: 2012-11-01 16:38+0000\n" +"Last-Translator: Dusan Laznik \n" "Language-Team: Slovenian \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-11-02 05:20+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -129,62 +129,62 @@ msgstr "OpenERP-Community Version" #. openerp-web #: addons/web/static/src/js/coresetup.js:619 msgid "less than a minute ago" -msgstr "" +msgstr "manj kot minuto nazaj" #. openerp-web #: addons/web/static/src/js/coresetup.js:620 msgid "about a minute ago" -msgstr "" +msgstr "približno pred minuto" #. openerp-web #: addons/web/static/src/js/coresetup.js:621 #, python-format msgid "%d minutes ago" -msgstr "" +msgstr "pred %d minutami" #. openerp-web #: addons/web/static/src/js/coresetup.js:622 msgid "about an hour ago" -msgstr "" +msgstr "pred približno eno uro" #. openerp-web #: addons/web/static/src/js/coresetup.js:623 #, python-format msgid "%d hours ago" -msgstr "" +msgstr "Pred %d urami" #. openerp-web #: addons/web/static/src/js/coresetup.js:624 msgid "a day ago" -msgstr "" +msgstr "pred enim dnevom" #. openerp-web #: addons/web/static/src/js/coresetup.js:625 #, python-format msgid "%d days ago" -msgstr "" +msgstr "pred %d dnevi" #. openerp-web #: addons/web/static/src/js/coresetup.js:626 msgid "about a month ago" -msgstr "" +msgstr "približno pred enim mesecem" #. openerp-web #: addons/web/static/src/js/coresetup.js:627 #, python-format msgid "%d months ago" -msgstr "" +msgstr "pred %d meseci" #. openerp-web #: addons/web/static/src/js/coresetup.js:628 msgid "about a year ago" -msgstr "" +msgstr "približno pred enim letom" #. openerp-web #: addons/web/static/src/js/coresetup.js:629 #, python-format msgid "%d years ago" -msgstr "" +msgstr "Pred %d leti" #. openerp-web #: addons/web/static/src/js/data_export.js:6 @@ -293,13 +293,13 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/search.js:999 msgid "Filter" -msgstr "" +msgstr "Filter:" #. openerp-web #: addons/web/static/src/js/search.js:1108 #, python-format msgid "Group by: %s" -msgstr "" +msgstr "Združi po: %s" #. openerp-web #: addons/web/static/src/js/search.js:1132 @@ -347,7 +347,7 @@ msgstr "Filtri" #. openerp-web #: addons/web/static/src/js/search.js:1762 msgid "Advanced" -msgstr "" +msgstr "Napredeno" #. openerp-web #: addons/web/static/src/js/search.js:1853 @@ -632,7 +632,7 @@ msgstr "Dodaj: " #. openerp-web #: addons/web/static/src/js/view_form.js:4230 msgid "Save As..." -msgstr "" +msgstr "Shrani kot ..." #. openerp-web #: addons/web/static/src/js/view_form.js:4230 @@ -669,7 +669,7 @@ msgstr "Skupina" #. openerp-web #: addons/web/static/src/js/view_list.js:549 msgid "Do you really want to remove these records?" -msgstr "" +msgstr "Res želite odstraniti te zapise?" #. openerp-web #: addons/web/static/src/js/views.js:925 @@ -679,7 +679,7 @@ msgstr "Opozorilo" #. openerp-web #: addons/web/static/src/js/view_list.js:716 msgid "You must select at least one record." -msgstr "" +msgstr "Izbrati morate vsaj en zapis" #. openerp-web #: addons/web/static/src/js/view_list.js:1243 @@ -727,17 +727,17 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/views.js:716 msgid "Print" -msgstr "" +msgstr "Tiskanje" #. openerp-web #: addons/web/static/src/js/views.js:717 msgid "Attachment" -msgstr "" +msgstr "Priponka" #. openerp-web #: addons/web/static/src/js/views.js:718 addons/web/static/src/xml/base.xml:276 msgid "More" -msgstr "" +msgstr "Dodatno" #. openerp-web #: addons/web/static/src/js/views.js:810 @@ -757,7 +757,7 @@ msgstr "Izbrati morate vsaj en zapis." #. openerp-web #: addons/web/static/src/js/views.js:875 msgid "Uploading..." -msgstr "" +msgstr "Pošiljanje ..." #. openerp-web #: addons/web/static/src/js/views.js:885 @@ -963,7 +963,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:327 msgid "Log out" -msgstr "" +msgstr "Odjava" #. openerp-web #: addons/web/static/src/xml/base.xml:333 @@ -1028,7 +1028,7 @@ msgstr "Potrditev gesla:" #. openerp-web #: addons/web/static/src/xml/base.xml:390 msgid "Open" -msgstr "" +msgstr "Odpri" #. openerp-web #: addons/web/static/src/xml/base.xml:390 @@ -1123,18 +1123,18 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:527 msgid "Add..." -msgstr "" +msgstr "Dodaj ..." #. openerp-web #: addons/web/static/src/xml/base.xml:622 #: addons/web/static/src/xml/base.xml:687 msgid "or" -msgstr "" +msgstr "ali" #. openerp-web #: addons/web/static/src/xml/base.xml:687 msgid "Discard" -msgstr "" +msgstr "Opusti" #. openerp-web #: addons/web/static/src/xml/base.xml:806 @@ -1220,7 +1220,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:981 msgid "Relation:" -msgstr "" +msgstr "Relacija:" #. openerp-web #: addons/web/static/src/xml/base.xml:985 @@ -1235,7 +1235,7 @@ msgstr "Odpri vir" #. openerp-web #: addons/web/static/src/xml/base.xml:1063 msgid "Select date" -msgstr "" +msgstr "Izberi datum" #. openerp-web #: addons/web/static/src/xml/base.xml:948 @@ -1298,7 +1298,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1260 msgid "Button Type:" -msgstr "" +msgstr "Vrsta tipke:" #. openerp-web #: addons/web/static/src/xml/base.xml:1264 @@ -1318,7 +1318,7 @@ msgstr "Polje" #. openerp-web #: addons/web/static/src/xml/base.xml:1205 msgid "Advanced Search..." -msgstr "" +msgstr "Napredno iskanje ..." #. openerp-web #: addons/web/static/src/xml/base.xml:1287 @@ -1363,7 +1363,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:1381 msgid "Filter name" -msgstr "" +msgstr "Ime filtra" #. openerp-web #: addons/web/static/src/xml/base.xml:1383 diff --git a/addons/web/static/lib/cleditor/jquery.cleditor.js b/addons/web/static/lib/cleditor/jquery.cleditor.js index c0763136c99..0fff0152776 100644 --- a/addons/web/static/lib/cleditor/jquery.cleditor.js +++ b/addons/web/static/lib/cleditor/jquery.cleditor.js @@ -295,7 +295,12 @@ // Bind the window resize event when the width or height is auto or % if (/auto|%/.test("" + options.width + options.height)) - $(window).resize(function() {refresh(editor);}); + $(window).resize(function() { + // CHM Note MonkeyPatch: if the DOM is not remove, refresh the cleditor + if(editor.$main.parent().parent().size()) { + refresh(editor); + } + }); // Create the iframe and resize the controls refresh(editor); @@ -562,7 +567,7 @@ //================== // Private Functions //================== - + // checksum - returns a checksum using the Adler-32 method function checksum(text) { diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 64b782835f2..d6fce64ca10 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -217,7 +217,7 @@ background-clip: padding-box; } .openerp.ui-dialog .ui-dialog-content { - padding: 0px; + padding: 0; } .openerp.ui-dialog .ui-dialog-titlebar, .openerp.ui-dialog .ui-dialog-content, .openerp.ui-dialog .ui-dialog-buttonpane { padding: 16px; @@ -2060,10 +2060,11 @@ padding-bottom: 0; } .openerp .oe_form div.oe_chatter { - min-width: 650px; - max-width: 860px; + box-sizing: border-box; + min-width: 682px; + max-width: 892px; margin: 0 auto; - padding: 16px 0 48px; + padding: 16px 16px 48px; } .openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; @@ -2518,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; } @@ -2563,9 +2567,6 @@ .openerp .oe_list_editable .oe_list_content td.oe_list_field_cell { padding: 4px 6px 3px 6px; } -.openerp .oe_list.oe_list_editable td.oe_list_record_delete { - position: absolute; -} .openerp .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) { color: transparent; } @@ -2874,6 +2875,78 @@ color: #333333; } +.openerp .oe_fileupload { + display: inline-block; + clear: both; + width: 100%; +} +.openerp .oe_fileupload .oe_add { + float: left; + position: relative; + width: 100%; + left: 2px; + top: 7px; +} +.openerp .oe_fileupload .oe_add button { + display: inline; + height: 24px; + font-size: 12px; + line-height: 12px; + vertical-align: middle; +} +.openerp .oe_fileupload .oe_add button.oe_attach { + width: 24px; + overflow: hidden; + width: 24px; + overflow: hidden; + background: transparent; + color: #7c7bad; + box-shadow: none; + border: none; + text-shadow: none; +} +.openerp .oe_fileupload .oe_add button.oe_attach .oe_e { + position: relative; + top: -1px; + left: -9px; +} +.openerp .oe_fileupload .oe_add input.oe_form_binary_file { + display: inline-block; + margin-left: -5px; + height: 28px; + width: 52px; + margin-top: -26px; +} +.openerp .oe_fileupload .oe_add .oe_attach_label { + color: #7c7bad; + margin-left: -3px; +} +.openerp .oe_fileupload .oe_attachments { + margin-bottom: 4px; + margin-right: 0px; + font-size: 12px; + border-radius: 2px; + border: solid 1px rgba(124, 123, 173, 0.14); +} +.openerp .oe_fileupload .oe_attachments .oe_attachment { + padding: 2px; + padding-left: 4px; + padding-right: 4px; +} +.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e { + font-size: 23px; + margin-top: -5px; +} +.openerp .oe_fileupload .oe_attachments .oe_attachment .oe_e:hover { + text-decoration: none; +} +.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(odd) { + background: white; +} +.openerp .oe_fileupload .oe_attachments .oe_attachment:nth-child(even) { + background: #f4f5fa; +} + .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); background-size: cover; @@ -2927,3 +3000,41 @@ div.ui-widget-overlay { -webkit-border-radius: 3px; border-radius: 3px; } + +@media print { + .openerp { + text-shadow: none; + } + .openerp .oe_header_row, .openerp ul.oe_header, .openerp div.oe_mail_thread_action, .openerp .oe_mail_recthread_actions, .openerp .oe_button_box, .openerp .oe_form button, .openerp button.oe_invite, .openerp .oe_form header, .openerp .openerp .oe_notebook > li.ui-state-default { + display: none; + } + .openerp .oe_list_content button, .openerp .oe_list_content input[type=checkbox] { + visibility: hidden; + } + .openerp .tree_header button, .openerp .oe_mail .oe_mail_thread_msg .oe_mail_unread, .openerp .oe_mail_fetch_more, .openerp .oe_m2o_drop_down_button img, .openerp .oe_form_field_one2many_list_row_add { + visibility: hidden; + } + .openerp a.oe_m2o_cm_button, .openerp a.oe_e { + visibility: hidden; + } + .openerp .oe_form .oe_form_field_date img, .openerp .oe_form .oe_form_field_datetime img { + visibility: hidden; + } + .openerp .oe_notebook > li.ui-tabs-selected { + display: block; + } + .openerp .oe_application .oe_form_sheet, .openerp .oe_application .oe_form_sheetbg { + border: 0px !important; + box-shadow: 0px 0px 0px; + } + .openerp .oe_view_manager_current > .oe_view_manager_header { + border: 0px !important; + box-shadow: 0px 0px 0px; + } + .openerp .text-core .text-wrap .text-arrow { + background: none; + } + .openerp .openerp div.oe_mail_wall { + overflow: hidden !important; + } +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f84d30a93ea..1719a863549 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -10,6 +10,8 @@ $tag-border-selected: #a6a6fe $hover-background: #f0f0fa $link-color: #7C7BAD $sheet-max-width: 860px +$sheet-min-width: 650px +$sheet-padding: 16px // }}} // Mixins {{{ @font-face @@ -256,6 +258,7 @@ $sheet-max-width: 860px // so remove position:relative .ui-tabs position: static + // Modal box &.ui-dialog display: none @@ -269,7 +272,7 @@ $sheet-max-width: 860px @include box-shadow(0 1px 12px rgba(0, 0, 0, 0.6)) @include background-clip() .ui-dialog-content - padding: 0px + padding: 0 .ui-dialog-titlebar, .ui-dialog-content, .ui-dialog-buttonpane padding: 16px .ui-dialog-titlebar @@ -1634,10 +1637,11 @@ $sheet-max-width: 860px width: 400px padding-bottom: 0 div.oe_chatter - min-width: 650px - max-width: $sheet-max-width + box-sizing: border-box + min-width: $sheet-min-width + 2* $sheet-padding + max-width: $sheet-max-width + 2* $sheet-padding margin: 0 auto - padding: 16px 0 48px + padding: 16px 16px 48px div.oe_form_configuration p, ul, ol color: #aaa @@ -1983,6 +1987,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 @@ -2027,9 +2034,6 @@ $sheet-max-width: 860px .oe_list_content td.oe_list_field_cell padding: 4px 6px 3px 6px - .oe_list.oe_list_editable - td.oe_list_record_delete - position: absolute .oe_list.oe_list_editable.oe_editing .oe_edition .oe_list_field_cell:not(.oe_readonly) * @@ -2273,6 +2277,67 @@ $sheet-max-width: 860px float: right color: #333 // }}} + +.openerp + .oe_fileupload + display: inline-block + clear: both + width: 100% + .oe_add + float: left + position: relative + width: 100% + left: +2px + top: +7px + button + display: inline + height: 24px + font-size: 12px + line-height: 12px + vertical-align: middle + button.oe_attach + width: 24px + overflow: hidden + width: 24px + overflow: hidden + background: transparent + color: #7C7BAD + box-shadow: none + border: none + text-shadow: none + .oe_e + position: relative + top: -1px + left: -9px + input.oe_form_binary_file + display: inline-block + margin-left: -5px + height: 28px + width: 52px + margin-top: -26px + .oe_attach_label + color: #7C7BAD + margin-left: -3px + .oe_attachments + margin-bottom: 4px + margin-right: 0px + font-size: 12px + border-radius: 2px + border: solid 1px rgba(124,123,173,0.14) + .oe_attachment + padding: 2px + padding-left: 4px + padding-right: 4px + .oe_e + font-size: 23px + margin-top: -5px + .oe_e:hover + text-decoration: none + .oe_attachment:nth-child(odd) + background: white + .oe_attachment:nth-child(even) + background: #F4F5FA + // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) @@ -2314,5 +2379,34 @@ div.ui-widget-overlay .ui-corner-all @include radius(3px) +@media print + .openerp + .oe_header_row, ul.oe_header, div.oe_mail_thread_action, .oe_mail_recthread_actions, .oe_button_box, .oe_form button, button.oe_invite, .oe_form header, .openerp .oe_notebook > li.ui-state-default + display: none + .oe_list_content + button, input[type=checkbox] + visibility: hidden + .tree_header button, .oe_mail .oe_mail_thread_msg .oe_mail_unread, .oe_mail_fetch_more, .oe_m2o_drop_down_button img, .oe_form_field_one2many_list_row_add + visibility: hidden + a + &.oe_m2o_cm_button, &.oe_e + visibility: hidden + .oe_form + .oe_form_field_date img, .oe_form_field_datetime img + visibility: hidden + .oe_notebook > li.ui-tabs-selected + display: block + .oe_application + .oe_form_sheet, .oe_form_sheetbg + border: 0px !important + box-shadow: 0px 0px 0px + .oe_view_manager_current > .oe_view_manager_header + border: 0px !important + box-shadow: 0px 0px 0px + text-shadow: none + .text-core .text-wrap .text-arrow + background: none + .openerp div.oe_mail_wall + overflow: hidden !important // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: 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/data.js b/addons/web/static/src/js/data.js index e279ade6fb3..63c90f53758 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -471,7 +471,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ default_get: function(fields, options) { options = options || {}; return this._model.call('default_get', - [fields], {context: this._model.context(options.context)}); + [fields], {context: this.get_context(options.context)}); }, /** * Creates a new record in db @@ -480,7 +480,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ * @returns {$.Deferred} */ create: function(data) { - return this._model.call('create', [data], {context: this._model.context()}); + return this._model.call('create', [data], {context: this.get_context()}); }, /** * Saves the provided data in an existing db record @@ -493,7 +493,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ */ write: function (id, data, options) { options = options || {}; - return this._model.call('write', [[id], data], {context: this._model.context(options.context)}).then(this.trigger('dataset_changed', id, data, options)); + return this._model.call('write', [[id], data], {context: this.get_context(options.context)}).then(this.trigger('dataset_changed', id, data, options)); }, /** * Deletes an existing record from the database @@ -501,7 +501,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ * @param {Number|String} ids identifier of the record to delete */ unlink: function(ids) { - return this._model.call('unlink', [ids], {context: this._model.context()}).then(this.trigger('dataset_changed', ids)); + return this._model.call('unlink', [ids], {context: this.get_context()}).then(this.trigger('dataset_changed', ids)); }, /** * Calls an arbitrary RPC method @@ -532,7 +532,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ * @returns {$.Deferred} */ name_get: function(ids) { - return this._model.call('name_get', [ids], {context: this._model.context()}); + return this._model.call('name_get', [ids], {context: this.get_context()}); }, /** * @@ -556,7 +556,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ * @param name */ name_create: function(name) { - return this._model.call('name_create', [name], {context: this._model.context()}); + return this._model.call('name_create', [name], {context: this.get_context()}); }, exec_workflow: function (id, signal) { return this._model.exec_workflow(id, signal); @@ -606,7 +606,7 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({ return instance.session.rpc('/web/dataset/resequence', { model: this.model, ids: ids, - context: this._model.context(options.context), + context: this.get_context(options.context), }).pipe(function (results) { return results; }); 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 72d9725e105..e0727b99259 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -427,7 +427,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var onchange = _.str.trim(on_change); var call = onchange.match(/^\s?(.*?)\((.*?)\)\s?$/); if (!call) { - return null; + throw new Error("Wrong on change format: " + onchange); } var method = call[1]; @@ -494,71 +494,59 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var self = this; return this.on_change_mutex.exec(function() { try { - var response = {}, can_process_onchange = $.Deferred(); + var def; processed = processed || []; processed.push(widget.name); var on_change = widget.node.attrs.on_change; if (on_change) { var change_spec = self.parse_on_change(on_change, widget); - if (change_spec) { - var ajax = { - url: '/web/dataset/onchange', - async: false - }; - can_process_onchange = self.rpc(ajax, { - model: self.dataset.model, - method: change_spec.method, - args: [(self.datarecord.id == null ? [] : [self.datarecord.id])].concat(change_spec.args), - context_id: change_spec.context_index == undefined ? null : change_spec.context_index + 1 - }).then(function(r) { - _.extend(response, r); - }); - } else { - console.warn("Wrong on_change format", on_change); - } - } - // fail if onchange failed - if (can_process_onchange.isRejected()) { - return can_process_onchange; + def = self.rpc('/web/dataset/onchange', { + model: self.dataset.model, + method: change_spec.method, + args: [(self.datarecord.id == null ? [] : [self.datarecord.id])].concat(change_spec.args), + context_id: change_spec.context_index == undefined ? null : change_spec.context_index + 1 + }); + } else { + def = $.when({}); } + return def.pipe(function(response) { + if (widget.field['change_default']) { + var fieldname = widget.name + var value_; + if (response.value && (fieldname in response.value)) { + // Use value from onchange if onchange executed + value_ = response.value[fieldname]; + } else { + // otherwise get form value for field + value_ = self.fields[fieldname].get_value(); + } + var condition = fieldname + '=' + value_; - if (widget.field['change_default']) { - var fieldname = widget.name, value_; - if (response.value && (fieldname in response.value)) { - // Use value from onchange if onchange executed - value_ = response.value[fieldname]; - } else { - // otherwise get form value for field - value_ = self.fields[fieldname].get_value(); + if (value_) { + return self.rpc('/web/dataset/call', { + model: 'ir.values', + method: 'get_defaults', + args: [self.model, condition] + }).pipe(function (results) { + if (!results.length) { + return response; + } + if (!response.value) { + response.value = {}; + } + for(var i=0; i + +
+ +
+ + ...Upload in progress... + + + + + + + [ + +
+ + +
+ + + +
+ +
+ + +
+
+
+ + + File + + + /web/binary/upload_attachment + + + + +
+
+ - or - Cancel + + or Cancel diff --git a/addons/web_calendar/i18n/sl.po b/addons/web_calendar/i18n/sl.po index 61259d9bde8..550fafc22d4 100644 --- a/addons/web_calendar/i18n/sl.po +++ b/addons/web_calendar/i18n/sl.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-01-30 17:43+0000\n" -"Last-Translator: ERP Basing \n" +"PO-Revision-Date: 2012-11-01 18:19+0000\n" +"Last-Translator: Dusan Laznik \n" "Language-Team: Slovenian \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-11-02 05:20+0000\n" +"X-Generator: Launchpad (build 16218)\n" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:11 @@ -25,114 +25,114 @@ msgstr "Koledar" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:70 msgid "Filter" -msgstr "" +msgstr "Filter:" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:144 msgid "Today" -msgstr "" +msgstr "Danes" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:145 msgid "Day" -msgstr "" +msgstr "Dan" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:146 msgid "Week" -msgstr "" +msgstr "Teden" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:147 msgid "Month" -msgstr "" +msgstr "Mesec" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:148 msgid "New event" -msgstr "" +msgstr "Nov dogodek" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:149 msgid "Save" -msgstr "" +msgstr "Shrani" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:150 msgid "Cancel" -msgstr "" +msgstr "Prekliči" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:151 msgid "Details" -msgstr "" +msgstr "Podrobnosti" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:152 msgid "Edit" -msgstr "" +msgstr "Uredi" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:153 msgid "Delete" -msgstr "" +msgstr "Izbriši" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:155 msgid "Event will be deleted permanently, are you sure?" -msgstr "" +msgstr "Dogodek bo trajno izbrisan. Ste prepričani?" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:156 #: addons/web_calendar/static/src/js/calendar.js:169 msgid "Description" -msgstr "" +msgstr "Opis" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:157 msgid "Time period" -msgstr "" +msgstr "Obdobje" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:158 msgid "Full day" -msgstr "" +msgstr "Cel dan" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:161 msgid "Do you want to edit the whole set of repeated events?" -msgstr "" +msgstr "Želite urediti celotno zbirko ponavljajočih dogodkov?" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:162 msgid "Repeat event" -msgstr "" +msgstr "Ponavljajoč dogodek" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:163 msgid "Disabled" -msgstr "" +msgstr "Onemogočeno" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:164 msgid "Enabled" -msgstr "" +msgstr "Omogočeno" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:167 #: addons/web_calendar/static/src/js/calendar.js:175 msgid "Agenda" -msgstr "" +msgstr "Dnevni red" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:168 msgid "Date" -msgstr "" +msgstr "Datum" #. openerp-web #: addons/web_calendar/static/src/js/calendar.js:172 msgid "Year" -msgstr "" +msgstr "Leto" #. openerp-web #: addons/web_calendar/static/src/xml/web_calendar.xml:5 diff --git a/addons/web_calendar/static/src/css/web_calendar.css b/addons/web_calendar/static/src/css/web_calendar.css index 9cfc2f777bd..6a82b6cea42 100644 --- a/addons/web_calendar/static/src/css/web_calendar.css +++ b/addons/web_calendar/static/src/css/web_calendar.css @@ -1053,3 +1053,12 @@ div.openerp .dhx_cal_editor textarea { .openerp .dhx_cal_event .dhx_header, .openerp .dhx_cal_event .dhx_header { display:none; } +@media print { + div.dhx_cal_navline .dhx_cal_tab, div.dhx_cal_navline .dhx_cal_prev_button, div.dhx_cal_navline .dhx_cal_next_button, div.dhx_cal_navline .dhx_cal_today_button{ + display: none; + } + .openerp .dhx_cal_data { + overflow-y: hidden !important; + position: relative; + } +} \ No newline at end of file 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_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index d5a6e78f862..85c6427b704 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -22,6 +22,7 @@ instance.web.DiagramView = instance.web.View.extend({ this.context = {}; this.ids = this.dataset.ids; this.on('view_loaded', self, self.load_diagram); + this.on('pager_action_executed', self, self.pager_action_trigger); }, start: function() { var self = this; @@ -59,12 +60,7 @@ instance.web.DiagramView = instance.web.View.extend({ self.$el.find('.oe_diagram_header').append(html_label); }) - this.$el.find('div.oe_diagram_pager button[data-pager-action]').click(function() { - var action = $(this).data('pager-action'); - self.execute_pager_action(action); - }); - - this.do_update_pager(); + this.init_pager(); // New Node,Edge this.$el.find('#new_node.oe_diagram_button_new').click(function(){self.add_node();}); @@ -366,36 +362,65 @@ instance.web.DiagramView = instance.web.View.extend({ form_controller.fields[self.connectors.attrs.destination].dirty = true; }); }, - - execute_pager_action: function(action) { - switch (action) { - case 'first': - this.dataset.index = 0; - break; - case 'previous': - this.dataset.previous(); - break; - case 'next': - this.dataset.next(); - break; - case 'last': - this.dataset.index = this.dataset.ids.length - 1; - break; + + do_hide: function () { + if (this.$pager) { + this.$pager.hide(); } + this._super(); + }, + + init_pager: function() { + var self = this; + if (this.$pager) + this.$pager.remove(); + + this.$pager = $(QWeb.render("DiagramView.pager", {'widget':self})).hide(); + if (this.options.$pager) { + this.$pager.appendTo(this.options.$pager); + } else { + this.$el.find('.oe_diagram_pager').replaceWith(this.$pager); + } + this.$pager.on('click','a[data-pager-action]',function() { + var action = $(this).data('pager-action'); + self.execute_pager_action(action); + }); + this.do_update_pager(); + }, + + pager_action_trigger: function(){ var loaded = this.dataset.read_index(_.keys(this.fields_view.fields)) .pipe(this.on_diagram_loaded); this.do_update_pager(); return loaded; }, + + execute_pager_action: function(action) { + switch (action) { + case 'first': + this.dataset.index = 0; + break; + case 'previous': + this.dataset.previous(); + break; + case 'next': + this.dataset.next(); + break; + case 'last': + this.dataset.index = this.dataset.ids.length - 1; + break; + } + this.trigger('pager_action_executed'); + + }, do_update_pager: function(hide_index) { - var $pager = this.$el.find('div.oe_diagram_pager'); - var index = hide_index ? '-' : this.dataset.index + 1; - if(!this.dataset.count) { - this.dataset.count = this.dataset.ids.length; + this.$pager.toggle(this.dataset.ids.length > 1); + if (hide_index) { + $(".oe_diagram_pager_state", this.$pager).html(""); + } else { + $(".oe_diagram_pager_state", this.$pager).html(_.str.sprintf(_t("%d / %d"), this.dataset.index + 1, this.dataset.ids.length)); } - $pager.find('span.oe_pager_index').html(index); - $pager.find('span.oe_pager_count').html(this.dataset.count); }, do_show: function() { diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml index 388092b3d23..54b06aafb27 100644 --- a/addons/web_diagram/static/src/xml/base_diagram.xml +++ b/addons/web_diagram/static/src/xml/base_diagram.xml @@ -1,18 +1,19 @@