diff options
| author | Parth Gajjar (Open ERP) <pga@tinyerp.com> | 2014-03-24 16:06:31 +0530 |
|---|---|---|
| committer | Parth Gajjar (Open ERP) <pga@tinyerp.com> | 2014-03-24 16:06:31 +0530 |
| commit | bf0d35dbdd3f15d7d931ef95e274b2311f03e320 (patch) | |
| tree | d488ec3f197b4cb8c2924c1a03ae6c7f3083f2c1 /addons/website/static/src | |
| parent | 2cf5e1a49069a619310f1317470ff06f442ac310 (diff) | |
[IMP] merged gengo translator with main translator, removed 'Restart Job' from wizard,removed constraint from base_gengo
bzr revid: pga@tinyerp.com-20140324103631-j4cswrlk5huuibt5
Diffstat (limited to 'addons/website/static/src')
| -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 | 17 |
3 files changed, 8 insertions, 15 deletions
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css index 5755bb06b03..da0fad43caf 100644 --- a/addons/website/static/src/css/editor.css +++ b/addons/website/static/src/css/editor.css @@ -145,10 +145,6 @@ 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 21b43ac77f3..4571dcd257e 100644 --- a/addons/website/static/src/css/editor.sass +++ b/addons/website/static/src/css/editor.sass @@ -115,8 +115,6 @@ 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 0083ad8f464..2f145f53dc5 100644 --- a/addons/website/static/src/js/website.translator.js +++ b/addons/website/static/src/js/website.translator.js @@ -34,11 +34,17 @@ dialog.$el.modal('hide'); self.translate().then(function () { mysuper.call(self); + if(self.gengo_translate){ + self.translation_gengo_display() + } }); }); } else { this.translate().then(function () { mysuper.call(self); + if(self.gengo_translate){ + self.translation_gengo_display() + } }); } }, @@ -90,7 +96,7 @@ self.sanitizeNode($node[0]); } if (self.getInitialContent($node[0]) !== $node.text()) { - $node.addClass('oe_dirty').removeClass('oe_translatable_todo'); + $node.addClass('oe_dirty').removeClass('oe_translatable_todo oe_translatable_inprogress'); } }, 0); }); @@ -118,19 +124,12 @@ if (trans.length) { node.setAttribute('data-oe-translation-id', trans[0].id); if(trans[0].gengo_translation && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){ - if(this.gengo_translate){ node.className += ' oe_translatable_inprogress'; - } - else{ - node.className += ' oe_translatable_todo'; - } } } else { node.className += ' oe_translatable_todo'; } - if(!this.gengo_translate){ - node.contentEditable = true; - } + node.contentEditable = true; var nid = _.uniqueId(); $(node).attr('data-oe-nodeid', nid); this.initial_content[nid] = content; |