From b783cbf4a628cbab5cc3bc7ec4a368970b6fcdd1 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 23 Sep 2013 13:54:17 +0200
Subject: [ADD] Translator

bzr revid: fme@openerp.com-20130923115417-bq20piq7f11pyjve
---
 .../website/static/src/xml/website.translator.xml  | 53 ++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.translator.xml

(limited to 'addons/website/static/src/xml/website.translator.xml')

diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
new file mode 100644
index 00000000000..f35cf583da9
--- /dev/null
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+<t t-name="website.TranslatorDialog">
+    <div class="modal fade oe_website_translator" tabindex="-1" role="dialog">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
+                    <h2 class="modal-title">Translate this page</h2>
+                </div>
+                <div class="modal-body">
+                    <section>
+                        <p>
+                            You are about to enter the translation mode.
+                        </p>
+                        <p>
+                            In this mode you can not change the structure of the document, you can only translate text.
+                        </p>
+                        <p>
+                            Here are the visuals used in order to help you in your translation flow:
+                            <ul class="oe_translate_examples">
+                                <li class="oe_translatable_text">
+                                    Normal translatable content
+                                </li>
+                                <li class="oe_translatable_field">
+                                    ERP translatable object data
+                                </li>
+                                <li class="oe_translatable_todo">
+                                    Translation TODO
+                                </li>
+                            </ul>
+                        </p>
+                    </section>
+                    <hr/>
+                    <section class="row">
+                        <div class="col-md-6">
+                            <button type="button" data-action="activate" class="btn btn-primary">Ok</button>
+                            or
+                            <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
+                        </div>
+                        <div class="col-md-6">
+                            <label>
+                                <input type="checkbox" name="do_not_show"/>
+                                Do not show this dialog later.
+                            </label>
+                        </div>
+                    </section>
+                </div>
+            </div>
+        </div>
+    </div>
+</t>
+</templates>
-- 
cgit v1.2.3


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: [ADD] UI improvement: Translate "or Edit Master"

bzr revid: fme@openerp.com-20131023081501-f9owb501j16757bk
---
 addons/website/static/src/xml/website.translator.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/website/static/src/xml/website.translator.xml')

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">
-- 
cgit v1.2.3


From 843e16e57ed0b9295114726b9f31731ad434c990 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 5 Nov 2013 09:07:43 +0100
Subject: [IMP] Small layout improvements

bzr revid: fp@tinyerp.com-20131105080743-jy5ee76500dhh923
---
 addons/website/static/src/xml/website.translator.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/website/static/src/xml/website.translator.xml')

diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index dac074688d8..4a3432cd9f8 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -1,8 +1,8 @@
 <?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>
+    <span class="oe_translate_or">or</span>
+    <a class="btn btn-link" 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">
-- 
cgit v1.2.3


From f385e3af012186f683a68ac0925b3e9db4165f7e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 6 Nov 2013 12:08:19 +0100
Subject: [IMP] Text for translate dialog

bzr revid: fp@tinyerp.com-20131106110819-yflp80pdqehwp9gy
---
 .../website/static/src/xml/website.translator.xml  | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'addons/website/static/src/xml/website.translator.xml')

diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index 4a3432cd9f8..dc5f93e87bf 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -18,22 +18,23 @@
                             You are about to enter the translation mode.
                         </p>
                         <p>
-                            In this mode you can not change the structure of the document, you can only translate text.
-                        </p>
-                        <p>
-                            Here are the visuals used in order to help you in your translation flow:
+                            Here are the visuals used to help you translate efficiently:
                             <ul class="oe_translate_examples">
-                                <li class="oe_translatable_text">
-                                    Normal translatable content
-                                </li>
-                                <li class="oe_translatable_field">
-                                    ERP translatable object data
-                                </li>
                                 <li class="oe_translatable_todo">
-                                    Translation TODO
+                                    Content to translate
+                                </li>
+                                <li class="oe_translatable_text">
+                                    Translated content
                                 </li>
                             </ul>
                         </p>
+                        <p>
+                            In this mode, you can only translate texts.  To
+                            change the structure of the page, you must edit the
+                            master page. Each modification on the master page
+                            is automatically applied to all translated
+                            versions.
+                        </p>
                     </section>
                     <hr/>
                     <section class="row">
-- 
cgit v1.2.3


From b37be42fd68aa43c3072bb828a8e581c22c7d2d4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 27 Nov 2013 17:16:27 +0100
Subject: [FIX] website: in all popups, always order buttons in the same order

bzr revid: chm@openerp.com-20131127161627-fwokmahwvp8jxhgl
---
 .../website/static/src/xml/website.translator.xml  | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'addons/website/static/src/xml/website.translator.xml')

diff --git a/addons/website/static/src/xml/website.translator.xml b/addons/website/static/src/xml/website.translator.xml
index dc5f93e87bf..d1d9ab14a39 100644
--- a/addons/website/static/src/xml/website.translator.xml
+++ b/addons/website/static/src/xml/website.translator.xml
@@ -36,20 +36,15 @@
                             versions.
                         </p>
                     </section>
-                    <hr/>
-                    <section class="row">
-                        <div class="col-md-6">
-                            <button type="button" data-action="activate" class="btn btn-primary">Ok</button>
-                            or
-                            <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
-                        </div>
-                        <div class="col-md-6">
-                            <label>
-                                <input type="checkbox" name="do_not_show"/>
-                                Do not show this dialog later.
-                            </label>
-                        </div>
-                    </section>
+                </div>
+                <div class="modal-footer">
+                    <div class="pull-left">
+                        <input type="checkbox" name="do_not_show"/>
+                        Do not show this dialog later.
+                    </div>
+                    <button type="button" data-action="activate" class="btn btn-primary">Ok</button>
+                    or
+                    <a data-action="discard" data-dismiss="modal" href="#">Cancel</a>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3