diff options
| author | chm@openerp.com <> | 2014-04-08 15:24:12 +0200 |
|---|---|---|
| committer | chm@openerp.com <> | 2014-04-08 15:24:12 +0200 |
| commit | 673dc5b1d7a86895d78f2d796c1ce485689cd5cc (patch) | |
| tree | 0a190f6e0519f8a3991c707bc9d91368745ca0ed /addons/website/static/src | |
| parent | 7a905238f299816543ea99d7881f7da5d16eec85 (diff) | |
| parent | dcdf729b9fb2404ac076aa0cd178df2c27dae0fb (diff) | |
[MERGE] from trunk
bzr revid: chm@openerp.com-20140408132412-7ofhd87laj3uoazj
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.editor.newpage.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.translator.js | 13 | ||||
| -rw-r--r-- | addons/website/static/src/xml/website.translator.xml | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js index 77a086790fa..b475223ecd9 100644 --- a/addons/website/static/src/js/website.editor.newpage.js +++ b/addons/website/static/src/js/website.editor.newpage.js @@ -48,7 +48,7 @@ } }).then(function (val, field, $dialog) { if (val) { - var url = '/website/add' + encodeURI(val); + var url = '/website/add/' + encodeURI(val); if ($dialog.find('input[type="checkbox"]').is(':checked')) url +="?add_menu=1"; document.location = url; } diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js index 44e2117a7f0..e88b1e4a6b6 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() + } }); } }, @@ -68,7 +74,7 @@ var source_attr = 'data-oe-source-id'; var $editables = $('[data-oe-model="ir.ui.view"]') .not('link, script') - .not('.oe_snippets,.oe_snippet, .oe_snippet *') + .not('.oe_snippets,.oe_snippet, .oe_snippet *, .navbar-toggle') .not('[data-oe-type]'); $editables.each(function () { @@ -92,7 +98,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); }); @@ -119,6 +125,9 @@ }); 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')){ + node.className += ' oe_translatable_inprogress'; + } } else { node.className += ' oe_translatable_todo'; } diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml index d1d9ab14a39..480489ad9b3 100644 --- a/addons/website/static/src/xml/website.translator.xml +++ b/addons/website/static/src/xml/website.translator.xml @@ -38,7 +38,7 @@ </section> </div> <div class="modal-footer"> - <div class="pull-left"> + <div class="pull-right"> <input type="checkbox" name="do_not_show"/> Do not show this dialog later. </div> |