From d15a6f426ddbd75a17cfd491e127966c7a1c03c6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 13 Nov 2013 15:39:34 +0100
Subject: [IMP] replace selection list of existing CMS pages by FAYT via
 select2

bzr revid: xmo@openerp.com-20131113143934-je7dusgzj15f7li0
---
 addons/website/static/src/xml/website.editor.xml | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 66b82ae7cbe..01ed1ca9950 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -41,23 +41,12 @@
                 <ul class="list-group">
                     <li class="list-group-item form-group active">
                         <h4 class="list-group-item-heading">
-                            <label for="link-existing" class="control-label">
-                                Existing page
+                            <label for="link-page" class="control-label">
+                                Page
                             </label>
                         </h4>
-                        <select class="existing form-control url-source"
-                                id="link-existing">
-                            <option/>
-                        </select>
-                    </li>
-                    <li class="list-group-item form-group">
-                        <h4 class="list-group-item-heading">
-                            <label for="link-new" class="control-label">
-                                New page
-                            </label>
-                        </h4>
-                        <input type="text" class="form-control pages url-source"
-                            id="link-new" placeholder="Page Name"/>
+                        <input class="page form-control url-source"
+                               id="link-page" type="hidden"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
                         <div class="pull-right">
-- 
cgit v1.2.3


From b6faef3d009929c12d46d731167faed3cb66dc10 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 18 Nov 2013 11:42:59 +0100
Subject: [IMP] html reduction

bzr revid: fp@tinyerp.com-20131118104259-3q2zifybopjarxzp
---
 addons/website/static/src/xml/website.menu.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index ea505d94b28..d5148b6b365 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -8,12 +8,8 @@
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-                <button type="button" class="btn btn-primary js_edit_menu">
-                    <i class="icon-edit"/>
-                </button>
-                <button type="button" class="btn btn-danger js_delete_menu">
-                    <i class="icon-trash"/>
-                </button>
+                <button type="button" class="btn btn-primary js_edit_menu icon-edit"/>
+                <button type="button" class="btn btn-danger js_delete_menu icon-trash"/>
             </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
-- 
cgit v1.2.3


From 43af23d272144d27ee7f0de8262da57f5f728505 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 18 Nov 2013 14:30:27 +0100
Subject: [FIX] Edit menu item

bzr revid: fme@openerp.com-20131118133027-85wk8x487ecqw1pm
---
 addons/website/static/src/xml/website.menu.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index d5148b6b365..2276076550a 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,7 +4,9 @@
         <div class="input-group">
             <span class="input-group-addon icon-reorder"/>
             <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
-                <t t-esc="submenu.name"/>
+                <span class="js_menu_label">
+                    <t t-esc="submenu.name"/>
+                </span>
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-- 
cgit v1.2.3


From 2ac9955ac693da7dde39fc4ce4ce1e05aa74669a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 26 Nov 2013 10:42:55 +0100
Subject: [IMP] website mobile preview: display scrollbar

bzr revid: chm@openerp.com-20131126094255-eawnxkj1cbso0x8m
---
 addons/website/static/src/xml/website.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 1b4254ca19b..b35dd8a9cfc 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,16 +57,7 @@
                         <h3 class="modal-title">Mobile preview</h3>
                     </div>
                     <div class="modal-body">
-                        <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
-                        <script>
-                            var $o = $('<div style="width:50px; overflow:scroll;"><div style="width:100%;"></div></div>');
-                            $o.appendTo("body");
-                            var scrollSize = 50 - $o.find("div").innerWidth();
-                            $o.remove();
-
-                            $(".modal-body").css({'overflow': 'hidden', 'margin-right': '5px'});
-                            $(".oe_mobile_viewport").css({'width': (320 + scrollSize + 5) + 'px'});
-                        </script>
+                        <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true" style="width: 326px"></iframe>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From 44af6d1e09aa3bec6967ac3eb4e67b3e9215fb08 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 26 Nov 2013 17:01:48 +0100
Subject: [IMP] significantly improve handling of trying to create a new page
 which already exists

# Through the menu

Rather than output a generic error (500 due to an IntegrityError),
return a templated 409 letting the user either visit the
page-which-already-exists-with-the-name-he'd-picked or open the page
creation dialog again for a second round.

An alternative would be to promote the website.prompt use to
full-blown dialog as a result of selecting "New Page" and handle the
"page already exists" case without even closing the dialog.

# Through the link dialog

Added an RPC call to check if a page already exists (essentially a
cheaper version of opening /page/whatever and checking whether it's a
200 over JSON-RPC), if the page matching the completion term already
exists, do *not* add the choice of creating the page, only provide
completions from existing pages.

bzr revid: xmo@openerp.com-20131126160148-wrk4zvz9istscwa0
---
 addons/website/static/src/xml/website.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index b35dd8a9cfc..d5368ec7b94 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -72,16 +72,21 @@
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
                         <div class="h2"><t t-esc="title"/></div>
                     </div>
-                    <div class="modal-body">
+                    <div class="modal-body" t-if="message or backend_url">
                         <section>
                             <t t-esc="message"/>
                         </section>
-                        <section class="mt32">
-                            You have encountered an error. You can edit in the <a t-att-href="backend_url">backend</a> this data.
+                        <section class="mt32" t-if="backend_url">
+                            <p>The web site has encountered an error.</p>
+                            <p>
+                                It might be possible to edit the relevant items
+                                or fix the issue in <a t-href="#{backend_url}">
+                                the classic OpenERP interface</a>.
+                            </p>
                         </section>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" data-dismiss="modal" href="#" class="close btn btn-default">Close</button>
+                        <button type="button" data-dismiss="modal" class="btn btn-primary">Close</button>
                     </div>
                 </div>
             </div>
-- 
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
---
 addons/website/static/src/xml/website.editor.xml   |  4 ++--
 addons/website/static/src/xml/website.seo.xml      |  2 +-
 .../website/static/src/xml/website.translator.xml  | 23 +++++++++-------------
 addons/website/static/src/xml/website.xml          |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)

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

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


From 94fbe76be8415ddf9358f737b65cf4801a50bf69 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 29 Nov 2013 15:30:58 +0100
Subject: [IMP] Hide tour in secondary languages (multilang)

bzr revid: ddm@openerp.com-20131129143058-oi6swnul3idr7ngp
---
 addons/website/static/src/xml/website.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 17f8dbd5d89..4ff2384d222 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -36,7 +36,7 @@
                                 <!-- filled in JS -->
                             </ul>
                         </li>
-                        <li class="dropdown">
+                        <li class="dropdown js_hide_on_translate">
                             <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="help-menu">
                                 <!-- filled in JS -->
-- 
cgit v1.2.3


From c1f306dd969c16ec5ebe57833353d11fb20d3b94 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 2 Dec 2013 13:45:04 +0100
Subject: [WIP] website: add website_button widget in backend to publish and go
 back to the website. (need bootstrap 3 for layout)

bzr revid: chm@openerp.com-20131202124504-78zvm5t0p1hpsn53
---
 addons/website/static/src/xml/website.backend.xml | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.backend.xml

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

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
new file mode 100644
index 00000000000..e7f83c23740
--- /dev/null
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+
+    <t t-name="WidgetWebsiteButton">
+
+        <div class="btn-group oe_WidgetWebsiteButton">
+            <button class="btn btn-success">
+                <span class="oe_unpublish">Not Published</span>
+                <span class="oe_publish">Published</span>
+            </button>
+            <button id="dopprod-6" data-toggle="dropdown" type="button" class="btn btn-default dropdown-toggle">
+                <span class="caret"></span>
+            </button>
+            <ul role="menu" class="dropdown-menu" aria-labelledby="dopprod-6">
+                <li>
+                    <a href="#" title="View in frontend">Website</a>
+                </li>
+            </ul>
+        </div>
+
+    </t>
+
+</templates>
-- 
cgit v1.2.3


From c3660ba7b9f520958d85f8fd5f3b695ffb8d8663 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 2 Dec 2013 17:30:10 +0100
Subject: [FIX] website: product backend view with website_button widget

bzr revid: chm@openerp.com-20131202163010-9nksvoxmbuj9v8i1
---
 addons/website/static/src/xml/website.backend.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml
index e7f83c23740..385b7ffa99a 100644
--- a/addons/website/static/src/xml/website.backend.xml
+++ b/addons/website/static/src/xml/website.backend.xml
@@ -6,14 +6,14 @@
     <t t-name="WidgetWebsiteButton">
 
         <div class="btn-group oe_WidgetWebsiteButton">
-            <button class="btn btn-success">
+            <button class="btn btn-sm btn-success">
                 <span class="oe_unpublish">Not Published</span>
                 <span class="oe_publish">Published</span>
             </button>
-            <button id="dopprod-6" data-toggle="dropdown" type="button" class="btn btn-default dropdown-toggle">
+            <button id="dopprod-0" data-toggle="dropdown" type="button" class="btn btn-sm btn-default dropdown-toggle">
                 <span class="caret"></span>
             </button>
-            <ul role="menu" class="dropdown-menu" aria-labelledby="dopprod-6">
+            <ul role="menu" class="dropdown-menu" aria-labelledby="dopprod-0">
                 <li>
                     <a href="#" title="View in frontend">Website</a>
                 </li>
-- 
cgit v1.2.3


From f2156614cb6ef90ef290d34d0c85ae8acc63f7be Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 3 Dec 2013 10:34:21 +0100
Subject: [FIX] website snippet: icones move, copy, remove

bzr revid: chm@openerp.com-20131203093421-05zs2xsx6gyafi53
---
 addons/website/static/src/xml/website.snippets.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 587c36a71bc..549b997e794 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -66,9 +66,9 @@
                         <a href="#" data-toggle="dropdown" class="btn btn-primary btn-sm" title="Customize">Customize <span class="caret"/></a>
                         <ul class="dropdown-menu" role="menu"></ul>
                     </div>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="Drag to Move">&amp;nbsp; <span class="icon-move"/> &amp;nbsp;</a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate Container"><span class="icon-copy"/></a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block"><span class="icon-remove"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="Drag to Move">&amp;nbsp;<i class="fa fa-arrows"></i>&amp;nbsp;</a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate Container">&amp;nbsp;<i class="fa fa-files-o"></i>&amp;nbsp; </a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove Block">&amp;nbsp;<i class="fa fa-trash-o"></i>&amp;nbsp; </a>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 78dedf2dff12fa659fc864bbf699c9c468022db2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 3 Dec 2013 11:04:49 +0100
Subject: [IMP] website snippet: icones goto parent snippet, clean css,
 unactive snippet when click outside

bzr revid: chm@openerp.com-20131203100449-7ups314ffru0kobh
---
 addons/website/static/src/xml/website.snippets.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 549b997e794..ecc3bb8cc38 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -61,7 +61,7 @@
         <div class="oe_overlay">
             <div class="oe_overlay_options">
                 <div class="btn-group">
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><span class="icon-upload-alt"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><i class="fa fa-upload"></i></a>
                     <div class="dropdown oe_options hidden btn-group">
                         <a href="#" data-toggle="dropdown" class="btn btn-primary btn-sm" title="Customize">Customize <span class="caret"/></a>
                         <ul class="dropdown-menu" role="menu"></ul>
-- 
cgit v1.2.3


From 771394ef9ad1118bdfa4c4e407bbfffefa920913 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 3 Dec 2013 11:08:51 +0100
Subject: [FIX] Restore mobile preview icon

bzr revid: ddm@openerp.com-20131203100851-rjdhmgfrq3i4o1nx
---
 addons/website/static/src/xml/website.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 4ff2384d222..ceec9c161d8 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -19,7 +19,7 @@
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
                     <ul class="nav navbar-nav navbar-right">
-                        <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
+                        <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview"><i class="fa fa-mobile"/></span></a></li>
                         <li class="divider-vertical"></li>
                         <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
                         <li class="dropdown js_hide_on_translate">
-- 
cgit v1.2.3


From 9a3eb7963601e019aa02a0e8628984f445a8cebb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 3 Dec 2013 14:51:56 +0100
Subject: [FIX] new fa icons for menu

bzr revid: fme@openerp.com-20131203135156-vflspcfkitv667wv
---
 addons/website/static/src/xml/website.menu.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 2276076550a..9277b0d4bc2 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -2,16 +2,16 @@
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
         <div class="input-group">
-            <span class="input-group-addon icon-reorder"/>
+            <span class="input-group-addon fa fa-bars"/>
             <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
                 <span class="js_menu_label">
                     <t t-esc="submenu.name"/>
                 </span>
-                <i class="pull-right icon-home" style="margin-top: 3px"/>
+                <i class="pull-right fa fa-home" style="margin-top: 3px"/>
             </span>
             <span class="input-group-btn">
-                <button type="button" class="btn btn-primary js_edit_menu icon-edit"/>
-                <button type="button" class="btn btn-danger js_delete_menu icon-trash"/>
+                <button type="button" class="btn btn-primary js_edit_menu fa fa-edit"/>
+                <button type="button" class="btn btn-danger js_delete_menu fa fa-trash-o"/>
             </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
@@ -32,11 +32,11 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                <span class="icon-indent-right"/> right indent for multi-level menus
+                <span class="fa fa-indent"/> right indent for multi-level menus
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-                    <i class="icon-plus-sign"/> Add Menu Entry
+                    <i class="fa fa-plus-circle"/> Add Menu Entry
                 </a>
             </div>
         </div>
-- 
cgit v1.2.3


From 9d9d3f207e7e6089d01f0b7fe26d7fd9cda0ddce Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Dec 2013 12:13:23 +0100
Subject: [IMP] cancellation of RTE

* rename Cancel to Discard for clarity (user test)

* add intermediate dialog in case of mis-click, use 'danger' button
  style to clearly indicate this is a destructive operation

bzr revid: xmo@openerp.com-20131203111323-9mx7aazfpsybe718
---
 addons/website/static/src/xml/website.editor.xml | 26 +++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 8f749374485..8c1adf1ee27 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     <button type="button" data-action="cancel"
-                            class="btn">Cancel</button>
+                            class="btn">Discard</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
@@ -170,4 +170,28 @@
         </table>
     </t>
 
+    <t t-name="website.editor.discard">
+        <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h3 class="modal-title">Discard edition</h3>
+                    </div>
+                    <div class="modal-body">
+                        <p>
+                            If you discard the current edition, <em>all</em>
+                            unsaved changes will be lost.
+                        </p>
+                        <p>You can cancel to return to the edition mode.</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-danger">Discard</button>
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From b79e56d1af9a2d9e10631df79c4325ea7d0854e1 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 Dec 2013 11:52:12 +0100
Subject: [IMP] clarity of links edition

According to user tests, users have a hard time finding out how to
edit links. Thus, add same system as image edition (a small button
appearing when hovering the element).

Extract and unify these two to avoid redundancies between handlings as
they are broadly similar (only details such as label, positioning and
size of button relative to the element being hovered really change,
the lifecycle itself is the same).

The main setup still isn't very clean, there might be a better way to
do it.

bzr revid: xmo@openerp.com-20131204105212-u0a49nbvwilgtfst
---
 addons/website/static/src/xml/website.editor.xml | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 8c1adf1ee27..be80e71afc0 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -194,4 +194,11 @@
         </div>
     </t>
 
+    <t t-name="website.editor.hoverbutton">
+        <button type="button" contenteditable="false"
+                t-attf-class="btn btn-primary hover-edition-button #{classes or ''}">
+            <t t-esc="label"/>
+        </button>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 083e88167e5c376a9559e6c38fd3af193266ff2f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Dec 2013 17:33:05 +0100
Subject: [IMP] website: save (button) or discard (link), on left in modal

bzr revid: chm@openerp.com-20131211163305-5qwltn11k2ph179o
---
 addons/website/static/src/xml/website.editor.xml | 14 ++++++++------
 addons/website/static/src/xml/website.seo.xml    |  3 ++-
 2 files changed, 10 insertions(+), 7 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index be80e71afc0..15f1fec8bbd 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -2,11 +2,11 @@
     <t t-extend="website.editorbar">
         <t t-jquery="#website-top-view" t-operation="after">
             <div class="navbar-inner" id="website-top-edit">
-                <form class="navbar-form pull-left">
+                <form class="navbar-form pull-left text-muted">
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
-                    <button type="button" data-action="cancel"
-                            class="btn">Discard</button>
+                    or
+                    <a href="#" data-action="cancel">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
@@ -25,7 +25,8 @@
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary save">Save</button>
                         <button type="button" class="btn hidden wait" disabled="disabled"/>
-                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        or
+                        <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
                     </div>
                 </div>
             </div>
@@ -138,7 +139,7 @@
                         <div class="existing-attachments"/>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        <a href="#" data-dismiss="modal" aria-hidden="true">Discard</a>
                     </div>
                 </div>
             </div>
@@ -187,7 +188,8 @@
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-danger">Discard</button>
-                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                        or
+                        <a href="#" data-dismiss="modal" aria-hidden="true">Cancel</a>
                     </div>
                 </div>
             </div>
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 676a4c7760e..be9414ca37f 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -57,7 +57,8 @@
                         -->
                     </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>
+                        or
+                        <a data-action="discard" data-dismiss="modal" href="#" >Discard</a>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From aca3b51bf3c9fb4bdde68f11429526e66d5cb6bc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Dec 2013 17:16:42 +0100
Subject: [IMP] website_sale: layout for all theme and mobile view

bzr revid: chm@openerp.com-20131213161642-e1ltxlidm9apg3l4
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 15f1fec8bbd..0497d2d574c 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     or
-                    <a href="#" data-action="cancel">Discard</a>
+                    <a href="#" data-action="cancel" class="text-danger">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
-- 
cgit v1.2.3


From c62e8fc793b9e65219d89759d384eb99ad3bffdc Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 14 Dec 2013 20:21:05 +0100
Subject: [IMP] Small improvements

bzr revid: fp@tinyerp.com-20131214192105-0ngdj4t6fz8xjd4q
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index 0497d2d574c..15f1fec8bbd 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -6,7 +6,7 @@
                     <button type="button" data-action="save"
                             class="btn btn-primary">Save</button>
                     or
-                    <a href="#" data-action="cancel" class="text-danger">Discard</a>
+                    <a href="#" data-action="cancel">Discard</a>
                 </form>
                 <ul class="nav navbar-nav pull-right">
                 </ul>
-- 
cgit v1.2.3