From 649585110224726ad8eafdda992fd5fbabf2a52a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 23 Oct 2013 10:15:01 +0200
Subject: [PATCH] [ADD] UI improvement: Translate "or Edit Master"

bzr revid: fme@openerp.com-20131023081501-f9owb501j16757bk
---
 addons/website/static/src/css/editor.css          |  5 +++++
 addons/website/static/src/css/editor.sass         |  3 +++
 .../website/static/src/js/website.translator.js   | 15 ++++++++++++++-
 .../website/static/src/xml/website.translator.xml |  4 ++++
 addons/website/views/website_templates.xml        |  7 ++++---
 5 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index a3151d14855..26032aaf7ce 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -112,6 +112,11 @@ table.editorbar-panel td.selected {
   background-color: #b1c9d9;
 }
 
+.oe_translate_or {
+  color: white;
+  padding: 0 0.2em;
+}
+
 .oe_translate_examples li {
   margin: 10px;
   padding: 4px;
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index dcfa88b89e7..e4ef24dad70 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -106,6 +106,9 @@ table.editorbar-panel
         background-color: #b1c9d9
 
 // ---- TRANSLATIONS ---- {{{
+.oe_translate_or
+    color: white
+    padding: 0 0.2em
 .oe_translate_examples li
     margin: 10px
     padding: 4px
diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 88b77fe73b4..014be7bfa6b 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -6,11 +6,16 @@
     var nodialog = 'website_translator_nodialog';
 
     website.EditorBar.include({
+        events: _.extend({}, website.EditorBar.prototype.events, {
+            'click a[data-action=edit_master]': 'edit_master',
+        }),
         start: function () {
             var self = this;
             this.initial_content = {};
             return this._super.apply(this, arguments).then(function () {
-                self.$('button[data-action=edit]').text("Translate");
+                self.$('button[data-action=edit]')
+                    .text("Translate")
+                    .after(openerp.qweb.render('website.TranslatorAdditionalButtons'));
                 self.$('[data-action=snippet]').hide();
                 self.$('#customize-menu-button').hide();
             });
@@ -34,6 +39,14 @@
                 });
             }
         },
+        edit_master: function (ev) {
+            ev.preventDefault();
+            var link = $('.js_language_selector a[data-default-lang]')[0];
+            if (link) {
+                link.search += (link.search ? '&' : '?') + 'unable_editor=1';
+                window.location = link.attributes.href.value;
+            }
+        },
         translate: function () {
             var self = this;
             this.translations = null;
diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index f35cf583da9..dac074688d8 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
+<t t-name="website.TranslatorAdditionalButtons">
+    <strong class="oe_translate_or">or</strong>
+    <a class="btn btn-default" data-action="edit_master" href="#">Edit Master</a>
+</t>
 <t t-name="website.TranslatorDialog">
     <div class="modal fade oe_website_translator" tabindex="-1" role="dialog">
         <div class="modal-dialog">
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d26b840a2ad..8862e17a374 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -103,12 +103,13 @@
                                                 <li t-if="request.multilang and
                                                             (len(website.language_ids) &gt; 1 or editable)" class="dropdown">
                                                     <!-- TODO: use flags for language selection -->
-                                                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                                    <a class="dropdown-toggle js_language_selected" data-toggle="dropdown" href="#">
                                                         <t t-esc="lang_selected[0]['name'].split('/').pop()"/> <span class="caret"></span>
                                                     </a>
-                                                    <ul class="dropdown-menu" role="menu">
+                                                    <ul class="dropdown-menu js_language_selector" role="menu">
                                                         <li t-foreach="website.language_ids" t-as="lg">
-                                                            <a t-att-href="url_for('', lang=lg.code)" role="menuitem">
+                                                            <a t-att-href="url_for('', lang=lg.code)" role="menuitem"
+                                                               t-att-data-default-lang="editable and 'true' if lg.code == website.default_lang_id.code else None">
                                                                 <strong t-att-class="'icon-circle' if lg.code == lang
                                                                     else 'icon-circle-blank'"></strong>
                                                                 <t t-esc="lg.name.split('/').pop()"/>