diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 44a3caaf8ec..fcfdca60a2a 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -48,7 +48,6 @@ This module provides the core of the OpenERP Web Client. "static/src/js/views.js", "static/src/js/data.js", "static/src/js/data_export.js", - "static/src/js/data_import.js", "static/src/js/search.js", "static/src/js/view_form.js", "static/src/js/view_list.js", @@ -63,7 +62,6 @@ This module provides the core of the OpenERP Web Client. "static/lib/jquery.textext/jquery.textext.css", "static/src/css/base.css", "static/src/css/data_export.css", - "static/src/css/data_import.css", "static/lib/cleditor/jquery.cleditor.css", ], 'qweb' : [ diff --git a/addons/web/common/http.py b/addons/web/common/http.py index 6dc99f2c997..4955876894d 100644 --- a/addons/web/common/http.py +++ b/addons/web/common/http.py @@ -7,6 +7,7 @@ import cgi import contextlib import functools import logging +import mimetypes import os import pprint import sys @@ -420,6 +421,10 @@ def session_context(request, storage_path, session_cookie='httpsessionid'): #---------------------------------------------------------- # OpenERP Web WSGI Application #---------------------------------------------------------- +# Add potentially missing (older ubuntu) font mime types +mimetypes.add_type('application/font-woff', '.woff') +mimetypes.add_type('application/vnd.ms-fontobject', '.eot') +mimetypes.add_type('application/x-font-ttf', '.ttf') class DisableCacheMiddleware(object): def __init__(self, app): self.app = app diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index cf7a7a06feb..b635f5abdcd 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -484,15 +484,13 @@ def fix_view_modes(action): if not action.get('views'): generate_views(action) - id_form = None - for index, (id, mode) in enumerate(action['views']): - if mode == 'form': - id_form = id - break - if action.pop('view_type', 'form') != 'form': return action + if 'view_mode' in action: + action['view_mode'] = ','.join( + mode if mode != 'tree' else 'list' + for mode in action['view_mode'].split(',')) action['views'] = [ [id, mode if mode != 'tree' else 'list'] for id, mode in action['views'] @@ -1351,27 +1349,6 @@ class View(openerpweb.Controller): def load(self, req, model, view_id, view_type, toolbar=False): return self.fields_view_get(req, model, view_id, view_type, toolbar=toolbar) -class ListView(View): - _cp_path = "/web/listview" - - def process_colors(self, view, row, context): - colors = view['arch']['attrs'].get('colors') - - if not colors: - return None - - color = [ - pair.split(':')[0] - for pair in colors.split(';') - if eval(pair.split(':')[1], dict(context, **row)) - ] - - if not color: - return None - elif len(color) == 1: - return color[0] - return 'maroon' - class TreeView(View): _cp_path = "/web/treeview" diff --git a/addons/web/i18n/ar.po b/addons/web/i18n/ar.po index d237236136c..91eb99fe322 100644 --- a/addons/web/i18n/ar.po +++ b/addons/web/i18n/ar.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bg.po b/addons/web/i18n/bg.po index f8d6336165b..e204cf38ea6 100644 --- a/addons/web/i18n/bg.po +++ b/addons/web/i18n/bg.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bn.po b/addons/web/i18n/bn.po index 1112da416c8..b2113fcfa3e 100644 --- a/addons/web/i18n/bn.po +++ b/addons/web/i18n/bn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/bs.po b/addons/web/i18n/bs.po index 5f63ccd21e0..7784c238582 100644 --- a/addons/web/i18n/bs.po +++ b/addons/web/i18n/bs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ca.po b/addons/web/i18n/ca.po index 36000bec82c..233aed9cf0b 100644 --- a/addons/web/i18n/ca.po +++ b/addons/web/i18n/ca.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po index 5c07120c4c3..6d9beb4eeb3 100644 --- a/addons/web/i18n/cs.po +++ b/addons/web/i18n/cs.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" "X-Poedit-Language: Czech\n" #. openerp-web diff --git a/addons/web/i18n/da.po b/addons/web/i18n/da.po index 12667911ba6..b54f47d40d1 100644 --- a/addons/web/i18n/da.po +++ b/addons/web/i18n/da.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/de.po b/addons/web/i18n/de.po index 70fd3f3a3a0..3e751656961 100644 --- a/addons/web/i18n/de.po +++ b/addons/web/i18n/de.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/en_AU.po b/addons/web/i18n/en_AU.po index 39286ff6654..6a8d7453504 100644 --- a/addons/web/i18n/en_AU.po +++ b/addons/web/i18n/en_AU.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/en_GB.po b/addons/web/i18n/en_GB.po index 8747f1d7673..b1e6d509c3b 100644 --- a/addons/web/i18n/en_GB.po +++ b/addons/web/i18n/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -243,17 +243,19 @@ msgid "" "Destination fields should only be selected once, some fields are selected " "more than once:" msgstr "" +"Destination fields should only be selected once, some fields are selected " +"more than once:" #. openerp-web #: addons/web/static/src/js/data_import.js:386 msgid "*Required Fields are not selected :" -msgstr "" +msgstr "*Required Fields are not selected :" #. openerp-web #: addons/web/static/src/js/formats.js:139 #, python-format msgid "(%d records)" -msgstr "" +msgstr "(%d records)" #. openerp-web #: addons/web/static/src/js/formats.js:325 @@ -663,7 +665,7 @@ msgstr "Export" #. openerp-web #: addons/web/static/src/js/view_list.js:374 msgid "Group" -msgstr "" +msgstr "Group" #. openerp-web #: addons/web/static/src/js/view_list.js:549 diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index 2da9ed2d493..f928d90d752 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/es_CL.po b/addons/web/i18n/es_CL.po index 00a9689d06f..34dd032902b 100644 --- a/addons/web/i18n/es_CL.po +++ b/addons/web/i18n/es_CL.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/es_CR.po b/addons/web/i18n/es_CR.po index 986040accbb..acc919de181 100644 --- a/addons/web/i18n/es_CR.po +++ b/addons/web/i18n/es_CR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" "Language: es\n" #. openerp-web diff --git a/addons/web/i18n/es_EC.po b/addons/web/i18n/es_EC.po index 26850332763..7e15e9bc088 100644 --- a/addons/web/i18n/es_EC.po +++ b/addons/web/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/et.po b/addons/web/i18n/et.po index 0d467739688..628bd1d0dde 100644 --- a/addons/web/i18n/et.po +++ b/addons/web/i18n/et.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/eu.po b/addons/web/i18n/eu.po index c86bd2ea1c8..1769cdfa541 100644 --- a/addons/web/i18n/eu.po +++ b/addons/web/i18n/eu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fi.po b/addons/web/i18n/fi.po index 52e37bd2d4c..7dfe3499a93 100644 --- a/addons/web/i18n/fi.po +++ b/addons/web/i18n/fi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fr.po b/addons/web/i18n/fr.po index 50815ffe6ab..7cd2e430d6e 100644 --- a/addons/web/i18n/fr.po +++ b/addons/web/i18n/fr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/fr_CA.po b/addons/web/i18n/fr_CA.po index ae752394b51..409a7f2bade 100644 --- a/addons/web/i18n/fr_CA.po +++ b/addons/web/i18n/fr_CA.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/gl.po b/addons/web/i18n/gl.po index 2ccfe758450..0f5cc4b82f3 100644 --- a/addons/web/i18n/gl.po +++ b/addons/web/i18n/gl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/gu.po b/addons/web/i18n/gu.po index 22ac401a774..0b07a8c36b2 100644 --- a/addons/web/i18n/gu.po +++ b/addons/web/i18n/gu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hi.po b/addons/web/i18n/hi.po index 87203a95e28..6c02a09e141 100644 --- a/addons/web/i18n/hi.po +++ b/addons/web/i18n/hi.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hr.po b/addons/web/i18n/hr.po index 60d684992e4..3d389b02120 100644 --- a/addons/web/i18n/hr.po +++ b/addons/web/i18n/hr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/hu.po b/addons/web/i18n/hu.po index c6b3c3e78c6..eaacfc2a2d7 100644 --- a/addons/web/i18n/hu.po +++ b/addons/web/i18n/hu.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -35,18 +35,18 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/chrome.js:198 msgid "Dont send" -msgstr "" +msgstr "Ne küldje" #. openerp-web #: addons/web/static/src/js/chrome.js:1119 msgid "Client Error" -msgstr "" +msgstr "Kliens hiba" #. openerp-web #: addons/web/static/src/js/chrome.js:260 #, python-format msgid "Loading (%d)" -msgstr "" +msgstr "Betöltés (%d)" #. openerp-web #: addons/web/static/src/js/chrome.js:292 @@ -66,12 +66,12 @@ msgstr "Az adatbázis mentése sikerült" #. openerp-web #: addons/web/static/src/js/chrome.js:499 msgid "Restored" -msgstr "" +msgstr "Visszaállítva" #. openerp-web #: addons/web/static/src/js/chrome.js:499 msgid "Database restored successfully" -msgstr "" +msgstr "Sikeres adatbázis visszaállítás" #. openerp-web #: addons/web/static/src/js/chrome.js:783 @@ -235,7 +235,7 @@ msgstr "Fájl importálása" #. openerp-web #: addons/web/static/src/js/data_import.js:108 msgid "External ID" -msgstr "" +msgstr "Külső azonosító" #. openerp-web #: addons/web/static/src/js/data_import.js:349 @@ -259,18 +259,18 @@ msgstr "" #: addons/web/static/src/js/formats.js:325 #: addons/web/static/src/js/view_page.js:268 msgid "Download" -msgstr "" +msgstr "Letöltés" #. openerp-web #: addons/web/static/src/js/formats.js:330 #, python-format msgid "Download \"%s\"" -msgstr "" +msgstr "\"%s\" letöltése" #. openerp-web #: addons/web/static/src/js/search.js:437 msgid "Invalid Search" -msgstr "" +msgstr "Helytelen keresés" #. openerp-web #: addons/web/static/src/js/search.js:437 @@ -325,12 +325,12 @@ msgstr "" #: addons/web/static/src/js/search.js:962 #: addons/web/static/src/xml/base.xml:973 msgid "Yes" -msgstr "" +msgstr "Igen" #. openerp-web #: addons/web/static/src/js/search.js:963 msgid "No" -msgstr "" +msgstr "Nem" #. openerp-web #: addons/web/static/src/js/search.js:1416 @@ -487,7 +487,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/view_editor.js:367 msgid "Inherited View" -msgstr "" +msgstr "Örökölt Nézet" #. openerp-web #: addons/web/static/src/js/view_editor.js:371 @@ -497,7 +497,7 @@ msgstr "Biztos, hogy létre akar hozni egy származtatott nézetet ide?" #. openerp-web #: addons/web/static/src/js/view_editor.js:381 msgid "Preview" -msgstr "" +msgstr "Előnézet" #. openerp-web #: addons/web/static/src/js/view_editor.js:501 @@ -508,19 +508,19 @@ msgstr "Biztos, hogy el akarja távolítani ezt a csomópontot?" #: addons/web/static/src/js/view_editor.js:815 #: addons/web/static/src/js/view_editor.js:939 msgid "Properties" -msgstr "" +msgstr "Tulajdonságok" #. openerp-web #: addons/web/static/src/js/view_editor.js:818 #: addons/web/static/src/js/view_editor.js:942 msgid "Update" -msgstr "" +msgstr "Frissítés" #. openerp-web #: addons/web/static/src/js/view_form.js:16 #: addons/web/static/src/js/view_form.js:210 msgid "Form" -msgstr "" +msgstr "Űrlap" #. openerp-web #: addons/web/static/src/xml/base.xml:632 @@ -577,7 +577,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/js/view_form.js:1287 msgid "Confirm" -msgstr "" +msgstr "Jóváhagyás" #. openerp-web #: addons/web/static/src/js/view_form.js:2220 @@ -1036,7 +1036,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:477 msgid "Debug View#" -msgstr "" +msgstr "Debug nézet#" #. openerp-web #: addons/web/static/src/xml/base.xml:478 @@ -1634,3 +1634,9 @@ msgstr "Itt van a fájlnak az előnézete, amit nem tudunk importálni:" #~ msgid "Hide this tip" #~ msgstr "Tii elrejtése" + +#~ msgid "OK" +#~ msgstr "OK" + +#~ msgid "Filter Entry" +#~ msgstr "Szűrő bejegyzés" diff --git a/addons/web/i18n/id.po b/addons/web/i18n/id.po index 1d79472e5d9..7da4a5808aa 100644 --- a/addons/web/i18n/id.po +++ b/addons/web/i18n/id.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po index fc5e946f0dd..3c7279777d9 100644 --- a/addons/web/i18n/it.po +++ b/addons/web/i18n/it.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po index 6c553ddeeb4..ecb6ab65b8f 100644 --- a/addons/web/i18n/ja.po +++ b/addons/web/i18n/ja.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ka.po b/addons/web/i18n/ka.po index 9a3bf76a186..0cd4f697133 100644 --- a/addons/web/i18n/ka.po +++ b/addons/web/i18n/ka.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/mk.po b/addons/web/i18n/mk.po index d22b2721a71..57b97af4a7b 100644 --- a/addons/web/i18n/mk.po +++ b/addons/web/i18n/mk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/mn.po b/addons/web/i18n/mn.po index 010b331b3e6..bb19a6696e1 100644 --- a/addons/web/i18n/mn.po +++ b/addons/web/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po index 6c38bf0de21..2fba758798d 100644 --- a/addons/web/i18n/nb.po +++ b/addons/web/i18n/nb.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nl.po b/addons/web/i18n/nl.po index df2938cc5f4..3d19f1164fb 100644 --- a/addons/web/i18n/nl.po +++ b/addons/web/i18n/nl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/nl_BE.po b/addons/web/i18n/nl_BE.po index ec7225e7edb..4b4e0f1e52f 100644 --- a/addons/web/i18n/nl_BE.po +++ b/addons/web/i18n/nl_BE.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pl.po b/addons/web/i18n/pl.po index 37435488dbf..c37a3ac2c23 100644 --- a/addons/web/i18n/pl.po +++ b/addons/web/i18n/pl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pt.po b/addons/web/i18n/pt.po index 201e9666379..b8807413786 100644 --- a/addons/web/i18n/pt.po +++ b/addons/web/i18n/pt.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po index 716450df49d..c2e91578243 100644 --- a/addons/web/i18n/pt_BR.po +++ b/addons/web/i18n/pt_BR.po @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -256,7 +256,7 @@ msgstr "*Campos Obrigatórios não selecionados :" #: addons/web/static/src/js/formats.js:139 #, python-format msgid "(%d records)" -msgstr "(%d registos)" +msgstr "(%d registros)" #. openerp-web #: addons/web/static/src/js/formats.js:325 @@ -500,7 +500,7 @@ msgstr "Quer realmente criar uma view herdada aqui?" #. openerp-web #: addons/web/static/src/js/view_editor.js:381 msgid "Preview" -msgstr "Pré-visualizar" +msgstr "Visualizar" #. openerp-web #: addons/web/static/src/js/view_editor.js:501 @@ -541,7 +541,7 @@ msgstr "Duplicar" #: addons/web/static/src/js/view_form.js:133 #: addons/web/static/src/js/view_form.js:728 msgid "Set Default" -msgstr "Definir como Padrão" +msgstr "Configurar Padrão" #. openerp-web #: addons/web/static/src/js/view_page.js:59 @@ -665,12 +665,12 @@ msgstr "Exportar" #. openerp-web #: addons/web/static/src/js/view_list.js:374 msgid "Group" -msgstr "Grupo" +msgstr "Agrupar" #. openerp-web #: addons/web/static/src/js/view_list.js:549 msgid "Do you really want to remove these records?" -msgstr "Deseja remover esse registro?" +msgstr "Deseja remover estes registros?" #. openerp-web #: addons/web/static/src/js/views.js:925 @@ -787,12 +787,12 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:251 msgid "OpenERP Entreprise" -msgstr "OpenERP Entreprise" +msgstr "OpenERP Enterprise" #. openerp-web #: addons/web/static/src/xml/base.xml:256 msgid "OpenERP Enterprise Contract." -msgstr "Contrato Corporativo OpenERP" +msgstr "Contrato Enterprise do OpenERP" #. openerp-web #: addons/web/static/src/xml/base.xml:257 @@ -829,7 +829,7 @@ msgstr "Banco de Dados:" #. openerp-web #: addons/web/static/src/xml/base.xml:306 msgid "Username" -msgstr "Nome do usuário" +msgstr "Nome de usuário" #. openerp-web #: addons/web/static/src/xml/base.xml:308 @@ -840,7 +840,7 @@ msgstr "Senha" #. openerp-web #: addons/web/static/src/xml/base.xml:310 msgid "Log in" -msgstr "Autenticar" +msgstr "Acessar" #. openerp-web #: addons/web/static/src/xml/base.xml:314 @@ -850,7 +850,7 @@ msgstr "Administrar bancos de dados" #. openerp-web #: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315 msgid "Powered by" -msgstr "Desenvolvido Por" +msgstr "Desenvolvido por" #. openerp-web #: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315 @@ -862,7 +862,7 @@ msgstr "OpenERP" #: addons/web/static/src/xml/base.xml:132 #: addons/web/static/src/xml/base.xml:328 msgid "Drop" -msgstr "Soltar" +msgstr "Excluir" #. openerp-web #: addons/web/static/src/xml/base.xml:166 @@ -981,7 +981,7 @@ msgstr "Versão" #. openerp-web #: addons/web/static/src/xml/base.xml:1821 msgid "Copyright © 2004-TODAY OpenERP SA. All Rights Reserved." -msgstr "Copyright © 2004-HOJE OpenERP SA. Alguns Direitos Reservados." +msgstr "Copyright © 2004-HOJE OpenERP SA. Todos os Direitos Reservados." #. openerp-web #: addons/web/static/src/xml/base.xml:1822 @@ -991,12 +991,12 @@ msgstr "OpenERP é uma marca de" #. openerp-web #: addons/web/static/src/xml/base.xml:1823 msgid "OpenERP SA Company" -msgstr "Empresa OpenERP SA" +msgstr "OpenERP SA" #. openerp-web #: addons/web/static/src/xml/base.xml:1825 msgid "Licenced under the terms of" -msgstr "Licenciado sobre os termos de" +msgstr "Licenciado sob os termos de" #. openerp-web #: addons/web/static/src/xml/base.xml:1826 @@ -1152,7 +1152,7 @@ msgstr "Condição:" #. openerp-web #: addons/web/static/src/xml/base.xml:842 msgid "Only you" -msgstr "Somente voce" +msgstr "Apenas eu" #. openerp-web #: addons/web/static/src/xml/base.xml:849 @@ -1167,7 +1167,7 @@ msgstr "Widget não utilizado" #. openerp-web #: addons/web/static/src/xml/base.xml:936 msgid "(nolabel)" -msgstr "(nolabel)" +msgstr "(sem rótulo)" #. openerp-web #: addons/web/static/src/xml/base.xml:941 @@ -1213,7 +1213,7 @@ msgstr "Modificadores:" #. openerp-web #: addons/web/static/src/xml/base.xml:973 msgid "Change default:" -msgstr "Trocar padrão" +msgstr "Alterar padrão" #. openerp-web #: addons/web/static/src/xml/base.xml:977 @@ -1238,7 +1238,7 @@ msgstr "Abrir este recurso" #. openerp-web #: addons/web/static/src/xml/base.xml:1063 msgid "Select date" -msgstr "Data selecionada" +msgstr "Escolha a data" #. openerp-web #: addons/web/static/src/xml/base.xml:948 @@ -1511,12 +1511,12 @@ msgstr "Arquivo CSV:" #. openerp-web #: addons/web/static/src/xml/base.xml:1756 msgid "2. Check your file format" -msgstr "Verifique seu formato de arquivo" +msgstr "2. Verifique seu formato de arquivo" #. openerp-web #: addons/web/static/src/xml/base.xml:1759 msgid "Import Options" -msgstr "Opções de importação" +msgstr "Opções de Importação" #. openerp-web #: addons/web/static/src/xml/base.xml:1763 @@ -1577,9 +1577,6 @@ msgstr "A importação falhou devido a:" msgid "Here is a preview of the file we could not import:" msgstr "Aqui está uma visualização do arquivo que não pode ser importado:" -#~ msgid "LOGOUT" -#~ msgstr "DESCONECTAR" - #~ msgid "Open..." #~ msgstr "Abrir..." @@ -1623,9 +1620,6 @@ msgstr "Aqui está uma visualização do arquivo que não pode ser importado:" #~ msgid "Page" #~ msgstr "Página" -#~ msgid "Customize" -#~ msgstr "Customizar" - #~ msgid "Reports" #~ msgstr "Relatórios" @@ -1665,9 +1659,6 @@ msgstr "Aqui está uma visualização do arquivo que não pode ser importado:" #~ msgid "Add / Remove Shortcut..." #~ msgstr "Adicionar/Remover atalho..." -#~ msgid "Fold menu" -#~ msgstr "Abrir menu" - #~ msgid "Add attachment" #~ msgstr "Adicionar anexo" @@ -1689,3 +1680,12 @@ msgstr "Aqui está uma visualização do arquivo que não pode ser importado:" #~ msgid "Filter disabled due to invalid syntax" #~ msgstr "Filtro desativado devido a sintaxe inválida" + +#~ msgid "Fold menu" +#~ msgstr "Fechar o menu" + +#~ msgid "LOGOUT" +#~ msgstr "SAIR" + +#~ msgid "Customize" +#~ msgstr "Personalizar" diff --git a/addons/web/i18n/ro.po b/addons/web/i18n/ro.po index 0285d511a95..153b1929695 100644 --- a/addons/web/i18n/ro.po +++ b/addons/web/i18n/ro.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/ru.po b/addons/web/i18n/ru.po index 44f3628970d..053ab8db761 100644 --- a/addons/web/i18n/ru.po +++ b/addons/web/i18n/ru.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 @@ -66,12 +66,12 @@ msgstr "База данных резервированна успешно" #. openerp-web #: addons/web/static/src/js/chrome.js:499 msgid "Restored" -msgstr "Восстановленна" +msgstr "Восстановлена" #. openerp-web #: addons/web/static/src/js/chrome.js:499 msgid "Database restored successfully" -msgstr "База данных восстановленна успешно" +msgstr "База данных восстановлена успешно" #. openerp-web #: addons/web/static/src/js/chrome.js:783 @@ -205,12 +205,12 @@ msgstr "Закрыть" #. openerp-web #: addons/web/static/src/js/data_export.js:20 msgid "Export To File" -msgstr "Экспортировать в файл" +msgstr "Экспорт в файл" #. openerp-web #: addons/web/static/src/js/data_export.js:126 msgid "Please enter save field list name" -msgstr "Введите имя для сохраняемого списка полей" +msgstr "Введите имя списка полей для сохранения" #. openerp-web #: addons/web/static/src/js/data_export.js:362 @@ -230,12 +230,12 @@ msgstr "Импорт данных" #. openerp-web #: addons/web/static/src/js/data_import.js:72 msgid "Import File" -msgstr "Импортировать файл" +msgstr "Импорт файла" #. openerp-web #: addons/web/static/src/js/data_import.js:108 msgid "External ID" -msgstr "Внешний идентификатор" +msgstr "Внешний ID" #. openerp-web #: addons/web/static/src/js/data_import.js:349 @@ -243,17 +243,19 @@ msgid "" "Destination fields should only be selected once, some fields are selected " "more than once:" msgstr "" +"Конечные поля должны быть выбраны единожды, некоторые поля выбраны более " +"одного раза:" #. openerp-web #: addons/web/static/src/js/data_import.js:386 msgid "*Required Fields are not selected :" -msgstr "" +msgstr "*Требуемые поля не выбраны :" #. openerp-web #: addons/web/static/src/js/formats.js:139 #, python-format msgid "(%d records)" -msgstr "" +msgstr "(%d записей)" #. openerp-web #: addons/web/static/src/js/formats.js:325 @@ -444,7 +446,7 @@ msgstr "ложно" #: addons/web/static/src/js/view_editor.js:20 #, python-format msgid "Manage Views (%s)" -msgstr "Управление макетами (%s)" +msgstr "Управление видами (%s)" #. openerp-web #: addons/web/static/src/js/view_editor.js:46 @@ -477,18 +479,18 @@ msgstr "Создать вид (%s)" #. openerp-web #: addons/web/static/src/js/view_editor.js:168 msgid "Do you really want to remove this view?" -msgstr "Вы действительно хотите удалить этот Вид?" +msgstr "Вы действительно хотите удалить этот вид?" #. openerp-web #: addons/web/static/src/js/view_editor.js:364 #, python-format msgid "View Editor %d - %s" -msgstr "Редактор Вида %d - %s" +msgstr "Редактор вида %d - %s" #. openerp-web #: addons/web/static/src/js/view_editor.js:367 msgid "Inherited View" -msgstr "Унаследованный Вид" +msgstr "Унаследованный вид" #. openerp-web #: addons/web/static/src/js/view_editor.js:371 @@ -503,7 +505,7 @@ msgstr "Предпросмотр" #. openerp-web #: addons/web/static/src/js/view_editor.js:501 msgid "Do you really want to remove this node?" -msgstr "Вы действительно хотите удалить этот Узел?" +msgstr "Вы действительно хотите удалить этот узел?" #. openerp-web #: addons/web/static/src/js/view_editor.js:815 @@ -544,18 +546,18 @@ msgstr "Установить по умолчанию" #. openerp-web #: addons/web/static/src/js/view_page.js:59 msgid "Do you really want to delete this record?" -msgstr "Вы действительно хотите удалить эту Запись?" +msgstr "Вы действительно хотите удалить эту запись?" #. openerp-web #: addons/web/static/src/js/view_form.js:508 msgid "" "Warning, the record has been modified, your changes will be discarded." -msgstr "Внимание. Эта запись была изменена. Ваши изменения будут потеряны." +msgstr "Внимание, запись была изменена. Ваши изменения будут потеряны." #. openerp-web #: addons/web/static/src/js/view_form.js:735 msgid "Save default" -msgstr "Сохранить как По Умолчанию" +msgstr "Сохранить значения по умолчанию" #. openerp-web #: addons/web/static/src/js/view_form.js:870 @@ -663,12 +665,12 @@ msgstr "Экспорт" #. openerp-web #: addons/web/static/src/js/view_list.js:374 msgid "Group" -msgstr "" +msgstr "Группа" #. openerp-web #: addons/web/static/src/js/view_list.js:549 msgid "Do you really want to remove these records?" -msgstr "Вы действительно хотите удалить эту Запись?" +msgstr "Вы действительно хотите удалить эти записи?" #. openerp-web #: addons/web/static/src/js/views.js:925 @@ -699,29 +701,29 @@ msgstr "Дерево" #. openerp-web #: addons/web/static/src/js/views.js:570 addons/web/static/src/xml/base.xml:480 msgid "Fields View Get" -msgstr "Получить Поля Просмотра" +msgstr "Получить поля вида" #. openerp-web #: addons/web/static/src/js/views.js:578 #, python-format msgid "View Log (%s)" -msgstr "Просмотреть Протокол (%s)" +msgstr "Показать отчет (%s)" #. openerp-web #: addons/web/static/src/js/views.js:605 #, python-format msgid "Model %s fields" -msgstr "Поля Модели %s" +msgstr "Поля модели %s" #. openerp-web #: addons/web/static/src/js/views.js:615 addons/web/static/src/xml/base.xml:482 msgid "Manage Views" -msgstr "Управление Видами" +msgstr "Управление видами" #. openerp-web #: addons/web/static/src/js/views.js:616 msgid "Could not find current view declaration" -msgstr "Не могу найти объявление текущего макета" +msgstr "Не удалось найти определение текущего вида" #. openerp-web #: addons/web/static/src/js/views.js:716 @@ -751,7 +753,7 @@ msgstr "Технический перевод" #. openerp-web #: addons/web/static/src/js/views.js:924 msgid "You must choose at least one record." -msgstr "Вы должны выбрать хотя-бы одну запись." +msgstr "Вы должны выбрать хотя бы одну запись." #. openerp-web #: addons/web/static/src/js/views.js:875 @@ -779,8 +781,7 @@ msgid "" "Your version of OpenERP is unsupported. Support & maintenance services are " "available here:" msgstr "" -"Ваша версия OpenERP не поддерживается. Службы Технической Поддержки доступны " -"тут:" +"Ваша версия OpenERP не поддерживается. Услуги техподдержки доступны здесь:" #. openerp-web #: addons/web/static/src/xml/base.xml:251 @@ -790,7 +791,7 @@ msgstr "OpenERP Entreprise" #. openerp-web #: addons/web/static/src/xml/base.xml:256 msgid "OpenERP Enterprise Contract." -msgstr "OpenERP Enterprise Contract." +msgstr "Контракт OpenERP Enterprise." #. openerp-web #: addons/web/static/src/xml/base.xml:257 @@ -843,7 +844,7 @@ msgstr "Вход" #. openerp-web #: addons/web/static/src/xml/base.xml:314 msgid "Manage Databases" -msgstr "Управление Базами Данных" +msgstr "Управление базами данных" #. openerp-web #: addons/web/static/src/xml/base.xml:44 addons/web/static/src/xml/base.xml:315 @@ -866,7 +867,7 @@ 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 @@ -877,7 +878,7 @@ msgstr "Востановить" #. openerp-web #: addons/web/static/src/xml/base.xml:332 msgid "Back to Login" -msgstr "Вернутся к Авторизации" +msgstr "Войти" #. openerp-web #: addons/web/static/src/xml/base.xml:61 @@ -887,7 +888,7 @@ msgstr "СОЗДАТЬ БАЗУ ДАННЫХ" #. openerp-web #: addons/web/static/src/xml/base.xml:68 addons/web/static/src/xml/base.xml:211 msgid "Master password:" -msgstr "Мастер пароль:" +msgstr "Мастер-пароль:" #. openerp-web #: addons/web/static/src/xml/base.xml:72 addons/web/static/src/xml/base.xml:191 @@ -897,7 +898,7 @@ msgstr "Название новой базы данных:" #. openerp-web #: addons/web/static/src/xml/base.xml:77 msgid "Load Demonstration data:" -msgstr "Загрузить Демонстрационные данные:" +msgstr "Загрузить демонстрационные данные:" #. openerp-web #: addons/web/static/src/xml/base.xml:81 @@ -924,7 +925,7 @@ msgstr "УДАЛИТЬ БАЗУ ДАННЫХ" #: addons/web/static/src/xml/base.xml:162 #: addons/web/static/src/xml/base.xml:187 msgid "Master Password:" -msgstr "Мастер Пароль:" +msgstr "Мастер-пароль:" #. openerp-web #: addons/web/static/src/xml/base.xml:143 @@ -944,17 +945,17 @@ msgstr "Файл:" #. openerp-web #: addons/web/static/src/xml/base.xml:204 msgid "CHANGE MASTER PASSWORD" -msgstr "ИЗМЕНИТЬ МАСТЕР ПАРОЛЬ" +msgstr "ИЗМЕНИТЬ МАСТЕР-ПАРОЛЬ" #. openerp-web #: addons/web/static/src/xml/base.xml:216 msgid "New master password:" -msgstr "Новый Мастер Пароль:" +msgstr "Новый мастер-пароль:" #. openerp-web #: addons/web/static/src/xml/base.xml:221 msgid "Confirm new master password:" -msgstr "Подтверждение Мастер Пароля:" +msgstr "Подтвердить мастер-пароль:" #. openerp-web #: addons/web/static/src/xml/base.xml:325 @@ -1054,7 +1055,7 @@ msgstr "" #. openerp-web #: addons/web/static/src/xml/base.xml:479 msgid "View Fields" -msgstr "Просмотр Полей" +msgstr "Просмотр полей" #. openerp-web #: addons/web/static/src/xml/base.xml:1300 @@ -1069,7 +1070,7 @@ msgstr "Вид" #. openerp-web #: addons/web/static/src/xml/base.xml:484 msgid "Edit SearchView" -msgstr "Изменить Вид Поиска" +msgstr "Изменить вид поиска" #. openerp-web #: addons/web/static/src/xml/base.xml:485 @@ -1099,7 +1100,7 @@ msgstr "Создатель:" #. openerp-web #: addons/web/static/src/xml/base.xml:500 msgid "Creation Date:" -msgstr "Дата Создания:" +msgstr "Дата создания:" #. openerp-web #: addons/web/static/src/xml/base.xml:503 @@ -1109,7 +1110,7 @@ msgstr "Изменялся:" #. openerp-web #: addons/web/static/src/xml/base.xml:506 msgid "Latest Modification Date:" -msgstr "Дата Изменения:" +msgstr "Дата изменения:" #. openerp-web #: addons/web/static/src/xml/base.xml:518 @@ -1299,7 +1300,7 @@ msgstr "Специальное:" #. openerp-web #: addons/web/static/src/xml/base.xml:1260 msgid "Button Type:" -msgstr "Тип Кнопки:" +msgstr "Тип кнопки:" #. openerp-web #: addons/web/static/src/xml/base.xml:1264 @@ -1309,7 +1310,7 @@ msgstr "Метод:" #. openerp-web #: addons/web/static/src/xml/base.xml:1268 msgid "Action ID:" -msgstr "ID Действия:" +msgstr "ID действия:" #. openerp-web #: addons/web/static/src/xml/base.xml:542 @@ -1334,7 +1335,7 @@ msgstr "-- Действия --" #. openerp-web #: addons/web/static/src/xml/base.xml:1297 msgid "Add Advanced Filter" -msgstr "Добавить Расширенный Фильтр" +msgstr "Добавить расширенный фильтр" #. openerp-web #: addons/web/static/src/xml/base.xml:1298 @@ -1344,12 +1345,12 @@ msgstr "Сохранить фильтр" #. openerp-web #: addons/web/static/src/xml/base.xml:1305 msgid "Filter Name:" -msgstr "Название Фильтра:" +msgstr "Название фильтра:" #. openerp-web #: addons/web/static/src/xml/base.xml:1307 msgid "(Any existing filter with the same name will be replaced)" -msgstr "(Существующий фильтр с таким же именени будет замещен)" +msgstr "(Имеющийся фильтр с таким же имененем будет заменен)" #. openerp-web #: addons/web/static/src/xml/base.xml:1376 @@ -1437,7 +1438,7 @@ msgstr "Тип экспорта:" #. openerp-web #: addons/web/static/src/xml/base.xml:1626 msgid "Import Compatible Export" -msgstr "Импорт совместимого Экспорта" +msgstr "Экспорт, совместимый с импортом" #. openerp-web #: addons/web/static/src/xml/base.xml:1627 @@ -1447,7 +1448,7 @@ msgstr "Экспортировать все данные" #. openerp-web #: addons/web/static/src/xml/base.xml:1630 msgid "Export Formats" -msgstr "Форматы Экспорта" +msgstr "Форматы экспорта" #. openerp-web #: addons/web/static/src/xml/base.xml:1636 @@ -1620,9 +1621,6 @@ msgstr "Предпросмотр файла, который система не #~ msgid "[%(first_record)d to %(last_record)d] of %(records_count)d" #~ msgstr "[%(first_record)d до %(last_record)d] из %(records_count)d" -#~ msgid "Filter disabled due to invalid syntax" -#~ msgstr "Фильтр отключен так-как имеет неверный синтаксис" - #~ msgid "Add / Remove Shortcut..." #~ msgstr "Добавить / Удалить ярлык..." @@ -1641,9 +1639,6 @@ msgstr "Предпросмотр файла, который система не #~ msgid "Open..." #~ msgstr "Открыть..." -#~ msgid "Send an e-mail with your default e-mail client" -#~ msgstr "Отправлять имейл вашим почтовым клиентом" - #~ msgid "Search..." #~ msgstr "Поиск…" @@ -1671,17 +1666,23 @@ msgstr "Предпросмотр файла, который система не #~ msgid "None of the following conditions must match" #~ msgstr "Ни одно из следующих условий не должно соответствовать" -#~ msgid "Advanced Filters" -#~ msgstr "Расширенные Фильтры" - #~ msgid "Activate the developper mode" #~ msgstr "Активировать режим разработчика" -#~ msgid "Title of new Dashboard item:" -#~ msgstr "Заголовок нового Дашбоарда:" - #~ msgid "Notebook Page \"" #~ msgstr "Страница Блокнота \"" +#~ msgid "Filter disabled due to invalid syntax" +#~ msgstr "Фильтр отключен из-за неверного синтаксиса" + +#~ msgid "Send an e-mail with your default e-mail client" +#~ msgstr "Отправлять e-mail вашим почтовым клиентом" + #~ msgid "Select Dashboard to add this filter to:" -#~ msgstr "Выберите Дашбоард, к которому добавить этот фильтр:" +#~ msgstr "Выберите панель для добавления этого фильтра:" + +#~ msgid "Title of new Dashboard item:" +#~ msgstr "Заголовок новой панели:" + +#~ msgid "Advanced Filters" +#~ msgstr "Расширенные фильтры" diff --git a/addons/web/i18n/sk.po b/addons/web/i18n/sk.po index cee3204f93e..006899d1889 100644 --- a/addons/web/i18n/sk.po +++ b/addons/web/i18n/sk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sl.po b/addons/web/i18n/sl.po index 1e017510061..99e18263443 100644 --- a/addons/web/i18n/sl.po +++ b/addons/web/i18n/sl.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sq.po b/addons/web/i18n/sq.po index acf9e89b55d..a545c3683aa 100644 --- a/addons/web/i18n/sq.po +++ b/addons/web/i18n/sq.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:54+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:04+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sr@latin.po b/addons/web/i18n/sr@latin.po index b46d56f58b7..2d389175260 100644 --- a/addons/web/i18n/sr@latin.po +++ b/addons/web/i18n/sr@latin.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/sv.po b/addons/web/i18n/sv.po index e7b7e1c9734..9a41194fdb6 100644 --- a/addons/web/i18n/sv.po +++ b/addons/web/i18n/sv.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/tr.po b/addons/web/i18n/tr.po index da03519d393..cec6ad422ca 100644 --- a/addons/web/i18n/tr.po +++ b/addons/web/i18n/tr.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/uk.po b/addons/web/i18n/uk.po index 5aaf5375900..528701f9e45 100644 --- a/addons/web/i18n/uk.po +++ b/addons/web/i18n/uk.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/zh_CN.po b/addons/web/i18n/zh_CN.po index a19dad87680..d2ce13e0621 100644 --- a/addons/web/i18n/zh_CN.po +++ b/addons/web/i18n/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/i18n/zh_TW.po b/addons/web/i18n/zh_TW.po index 50600d342ae..d1f9a36c638 100644 --- a/addons/web/i18n/zh_TW.po +++ b/addons/web/i18n/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-05 04:55+0000\n" -"X-Generator: Launchpad (build 15901)\n" +"X-Launchpad-Export-Date: 2012-09-14 05:05+0000\n" +"X-Generator: Launchpad (build 15944)\n" #. openerp-web #: addons/web/static/src/js/chrome.js:176 diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1256ffef6f9..a67d9b72d2c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -25,6 +25,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -40,7 +41,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -111,28 +112,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { - list-style-type: none; -} -.openerp ul.oe_semantic_html_override { - margin: 0; - padding: 0; -} -.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li { - margin: 0; - padding: 0; -} -.openerp ul.oe_semantic_html_override li { - list-style-type: none; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -265,7 +244,7 @@ border-radius: 0 0 2px 2px; } .openerp.ui-dialog .ui-dialog-buttonpane button { - margin: 0; + margin: 0 4px 0 0; } .openerp.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: left; @@ -393,40 +372,38 @@ background: #dc5f59; } .openerp button.oe_highlight { - background-color: #dc5f59; - background-image: -webkit-gradient(linear, left top, left bottom, from(#dc5f59), to(#b33630)); - background-image: -webkit-linear-gradient(top, #dc5f59, #b33630); - background-image: -moz-linear-gradient(top, #dc5f59, #b33630); - background-image: -ms-linear-gradient(top, #dc5f59, #b33630); - background-image: -o-linear-gradient(top, #dc5f59, #b33630); - background-image: linear-gradient(to bottom, #dc5f59, #b33630); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; -} -.openerp button.oe_highlight:active { - background-color: #b33630; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b33630), to(#dc5f59)); - background-image: -webkit-linear-gradient(top, #b33630, #dc5f59); - background-image: -moz-linear-gradient(top, #b33630, #dc5f59); - background-image: -ms-linear-gradient(top, #b33630, #dc5f59); - background-image: -o-linear-gradient(top, #b33630, #dc5f59); - background-image: linear-gradient(to bottom, #b33630, #dc5f59); - -moz-box-shadow: none; - -webkit-box-shadow: none; - box-shadow: none; + border: 1px solid #795151; + background-color: #df3f3f; + background-image: -webkit-gradient(linear, left top, left bottom, from(#df3f3f), to(#a21a1a)); + background-image: -webkit-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -moz-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -ms-linear-gradient(top, #df3f3f, #a21a1a); + background-image: -o-linear-gradient(top, #df3f3f, #a21a1a); + background-image: linear-gradient(to bottom, #df3f3f, #a21a1a); + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset; } .openerp button.oe_highlight:hover { - background-color: #df6b66; - background-image: -webkit-gradient(linear, left top, left bottom, from(#df6b66), to(#bf3a33)); - background-image: -webkit-linear-gradient(top, #df6b66, #bf3a33); - background-image: -moz-linear-gradient(top, #df6b66, #bf3a33); - background-image: -ms-linear-gradient(top, #df6b66, #bf3a33); - background-image: -o-linear-gradient(top, #df6b66, #bf3a33); - background-image: linear-gradient(to bottom, #df6b66, #bf3a33); - -moz-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); - box-shadow: 0 0 1px rgba(0, 0, 0, 0.2); + background-color: #e25858; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e25858), to(#ab1b1b)); + background-image: -webkit-linear-gradient(top, #e25858, #ab1b1b); + background-image: -moz-linear-gradient(top, #e25858, #ab1b1b); + background-image: -ms-linear-gradient(top, #e25858, #ab1b1b); + background-image: -o-linear-gradient(top, #e25858, #ab1b1b); + background-image: linear-gradient(to bottom, #e25858, #ab1b1b); +} +.openerp button.oe_highlight:active { + background-color: #c52020; + background-image: -webkit-gradient(linear, left top, left bottom, from(#c52020), to(#d22323)); + background-image: -webkit-linear-gradient(top, #c52020, #d22323); + background-image: -moz-linear-gradient(top, #c52020, #d22323); + background-image: -ms-linear-gradient(top, #c52020, #d22323); + background-image: -o-linear-gradient(top, #c52020, #d22323); + background-image: linear-gradient(to bottom, #c52020, #d22323); +} +.openerp .oe_background_grey { + background: #eeeeee !important; } .openerp .oe_form_dirty .oe_highlight_on_dirty { color: white; @@ -472,9 +449,9 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: 0 1px 4px rgba(0, 0, 0, 0.4); border: none; margin-bottom: 10px; } @@ -604,26 +581,6 @@ padding: 0 16px; list-style: none; zoom: 1; - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li { - margin: 0; - padding: 0; -} -.openerp .oe_notebook li { - list-style-type: none; -} -.openerp .oe_notebook ul, .openerp .oe_notebook ol { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { - list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -700,6 +657,8 @@ top: 26px; left: 0; z-index: 1; + margin: 0; + padding: 0; border: 1px solid #afafb6; background: white; padding: 4px 0; @@ -717,6 +676,7 @@ float: none; display: block; position: relative; + margin: 0; padding: 2px 8px; } .openerp .oe_dropdown_menu > li:hover { @@ -834,9 +794,10 @@ font-size: 14px; height: 100%; } -.openerp .oe_login li { +.openerp .oe_login ul, .openerp .oe_login li { + margin: 0; list-style-type: none; - padding-bottom: 4px; + padding: 0 0 4px 0; } .openerp .oe_login button { float: right; @@ -865,9 +826,9 @@ font-family: "Lucida Grande", Helvetica, Verdana, Arial; border: 1px solid #999999; background: whitesmoke; - -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); - box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); + -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); + box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.4); -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; @@ -929,17 +890,6 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } -.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { - list-style-type: none; -} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1010,7 +960,6 @@ .openerp .oe_topbar { width: 100%; height: 31px; - border-top: solid 1px #d3d3d3; background-color: #646060; background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); background-image: -webkit-linear-gradient(top, #646060, #262626); @@ -1019,17 +968,6 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar ul, .openerp .oe_topbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { - list-style-type: none; -} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1102,17 +1040,6 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } -.openerp .oe_leftbar ul, .openerp .oe_leftbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { - list-style-type: none; -} .openerp a.oe_logo { width: 220px; display: block; @@ -1168,6 +1095,9 @@ margin: 0; } .openerp .oe_menu > li { + list-style-type: none; + padding: 0; + margin: 0; float: left; } .openerp .oe_menu > li > a { @@ -1207,7 +1137,9 @@ } .openerp .oe_secondary_submenu li { position: relative; + margin: 0; padding: 1px 0 1px 20px !important; + list-style-type: none; } .openerp .oe_secondary_submenu li a { display: block; @@ -1235,24 +1167,26 @@ .openerp .oe_secondary_submenu .oe_menu_counter { float: right; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - margin: 0px; + margin: 1px; padding: 1px 4px; + border: none; } .openerp .oe_secondary_submenu .oe_menu_counter:hover { cursor: pointer; - border: 1px solid #c81010; - -moz-box-shadow: 0 0 2px #c81010; - -webkit-box-shadow: 0 0 2px #c81010; - box-shadow: 0 0 2px #c81010; + -webkit-transform: scale(1.1); + -moz-transform: scale(1.1); + -ms-transform: scale(1.1); + -o-transform: scale(1.1); + transform: scale(1.1); } .openerp .oe_secondary_submenu .oe_active { - background: #7c7bad; border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; + border-bottom: 1px solid #dedede; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2); + background: #7c7bad; } .openerp .oe_secondary_submenu .oe_active a { color: white; @@ -1268,6 +1202,9 @@ .openerp .oe_secondary_submenu .oe_active .oe_menu_counter { background: #eeeeee; color: #7c7bad; + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.2); } .openerp .oe_secondary_submenu .oe_menu_toggler:before { width: 0; @@ -1305,6 +1242,13 @@ .openerp .oe_application > div { height: 100%; } +.openerp .oe_application .oe_breadcrumb_item:not(:last-child) { + display: inline-block; + max-width: 7em; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } @@ -1315,16 +1259,6 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul { - padding: 0; - margin-right: 0; - margin-top: 0; - margin-bottom: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul li { - list-style-type: none; - margin: 0; -} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1396,6 +1330,10 @@ float: left; margin-right: 8px; } +.openerp .oe_view_manager ul.oe_pager_group { + padding: 0; + margin: 0; +} .openerp .oe_view_manager .oe_pager_group { float: left; height: 24px; @@ -1411,6 +1349,8 @@ height: 24px; line-height: 24px; padding: 0; + margin: 0; + list-style-type: none; float: left; border-right: 1px solid #ababab; } @@ -1435,14 +1375,17 @@ text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } .openerp .oe_view_manager .oe_view_manager_switch { - margin-left: 8px; + padding: 0; + margin: 0 0 0 8px; } .openerp .oe_view_manager .oe_view_manager_switch li { - text-align: center; + margin: 0; width: 24px; height: 24px; line-height: 16px; padding: 0; + text-align: center; + list-style-type: none; } .openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; @@ -1502,10 +1445,10 @@ .openerp .oe_view_manager_current > .oe_view_manager_header .oe_header_row:first-child td { padding-top: 8px; } -.openerp .oe_view_manager_inline { +.openerp .oe_view_manager_inline, .openerp .oe_view_manager_inlineview { height: 100%; } -.openerp .oe_view_manager_inline > .oe_view_manager_header { +.openerp .oe_view_manager_inline > .oe_view_manager_header, .openerp .oe_view_manager_inlineview > .oe_view_manager_header { display: none; } .openerp .oe_popup_form > .oe_formview > .oe_form_pager { @@ -2006,6 +1949,7 @@ .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; + padding-left: 2px; background-color: #fcfcfc; background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); @@ -2018,6 +1962,9 @@ display: inline-block; float: right; } +.openerp .oe_form header .oe_form_button { + margin: 3px 2px 1px; +} .openerp .oe_form div.oe_chatter { min-width: 650px; max-width: 860px; @@ -2037,140 +1984,11 @@ min-width: 150px; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label { - padding: 2px 0; + padding: 1px 0; } .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable { - display: inline-block; - padding-right: 18px; -} -.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li { - display: inline-block; - margin-right: -20px; - background-color: #fcfcfc; - background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); - background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); - background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); - background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); - background-image: -o-linear-gradient(top, #fcfcfc, #dedede); - background-image: linear-gradient(to bottom, #fcfcfc, #dedede); -} -.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label { - border-left: 1px solid #cacaca; - padding-left: 14px; -} -.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child { - border-right: 1px solid #cacaca; -} -.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label { - padding-right: 14px; -} -.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow { - display: none; -} -.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label { - color: #4c4c4c; - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; - padding: 7px; - display: inline-block; - padding-left: 24px; - margin: 0; - position: relative; -} -.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow { - width: 17px; - display: inline-block; - vertical-align: top; - overflow: hidden; - margin-left: -5px; -} -.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span { - position: relative; - width: 24px; - height: 24px; - display: inline-block; - margin-left: -12px; - margin-top: 3px; - box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); - background-color: #dedede; - background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); - background: -o-linear-gradient(135deg, #fcfcfc, #dedede); - background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -ms-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); -} -.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { - background-color: #729fcf; - background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); - background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); - background-image: -moz-linear-gradient(top, #729fcf, #3465a4); - background-image: -ms-linear-gradient(top, #729fcf, #3465a4); - background-image: -o-linear-gradient(top, #729fcf, #3465a4); - background-image: linear-gradient(to bottom, #729fcf, #3465a4); -} -.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span { - background-color: #3465a4; - background: -moz-linear-gradient(135deg, #3465a4, #729fcf); - background: -o-linear-gradient(135deg, #729fcf, #3465a4); - background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); -} -.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label { - color: white; - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; -} -.openerp .oe_form ul.oe_form_steps_clickable li { - cursor: pointer; -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover { - background-color: #e8e8e8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); - background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); - background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover .label { - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; -} -.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span { - background-color: #e8e8e8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); - background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); - background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); - background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); -} -.openerp .oe_form ul.oe_form_steps_clickable li .label { - color: #7c7bad; -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover { - background-color: #4c85c2; - background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); - background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); - background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); - background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); - background-image: -o-linear-gradient(top, #4c85c2, #284d7d); - background-image: linear-gradient(to bottom, #4c85c2, #284d7d); -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label { - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; -} -.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span { - background-color: #284d7d; - background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); - background: -o-linear-gradient(135deg, #4c85c2, #284d7d); - background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); -} .openerp .oe_form .oe_subtotal_footer { width: 1% !important; } @@ -2202,7 +2020,7 @@ } .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; - padding: 4px 0px 4px 0px; + padding: 2px 0px; } .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; @@ -2210,7 +2028,7 @@ min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { - padding-left: 6px; + padding: 2px 0 2px 8px; } .openerp .oe_form .oe_form_group { width: 100%; @@ -2222,7 +2040,7 @@ .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; - padding-right: 6px; + padding-right: 8px; } .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span { font-size: 80%; @@ -2298,7 +2116,6 @@ width: 100%; display: inline-block; padding: 2px 2px 2px 0px; - line-height: 1em; } .openerp .oe_form .oe_form_field input { margin: 0px; @@ -2459,27 +2276,137 @@ .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { margin-top: 10px; } -.openerp .oe_form_field_status { +.openerp ul.oe_form_status, .openerp ul.oe_form_status_clickable { + display: inline-block; margin: 0; - padding: 0; + padding: 0 18px 0 0; } -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { +.openerp ul.oe_form_status li, .openerp ul.oe_form_status_clickable li { + display: inline-block; list-style-type: none; -} -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li { - margin: 0; + margin: 0 -20px 0 0; padding: 0; + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp .oe_form_field_status li { - list-style-type: none; +.openerp ul.oe_form_status li:first-child .label, .openerp ul.oe_form_status_clickable li:first-child .label { + border-left: 1px solid #cacaca; + padding-left: 14px; +} +.openerp ul.oe_form_status li:last-child, .openerp ul.oe_form_status_clickable li:last-child { + border-right: 1px solid #cacaca; +} +.openerp ul.oe_form_status li:last-child .label, .openerp ul.oe_form_status_clickable li:last-child .label { + padding-right: 14px; +} +.openerp ul.oe_form_status li:last-child .arrow, .openerp ul.oe_form_status_clickable li:last-child .arrow { + display: none; +} +.openerp ul.oe_form_status li .label, .openerp ul.oe_form_status_clickable li .label { + color: #4c4c4c; + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; + padding: 7px; + display: inline-block; + padding-left: 24px; + margin: 0; + position: relative; +} +.openerp ul.oe_form_status li .arrow, .openerp ul.oe_form_status_clickable li .arrow { + width: 17px; + display: inline-block; + vertical-align: top; + overflow: hidden; + margin-left: -5px; +} +.openerp ul.oe_form_status li .arrow span, .openerp ul.oe_form_status_clickable li .arrow span { + position: relative; + width: 24px; + height: 24px; + display: inline-block; + margin-left: -12px; + margin-top: 3px; + box-shadow: -1px 1px 2px rgba(255, 255, 255, 0.2), inset -1px 1px 1px rgba(0, 0, 0, 0.2); + background-color: #dedede; + background: -moz-linear-gradient(135deg, #dedede, #fcfcfc); + background: -o-linear-gradient(135deg, #fcfcfc, #dedede); + background: -webkit-gradient(linear, left top, right bottom, from(#fcfcfc), to(#dedede)); + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); +} +.openerp ul.oe_form_status li.oe_active, .openerp ul.oe_form_status_clickable li.oe_active { + background-color: #729fcf; + background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); + background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); + background-image: -moz-linear-gradient(top, #729fcf, #3465a4); + background-image: -ms-linear-gradient(top, #729fcf, #3465a4); + background-image: -o-linear-gradient(top, #729fcf, #3465a4); + background-image: linear-gradient(to bottom, #729fcf, #3465a4); +} +.openerp ul.oe_form_status li.oe_active .arrow span, .openerp ul.oe_form_status_clickable li.oe_active .arrow span { + background-color: #3465a4; + background: -moz-linear-gradient(135deg, #3465a4, #729fcf); + background: -o-linear-gradient(135deg, #729fcf, #3465a4); + background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); +} +.openerp ul.oe_form_status li.oe_active .label, .openerp ul.oe_form_status_clickable li.oe_active .label { + color: white; + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li { + cursor: pointer; +} +.openerp ul.oe_form_status_clickable li:hover { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li:hover .label { + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; +} +.openerp ul.oe_form_status_clickable li:hover .arrow span { + background-color: #e8e8e8; + background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); + background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -moz-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -ms-linear-gradient(top, #e8e8e8, #cacaca); + background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); + background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); +} +.openerp ul.oe_form_status_clickable li .label { + color: #7c7bad; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover { + background-color: #4c85c2; + background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); + background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); + background-image: -moz-linear-gradient(top, #4c85c2, #284d7d); + background-image: -ms-linear-gradient(top, #4c85c2, #284d7d); + background-image: -o-linear-gradient(top, #4c85c2, #284d7d); + background-image: linear-gradient(to bottom, #4c85c2, #284d7d); +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .label { + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; +} +.openerp ul.oe_form_status_clickable li.oe_active:hover .arrow span { + background-color: #284d7d; + background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); + background: -o-linear-gradient(135deg, #4c85c2, #284d7d); + background: -webkit-gradient(linear, left top, right bottom, from(#4c85c2), to(#284d7d)); } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; @@ -2541,7 +2468,7 @@ .openerp .oe_list.oe_list_editable.oe_editing .oe_m2o_cm_button { display: none; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input { +.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { height: 27px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { @@ -2551,9 +2478,6 @@ border: 1px solid #aaaaff; margin: 0; } -.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { - height: 60px; -} .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_float input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_view_integer input { text-align: right; } @@ -2570,10 +2494,13 @@ .openerp .oe_form .oe_form_field_many2many > .oe_list .oe_list_pager_single_page { display: none; } +.openerp .oe_list_buttons .oe_alternative { + visibility: hidden; +} .openerp .oe_list_buttons .oe_list_save, .openerp .oe_list_buttons .oe_list_discard { display: none; } -.openerp .oe_list_buttons.oe_editing .oe_list_add, .openerp .oe_list_buttons.oe_editing .oe_list_button_import { +.openerp .oe_list_buttons.oe_editing .oe_list_add { display: none; } .openerp .oe_list_buttons.oe_editing .oe_list_save { @@ -2582,6 +2509,9 @@ .openerp .oe_list_buttons.oe_editing .oe_list_discard { display: inline; } +.openerp .oe_list_buttons.oe_editing .oe_alternative { + visibility: visible; +} .openerp .oe_list { position: relative; } @@ -2596,6 +2526,15 @@ margin: 0 !important; padding: 0; } +.openerp .oe_list .oe_list_content .oe_group_header { + background-color: #fcfcfc; + background-image: -webkit-gradient(linear, left top, left bottom, from(#fcfcfc), to(#dedede)); + background-image: -webkit-linear-gradient(top, #fcfcfc, #dedede); + background-image: -moz-linear-gradient(top, #fcfcfc, #dedede); + background-image: -ms-linear-gradient(top, #fcfcfc, #dedede); + background-image: -o-linear-gradient(top, #fcfcfc, #dedede); + background-image: linear-gradient(to bottom, #fcfcfc, #dedede); +} .openerp .oe_list_content { width: 100%; } @@ -2813,16 +2752,6 @@ float: right; color: #333333; } -.openerp .oe_semantic_html li { - list-style-type: disc; - display: list-item; -} -.openerp .oe_semantic_html ul { - padding-left: 1em; -} -.openerp .oe_semantic_html p { - color: #4c4c4c !important; -} .kitten-mode-activated { background-image: url(http://placekitten.com/g/1365/769); diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ac73f3de045..3661fedd49f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,19 +124,6 @@ $sheet-max-width: 860px content: $icon-name color: $color -@mixin ul-html-override() - margin: 0 - padding: 0 - ul, ol, li - margin: 0 - padding: 0 - li - list-style-type: none - -@mixin semantic-html-override() - ul, ol - @include ul-html-override() - // }}} @media print @@ -200,10 +187,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override - @include semantic-html-override - ul.oe_semantic_html_override - @include ul-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -283,7 +266,7 @@ $sheet-max-width: 860px margin: 0 @include radius(0 0 2px 2px) button - margin: 0 + margin: 0 4px 0 0 .ui-dialog-buttonset float: left .ui-button @@ -379,15 +362,15 @@ $sheet-max-width: 860px color: white background: #DC5F59 button.oe_highlight - @include vertical-gradient(#dc5f59, #b33630) - @include box-shadow(none) - button.oe_highlight:active - @include vertical-gradient(#b33630, #dc5f59) - @include box-shadow(none) + border: 1px solid #795151 + @include vertical-gradient(#df3f3f, #a21a1a) + @include box-shadow((0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(155, 155, 155, 0.4) inset)) button.oe_highlight:hover - @include vertical-gradient(#DF6B66, #BF3A33) - //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%)) - @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2)) + @include vertical-gradient(lighten(#e04f4f, 2%), lighten(#a21a1a, 2%)) + button.oe_highlight:active + @include vertical-gradient(lighten(#a21a1a, 8%), darken(#df3f3f, 8%)) + .oe_background_grey + background: #eee !important .oe_form_dirty .oe_highlight_on_dirty @@ -418,7 +401,7 @@ $sheet-max-width: 860px max-height: 90px max-width: 90px @include radius(3px) - @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) + @include box-shadow(0 1px 4px rgba(0, 0, 0, 0.4)) border: none margin-bottom: 10px .oe_avatar + div @@ -509,8 +492,6 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 - @include ul-html-override - @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -568,6 +549,8 @@ $sheet-max-width: 860px top: 26px left: 0 z-index: 1 + margin: 0 + padding: 0 border: 1px solid $tag-border background: white padding: 4px 0 @@ -583,6 +566,7 @@ $sheet-max-width: 860px float: none display: block position: relative + margin: 0 padding: 2px 8px > a white-space: nowrap @@ -671,9 +655,10 @@ $sheet-max-width: 860px text-align: center font-size: 14px height: 100% - li + ul, li + margin: 0 list-style-type: none - padding-bottom: 4px + padding: 0 0 4px 0 button float: right display: inline-block @@ -690,7 +675,7 @@ $sheet-max-width: 860px font-family: "Lucida Grande", Helvetica, Verdana, Arial border: 1px solid #999999 background: whitesmoke - @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.3)) + @include box-shadow(inset 0 1px 4px rgba(0, 0, 0, 0.4)) @include radius(3px) input margin-bottom: 9px @@ -731,7 +716,6 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -795,9 +779,7 @@ $sheet-max-width: 860px .oe_topbar width: 100% height: 31px - border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -848,7 +830,6 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px - @include semantic-html-override a.oe_logo width: 220px display: block @@ -899,6 +880,9 @@ $sheet-max-width: 860px padding: 0 margin: 0 > li + list-style-type: none + padding: 0 + margin: 0 float: left > a display: block @@ -928,7 +912,9 @@ $sheet-max-width: 860px display: inline-block li position: relative + margin: 0 padding: 1px 0 1px 20px !important + list-style-type: none a display: block color: #4c4c4c @@ -949,18 +935,18 @@ $sheet-max-width: 860px .oe_menu_counter float: right text-shadow: 0 1px 1px rgba(0,0,0,0.2) - margin: 0px + margin: 1px padding: 1px 4px + border: none &:hover cursor: pointer - border: 1px solid #C81010 - @include box-shadow(0 0 2px #C81010) + @include transform(scale(1.1)) .oe_active - background: $link-color border-top: 1px solid lightGray - border-bottom: 1px solid lightGray + border-bottom: 1px solid #dedede text-shadow: 0 1px 1px rgba(0,0,0,0.2) - @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.2)) + @include box-shadow((inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2))) + background: $link-color a color: white .oe_menu_label @@ -971,6 +957,7 @@ $sheet-max-width: 860px .oe_menu_counter background: #eee color: $link-color + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.2)) .oe_menu_toggler:before width: 0 height: 0 @@ -1002,6 +989,12 @@ $sheet-max-width: 860px text-decoration: underline > div height: 100% + .oe_breadcrumb_item:not(:last-child) + display: inline-block + max-width: 7em + white-space: nowrap + overflow: hidden + text-overflow: ellipsis // }}} // ViewManager common {{{ .oe_view_manager @@ -1013,14 +1006,6 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - ul - padding: 0 - margin-right: 0 - margin-top: 0 - margin-bottom: 0 - li - list-style-type: none - margin: 0 .oe_header_row //min-height: 26px //line-height: 26px @@ -1075,6 +1060,9 @@ $sheet-max-width: 860px .oe_pager_value float: left margin-right: 8px + ul.oe_pager_group + padding: 0 + margin: 0 .oe_pager_group float: left height: 24px @@ -1087,6 +1075,8 @@ $sheet-max-width: 860px height: 24px line-height: 24px padding: 0 + margin: 0 + list-style-type: none float: left border-right: 1px solid #ababab &:last-child @@ -1105,13 +1095,16 @@ $sheet-max-width: 860px // }}} // ViewManager.switches {{{ .oe_view_manager_switch - margin-left: 8px + padding: 0 + margin: 0 0 0 8px li - text-align: center + margin: 0 width: 24px height: 24px line-height: 16px padding: 0 + text-align: center + list-style-type: none a position: relative .oe_vm_switch_list:after, .oe_vm_switch_tree:after @@ -1156,7 +1149,7 @@ $sheet-max-width: 860px padding-top: 8px // }}} // ViewManager inline {{{ - .oe_view_manager_inline + .oe_view_manager_inline, .oe_view_manager_inlineview height: 100% > .oe_view_manager_header display: none @@ -1546,10 +1539,13 @@ $sheet-max-width: 860px header position: relative border-bottom: 1px solid #cacaca + padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) ul display: inline-block float: right + .oe_form_button + margin: 3px 2px 1px div.oe_chatter min-width: 650px max-width: $sheet-max-width @@ -1566,75 +1562,9 @@ $sheet-max-width: 860px label min-width: 150px .oe_form_group_cell_label - padding: 2px 0 + padding: 1px 0 .oe_form_group_cell div div padding: 1px 0 - ul.oe_form_steps, ul.oe_form_steps_clickable - display: inline-block - padding-right: 18px - li - display: inline-block - margin-right: -20px - @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label - border-left: 1px solid #cacaca - padding-left: 14px - &:last-child - border-right: 1px solid #cacaca - .label - padding-right: 14px - .arrow - display: none - .label - color: #4c4c4c - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede - padding: 7px - display: inline-block - padding-left: 24px - margin: 0 - position: relative - .arrow - width: 17px - display: inline-block - vertical-align: top - overflow: hidden - margin-left: -5px - span - position: relative - width: 24px - height: 24px - display: inline-block - margin-left: -12px - margin-top: 3px - box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) - @include skew-gradient(#fcfcfc, #dedede) - @include radius(3px) - @include transform(rotate(45deg)) - li.oe_active - @include vertical-gradient(#729fcf, #3465a4) - .arrow span - @include skew-gradient(#729fcf, #3465a4) - .label - color: white - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 - ul.oe_form_steps_clickable - li - cursor: pointer - &:hover - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede - .arrow span - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - color: $link-color - li.oe_active - &:hover - @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) - .label - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span - @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) .oe_subtotal_footer width: 1% !important td.oe_form_group_cell @@ -1662,13 +1592,13 @@ $sheet-max-width: 860px margin: 2px td.oe_form_group_cell_label border-right: 1px solid #ddd - padding: 4px 0px 4px 0px + padding: 2px 0px label line-height: 18px display: block min-width: 140px td.oe_form_group_cell + .oe_form_group_cell - padding-left: 6px + padding: 2px 0 2px 8px .oe_form_group width: 100% margin: 9px 0 9px 0 @@ -1680,7 +1610,7 @@ $sheet-max-width: 860px .oe_form_label_help[for], .oe_form_label[for] font-weight: bold white-space: nowrap - padding-right: 6px + padding-right: 8px span font-size: 80% color: darkGreen @@ -1743,7 +1673,6 @@ $sheet-max-width: 860px width: 100% display: inline-block padding: 2px 2px 2px 0px - line-height: 1em input margin: 0px input[type="text"], input[type="password"], input[type="file"], select @@ -1877,9 +1806,75 @@ $sheet-max-width: 860px margin-top: 10px // }}} // FormView.fieldstatus {{{ - .oe_form_field_status - @include semantic-html-override - @include ul-html-override + ul.oe_form_status, ul.oe_form_status_clickable + display: inline-block + margin: 0 + padding: 0 18px 0 0 + li + display: inline-block + list-style-type: none + margin: 0 -20px 0 0 + padding: 0 + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label + border-left: 1px solid #cacaca + padding-left: 14px + &:last-child + border-right: 1px solid #cacaca + .label + padding-right: 14px + .arrow + display: none + .label + color: #4c4c4c + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 + position: relative + .arrow + width: 17px + display: inline-block + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) + .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_status_clickable + li + cursor: pointer + &:hover + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) + .label + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager @@ -1943,14 +1938,12 @@ $sheet-max-width: 860px .oe_m2o_cm_button display: none .oe_form_field - input + input, textarea height: $row-height input, textarea @include radius(0) border: 1px solid #aaf margin: 0 - textarea - height: 60px &.oe_form_field_float,&.oe_form_view_integer input text-align: right @@ -1970,15 +1963,19 @@ $sheet-max-width: 860px // }}} // ListView {{{ .oe_list_buttons + .oe_alternative + visibility: hidden .oe_list_save, .oe_list_discard display: none &.oe_editing - .oe_list_add, .oe_list_button_import + .oe_list_add display: none .oe_list_save display: inline-block .oe_list_discard display: inline + .oe_alternative + visibility: visible .oe_list position: relative @@ -1992,6 +1989,8 @@ $sheet-max-width: 860px position: absolute margin: 0 !important // dammit padding: 0 + .oe_list_content .oe_group_header + @include vertical-gradient(#fcfcfc, #dedede) .oe_list_content width: 100% @@ -2051,6 +2050,7 @@ $sheet-max-width: 860px > tr:nth-child(odd) background-color: #f0f0fa @include vertical-gradient(#f0f0fa, #eeeef6) + > tfoot border-top: 2px solid #cacaca border-bottom: 1px solid #cacaca @@ -2162,15 +2162,6 @@ $sheet-max-width: 860px float: right color: #333 // }}} - .oe_semantic_html // a style to use normal html - li - list-style-type: disc - display: list-item - ul - padding-left: 1em - p - color: #4C4C4C !important - // Kitten Mode {{{ .kitten-mode-activated background-image: url(http://placekitten.com/g/1365/769) diff --git a/addons/web/static/src/css/data_import.css b/addons/web/static/src/css/data_import.css deleted file mode 100644 index 47cd52aa081..00000000000 --- a/addons/web/static/src/css/data_import.css +++ /dev/null @@ -1,46 +0,0 @@ -.openerp .oe_import_grid { - border: none; - border-collapse: collapse; -} -.openerp .oe_import_grid-header .oe_import_grid-cell { - background: url(../img/gradientlinebg.gif) repeat-x #CCCCCC; - border-bottom: 1px solid #E3E3E3; - font-weight: bold; - text-align: left; -} -.openerp .oe_import_grid-row .oe_import_grid-cell { - border-bottom: 1px solid #E3E3E3; -} - -.openerp .oe_import_no_result .oe_import_result { - display: none; -} -.openerp .oe_import fieldset { - cursor: pointer; -} -.openerp .oe_import fieldset legend:before { - content: '\25BC '; -} -.openerp .oe_import fieldset.oe_closed legend:before { - content: '\25B6 '; -} -.openerp .oe_import fieldset.oe_closed table { - display: none; -} -.openerp .oe_import .separator.horizontal { - font-weight: bold; - border-bottom-width: 1px; - margin: 6px 4px 6px 1px; - height: 20px; -} -.openerp .duplicate_fld{ - background-color:#FF6666; -} -.openerp .select_fld{ - background: none repeat scroll 0 0 white; -} -.openerp .ui-autocomplete { - max-height: 300px; - overflow-y: auto; - padding-right: 20px; -} diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 736e10875f6..3114aaf315f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -731,6 +731,8 @@ instance.web.Menu = instance.web.Widget.extend({ * @param {Number} id database id of the terminal menu to select */ open_menu: function (id) { + this.current_menu = id; + this.session.active_id = id; var $clicked_menu, $sub_menu, $main_menu; $clicked_menu = this.$el.add(this.$secondary_menus).find('a[data-menu=' + id + ']'); this.trigger('open_menu', id, $clicked_menu); @@ -803,16 +805,15 @@ instance.web.Menu = instance.web.Widget.extend({ } } } - this.open_menu(id); - this.current_menu = id; - this.session.active_id = id; if (action_id) { this.trigger('menu_click', { action_id: action_id, needaction: needaction, - id: id + id: id, + previous_menu_id: this.current_menu // Here we don't know if action will fail (in which case we have to revert menu) }, $item); } + this.open_menu(id); }, /** * Jquery event handler for menu click @@ -870,10 +871,12 @@ instance.web.UserMenu = instance.web.Widget.extend({ }, on_menu_settings: function() { var self = this; - self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) { - result.result.res_id = instance.session.uid; - self.getParent().action_manager.do_action(result.result); - }); + if (!this.getParent().has_uncommitted_changes()) { + self.rpc("/web/action/load", { action_id: "base.action_res_users_my" }, function(result) { + result.result.res_id = instance.session.uid; + self.getParent().action_manager.do_action(result.result); + }); + } }, on_menu_about: function() { var self = this; @@ -951,7 +954,10 @@ instance.web.Client = instance.web.Widget.extend({ }, toggle_bars: function(value) { this.$('tr:has(td.oe_topbar),.oe_leftbar').toggle(value); - } + }, + has_uncommitted_changes: function() { + return false; + }, }); instance.web.WebClient = instance.web.Client.extend({ @@ -963,6 +969,9 @@ instance.web.WebClient = instance.web.Client.extend({ start: function() { var self = this; return $.when(this._super()).pipe(function() { + self.$el.on('click', '.oe_logo', function() { + self.action_manager.do_action('home'); + }); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { $("body").addClass("kitten-mode-activated"); if ($.blockUI) { @@ -1048,11 +1057,13 @@ instance.web.WebClient = instance.web.Client.extend({ }, on_logout: function() { var self = this; - this.session.session_logout().then(function () { - $(window).unbind('hashchange', self.on_hashchange); - self.do_push_state({}); - window.location.reload(); - }); + if (!this.has_uncommitted_changes()) { + this.session.session_logout().then(function () { + $(window).unbind('hashchange', self.on_hashchange); + self.do_push_state({}); + window.location.reload(); + }); + } }, bind_hashchange: function() { var self = this; @@ -1095,14 +1106,15 @@ instance.web.WebClient = instance.web.Client.extend({ }, on_menu_action: function(options) { var self = this; - this.rpc("/web/action/load", { action_id: options.action_id }) - .then(function (result) { + return this.rpc("/web/action/load", { action_id: options.action_id }) + .pipe(function (result) { var action = result.result; if (options.needaction) { action.context.search_default_needaction_pending = true; } - self.action_manager.clear_breadcrumbs(); - self.action_manager.do_action(action); + return $.when(self.action_manager.do_action(action, null, true)).fail(function() { + self.menu.open_menu(options.previous_menu_id); + }); }); }, do_action: function(action) { @@ -1122,7 +1134,16 @@ instance.web.WebClient = instance.web.Client.extend({ $(".oe_webclient", this.$el).removeClass("oe_content_full_screen"); $("body").css({'overflow-y':'scroll'}); } - } + }, + has_uncommitted_changes: function() { + var $e = $.Event('clear_uncommitted_changes'); + instance.web.bus.trigger('clear_uncommitted_changes', $e); + if ($e.isDefaultPrevented()) { + return true; + } else { + return this._super.apply(this, arguments); + } + }, }); instance.web.EmbeddedClient = instance.web.Client.extend({ diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index ab3e355e818..5f0ecc80827 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -585,7 +585,7 @@ instance.session.on('module_loaded', this, function () { /** Setup blockui */ if ($.blockUI) { $.blockUI.defaults.baseZ = 1100; - $.blockUI.defaults.message = '
').text(instance.web.json_node_to_xml(current_view.fields_view.arch, true)).appendTo(dialog.$el);
break;
+ case 'tests':
+ this.do_action({
+ name: "JS Tests",
+ target: 'new',
+ type : 'ir.actions.act_url',
+ url: '/web/static/test/test.html'
+ })
+ break;
case 'perm_read':
var ids = current_view.get_selected_ids();
if (ids.length === 1) {
@@ -807,6 +837,21 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({
}
});
break;
+ case 'print_workflow':
+ if (current_view.get_selected_ids && current_view.get_selected_ids().length == 1) {
+ instance.web.blockUI();
+ var action = {
+ context: { active_ids: current_view.get_selected_ids() },
+ report_name: "workflow.instance.graph",
+ datas: {
+ model: this.dataset.model,
+ id: current_view.get_selected_ids()[0],
+ nested: true,
+ }
+ };
+ this.session.get_file({ url: '/web/report', data: {action: JSON.stringify(action)}, complete: instance.web.unblockUI });
+ }
+ break;
default:
if (val) {
console.log("No debug handler for ", val);
@@ -1220,9 +1265,6 @@ instance.web.View = instance.web.Widget.extend({
},
do_search: function(view) {
},
- on_sidebar_import: function() {
- new instance.web.DataImport(this, this.dataset).open();
- },
on_sidebar_export: function() {
new instance.web.DataExport(this, this.dataset).open();
},
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index d206c538e1c..b6b89a4f1ec 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -79,7 +79,7 @@
@@ -404,13 +404,10 @@
@@ -479,6 +476,7 @@
+
@@ -489,6 +487,7 @@
+
| |