diff options
| author | Parth Gajjar (Open ERP) <pga@tinyerp.com> | 2014-03-19 19:01:21 +0530 |
|---|---|---|
| committer | Parth Gajjar (Open ERP) <pga@tinyerp.com> | 2014-03-19 19:01:21 +0530 |
| commit | b8d87606f0579bbdfdf75dee4669d5f0fd9bb279 (patch) | |
| tree | bd83a31d8c8ae4ddca632e49ae5674a89e6b581d /addons/website | |
| parent | c49befd59f5ab3ef50a061b29dcef36b55c79088 (diff) | |
[IMP] added gengo statistics, displayed inprogress elements
bzr revid: pga@tinyerp.com-20140319133121-31umju0ea84sm93y
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/controllers/main.py | 2 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.css | 4 | ||||
| -rw-r--r-- | addons/website/static/src/css/editor.sass | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.translator.js | 5 |
4 files changed, 12 insertions, 1 deletions
diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 4d20dd11d40..011a31e00e3 100644 --- a/addons/website/controllers/main.py +++ b/addons/website/controllers/main.py @@ -206,7 +206,7 @@ class Website(openerp.addons.web.controllers.main.Home): views_ids = [view.get('id') for view in views if view.get('active')] domain = [('type', '=', 'view'), ('res_id', 'in', views_ids), ('lang', '=', lang)] irt = request.registry.get('ir.translation') - return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value'], context=request.context) + return irt.search_read(request.cr, request.uid, domain, ['id', 'res_id', 'value','state'], context=request.context) @http.route('/website/set_translations', type='json', auth='public', website=True) def set_translations(self, data, lang): diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index da0fad43caf..5755bb06b03 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -145,6 +145,10 @@ table.editorbar-panel td.selected { background: #ffffb6; } +.oe_translatable_inprogress { + background: #b7e4ff; +} + /* ---- MENU ---- {{{ */ div.oe_menu_buttons { top: -8px; diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass index 4571dcd257e..21b43ac77f3 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -115,6 +115,8 @@ table.editorbar-panel padding: 0 10px .oe_translatable_todo background: rgb(255, 255, 182) +.oe_translatable_todo + background: rgb(183, 228, 255) // }}} diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index c330d511170..12c740300c6 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -115,8 +115,13 @@ var trans = this.translations.filter(function (t) { return t.res_id === view_id && t.value === content; }); + console.log(trans); + console.log(this.translations); if (trans.length) { node.setAttribute('data-oe-translation-id', trans[0].id); + if(trans[0].state && trans[0].state == 'inprogress'){ + node.className += ' oe_translatable_inprogress'; + } } else { node.className += ' oe_translatable_todo'; } |