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: [PATCH] [FIX] website: in all popups, always order buttons in the
 same order

bzr revid: chm@openerp.com-20131127161627-fwokmahwvp8jxhgl
---
 .../website/static/src/xml/website.editor.xml |  4 ++--
 addons/website/static/src/xml/website.seo.xml |  2 +-
 .../static/src/xml/website.translator.xml     | 23 ++++++++-----------
 addons/website/static/src/xml/website.xml     |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 01ed1ca9950..8f749374485 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -23,9 +23,9 @@
                     </div>
                     <div class="modal-body"><t t-raw="__content__"/></div>
                     <div class="modal-footer">
-                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        <button type="button" class="btn btn-primary save">Save</button>
                         <button type="button" class="btn hidden wait" disabled="disabled"/>
-                        <button type="button" class="btn btn-primary save">Save Changes</button>
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
                     </div>
                 </div>
             </div>
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 2c3f8cab52a..676a4c7760e 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -56,8 +56,8 @@
                         </section>
                         -->
                     </div><div class="modal-footer">
+                        <button type="button" data-action="update" class="btn btn-primary">Save</button>
                         <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button>
-                        <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button>
                     </div>
                 </div>
             </div>
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>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index d5368ec7b94..17f8dbd5d89 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -116,8 +116,8 @@
                         </form>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
                         <button type="button" class="btn btn-primary">Continue</button>
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
                     </div>
                 </div>
             </div>