From 6dd657f253d19adb40fe40546699d7af24d2f15a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 27 Jun 2013 18:15:36 +0200
Subject: [IMP] Webeditor as a webclient module (with more hackery)

bzr revid: fme@openerp.com-20130627161536-cp6mdz8junts3316
---
 addons/website/static/src/xml/website.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.xml

(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
new file mode 100644
index 00000000000..a58e21de44c
--- /dev/null
+++ b/addons/website/static/src/xml/website.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vim:fdl=1:
+-->
+<templates id="template" xml:space="preserve">
+<t t-name="Website.EditorBar">
+    <ul class="oe_website_editorbar openerp">
+        <li><strong>OpenERP Website Editor</strong></li>
+        <li class="oe_right"><button data-action="save">Save</button></li>
+        <li class="oe_right"><button data-action="cancel">Cancel</button></li>
+    </ul>
+</t>
+</templates>
-- 
cgit v1.2.3


From 2b5cf63ed78114d959ca647f4956422b28a0c77e Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 2 Jul 2013 19:16:14 +0200
Subject: m

bzr revid: al@openerp.com-20130702171614-opy0xy7l1h3r330u
---
 addons/website/static/src/xml/website.xml | 37 ++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 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 a58e21de44c..5f68cba48d6 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,10 +3,45 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Website.EditorBar">
+
+    OK
+<div class="navbar">
+    <div class="navbar-inner">
+        <a class="brand" href="#">Title</a>
+        <ul class="nav">
+        <li class="active"><a href="#">Home</a></li>
+        <li><a href="#">Link</a></li>
+        <li><a href="#">Link</a></li>
+        </ul>
+    </div>
+</div>
+
+    <div class="navbar navbar-inverse">
+      <div class="navbar-inner">
+        <div class="container">
+          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="brand" href="./index.html">Bootstrap</a>
+          <div class="nav-collapse collapse">
+            <ul class="nav">
+              <li class=""><a href="./index.html">Home</a> </li>
+              <li class=""> <a href="./getting-started.html">Get started</a> </li>
+              <li class=""> <a href="./customize.html">Customize</a> </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+
     <ul class="oe_website_editorbar openerp">
-        <li><strong>OpenERP Website Editor</strong></li>
+        <li><strong> YESSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS OpenERP Website Editor</strong></li>
         <li class="oe_right"><button data-action="save">Save</button></li>
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
+        <li class="oe_right"><button data-action="edit">Edit</button></li>
     </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From e6dc4a0e06dd625874ac2b5f647dd6673777ce3d Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 2 Jul 2013 20:01:24 +0200
Subject: topbar

bzr revid: al@openerp.com-20130702180124-yeetg6dx2piiinla
---
 addons/website/static/src/xml/website.xml | 36 +------------------------------
 1 file changed, 1 insertion(+), 35 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 5f68cba48d6..c4dc56f18ca 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,42 +3,8 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Website.EditorBar">
-
-    OK
-<div class="navbar">
-    <div class="navbar-inner">
-        <a class="brand" href="#">Title</a>
-        <ul class="nav">
-        <li class="active"><a href="#">Home</a></li>
-        <li><a href="#">Link</a></li>
-        <li><a href="#">Link</a></li>
-        </ul>
-    </div>
-</div>
-
-    <div class="navbar navbar-inverse">
-      <div class="navbar-inner">
-        <div class="container">
-          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="brand" href="./index.html">Bootstrap</a>
-          <div class="nav-collapse collapse">
-            <ul class="nav">
-              <li class=""><a href="./index.html">Home</a> </li>
-              <li class=""> <a href="./getting-started.html">Get started</a> </li>
-              <li class=""> <a href="./customize.html">Customize</a> </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-
-
     <ul class="oe_website_editorbar openerp">
-        <li><strong> YESSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS OpenERP Website Editor</strong></li>
+        <li><strong>OpenERP Website Editor</strong></li>
         <li class="oe_right"><button data-action="save">Save</button></li>
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
         <li class="oe_right"><button data-action="edit">Edit</button></li>
-- 
cgit v1.2.3


From 2663e21f5087b88f61479fce5d1b5a34efeb8c5f Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 2 Jul 2013 23:00:35 +0200
Subject: snippet part3 + fix alhoa hightlight

bzr revid: al@openerp.com-20130702210035-44jka7w1ijc9vak8
---
 addons/website/static/src/xml/website.xml | 1 +
 1 file changed, 1 insertion(+)

(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 c4dc56f18ca..1754b7b81b6 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -7,6 +7,7 @@
         <li><strong>OpenERP Website Editor</strong></li>
         <li class="oe_right"><button data-action="save">Save</button></li>
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
+        <li class="oe_right"><button data-action="snippet">Snippet</button></li>
         <li class="oe_right"><button data-action="edit">Edit</button></li>
     </ul>
 </t>
-- 
cgit v1.2.3


From f3aabcc2560ecd29c06586761aa6aa46f829e271 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 24 Jul 2013 16:48:51 +0200
Subject: [ADD] fixed toolbar positioning for ckeditor

bzr revid: xmo@openerp.com-20130724144851-40f69hkuantjbgtg
---
 addons/website/static/src/xml/website.xml | 1 +
 1 file changed, 1 insertion(+)

(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 1754b7b81b6..8715a74184a 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,6 +9,7 @@
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
         <li class="oe_right"><button data-action="snippet">Snippet</button></li>
         <li class="oe_right"><button data-action="edit">Edit</button></li>
+        <li class="oe_right" id="oe_rte_toolbar"></li>
     </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From 7d59a7355fae088ba32dfbd321fb103e175a9330 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 25 Jul 2013 16:55:05 +0200
Subject: [IMP] remove sharedspace plugin, disable ckeditor's own toolbar,
 build toolbar from scratch

bzr revid: xmo@openerp.com-20130725145505-sb8ul41fd3nfmhwc
---
 addons/website/static/src/xml/website.xml | 1 -
 1 file changed, 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 8715a74184a..1754b7b81b6 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,7 +9,6 @@
         <li class="oe_right"><button data-action="cancel">Cancel</button></li>
         <li class="oe_right"><button data-action="snippet">Snippet</button></li>
         <li class="oe_right"><button data-action="edit">Edit</button></li>
-        <li class="oe_right" id="oe_rte_toolbar"></li>
     </ul>
 </t>
 </templates>
-- 
cgit v1.2.3


From 3a8f51385d83c4256c339798614bf421fde948e3 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 29 Jul 2013 16:38:42 +0200
Subject: [ADD] toolbar subgroups, hooks for styling lists correctly, more
 widgets

bzr revid: xmo@openerp.com-20130729143842-k4r7e42hhvw1y1xu
---
 addons/website/static/src/xml/website.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(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 1754b7b81b6..5dc34257a07 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -11,4 +11,12 @@
         <li class="oe_right"><button data-action="edit">Edit</button></li>
     </ul>
 </t>
+<t t-name="Website.ActionGroup">
+    <div class="dropdown">
+        <button type="button" class="oe_button_list dropdown-toggle">
+            <t t-esc="widget.name"/>
+        </button>
+        <ul class="dropdown-menu" role="menu"/>
+    </div>
+</t>
 </templates>
-- 
cgit v1.2.3


From 1d0af41f612adb1880fe90bbf1412792bc242d46 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 30 Jul 2013 16:36:43 +0200
Subject: [IMP] website: carousel

bzr revid: chm@openerp.com-20130730143643-1itg8hhwuchnb5k3
---
 addons/website/static/src/xml/website.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(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 e65565d6a96..6d3cb227cc1 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -18,4 +18,13 @@
         <ul class="dropdown-menu" role="menu"/>
     </div>
 </t>
+<t t-name="Website.Snipped.carousel">
+    <div style="position: absolute; top: -4px;">
+        <button class="add"><t t-esc="'Add a new banner\'s page'"/></button>
+        <button class="remove"><t t-esc="'Remove this banner\'s page'"/></button>
+        <div style="display: none;">
+            <div class="item" style="width: 992px; min-height: 100px;"><h1>Please edit me...</h1></div>
+        </div>
+    </div>
+</t>
 </templates>
-- 
cgit v1.2.3


From 327f943c452b4d6717c34bd68e5892bc569bdc3c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 30 Jul 2013 16:42:52 +0200
Subject: [IMP] website: carousel image bg

bzr revid: chm@openerp.com-20130730144252-grypnxx2urswvzb6
---
 addons/website/static/src/xml/website.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 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 6d3cb227cc1..64d5384cff7 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,7 +23,17 @@
         <button class="add"><t t-esc="'Add a new banner\'s page'"/></button>
         <button class="remove"><t t-esc="'Remove this banner\'s page'"/></button>
         <div style="display: none;">
-            <div class="item" style="width: 992px; min-height: 100px;"><h1>Please edit me...</h1></div>
+            <div class="item">
+                <div style="border:1px solid #eee; width: 992px; height: 210px; overflow: hidden;">
+                    <img src="//cleancanvas.herokuapp.com/img/backgrounds/color-splash.jpg"/>
+                </div>
+                <div class="css_titlebox" style="position: absolute; top: 25px; right: 80px;">
+                    <div style="text-align: right; background: #f6f6f6; padding: 7px 20px; border-radius: 5px;">
+                        <h1>Please edit me !</h1>
+                        <h4>text text text exampletext text text </h4>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </t>
-- 
cgit v1.2.3


From e7b14ae02eadb0135bc3624c83bd75610d282c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 31 Jul 2013 09:43:13 +0200
Subject: fix banner insertion

bzr revid: fva@openerp.com-20130731074313-taa1d02lyc9tyz4a
---
 addons/website/static/src/xml/website.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 64d5384cff7..19c62ac8950 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -24,13 +24,11 @@
         <button class="remove"><t t-esc="'Remove this banner\'s page'"/></button>
         <div style="display: none;">
             <div class="item">
-                <div style="border:1px solid #eee; width: 992px; height: 210px; overflow: hidden;">
-                    <img src="//cleancanvas.herokuapp.com/img/backgrounds/color-splash.jpg"/>
-                </div>
+                <img src="/website/static/src/img/volcano.jpg"/>
                 <div class="css_titlebox" style="position: absolute; top: 25px; right: 80px;">
                     <div style="text-align: right; background: #f6f6f6; padding: 7px 20px; border-radius: 5px;">
-                        <h1>Please edit me !</h1>
-                        <h4>text text text exampletext text text </h4>
+                        <h1>Insert Title Here</h1>
+                        <h4>Insert subtitle here</h4>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From 8863d65457e02d7051a414293aba320567aa1354 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 31 Jul 2013 16:03:24 +0200
Subject: [IMP] website: change boutton layout for carousel

bzr revid: chm@openerp.com-20130731140324-d0ujwllud3155en2
---
 addons/website/static/src/xml/website.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 19c62ac8950..867935a95d2 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -20,8 +20,8 @@
 </t>
 <t t-name="Website.Snipped.carousel">
     <div style="position: absolute; top: -4px;">
-        <button class="add"><t t-esc="'Add a new banner\'s page'"/></button>
-        <button class="remove"><t t-esc="'Remove this banner\'s page'"/></button>
+        <span class="label" style="cursor:pointer"><i class="add icon-plus-sign"></i></span>
+        <span class="label" style="cursor:pointer"><i class="remove icon-minus-sign"></i></span>
         <div style="display: none;">
             <div class="item">
                 <img src="/website/static/src/img/volcano.jpg"/>
-- 
cgit v1.2.3


From fd0d98e9e846710e4b37554ae57ef5d7fd7a2922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Wed, 31 Jul 2013 16:53:27 +0200
Subject: made the banner beautiful

bzr revid: fva@openerp.com-20130731145327-efm61ao2oh4f043q
---
 addons/website/static/src/xml/website.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 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 19c62ac8950..3b078e758ab 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,13 +23,10 @@
         <button class="add"><t t-esc="'Add a new banner\'s page'"/></button>
         <button class="remove"><t t-esc="'Remove this banner\'s page'"/></button>
         <div style="display: none;">
-            <div class="item">
-                <img src="/website/static/src/img/volcano.jpg"/>
-                <div class="css_titlebox" style="position: absolute; top: 25px; right: 80px;">
-                    <div style="text-align: right; background: #f6f6f6; padding: 7px 20px; border-radius: 5px;">
-                        <h1>Insert Title Here</h1>
-                        <h4>Insert subtitle here</h4>
-                    </div>
+            <div class="item active" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+                <div class='container'>
+                    <h1 class='mt64'>Your New Banner Slide</h1>
+                    <h2>With another convincing subtitle</h2>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 7c2d3a871f40c937bff43d692161fd62741a99cc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 31 Jul 2013 17:05:11 +0200
Subject: [IMP] website: carousel edition

bzr revid: chm@openerp.com-20130731150511-8wfza72kb6lynmor
---
 addons/website/static/src/xml/website.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 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 75d25616d87..941015fd0f5 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -19,16 +19,10 @@
     </div>
 </t>
 <t t-name="Website.Snipped.carousel">
-    <div style="position: absolute; top: -4px;">
-        <span class="label" style="cursor:pointer"><i class="add icon-plus-sign"></i></span>
-        <span class="label" style="cursor:pointer"><i class="remove icon-minus-sign"></i></span>
-        <div style="display: none;">
-            <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-                <div class='container'>
-                    <h1 class='mt64'>Your New Banner Slide</h1>
-                    <h2>With another convincing subtitle</h2>
-                </div>
-            </div>
+    <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+        <div class='container'>
+            <h1 class='mt64'>Your New Banner Slide</h1>
+            <h2>With another convincing subtitle</h2>
         </div>
     </div>
 </t>
-- 
cgit v1.2.3


From af902530921c017068d333a7e6dce41599407332 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 11 Aug 2013 11:04:25 +0200
Subject: [IMP] bootstrapify top bar

bzr revid: fp@openerp.com-20130811090425-y45cj68rfivep4vv
---
 addons/website/static/src/xml/website.xml | 40 +++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

(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 941015fd0f5..4549f29e2a3 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,6 +9,46 @@
         <li><button data-action="cancel">Cancel</button></li>
         <li class="oe_right"><button data-action="snippet">Building Blocks</button></li>
     </ul>
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+        <div class="navbar-inner">
+            <form class="navbar-form pull-left">
+                <button class="btn btn-primary">Edit</button>
+            </form>
+            <ul class="nav pull-right">
+                <li><a href="#">Promote<sup><span class="badge">1</span></sup></a></li>
+                <li><a href="#">Translate</a></li>
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <strong class="carret"></strong></a>i
+                    <div class="dropdown-menu">
+                         aaa            
+                    </div>
+                </li>
+                <li class="dropdown">
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Settings <strong class="carret"></strong></a>
+                    <div class="dropdown-menu">
+                         Install Apps
+                         Paramters
+                    </div>
+                </li>
+            </ul>
+        </div>
+
+        <div class="navbar-inner">
+            <form class="navbar-form pull-left">
+                <button class="btn btn-primary">Save</button>
+                <button class="btn">Cancel</button>
+            </form>
+            <ul class="nav pull-right">
+                <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+            </ul>
+            <p class="navbar-text text-center">
+                Click anywhere in the page to modify the content
+            </p>
+        </div>
+    </div>
+
+
 </t>
 <t t-name="Website.ActionGroup">
     <div class="dropdown">
-- 
cgit v1.2.3


From a41626780625e9f89538c3425a672f592031b41f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 11 Aug 2013 16:06:19 +0200
Subject: [IMP] Website Apps

bzr revid: fp@tinyerp.com-20130811140619-a164pkqxwpdwrohc
---
 addons/website/static/src/xml/website.xml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 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 b719bbdd324..3dc7b4fc789 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,20 +9,26 @@
                 <button data-action="edit" class="btn btn-primary">Edit</button>
             </form>
             <ul class="nav pull-right">
+                <li class="active"><a href="#"><span class="icon-desktop"/></a></li>
+                <li><a href="#"><span class="icon-mobile-phone"/></a></li>
+                <li class="divider-vertical"></li>
                 <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
                 <li><a href="#">Translate</a></li>
                 <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <strong class="carret"></strong></a>
+                    <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                     <div class="dropdown-menu">
-                         aaa
+                        <ul class="nav nav-list" id="customize-menu">
+                            <!-- filled in JS -->
+                        </ul>
                     </div>
                 </li>
                 <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Settings <strong class="carret"></strong></a>
-                    <div class="dropdown-menu">
-                         Install Apps
-                         Paramters
-                    </div>
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Settings <strong class="caret"></strong></a>
+                    <ul class="dropdown-menu">
+                         <li><a href="/admin#action=website.action_module_website">Install Apps</a></li>
+                         <li class="divider"></li>
+                         <li><a href="#">General Configuration</a></li>
+                    </ul>
                 </li>
             </ul>
         </div>
-- 
cgit v1.2.3


From 08f21c07c8a6511380817fcc851f2cd63b10aada Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 12 Aug 2013 10:35:20 +0200
Subject: [IMP] Only Apps menu

bzr revid: fp@tinyerp.com-20130812083520-rjplfn8578uxo06h
---
 addons/website/static/src/xml/website.xml | 7 +------
 1 file changed, 1 insertion(+), 6 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 3dc7b4fc789..09cf4a8ea5e 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,12 +23,7 @@
                     </div>
                 </li>
                 <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="#">Settings <strong class="caret"></strong></a>
-                    <ul class="dropdown-menu">
-                         <li><a href="/admin#action=website.action_module_website">Install Apps</a></li>
-                         <li class="divider"></li>
-                         <li><a href="#">General Configuration</a></li>
-                    </ul>
+                    <a class="dropdown-toggle" data-toggle="dropdown" href="/admin#action=website.action_module_website">Apps</a>
                 </li>
             </ul>
         </div>
-- 
cgit v1.2.3


From a8e3f7d3566fcb74be543ea4e17fd58532ecad4c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 12 Aug 2013 11:37:45 +0200
Subject: [FIX] Apps dropdown

bzr revid: fme@openerp.com-20130812093745-1c8iqwbeg38fp62p
---
 addons/website/static/src/xml/website.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 09cf4a8ea5e..9f11ff40bca 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -22,8 +22,8 @@
                         </ul>
                     </div>
                 </li>
-                <li class="dropdown">
-                    <a class="dropdown-toggle" data-toggle="dropdown" href="/admin#action=website.action_module_website">Apps</a>
+                <li>
+                    <a href="/admin#action=website.action_module_website">Apps</a>
                 </li>
             </ul>
         </div>
-- 
cgit v1.2.3


From 660e8798abdd73eb56f1b571654edb39707c24c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 19 Aug 2013 11:25:07 +0200
Subject: [WIP] website: Cleaning up the snippet editor

bzr revid: fva@openerp.com-20130819092507-s3d9wl1ph6z43thh
---
 addons/website/static/src/xml/website.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(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 9f11ff40bca..3e2e5db538b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,4 +57,11 @@
         </div>
     </div>
 </t>
+
+    <t t-name="website.snippets">
+        <div class='oe_snippets oe_hidden'>
+            sadfasdfsadf
+        </div>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 6284b4b925a17e6c463694758c23c4ecf87d7035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Tue, 20 Aug 2013 18:45:57 +0200
Subject: [WIP] cms: snippets are ugly but working well

bzr revid: fva@openerp.com-20130820164557-kjh87mrtv4tueln8
---
 addons/website/static/src/xml/website.xml | 1 -
 1 file changed, 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 3e2e5db538b..e6611121bb8 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -60,7 +60,6 @@
 
     <t t-name="website.snippets">
         <div class='oe_snippets oe_hidden'>
-            sadfasdfsadf
         </div>
     </t>
 
-- 
cgit v1.2.3


From 7d40a7db38cd11ebb1b6cb3e1dc1a6f2f5cae255 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 22 Aug 2013 10:58:25 +0200
Subject: Mobile preview (initial commit)

bzr revid: ddm@openerp.com-20130822085825-7mpsoi0nyujekg5f
---
 addons/website/static/src/xml/website.xml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 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 e6611121bb8..953f0153e3f 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -9,8 +9,7 @@
                 <button data-action="edit" class="btn btn-primary">Edit</button>
             </form>
             <ul class="nav pull-right">
-                <li class="active"><a href="#"><span class="icon-desktop"/></a></li>
-                <li><a href="#"><span class="icon-mobile-phone"/></a></li>
+                <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
                 <li class="divider-vertical"></li>
                 <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
                 <li><a href="#">Translate</a></li>
@@ -39,6 +38,17 @@
         </div>
     </div>
 
+    <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobilePreview" aria-hidden="true">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="mobilePreview">Mobile preview</h3>
+        </div>
+        <div class="modal-body">
+            <div class="oe_mobile_preview">
+                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+            </div>
+        </div>
+    </div>
 
 </t>
 <t t-name="Website.ActionGroup">
-- 
cgit v1.2.3


From b9f2e796ca8cb84e578a0856cb00a91211ed4007 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 22 Aug 2013 12:47:36 +0200
Subject: Mobile preview (initial styling)

bzr revid: ddm@openerp.com-20130822104736-5gt43278o83fvt9s
---
 addons/website/static/src/xml/website.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.xml b/addons/website/static/src/xml/website.xml
index 953f0153e3f..7356cfc85f6 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -38,10 +38,10 @@
         </div>
     </div>
 
-    <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobilePreview" aria-hidden="true">
-        <div class="modal-header">
+    <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
+        <div class="modal-header oe_mobile_preview_header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="mobilePreview">Mobile preview</h3>
+            <h3 id="mobile-preview-title">Preview</h3>
         </div>
         <div class="modal-body">
             <div class="oe_mobile_preview">
-- 
cgit v1.2.3


From f820c074a106fa286964f1596f7e1c558fd53aae Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 22 Aug 2013 14:40:13 +0200
Subject: Disable editor on smartphones

<=767px according to bootstrap responsive classes

bzr revid: ddm@openerp.com-20130822124013-br8ccw8hb26dr060
---
 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 7356cfc85f6..04868b16ebe 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -45,7 +45,7 @@
         </div>
         <div class="modal-body">
             <div class="oe_mobile_preview">
-                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
             </div>
         </div>
     </div>
-- 
cgit v1.2.3


From 4fc8193e463c0ff8ad984ac4f490176618b1ba4d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 23 Aug 2013 11:24:56 +0200
Subject: CSS improvements

bzr revid: ddm@openerp.com-20130823092456-7g783rh2g0irlp63
---
 addons/website/static/src/xml/website.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.xml b/addons/website/static/src/xml/website.xml
index 04868b16ebe..f24498c5568 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -40,12 +40,12 @@
 
     <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
         <div class="modal-header oe_mobile_preview_header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="mobile-preview-title">Preview</h3>
+            <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+            <h3 id="mobile-preview-title" class="oe_mobile_preview_title">Mobile preview</h3>
         </div>
         <div class="modal-body">
             <div class="oe_mobile_preview">
-                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
+                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
             </div>
         </div>
     </div>
-- 
cgit v1.2.3


From b4ca228747557c0ab39aeeeec095f1e2db2b7ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 12:00:22 +0200
Subject: [IMP] website: clean up client side templates

bzr revid: fva@openerp.com-20130823100022-a2f0n4oc7f16glfd
---
 addons/website/static/src/xml/website.xml | 110 ++++++++++++++----------------
 1 file changed, 52 insertions(+), 58 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 04868b16ebe..e58a72c8f25 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -2,71 +2,65 @@
 <!-- vim:fdl=1:
 -->
 <templates id="template" xml:space="preserve">
-<t t-name="Website.EditorBar">
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="navbar-inner" id="website-top-view">
-            <form class="navbar-form pull-left">
-                <button data-action="edit" class="btn btn-primary">Edit</button>
-            </form>
-            <ul class="nav pull-right">
-                <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
-                <li class="divider-vertical"></li>
-                <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
-                <li><a href="#">Translate</a></li>
-                <li class="dropdown">
-                    <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
-                    <div class="dropdown-menu">
-                        <ul class="nav nav-list" id="customize-menu">
-                            <!-- filled in JS -->
-                        </ul>
-                    </div>
-                </li>
-                <li>
-                    <a href="/admin#action=website.action_module_website">Apps</a>
-                </li>
-            </ul>
-        </div>
 
-        <div class="navbar-inner" id="website-top-edit">
-            <form class="navbar-form pull-left">
-                <button data-action="save" class="btn btn-primary">Save</button>
-                <button data-action="cancel" class="btn">Cancel</button>
-            </form>
-            <ul class="nav pull-right">
-                <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-            </ul>
-        </div>
-    </div>
+    <t t-name="website.editorbar">
+        <div class="navbar navbar-inverse navbar-fixed-top">
+            <div class="navbar-inner" id="website-top-view">
+                <form class="navbar-form pull-left">
+                    <button data-action="edit" class="btn btn-primary">Edit</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
+                    <li class="divider-vertical"></li>
+                    <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
+                    <li><a href="#">Translate</a></li>
+                    <li class="dropdown">
+                        <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
+                        <div class="dropdown-menu">
+                            <ul class="nav nav-list" id="customize-menu">
+                                <!-- filled in JS -->
+                            </ul>
+                        </div>
+                    </li>
+                    <li>
+                        <a href="/admin#action=website.action_module_website">Apps</a>
+                    </li>
+                </ul>
+            </div>
 
-    <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
-        <div class="modal-header oe_mobile_preview_header">
-            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            <h3 id="mobile-preview-title">Preview</h3>
+            <div class="navbar-inner" id="website-top-edit">
+                <form class="navbar-form pull-left">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
         </div>
-        <div class="modal-body">
-            <div class="oe_mobile_preview">
-                <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
+
+        <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
+            <div class="modal-header oe_mobile_preview_header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3 id="mobile-preview-title">Preview</h3>
+            </div>
+            <div class="modal-body">
+                <div class="oe_mobile_preview">
+                    <iframe id="mobile-viewport" class="oe_mobile_viewport" src="#"></iframe>
+                </div>
             </div>
         </div>
-    </div>
 
-</t>
-<t t-name="Website.ActionGroup">
-    <div class="dropdown">
-        <button type="button" class="oe_button_list dropdown-toggle">
-            <t t-esc="widget.name"/>
-        </button>
-        <ul class="dropdown-menu" role="menu"/>
-    </div>
-</t>
-<t t-name="Website.Snipped.carousel">
-    <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-        <div class='container'>
-            <h1 class='mt64'>Your New Banner Slide</h1>
-            <h2>With another convincing subtitle</h2>
+    </t>
+
+    <t t-name="website.carousel">
+        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+            <div class='container'>
+                <h1 class='mt64'>Your New Banner Slide</h1>
+                <h2>With another convincing subtitle</h2>
+            </div>
         </div>
-    </div>
-</t>
+    </t>
 
     <t t-name="website.snippets">
         <div class='oe_snippets oe_hidden'>
-- 
cgit v1.2.3


From a142d3a16b369deaf156eebd0167b711f56ec043 Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Fri, 23 Aug 2013 16:20:54 +0530
Subject: [IMP]As per bootstrap 3.0 added class and tags.

bzr revid: bth@tinyerp.com-20130823105054-vgm8irxijayyfblg
---
 addons/website/static/src/xml/website.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 04868b16ebe..89d183958f9 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,12 +3,13 @@
 -->
 <templates id="template" xml:space="preserve">
 <t t-name="Website.EditorBar">
-    <div class="navbar navbar-inverse navbar-fixed-top">
-        <div class="navbar-inner" id="website-top-view">
-            <form class="navbar-form pull-left">
+    <nav class="navbar navbar-inverse navbar-custom navbar-fixed-top" role="navigation">
+        <!-- Collect the nav links, forms, and other content for toggling -->
+        <div class="navbar-collapse navbar-ex1-collapse" id="website-top-view">
+            <form class="navbar-form navbar-left">
                 <button data-action="edit" class="btn btn-primary">Edit</button>
             </form>
-            <ul class="nav pull-right">
+            <ul class="nav navbar-nav navbar-right">
                 <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
                 <li class="divider-vertical"></li>
                 <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
@@ -26,18 +27,17 @@
                 </li>
             </ul>
         </div>
-
         <div class="navbar-inner" id="website-top-edit">
-            <form class="navbar-form pull-left">
+            <form class="navbar-form navbar-left">
                 <button data-action="save" class="btn btn-primary">Save</button>
                 <button data-action="cancel" class="btn">Cancel</button>
             </form>
-            <ul class="nav pull-right">
+            <ul class="nav navbar-nav navbar-right">
                 <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
             </ul>
         </div>
-    </div>
-
+    <!-- /.navbar-collapse -->
+    </nav>
     <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
         <div class="modal-header oe_mobile_preview_header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-- 
cgit v1.2.3


From 306138327ff4e54f1c403559378cfbde3014d0ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Fri, 23 Aug 2013 18:04:11 +0200
Subject: [IMP] website: snippet resizing

bzr revid: fva@openerp.com-20130823160411-xoxek62wwhi5w3by
---
 addons/website/static/src/xml/website.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(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 e58a72c8f25..5e83471976e 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -67,4 +67,17 @@
         </div>
     </t>
 
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'>
+            <div class='oe_handle n'></div>
+            <div class='oe_handle ne'></div>
+            <div class='oe_handle e'></div>
+            <div class='oe_handle se'></div>
+            <div class='oe_handle s'></div>
+            <div class='oe_handle sw'></div>
+            <div class='oe_handle w'></div>
+            <div class='oe_handle nw'></div>
+        </div>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From bda0a4fa366de2ca208712910051462fd333fe40 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 09:04:35 +0200
Subject: SEO configurator mockup

bzr revid: ddm@openerp.com-20130827070435-bqrhg887ynz1f6ys
---
 addons/website/static/src/xml/website.xml | 50 ++++++++++++++++++++++++++++++-
 1 file changed, 49 insertions(+), 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 37a3bc453f3..326331d23af 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -12,7 +12,7 @@
                 <ul class="nav pull-right">
                     <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
                     <li class="divider-vertical"></li>
-                    <li><a href="#">Promote<!-- <sup><span class="badge">1</span></sup> --></a></li>
+                    <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
                     <li><a href="#">Translate</a></li>
                     <li class="dropdown">
                         <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
@@ -53,6 +53,54 @@
 
     </t>
 
+    <t t-name="website.seo_configuration">
+        <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="seo-configuration-title" aria-hidden="true">
+            <div class="modal-header">
+                <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3 id="seo-configuration-title">Promote your page on the web</h3>
+            </div>
+            <div class="modal-body">
+                <div class="control-group">
+                    <label class="control-label" for="seo_page_url">URL</label>
+                    <div class="controls">
+                        <input type="text" name="seo_page_url" required="True" size="70" readonly="readonly"/>
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label" for="seo_page_title">Title</label>
+                    <div class="controls">
+                        <input type="text" name="seo_page_title" required="True" size="70"/>
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label" for="seo_page_description">Description</label>
+                    <div class="controls">
+                        <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
+                    </div>
+                </div>
+                <div class="control-group">
+                    <label class="control-label" for="seo_page_keywords">Keywords</label>
+                    <div class="controls">
+                        <div class="input-append">
+                            <input type="text" name="seo_page_keywords" required="True" size="30" placeholder="New keyword"/>
+                            <button data-action="add" class="btn" type="button">Add</button>
+                        </div>
+                        <ul class="seo-keywords-list">
+                            <!-- filled in JS -->
+                        </ul>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a data-action="update" href="#" class="btn btn-primary">Update page</a>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.seo_keyword">
+        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label seo-keyword"><t t-raw="widget.keyword"/></span></li>
+    </t>
+
     <t t-name="website.carousel">
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
             <div class='container'>
-- 
cgit v1.2.3


From a20474297886b35e2107f1639996247a87ebee7e Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Tue, 27 Aug 2013 12:43:21 +0530
Subject: [IMP]Mobile preview is fixed.

bzr revid: bth@tinyerp.com-20130827071321-0v7xcyis249kyh72
---
 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 39d62ed4f04..c3b976a7336 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
     <t t-name="website.editorbar">
-        <nav class="navbar navbar-inverse navbar-custom navbar-fixed-top" role="navigation">
+        <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
             <div class="navbar-collapse navbar-ex1-collapse" id="website-top-view">
                 <form class="navbar-form navbar-left">
                     <button data-action="edit" class="btn btn-primary">Edit</button>
-- 
cgit v1.2.3


From f880ce9ae7057628ded1337bab31f7dbff1bad90 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 09:48:16 +0200
Subject: Code cleanup

bzr revid: ddm@openerp.com-20130827074816-1kuvpbz6vubhel68
---
 addons/website/static/src/xml/website.xml | 9 +++++----
 1 file changed, 5 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 326331d23af..9b7c22482ae 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -10,7 +10,7 @@
                     <button data-action="edit" class="btn btn-primary">Edit</button>
                 </form>
                 <ul class="nav pull-right">
-                    <li><a data-action="show-mobile-preview" href="#mobile-preview" data-toggle="modal" role="button"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
+                    <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></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><a href="#">Translate</a></li>
@@ -38,8 +38,10 @@
                 </ul>
             </div>
         </div>
+    </t>
 
-        <div id="mobile-preview" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
+    <t t-name="website.mobile_preview">
+        <div id="mobile-preview" class="modal hide fade oe_mobile_preview" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
             <div class="modal-header oe_mobile_preview_header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                 <h3 id="mobile-preview-title" class="oe_mobile_preview_title">Mobile preview</h3>
@@ -50,7 +52,6 @@
                 </div>
             </div>
         </div>
-
     </t>
 
     <t t-name="website.seo_configuration">
@@ -85,7 +86,7 @@
                             <input type="text" name="seo_page_keywords" required="True" size="30" placeholder="New keyword"/>
                             <button data-action="add" class="btn" type="button">Add</button>
                         </div>
-                        <ul class="seo-keywords-list">
+                        <ul class="js_seo_keywords_list">
                             <!-- filled in JS -->
                         </ul>
                     </div>
-- 
cgit v1.2.3


From 5f7d4098a0e6e3a22fb2a143f34dd24070ca69bd Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 10:22:32 +0200
Subject: Code cleanup

bzr revid: ddm@openerp.com-20130827082232-4irtyjd4t67pz5hl
---
 addons/website/static/src/xml/website.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.xml b/addons/website/static/src/xml/website.xml
index 9b7c22482ae..978c1b22591 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -64,13 +64,13 @@
                 <div class="control-group">
                     <label class="control-label" for="seo_page_url">URL</label>
                     <div class="controls">
-                        <input type="text" name="seo_page_url" required="True" size="70" readonly="readonly"/>
+                        <input type="text" name="seo_page_url" size="70" readonly="readonly"/>
                     </div>
                 </div>
                 <div class="control-group">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
-                        <input type="text" name="seo_page_title" required="True" size="70"/>
+                        <input type="text" name="seo_page_title" size="70"/>
                     </div>
                 </div>
                 <div class="control-group">
@@ -83,7 +83,7 @@
                     <label class="control-label" for="seo_page_keywords">Keywords</label>
                     <div class="controls">
                         <div class="input-append">
-                            <input type="text" name="seo_page_keywords" required="True" size="30" placeholder="New keyword"/>
+                            <input type="text" name="seo_page_keywords" size="30" placeholder="New keyword"/>
                             <button data-action="add" class="btn" type="button">Add</button>
                         </div>
                         <ul class="js_seo_keywords_list">
-- 
cgit v1.2.3


From 48a8aa14a3552b4767500549d19f0753166967bc Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 10:51:21 +0200
Subject: SEO keywords must be unique

bzr revid: ddm@openerp.com-20130827085121-2vkxscag56dze107
---
 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 978c1b22591..d3bab78faf9 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -99,7 +99,7 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label seo-keyword"><t t-raw="widget.keyword"/></span></li>
+        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></li>
     </t>
 
     <t t-name="website.carousel">
-- 
cgit v1.2.3


From 5ddbdeac96ab3bb4acb339ff5a36368e047abcef Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 11:32:37 +0200
Subject: SEO keywords list mockup

bzr revid: ddm@openerp.com-20130827093237-v13oihsyhadl92w3
---
 addons/website/static/src/xml/website.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 d3bab78faf9..c1925636a62 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -79,14 +79,14 @@
                         <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
                     </div>
                 </div>
-                <div class="control-group">
+                <div class="control-group oe_seo_keywords_area">
                     <label class="control-label" for="seo_page_keywords">Keywords</label>
                     <div class="controls">
                         <div class="input-append">
                             <input type="text" name="seo_page_keywords" size="30" placeholder="New keyword"/>
                             <button data-action="add" class="btn" type="button">Add</button>
                         </div>
-                        <ul class="js_seo_keywords_list">
+                        <ul class="oe_seo_keywords_list js_seo_keywords_list">
                             <!-- filled in JS -->
                         </ul>
                     </div>
-- 
cgit v1.2.3


From 373a26290cb2b2c1966d457d8c60ee538420aaeb Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Tue, 27 Aug 2013 16:53:18 +0530
Subject: [IMP]Improved header,customized menu,added vertical divider class and
 html formating.

bzr revid: bth@tinyerp.com-20130827112318-kzt0xt2u49zzgfy2
---
 addons/website/static/src/xml/website.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 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 c3b976a7336..6e36dc06c62 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,8 +3,8 @@
 -->
 <templates id="template" xml:space="preserve">
     <t t-name="website.editorbar">
-        <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
-            <div class="navbar-collapse navbar-ex1-collapse" id="website-top-view">
+        <nav class="navbar-inverse navbar-fixed-top" role="navigation">
+            <div id="website-top-view">
                 <form class="navbar-form navbar-left">
                     <button data-action="edit" class="btn btn-primary">Edit</button>
                 </form>
@@ -15,11 +15,9 @@
                     <li><a href="#">Translate</a></li>
                     <li class="dropdown">
                         <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
-                        <div class="dropdown-menu">
-                            <ul class="nav nav-list" id="customize-menu">
-                                <!-- filled in JS -->
-                            </ul>
-                        </div>
+                        <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1" id="customize-menu">
+                            <!-- filled in JS -->
+                        </ul>
                     </li>
                     <li>
                         <a href="/admin#action=website.action_module_website">Apps</a>
@@ -27,7 +25,7 @@
                 </ul>
             </div>
 
-            <div class="navbar-inner" id="website-top-edit">
+            <div id="website-top-edit">
                 <form class="navbar-form navbar-left">
                     <button data-action="save" class="btn btn-primary">Save</button>
                     <button data-action="cancel" class="btn">Cancel</button>
-- 
cgit v1.2.3


From be165dbb7a32a1990dcd151c4bb2e66ab3be91f1 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 13:35:50 +0200
Subject: SEO tools visual cleanup

bzr revid: ddm@openerp.com-20130827113550-xi8r0qs8oz2uu990
---
 addons/website/static/src/xml/website.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.xml b/addons/website/static/src/xml/website.xml
index c1925636a62..5ac7f6f6f3b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -64,13 +64,13 @@
                 <div class="control-group">
                     <label class="control-label" for="seo_page_url">URL</label>
                     <div class="controls">
-                        <input type="text" name="seo_page_url" size="70" readonly="readonly"/>
+                        <input type="text" name="seo_page_url" maxlength="70" size="70" readonly="readonly"/>
                     </div>
                 </div>
                 <div class="control-group">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
-                        <input type="text" name="seo_page_title" size="70"/>
+                        <input type="text" name="seo_page_title" maxlength="70" size="70"/>
                     </div>
                 </div>
                 <div class="control-group">
@@ -83,7 +83,7 @@
                     <label class="control-label" for="seo_page_keywords">Keywords</label>
                     <div class="controls">
                         <div class="input-append">
-                            <input type="text" name="seo_page_keywords" size="30" placeholder="New keyword"/>
+                            <input type="text" name="seo_page_keywords" maxlength="20" size="24" placeholder="New keyword"/>
                             <button data-action="add" class="btn" type="button">Add</button>
                         </div>
                         <ul class="oe_seo_keywords_list js_seo_keywords_list">
-- 
cgit v1.2.3


From fcd97879e3cd57a15f91db81ff88da7c6c114b98 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 27 Aug 2013 16:12:35 +0200
Subject: Improve SEO tools CSS across themes

bzr revid: ddm@openerp.com-20130827141235-wfrx21hqem1v076b
---
 addons/website/static/src/xml/website.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 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 5ac7f6f6f3b..630e9c4a55f 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -55,18 +55,14 @@
     </t>
 
     <t t-name="website.seo_configuration">
-        <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="seo-configuration-title" aria-hidden="true">
+        <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="js_seo_page_url" aria-hidden="true">
             <div class="modal-header">
                 <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="seo-configuration-title">Promote your page on the web</h3>
+                <h3>Promote your page on the Web</h3>
+                <br/>
+                <span class="js_seo_page_url"></span>
             </div>
             <div class="modal-body">
-                <div class="control-group">
-                    <label class="control-label" for="seo_page_url">URL</label>
-                    <div class="controls">
-                        <input type="text" name="seo_page_url" maxlength="70" size="70" readonly="readonly"/>
-                    </div>
-                </div>
                 <div class="control-group">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
-- 
cgit v1.2.3


From 3c9f07d244cb88efede8dd27c4786a90fea9932e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 28 Aug 2013 15:55:58 +0200
Subject: SEO: keyword suggest mockup

bzr revid: ddm@openerp.com-20130828135558-w4ysgixr6l7n45b5
---
 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 630e9c4a55f..17ec64bc6bb 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -79,7 +79,7 @@
                     <label class="control-label" for="seo_page_keywords">Keywords</label>
                     <div class="controls">
                         <div class="input-append">
-                            <input type="text" name="seo_page_keywords" maxlength="20" size="24" placeholder="New keyword"/>
+                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder="New keyword"/>
                             <button data-action="add" class="btn" type="button">Add</button>
                         </div>
                         <ul class="oe_seo_keywords_list js_seo_keywords_list">
-- 
cgit v1.2.3


From 93c9f491b3fe752cea35fce6ebc2dd0a3ddeecaf Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Thu, 29 Aug 2013 11:59:18 +0530
Subject: [IMP]Improved code for fixed topbar navigation menu.

bzr revid: bth@tinyerp.com-20130829062918-12dvjv0e8y0lkrty
---
 addons/website/static/src/xml/website.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 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 0761f92ea0a..ea835d0280c 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
     <t t-name="website.editorbar">
-        <nav class="navbar-inverse navbar-fixed-top" role="navigation">
+        <div class="navbar-inverse navbar-fixed-top">
             <div id="website-top-view">
                 <form class="navbar-form navbar-left">
                     <button data-action="edit" class="btn btn-primary">Edit</button>
@@ -24,7 +24,6 @@
                     </li>
                 </ul>
             </div>
-
             <div id="website-top-edit">
                 <form class="navbar-form navbar-left">
                     <button data-action="save" class="btn btn-primary">Save</button>
@@ -34,7 +33,7 @@
                     <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
                 </ul>
             </div>
-        </nav>
+        </div>
     </t>
 
     <t t-name="website.mobile_preview">
-- 
cgit v1.2.3


From 0d64c9037dcf27d8a32515e5150e96e16ef8a75e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 29 Aug 2013 17:34:41 +0200
Subject: [IMP] Implement custom bootstrap dialog for links.

Dialog doesn't work right as it's a bootstrap 3-ish dialog, not 2, so
none of the classes works correctly.

Also moved editor templates outside of main website template file.

bzr revid: xmo@openerp.com-20130829153441-w51n3hxxikyti0xj
---
 addons/website/static/src/xml/website.editor.xml | 56 ++++++++++++++++++++++++
 addons/website/static/src/xml/website.xml        | 10 -----
 2 files changed, 56 insertions(+), 10 deletions(-)
 create mode 100644 addons/website/static/src/xml/website.editor.xml

(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
new file mode 100644
index 00000000000..6fbc7345b17
--- /dev/null
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -0,0 +1,56 @@
+<templates id="template" xml:space="preserve">
+    <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">
+                    <button data-action="save" class="btn btn-primary">Save</button>
+                    <button data-action="cancel" class="btn">Cancel</button>
+                </form>
+                <ul class="nav pull-right">
+                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                </ul>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.link">
+        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                <h3>Link to:</h3>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <ul class="list-group">
+                        <li class="list-group-item active">
+                            <h3 class="list-group-item-heading">Page on Your Website</h3>
+                            <select class="form-control pages url-source"/>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                            <div class="pull-right">
+                                <label>
+                                    <input type="checkbox" class="window-new"/>
+                                    Open in new window
+                                </label>
+                            </div>
+                            <div class="clearfix"></div>
+                            <div class="input-group">
+                                <input type="text" class="form-control url url-source"
+                                       placeholder="http://openerp.com"/>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h3 class="list-group-item-heading">Email Address</h3>
+                            <input type="email" class="form-control email-address url-source"
+                                   placeholder="you@yourwebsite.com"/>
+                        </li>
+                    </ul>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                <button type="button" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 17ec64bc6bb..a03868d392b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -27,16 +27,6 @@
                     </li>
                 </ul>
             </div>
-
-            <div class="navbar-inner" id="website-top-edit">
-                <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
-                </form>
-                <ul class="nav pull-right">
-                    <li><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
-                </ul>
-            </div>
         </div>
     </t>
 
-- 
cgit v1.2.3


From bc5c8a082894b824d3d9a83010b082031b07690a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 29 Aug 2013 18:39:52 +0200
Subject: SEO screen based on mockup (partial)

bzr revid: ddm@openerp.com-20130829163952-v41gi10q7ths1elt
---
 addons/website/static/src/xml/website.xml | 52 +++++++++++++++++++------------
 1 file changed, 32 insertions(+), 20 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 a03868d392b..61f9e8011ca 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -48,44 +48,56 @@
         <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="js_seo_page_url" aria-hidden="true">
             <div class="modal-header">
                 <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3>Promote your page on the Web</h3>
-                <br/>
-                <span class="js_seo_page_url"></span>
+                <h2>Promote <small class="js_seo_page_url"></small></h2>
+                <h4>Get your page efficiently referenced in Google to attract more visitors with relevant content.</h4>
             </div>
             <div class="modal-body">
-                <div class="control-group">
+                <div class="js_seo_tips" />
+
+                <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                <div class="control-group form-horizontal oe_seo_keywords_area">
+                    <label class="control-label" for="seo_page_keywords">Keyword</label>
+                    <div class="controls">
+                        <div class="input-append">
+                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder=""/>
+                            <button data-action="add" class="btn" type="button">Add</button>
+                        </div>
+                        <div class="container oe_seo_keywords_list js_seo_keywords_list">
+
+                                <!-- filled in JS -->
+
+                        </div>
+                    </div>
+                </div>
+
+                <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
+                <div class="control-group form-horizontal">
                     <label class="control-label" for="seo_page_title">Title</label>
                     <div class="controls">
                         <input type="text" name="seo_page_title" maxlength="70" size="70"/>
                     </div>
                 </div>
-                <div class="control-group">
+                <div class="control-group form-horizontal">
                     <label class="control-label" for="seo_page_description">Description</label>
                     <div class="controls">
                         <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
                     </div>
                 </div>
-                <div class="control-group oe_seo_keywords_area">
-                    <label class="control-label" for="seo_page_keywords">Keywords</label>
-                    <div class="controls">
-                        <div class="input-append">
-                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder="New keyword"/>
-                            <button data-action="add" class="btn" type="button">Add</button>
-                        </div>
-                        <ul class="oe_seo_keywords_list js_seo_keywords_list">
-                            <!-- filled in JS -->
-                        </ul>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
+                <hr/>
                 <a data-action="update" href="#" class="btn btn-primary">Update page</a>
             </div>
         </div>
     </t>
 
+    <t t-name="website.seo_tip">
+        <div t-attf-class="alert alert-#{widget.type}">
+              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
+              <t t-raw="widget.message"/>
+        </div>
+    </t>
+
     <t t-name="website.seo_keyword">
-        <li><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></li>
+        <div class="oe_seo_keyword"><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></div>
     </t>
 
     <t t-name="website.carousel">
-- 
cgit v1.2.3


From 10686adf144536456006695a2ce28f8aa99c3b30 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 30 Aug 2013 00:29:04 +0200
Subject: [IMP] modal preview small improvement

bzr revid: fp@openerp.com-20130829222904-mf6uk9yx63i4ablo
---
 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 53715824c53..340760723e9 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -42,7 +42,7 @@
         <div id="mobile-preview" class="modal hide fade oe_mobile_preview" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
             <div class="modal-header oe_mobile_preview_header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="mobile-preview-title" class="oe_mobile_preview_title">Mobile preview</h3>
+                <h3 id="mobile-preview-title" class="oe_mobile_preview_title modal-title">Mobile preview</h3>
             </div>
             <div class="modal-body">
                 <div class="oe_mobile_preview">
-- 
cgit v1.2.3


From ccc3465dec7b4289b659caeb9db248d706b82690 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 30 Aug 2013 09:09:06 +0200
Subject: [IMP] bootstrap 3: oe_hidden -> hide

bzr revid: fp@tinyerp.com-20130830070906-f9gr24iq95oz6bp2
---
 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 340760723e9..f550f8cb372 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -118,7 +118,7 @@
     </t>
 
     <t t-name="website.snippets">
-        <div class='oe_snippets oe_hidden'>
+        <div class='oe_snippets hide'>
         </div>
     </t>
 
-- 
cgit v1.2.3


From f71c0b9f6edc7b50f8cb8331f77e1011bb1fe02e Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 30 Aug 2013 10:31:18 +0200
Subject: [FIX] link dialog broken under bootstrap 3

bzr revid: xmo@openerp.com-20130830083118-y2r5xfywccclcs64
---
 addons/website/static/src/xml/website.editor.xml | 75 ++++++++++++------------
 1 file changed, 38 insertions(+), 37 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 b55e3bd47c5..76aa855e6b1 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -13,43 +13,44 @@
         </t>
     </t>
     <t t-name="website.editor.dialog.link">
-        <div class="modal hide" tabindex="-1" role="dialog" aria-hidden="true">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3>Link to:</h3>
-            </div>
-            <div class="modal-body">
-                <form>
-                    <ul class="list-group">
-                        <li class="list-group-item active">
-                            <h3 class="list-group-item-heading">Page on Your Website</h3>
-                            <select class="form-control pages url-source"/>
-                        </li>
-                        <li class="list-group-item">
-                            <h3 class="list-group-item-heading pull-left">Website URL</h3>
-                            <div class="pull-right">
-                                <label>
-                                    <input type="checkbox" class="window-new"/>
-                                    Open in new window
-                                </label>
-                            </div>
-                            <div class="clearfix"></div>
-                            <div class="input-group">
-                                <input type="text" class="form-control url url-source"
-                                       placeholder="http://openerp.com"/>
-                            </div>
-                        </li>
-                        <li class="list-group-item">
-                            <h3 class="list-group-item-heading">Email Address</h3>
-                            <input type="email" class="form-control email-address url-source"
-                                   placeholder="you@yourwebsite.com"/>
-                        </li>
-                    </ul>
-                </form>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
-                <button type="button" class="btn btn-primary">Save changes</button>
+        <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>Link to:</h3>
+                    </div>
+                    <div class="modal-body">
+                        <form>
+                            <ul class="list-group form-group">
+                                <li class="list-group-item active">
+                                    <h3 class="list-group-item-heading">Page on Your Website</h3>
+                                    <select class="form-control pages url-source"/>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="pull-right">
+                                        <label>
+                                            <input type="checkbox" class="window-new"/>
+                                            Open in new window
+                                        </label>
+                                    </div>
+                                    <h3 class="list-group-item-heading pull-left">Website URL</h3>
+                                    <input type="text" class="form-control url url-source"
+                                           placeholder="http://openerp.com"/>
+                                </li>
+                                <li class="list-group-item">
+                                    <h3 class="list-group-item-heading">Email Address</h3>
+                                    <input type="email" class="form-control email-address url-source"
+                                           placeholder="you@yourwebsite.com"/>
+                                </li>
+                            </ul>
+                        </form>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
+                        <button type="button" class="btn btn-primary">Save changes</button>
+                    </div>
+                </div>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From 3db7d635c00ea31454ad2d96872318b8cc36ad57 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 30 Aug 2013 13:21:24 +0200
Subject: Mobile preview + SEO: Bootstrap 3

bzr revid: ddm@openerp.com-20130830112124-ht5wnngxa8fwlrdh
---
 addons/website/static/src/xml/website.xml | 111 +++++++++++++++++-------------
 1 file changed, 65 insertions(+), 46 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 f550f8cb372..431d567ea50 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -39,60 +39,76 @@
     </t>
 
     <t t-name="website.mobile_preview">
-        <div id="mobile-preview" class="modal hide fade oe_mobile_preview" tabindex="-1" role="dialog" aria-labelledby="mobile-preview-title" aria-hidden="true">
-            <div class="modal-header oe_mobile_preview_header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h3 id="mobile-preview-title" class="oe_mobile_preview_title modal-title">Mobile preview</h3>
-            </div>
-            <div class="modal-body">
-                <div class="oe_mobile_preview">
-                    <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+        <div class="modal fade oe_mobile_preview" 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>
+                        <h3 class="modal-title">Mobile preview</h3>
+                    </div>
+                    <div class="modal-body">
+                        <div>
+                            <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
     </t>
 
     <t t-name="website.seo_configuration">
-        <div class="modal hide fade oe_seo_configuration" tabindex="-1" role="dialog" aria-labelledby="js_seo_page_url" aria-hidden="true">
-            <div class="modal-header">
-                <button title="Close" type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                <h2>Promote <small class="js_seo_page_url"></small></h2>
-                <h4>Get your page efficiently referenced in Google to attract more visitors with relevant content.</h4>
-            </div>
-            <div class="modal-body">
-                <div class="js_seo_tips" />
-
-                <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
-                <div class="control-group form-horizontal oe_seo_keywords_area">
-                    <label class="control-label" for="seo_page_keywords">Keyword</label>
-                    <div class="controls">
-                        <div class="input-append">
-                            <input type="text" name="seo_page_keywords" data-provide="typeahead" autocomplete="off" maxlength="20" size="24" placeholder=""/>
-                            <button data-action="add" class="btn" type="button">Add</button>
-                        </div>
-                        <div class="container oe_seo_keywords_list js_seo_keywords_list">
-
-                                <!-- filled in JS -->
-
-                        </div>
-                    </div>
-                </div>
-
-                <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
-                <div class="control-group form-horizontal">
-                    <label class="control-label" for="seo_page_title">Title</label>
-                    <div class="controls">
-                        <input type="text" name="seo_page_title" maxlength="70" size="70"/>
+        <div class="modal fade oe_seo_configuration" 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">Promote <small class="js_seo_page_url"></small></h2>
+                        <h4>Get your page efficiently referenced in Google to attract more visitors.</h4>
                     </div>
-                </div>
-                <div class="control-group form-horizontal">
-                    <label class="control-label" for="seo_page_description">Description</label>
-                    <div class="controls">
-                        <textarea name="seo_page_description" rows="3" cols="70" size="160"/>
+                    <div class="modal-body">
+                        <div class="js_seo_tips" />
+                        <section>
+                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Keyword</label>
+                                    <div class="col-lg-8">
+                                        <div class="input-group">
+                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="20" size="24"/>
+                                          <span class="input-group-btn">
+                                              <button data-action="add" class="btn btn-default" type="button">Add</button>
+                                          </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="container oe_seo_keywords_list js_seo_keywords_list">
+                                <!-- filled in JS -->
+                            </div>
+                        </section>
+                        <section>
+                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
+                                    <div class="col-lg-8">
+                                        <input type="text" name="seo_page_title" class="form-control" maxlength="70" size="70"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="seo_page_description" class="col-lg-2 control-label">Description</label>
+                                    <div class="col-lg-8">
+                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" size="160"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </section>
+                        <hr/>
+                        <section>
+                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
+                        </section>
                     </div>
                 </div>
-                <hr/>
-                <a data-action="update" href="#" class="btn btn-primary">Update page</a>
             </div>
         </div>
     </t>
@@ -105,7 +121,10 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <div class="oe_seo_keyword"><a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a> <span class="label js_seo_keyword"><t t-raw="widget.keyword"/></span></div>
+        <div class="oe_seo_keyword">
+            <a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a>
+            <span class="label label-default js_seo_keyword"><t t-raw="widget.keyword"/></span>
+        </div>
     </t>
 
     <t t-name="website.carousel">
-- 
cgit v1.2.3


From 8b0f006398b2c53b5d582b6b07d229987886fb6c Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 30 Aug 2013 15:19:52 +0200
Subject: Mobile preview & SEO: more Bootstrap 3 fixes

bzr revid: ddm@openerp.com-20130830131952-fmmnhvawlrbekxay
---
 addons/website/static/src/xml/website.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 431d567ea50..2a75a0d89c7 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -72,9 +72,9 @@
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_keywords" class="col-lg-2 control-label">Keyword</label>
-                                    <div class="col-lg-8">
+                                    <div class="col-lg-4">
                                         <div class="input-group">
-                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="20" size="24"/>
+                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
                                           <span class="input-group-btn">
                                               <button data-action="add" class="btn btn-default" type="button">Add</button>
                                           </span>
-- 
cgit v1.2.3


From 1916b769ac64d99e200f4ed597444b1c0e585f02 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 09:52:16 +0200
Subject: [ADD] bootstrap image dialog, behavior missing

bzr revid: xmo@openerp.com-20130902075216-4y83ed2r19z2fgha
---
 addons/website/static/src/xml/website.editor.xml | 86 ++++++++++++++++--------
 1 file changed, 57 insertions(+), 29 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 76aa855e6b1..25005cc4e0e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -12,46 +12,74 @@
             </div>
         </t>
     </t>
-    <t t-name="website.editor.dialog.link">
+    <t t-name="website.editor.dialog">
         <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>Link to:</h3>
-                    </div>
-                    <div class="modal-body">
-                        <form>
-                            <ul class="list-group form-group">
-                                <li class="list-group-item active">
-                                    <h3 class="list-group-item-heading">Page on Your Website</h3>
-                                    <select class="form-control pages url-source"/>
-                                </li>
-                                <li class="list-group-item">
-                                    <div class="pull-right">
-                                        <label>
-                                            <input type="checkbox" class="window-new"/>
-                                            Open in new window
-                                        </label>
-                                    </div>
-                                    <h3 class="list-group-item-heading pull-left">Website URL</h3>
-                                    <input type="text" class="form-control url url-source"
-                                           placeholder="http://openerp.com"/>
-                                </li>
-                                <li class="list-group-item">
-                                    <h3 class="list-group-item-heading">Email Address</h3>
-                                    <input type="email" class="form-control email-address url-source"
-                                           placeholder="you@yourwebsite.com"/>
-                                </li>
-                            </ul>
-                        </form>
+                        <h3><t t-esc="title"/></h3>
                     </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">Close</button>
-                        <button type="button" class="btn btn-primary">Save changes</button>
+                        <button type="button" class="btn btn-primary save">Save changes</button>
                     </div>
                 </div>
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.link">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Link to:</t>
+            <form>
+                <ul class="list-group form-group">
+                    <li class="list-group-item active">
+                        <h3 class="list-group-item-heading">Page on your website</h3>
+                        <select class="form-control pages url-source"/>
+                    </li>
+                    <li class="list-group-item">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
+                        <h3 class="list-group-item-heading">Website URL</h3>
+                        <input type="text" class="form-control url url-source"
+                               placeholder="http://openerp.com"/>
+                    </li>
+                    <li class="list-group-item">
+                        <h3 class="list-group-item-heading">Email Address</h3>
+                        <input type="email" class="form-control email-address url-source"
+                               placeholder="you@yourwebsite.com"/>
+                    </li>
+                </ul>
+            </form>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Image:</t>
+            <form method="POST" action="/website/attach"
+                  enctype="multipart/form-data"
+                  target="fileframe">
+                <div class="well">
+                    <!-- a href="#" class="pull-left">Find image</a -->
+                    <h3 class="list-group-item-heading">Image URL</h3>
+                    <input type="text" class="form-control url"
+                           placeholder="http://openerp.com"/>
+                </div>
+                <div class="text-center">
+                    <p class="">— or —</p>
+                    <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                    <button type="button" class="btn btn-primary btn-lg filepicker">
+                        Upload an image from your computer
+                    </button>
+                </div>
+                <input type="hidden" name="func"/>
+            </form>
+            <iframe src="about:blank" name="fileframe" class="hidden"/>
+        </t>
+    </t>
 </templates>
-- 
cgit v1.2.3


From c5fa23bffa8ccbc3db6a88be822c4f9209701ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= <fva@openerp.com>
Date: Mon, 2 Sep 2013 11:10:05 +0200
Subject: [IMP] website editor: allow click trough on snippet manipulators

bzr revid: fva@openerp.com-20130902091005-pnhb05fxk29z5q0r
---
 addons/website/static/src/xml/website.xml | 4 ++++
 1 file changed, 4 insertions(+)

(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 37a3bc453f3..ab2f622429c 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -69,6 +69,10 @@
 
     <t t-name="website.snippet_manipulator">
         <div class='oe_snippet_manipulator'>
+            <div class='oe_buttons'>
+                <i class='icon-move oe_icon js_move'></i>
+                <i class='icon-remove oe_icon js_remove'></i>
+            </div>
             <div class='oe_handle n'></div>
             <div class='oe_handle ne'></div>
             <div class='oe_handle e'></div>
-- 
cgit v1.2.3


From f50b273ae12493e227806670d9a866b6be162551 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 11:37:55 +0200
Subject: SEO dialog (without save)

bzr revid: ddm@openerp.com-20130902093755-05wins912upe47qj
---
 addons/website/static/src/xml/website.xml | 40 ++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 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 2a75a0d89c7..94b85182eaa 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -69,9 +69,17 @@
                         <div class="js_seo_tips" />
                         <section>
                             <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <dl class="dl-horizontal">
+                                <dt>Suggestions</dt>
+                                <dd>
+                                    <ul class="list-inline js_seo_company_suggestions">
+                                        <!-- filled in JS -->
+                                    </ul>
+                                </dd>
+                            </dl>
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
-                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Keyword</label>
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
                                     <div class="col-lg-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
@@ -82,9 +90,14 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="container oe_seo_keywords_list js_seo_keywords_list">
-                                <!-- filled in JS -->
-                            </div>
+                            <dl class="dl-horizontal oe_seo_keywords_list">
+                                <dt>Current selection</dt>
+                                <dd>
+                                    <ul class="list-inline js_seo_keywords_list">
+                                        <!-- filled in JS -->
+                                    </ul>
+                                </dd>
+                            </dl>
                         </section>
                         <section>
                             <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
@@ -121,10 +134,21 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <div class="oe_seo_keyword">
-            <a href="#" class="oe_remove" data-action="remove-keyword"><i class="icon-trash"/></a>
-            <span class="label label-default js_seo_keyword"><t t-raw="widget.keyword"/></span>
-        </div>
+        <li class="oe_seo_keyword">
+            <span t-attf-class="label label-default js_seo_keyword">
+                <t t-raw="widget.keyword"/>
+                &amp;nbsp;
+                <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
+            </span>
+        </li>
+    </t>
+
+    <t t-name="website.seo_suggestion">
+        <li class="oe_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
+                <t t-raw="widget.keyword"/>
+            </span>
+        </li>
     </t>
 
     <t t-name="website.carousel">
-- 
cgit v1.2.3


From efc408e3bf8e9087fe3f5d6b4930bd6f53636ef8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 12:26:21 +0200
Subject: SEO keywords improvement

bzr revid: ddm@openerp.com-20130902102621-fd02b3mzkd3fm6wv
---
 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 94b85182eaa..9d474781e9e 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -135,7 +135,7 @@
 
     <t t-name="website.seo_keyword">
         <li class="oe_seo_keyword">
-            <span t-attf-class="label label-default js_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_keyword">
                 <t t-raw="widget.keyword"/>
                 &amp;nbsp;
                 <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
-- 
cgit v1.2.3


From f0021c5cc5b9b0be991a340379683e400cb9e399 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 12:29:39 +0200
Subject: SEO keyword bugfix

bzr revid: ddm@openerp.com-20130902102939-mkpf08al9p3tibpp
---
 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 9d474781e9e..2360a17b552 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -135,7 +135,7 @@
 
     <t t-name="website.seo_keyword">
         <li class="oe_seo_keyword">
-            <span t-attf-class="label label-#{ widget.type } js_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
                 <t t-raw="widget.keyword"/>
                 &amp;nbsp;
                 <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
-- 
cgit v1.2.3


From ba2076f400dee422d7a2ea78a0dee94319efc821 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 13:15:51 +0200
Subject: [FIX] correctly set @type of non-submit buttons to button

because of fix to $raw_editables links disabler, buttons which were
(apparently) previously cancelDefault-ed now are not, and blow up
various things when used.

bzr revid: xmo@openerp.com-20130902111551-ryldrw8kebz98u1w
---
 addons/website/static/src/xml/website.editor.xml | 8 +++++---
 addons/website/static/src/xml/website.xml        | 3 ++-
 2 files changed, 7 insertions(+), 4 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 25005cc4e0e..b1258a91873 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -3,11 +3,13 @@
         <t t-jquery="#website-top-view" t-operation="after">
             <div class="navbar-inner" id="website-top-edit">
                 <form class="navbar-form pull-left">
-                    <button data-action="save" class="btn btn-primary">Save</button>
-                    <button data-action="cancel" class="btn">Cancel</button>
+                    <button type="button" data-action="save"
+                            class="btn btn-primary">Save</button>
+                    <button type="button" data-action="cancel"
+                            class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
-                    <li class="navbar-form"><button data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
+                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
                 </ul>
             </div>
         </t>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index f550f8cb372..47ddb2fd8d1 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -14,7 +14,8 @@
                         <span class="icon-bar"></span>
                     </button>
                     <form class="navbar-form navbar-left">
-                        <button data-action="edit" class="btn btn-primary">Edit</button>
+                        <button type="button" data-action="edit"
+                                class="btn btn-primary">Edit</button>
                     </form>
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
-- 
cgit v1.2.3


From e44332e5f7a50302cb1698a3ba8395d242e4d11b Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 15:39:23 +0200
Subject: SEO bugfixes

bzr revid: ddm@openerp.com-20130902133923-hhzfe0gv4t6usd22
---
 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 a151f9ecb7e..04b116b787d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -145,7 +145,7 @@
     </t>
 
     <t t-name="website.seo_suggestion">
-        <li class="oe_seo_keyword">
+        <li class="oe_seo_suggestion">
             <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
                 <t t-raw="widget.keyword"/>
             </span>
-- 
cgit v1.2.3


From f77b9c7bd6f4bc4e64c94cc9914fe2b798cc3497 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 17:06:29 +0200
Subject: SEO image thumbnails

bzr revid: ddm@openerp.com-20130902150629-g3x9o9bi6ptsx7zf
---
 addons/website/static/src/xml/website.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(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 04b116b787d..866da125a40 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -117,6 +117,12 @@
                                 </div>
                             </div>
                         </section>
+                        <section>
+                            <h3 class="page-header">3. Describe your images</h3>
+                            <div class="row js_seo_images">
+                                  <!-- filled in JS -->
+                            </div>
+                        </section>
                         <hr/>
                         <section>
                             <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
@@ -152,6 +158,13 @@
         </li>
     </t>
 
+    <t t-name="website.seo_image">
+        <div class="col-sm-6 col-md-3 oe_seo_image_preview">
+            <img t-att-src="widget.src" class="img-rounded thumbnail"/>
+            <input type="text" class="form-control" t-attf-placeholder="#{widget.alt or 'Description...'}"/>
+        </div>
+    </t>
+
     <t t-name="website.carousel">
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
             <div class='container'>
-- 
cgit v1.2.3


From fec90fd7891038ecbea61be58a19527a959d549e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 2 Sep 2013 17:17:49 +0200
Subject: SEO bugfix

bzr revid: ddm@openerp.com-20130902151749-o9wxc67sdgql8zh8
---
 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 866da125a40..bc853b4cadf 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -161,7 +161,7 @@
     <t t-name="website.seo_image">
         <div class="col-sm-6 col-md-3 oe_seo_image_preview">
             <img t-att-src="widget.src" class="img-rounded thumbnail"/>
-            <input type="text" class="form-control" t-attf-placeholder="#{widget.alt or 'Description...'}"/>
+            <input type="text" class="form-control" t-att-value="widget.alt" placeholder="Description..."/>
         </div>
     </t>
 
-- 
cgit v1.2.3


From b11dc9d3dacbf35ef021e043b189d6593e0fefdb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 2 Sep 2013 18:51:23 +0200
Subject: [IMP] small changes bootstrap style

bzr revid: fp@tinyerp.com-20130902165123-e2246x1la28xy1ei
---
 addons/website/static/src/xml/website.editor.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 b1258a91873..bd8f632a329 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -20,12 +20,12 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-                        <h3><t t-esc="title"/></h3>
+                        <h3 class="modal-title"><t t-esc="title"/></h3>
                     </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">Close</button>
-                        <button type="button" class="btn btn-primary save">Save changes</button>
+                        <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Discard</button>
+                        <button type="button" class="btn btn-primary save">Save Changes</button>
                     </div>
                 </div>
             </div>
@@ -33,7 +33,7 @@
     </t>
     <t t-name="website.editor.dialog.link">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Link to:</t>
+            <t t-set="title">Link to</t>
             <form>
                 <ul class="list-group form-group">
                     <li class="list-group-item active">
@@ -62,7 +62,7 @@
     </t>
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Image:</t>
+            <t t-set="title">Image</t>
             <form method="POST" action="/website/attach"
                   enctype="multipart/form-data"
                   target="fileframe">
-- 
cgit v1.2.3


From cf9ab25816b47a2e501f5cb4b155441c45212ab2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 2 Sep 2013 15:49:20 +0200
Subject: [ADD] image preview to dialog

bzr revid: xmo@openerp.com-20130902134920-um72bldsv19mf5ij
---
 addons/website/static/src/xml/website.editor.xml | 44 ++++++++++++++----------
 1 file changed, 26 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 bd8f632a329..8dee9aa9c65 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -62,25 +62,33 @@
     </t>
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
-            <t t-set="title">Image</t>
-            <form method="POST" action="/website/attach"
-                  enctype="multipart/form-data"
-                  target="fileframe">
-                <div class="well">
-                    <!-- a href="#" class="pull-left">Find image</a -->
-                    <h3 class="list-group-item-heading">Image URL</h3>
-                    <input type="text" class="form-control url"
-                           placeholder="http://openerp.com"/>
-                </div>
-                <div class="text-center">
-                    <p class="">— or —</p>
-                    <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                    <button type="button" class="btn btn-primary btn-lg filepicker">
-                        Upload an image from your computer
-                    </button>
+            <t t-set="title">Image:</t>
+            <div class="row">
+                <form method="POST" action="/website/attach"
+                      enctype="multipart/form-data"
+                      target="fileframe"
+                      class="col-sm-8">
+                    <div class="well">
+                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <h3 class="list-group-item-heading">Image URL</h3>
+                        <input type="text" class="form-control url"
+                               placeholder="http://openerp.com"/>
+                    </div>
+                    <div class="text-center">
+                        <p class="">— or —</p>
+                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary btn-lg filepicker">
+                            Upload an image from your computer
+                        </button>
+                    </div>
+                    <input type="hidden" name="func"/>
+                </form>
+                <div class="col-sm-4">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                         class="pull-right img-rounded"
+                         width="100%"/>
                 </div>
-                <input type="hidden" name="func"/>
-            </form>
+            </div>
             <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
-- 
cgit v1.2.3


From c89d31ca95ab311d720b4754b624bd887d77016d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 3 Sep 2013 16:32:37 +0200
Subject: [ADD] creation of new page from link dialog

* Replace select by input with dropdown

* Add random crap to /pagenew so it does not blow up when a butterfly
  flaps its wings, also so it's possible to call it through xhr and
  get something out of it

* Fix duplicated save() call in link dialog widget thing

bzr revid: xmo@openerp.com-20130903143237-6pwsbqzc02bv3mri
---
 addons/website/static/src/xml/website.editor.xml | 9 ++++++++-
 1 file changed, 8 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 8dee9aa9c65..4dd6a958949 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -38,7 +38,14 @@
                 <ul class="list-group form-group">
                     <li class="list-group-item active">
                         <h3 class="list-group-item-heading">Page on your website</h3>
-                        <select class="form-control pages url-source"/>
+                        <div class="input-group">
+                            <input type="text" class="form-control pages url-source"
+                                    placeholder="Create new page"/>
+                            <div class="input-group-btn existing dropdown">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
+                                <ul class="dropdown-menu pull-right"/>
+                            </div>
+                        </div>
                     </li>
                     <li class="list-group-item">
                         <div class="pull-right">
-- 
cgit v1.2.3


From a2c9bdaaed03750eb0581ff19bad132fb5133961 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 3 Sep 2013 17:41:44 +0200
Subject: SEO rerefactor

bzr revid: ddm@openerp.com-20130903154144-8li4zo4q3z6isyoq
---
 addons/website/static/src/xml/website.xml | 12 ++++++++----
 1 file changed, 8 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 bc853b4cadf..2f5fdf711fe 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -93,10 +93,8 @@
                             </div>
                             <dl class="dl-horizontal oe_seo_keywords_list">
                                 <dt>Current selection</dt>
-                                <dd>
-                                    <ul class="list-inline js_seo_keywords_list">
-                                        <!-- filled in JS -->
-                                    </ul>
+                                <dd class="js_seo_keywords_list">
+                                    <!-- filled in JS -->
                                 </dd>
                             </dl>
                         </section>
@@ -150,6 +148,12 @@
         </li>
     </t>
 
+    <t t-name="website.seo_keyword_list">
+        <ul class="list-inline">
+            <!-- filled in JS -->
+        </ul>
+    </t>
+
     <t t-name="website.seo_suggestion">
         <li class="oe_seo_suggestion">
             <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
-- 
cgit v1.2.3


From 4ed648c0c0bdc0e6fc60ff602af097c0e2b8b5f9 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 4 Sep 2013 06:07:00 +0200
Subject: SEO code cleanup

bzr revid: ddm@openerp.com-20130904040700-3fctlb1u5k3k1lhy
---
 addons/website/static/src/xml/website.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 2f5fdf711fe..dcf8294feaf 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -117,7 +117,7 @@
                         </section>
                         <section>
                             <h3 class="page-header">3. Describe your images</h3>
-                            <div class="row js_seo_images">
+                            <div class="row js_seo_image_list">
                                   <!-- filled in JS -->
                             </div>
                         </section>
@@ -131,6 +131,12 @@
         </div>
     </t>
 
+    <t t-name="website.seo_list">
+        <ul class="list-inline">
+            <!-- filled in JS -->
+        </ul>
+    </t>
+
     <t t-name="website.seo_tip">
         <div t-attf-class="alert alert-#{widget.type}">
               <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
@@ -148,12 +154,6 @@
         </li>
     </t>
 
-    <t t-name="website.seo_keyword_list">
-        <ul class="list-inline">
-            <!-- filled in JS -->
-        </ul>
-    </t>
-
     <t t-name="website.seo_suggestion">
         <li class="oe_seo_suggestion">
             <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
@@ -165,7 +165,7 @@
     <t t-name="website.seo_image">
         <div class="col-sm-6 col-md-3 oe_seo_image_preview">
             <img t-att-src="widget.src" class="img-rounded thumbnail"/>
-            <input type="text" class="form-control" t-att-value="widget.alt" placeholder="Description..."/>
+            <input type="text" class="form-control" t-att-src="widget.src" t-att-value="widget.alt" placeholder="Description..."/>
         </div>
     </t>
 
-- 
cgit v1.2.3


From 4932521377aa38891617c3bd4add15473b996a0c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 4 Sep 2013 13:32:22 +0200
Subject: [ADD] selection of existing image in image dialog

bzr revid: xmo@openerp.com-20130904113222-xync5o48nwngvtj4
---
 addons/website/static/src/xml/website.editor.xml | 19 ++++++++++++++++++-
 1 file changed, 18 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 4dd6a958949..927ad3df66e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -88,15 +88,32 @@
                             Upload an image from your computer
                         </button>
                     </div>
+                    <p class="text-center">— or —</p>
+                    <div class="well">
+                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
+                        <div class="existing-attachments"/>
+                    </div>
                     <input type="hidden" name="func"/>
                 </form>
                 <div class="col-sm-4">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded"
+                         class="pull-right img-rounded image-preview"
                          width="100%"/>
                 </div>
             </div>
             <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
+    <t t-name="website.editor.dialog.image.existing">
+        <div class="existing-attachments">
+            <div class="row" t-foreach="rows" t-as="row">
+                <div class="col-md-4" t-foreach="row" t-as="attachment">
+                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
+                    <a t-att-href="url" class="thumbnail">
+                        <img t-att-src="url" t-att-alt="attachment.name"/>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </t>
 </templates>
-- 
cgit v1.2.3


From 20e0db456f005faf165e5dfa44bfb0f567e7e44e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 4 Sep 2013 16:01:38 +0200
Subject: [IMP] wwebsite: add option background and style in snippets carousel

bzr revid: chm@openerp.com-20130904140138-tvt640suoiln13fx
---
 addons/website/static/src/xml/website.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 dcf8294feaf..a50f8c5ab2b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -172,8 +172,11 @@
     <t t-name="website.carousel">
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
             <div class='container'>
-                <h1 class='mt64'>Your New Banner Slide</h1>
-                <h2>With another convincing subtitle</h2>
+                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                    <h1>Your New Banner Slide</h1>
+                    <h3>With another convincing subtitle</h3>
+                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                </div>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From 98a0b8c2f80272cca9ea45f2ba8bcb598a15fc47 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 5 Sep 2013 11:20:38 +0200
Subject: SEO move templates to website.seo.xml

bzr revid: ddm@openerp.com-20130905092038-a0ao4dxhjz902lqg
---
 addons/website/static/src/xml/website.seo.xml | 115 ++++++++++++++++++++++++++
 addons/website/static/src/xml/website.xml     | 112 -------------------------
 2 files changed, 115 insertions(+), 112 deletions(-)
 create mode 100644 addons/website/static/src/xml/website.seo.xml

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
new file mode 100644
index 00000000000..ed65e318440
--- /dev/null
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="website.seo_configuration">
+        <div class="modal fade oe_seo_configuration" 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">Promote <small class="js_seo_page_url"></small></h2>
+                        <h4>Get your page efficiently referenced in Google to attract more visitors.</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="js_seo_tips" />
+                        <section>
+                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <dl class="dl-horizontal">
+                                <dt>Suggestions</dt>
+                                <dd>
+                                    <ul class="list-inline js_seo_company_suggestions">
+                                        <!-- filled in JS -->
+                                    </ul>
+                                </dd>
+                            </dl>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
+                                    <div class="col-lg-4">
+                                        <div class="input-group">
+                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
+                                          <span class="input-group-btn">
+                                              <button data-action="add" class="btn btn-default" type="button">Add</button>
+                                          </span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <dl class="dl-horizontal oe_seo_keywords_list">
+                                <dt>Current selection</dt>
+                                <dd class="js_seo_keywords_list">
+                                    <!-- filled in JS -->
+                                </dd>
+                            </dl>
+                        </section>
+                        <section>
+                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
+                            <div class="form-horizontal" role="form">
+                                <div class="form-group">
+                                    <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
+                                    <div class="col-lg-8">
+                                        <input type="text" name="seo_page_title" class="form-control" maxlength="70" size="70"/>
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="seo_page_description" class="col-lg-2 control-label">Description</label>
+                                    <div class="col-lg-8">
+                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" size="160"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </section>
+                        <section>
+                            <h3 class="page-header">3. Describe your images</h3>
+                            <div class="row js_seo_image_list">
+                                  <!-- filled in JS -->
+                            </div>
+                        </section>
+                        <hr/>
+                        <section>
+                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
+                        </section>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.seo_list">
+        <ul class="list-inline">
+            <!-- filled in JS -->
+        </ul>
+    </t>
+
+    <t t-name="website.seo_tip">
+        <div t-attf-class="alert alert-#{widget.type}">
+              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
+              <t t-raw="widget.message"/>
+        </div>
+    </t>
+
+    <t t-name="website.seo_keyword">
+        <li class="oe_seo_keyword">
+            <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
+                <t t-raw="widget.keyword"/>
+                &amp;nbsp;
+                <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
+            </span>
+        </li>
+    </t>
+
+    <t t-name="website.seo_suggestion">
+        <li class="oe_seo_suggestion">
+            <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
+                <t t-raw="widget.keyword"/>
+            </span>
+        </li>
+    </t>
+
+    <t t-name="website.seo_image">
+        <div class="col-sm-6 col-md-3 oe_seo_image_preview">
+            <img t-att-src="widget.src" class="img-rounded thumbnail"/>
+            <input type="text" class="form-control" t-att-src="widget.src" t-att-value="widget.alt" placeholder="Description..."/>
+        </div>
+    </t>
+
+</templates>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index a50f8c5ab2b..5b5018e1b37 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,118 +57,6 @@
         </div>
     </t>
 
-    <t t-name="website.seo_configuration">
-        <div class="modal fade oe_seo_configuration" 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">Promote <small class="js_seo_page_url"></small></h2>
-                        <h4>Get your page efficiently referenced in Google to attract more visitors.</h4>
-                    </div>
-                    <div class="modal-body">
-                        <div class="js_seo_tips" />
-                        <section>
-                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
-                            <dl class="dl-horizontal">
-                                <dt>Suggestions</dt>
-                                <dd>
-                                    <ul class="list-inline js_seo_company_suggestions">
-                                        <!-- filled in JS -->
-                                    </ul>
-                                </dd>
-                            </dl>
-                            <div class="form-horizontal" role="form">
-                                <div class="form-group">
-                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
-                                    <div class="col-lg-4">
-                                        <div class="input-group">
-                                          <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
-                                          <span class="input-group-btn">
-                                              <button data-action="add" class="btn btn-default" type="button">Add</button>
-                                          </span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <dl class="dl-horizontal oe_seo_keywords_list">
-                                <dt>Current selection</dt>
-                                <dd class="js_seo_keywords_list">
-                                    <!-- filled in JS -->
-                                </dd>
-                            </dl>
-                        </section>
-                        <section>
-                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
-                            <div class="form-horizontal" role="form">
-                                <div class="form-group">
-                                    <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
-                                    <div class="col-lg-8">
-                                        <input type="text" name="seo_page_title" class="form-control" maxlength="70" size="70"/>
-                                    </div>
-                                </div>
-                                <div class="form-group">
-                                    <label for="seo_page_description" class="col-lg-2 control-label">Description</label>
-                                    <div class="col-lg-8">
-                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" size="160"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </section>
-                        <section>
-                            <h3 class="page-header">3. Describe your images</h3>
-                            <div class="row js_seo_image_list">
-                                  <!-- filled in JS -->
-                            </div>
-                        </section>
-                        <hr/>
-                        <section>
-                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
-                        </section>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.seo_list">
-        <ul class="list-inline">
-            <!-- filled in JS -->
-        </ul>
-    </t>
-
-    <t t-name="website.seo_tip">
-        <div t-attf-class="alert alert-#{widget.type}">
-              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
-              <t t-raw="widget.message"/>
-        </div>
-    </t>
-
-    <t t-name="website.seo_keyword">
-        <li class="oe_seo_keyword">
-            <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
-                <t t-raw="widget.keyword"/>
-                &amp;nbsp;
-                <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
-            </span>
-        </li>
-    </t>
-
-    <t t-name="website.seo_suggestion">
-        <li class="oe_seo_suggestion">
-            <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
-                <t t-raw="widget.keyword"/>
-            </span>
-        </li>
-    </t>
-
-    <t t-name="website.seo_image">
-        <div class="col-sm-6 col-md-3 oe_seo_image_preview">
-            <img t-att-src="widget.src" class="img-rounded thumbnail"/>
-            <input type="text" class="form-control" t-att-src="widget.src" t-att-value="widget.alt" placeholder="Description..."/>
-        </div>
-    </t>
-
     <t t-name="website.carousel">
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
             <div class='container'>
-- 
cgit v1.2.3


From e56953d94e71854ed57540743a6a00e6ceafe9ba Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 6 Sep 2013 10:50:45 +0200
Subject: [ADD] new table-creation button

bzr revid: xmo@openerp.com-20130906085045-zpemzy2akh3bz7q3
---
 addons/website/static/src/xml/website.editor.xml | 12 ++++++++++++
 1 file changed, 12 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 927ad3df66e..5b2673f16d1 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -116,4 +116,16 @@
             </div>
         </div>
     </t>
+    <t t-name="website.editor.table.panel">
+        <table class="editorbar-panel">
+            <tr t-foreach="rows"><td t-foreach="cols">&#8203;</td></tr>
+        </table>
+    </t>
+    <t t-name="website.editor.table">
+        <table class="table table-bordered table-responsive">
+            <tbody>
+                <tr t-foreach="rows"><td t-foreach="cols">&#8203;</td></tr>
+            </tbody>
+        </table>
+    </t>
 </templates>
-- 
cgit v1.2.3


From 4d1cc6a4ed499ddd8541fb37810a6728da66f9d1 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 6 Sep 2013 17:04:08 +0200
Subject: [WIP] website: snippets

bzr revid: chm@openerp.com-20130906150408-81qzb2492lwqf7lb
---
 addons/website/static/src/xml/website.snippets.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.snippets.xml

(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
new file mode 100644
index 00000000000..8665a1ce06e
--- /dev/null
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="website.snippets.EditorBar.carousel">
+        <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
+        <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
+        <select name="carousel-background">
+            <option value="">Chose an other background</option>
+            <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
+            <option value="/website/static/src/img/landscape.png">landscape</option>
+            <option value="/website/static/src/img/aqua.jpg">aqua</option>
+        </select>
+        <select name="carousel-style">
+            <option value="">Chose an other style</option>
+            <option value="no_image">No image</option>
+            <option value="image_left">Image left</option>
+            <option value="image_right">Image right</option>
+        </select>
+    </t>
+
+</templates>
-- 
cgit v1.2.3


From 62aafc07b1b7cfd83108bd854ea87997bbad1876 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 6 Sep 2013 18:00:06 +0200
Subject: [WIP] website: snippets, use template qweb js for snippets

bzr revid: chm@openerp.com-20130906160006-5gdgsv2jq8lz1voz
---
 addons/website/static/src/xml/website.snippets.xml | 107 ++++++++++++++++++++-
 1 file changed, 105 insertions(+), 2 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 8665a1ce06e..a32b2dc5191 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -5,17 +5,120 @@
         <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
         <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
         <select name="carousel-background">
-            <option value="">Chose an other background</option>
             <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
             <option value="/website/static/src/img/landscape.png">landscape</option>
             <option value="/website/static/src/img/aqua.jpg">aqua</option>
         </select>
         <select name="carousel-style">
-            <option value="">Chose an other style</option>
             <option value="no_image">No image</option>
             <option value="image_left">Image left</option>
             <option value="image_right">Image right</option>
         </select>
     </t>
 
+    <div t-name="website.snippets.Builder.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+        <div class='oe_snippet_thumbnail oe_label'>carousel</div>
+        <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="100000">
+            <!-- Carousel items -->
+            <div class="carousel-inner">
+                <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
+                    <div class="container">
+                        <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                            <h1>Create Awesome Websites</h1>
+                            <h3>Super easy, fully flexible</h3>
+                            <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!-- Carousel nav -->
+            <a class="carousel-control left" href="#myCarousel" data-slide="prev"></a>
+            <a class="carousel-control right" href="#myCarousel" data-slide="next"></a>
+        </div>
+    </div>
+
+    <div t-name="website.snippets.Builder.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+        <div class='oe_snippet_thumbnail oe_label'>Darken</div>
+    </div>
+
+    <div t-name="website.snippets.Builder.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+        <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
+    </div>
+
+    <div t-name="website.snippets.Builder.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
+        <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
+        <div class="oe_snippet_body container mt32"></div>
+    </div>
+
+    <div t-name="website.snippets.Builder.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
+        <div class='oe_snippet_thumbnail oe_label'>
+            Main Title
+        </div>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    <h1 class="mt64">Welcome To Your New Homepage,</h1>
+                    <h2 class="mt32 subheader">where <b><em>everything</em></b> can be customized </h2>
+                </div>
+            </div>
+        </section>
+    </div>
+
+    <div t-name="website.snippets.Builder.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-12 text-center">
+                    <h2 class="mt48">Ut enim ad minim veniam</h2>
+                </div>
+            </div>
+            <div class="row mt32">
+                <div class="col-md-4">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
+                    <h4 class="mt16">Cillum Dolore</h4>
+                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                </div>
+                <div class="col-md-4">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg"/>
+                    <h4 class="mt16">Mollit Anim</h4>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>
+                </div>
+                <div class="col-md-4">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg"/>
+                    <h4 class="mt16">Nemo Enim Ipsam</h4>
+                    <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
+                        doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
+                        veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim
+                        ipsam voluptatem quia voluptas</p>
+                </div>
+            </div>
+        </section>
+    </div>
+
+    <div t-name="website.snippets.Builder.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
+        <section class="container oe_snippet_body">
+            <div class="row">
+                <div class="col-md-5">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+                </div>
+                <div class="col-md-6 col-lg-offset-1">
+                    <p class="mt16">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>
+                    <div class="text-center">
+                        <a href="http://www.openerp.com/start" class="btn btn-default mt16 btn-lg btn-primary">Call To  <em>Action</em></a>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
 </templates>
-- 
cgit v1.2.3


From 0b199c50e5ee2a85a4a4826b033fecc013bb0e70 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 15:28:00 +0200
Subject: [WIP] website: snippets: box snippet widget with resize options on
 click

bzr revid: chm@openerp.com-20130909132800-au0lgkf8thirsv8r
---
 addons/website/static/src/xml/website.snippets.xml | 90 +++++++++++++++++-----
 addons/website/static/src/xml/website.xml          | 34 --------
 2 files changed, 70 insertions(+), 54 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 a32b2dc5191..2e889c3357b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -1,23 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
 
-    <t t-name="website.snippets.EditorBar.carousel">
-        <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
-        <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
-        <select name="carousel-background">
-            <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
-            <option value="/website/static/src/img/landscape.png">landscape</option>
-            <option value="/website/static/src/img/aqua.jpg">aqua</option>
-        </select>
-        <select name="carousel-style">
-            <option value="no_image">No image</option>
-            <option value="image_left">Image left</option>
-            <option value="image_right">Image right</option>
-        </select>
+    <!-- Editor -->
+
+    <t t-name="website.snippets">
+        <div class='oe_snippets hide'>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'></div>
     </t>
 
-    <div t-name="website.snippets.Builder.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+    <!-- Snippets -->
+
+    <div t-name="website.snippets.box" data-snippet-id='box'>
+        
+        <!-- editor bar to display inside the top edit bar -->
+        <li class='oe_snippet_editorbar'>
+            <i class='icon-move oe_icon js_move'></i>
+            <i class='icon-remove oe_icon js_remove'></i>
+        </li>
+
+        <!-- custom data for the widget -->
+        <div class='oe_handles'>
+            <div class='oe_handle n'></div>
+            <div class='oe_handle ne'></div>
+            <div class='oe_handle e'></div>
+            <div class='oe_handle se'></div>
+            <div class='oe_handle s'></div>
+            <div class='oe_handle sw'></div>
+            <div class='oe_handle w'></div>
+            <div class='oe_handle nw'></div>
+        </div>
+    </div>
+
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+        
+        <!-- editor bar to display inside the top edit bar -->
+        <li class='oe_snippet_editorbar'>
+            <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
+            <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
+            <select name="carousel-background">
+                <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
+                <option value="/website/static/src/img/landscape.png">landscape</option>
+                <option value="/website/static/src/img/aqua.jpg">aqua</option>
+            </select>
+            <select name="carousel-style">
+                <option value="no_image">No image</option>
+                <option value="image_left">Image left</option>
+                <option value="image_right">Image right</option>
+            </select>
+        </li>
+
+        <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail oe_label'>carousel</div>
+
+        <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="100000">
             <!-- Carousel items -->
             <div class="carousel-inner">
@@ -35,22 +74,33 @@
             <a class="carousel-control left" href="#myCarousel" data-slide="prev"></a>
             <a class="carousel-control right" href="#myCarousel" data-slide="next"></a>
         </div>
+
+        <!-- custom data for the widget -->
+        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
+            <div class='container'>
+                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                    <h1>Your New Banner Slide</h1>
+                    <h3>With another convincing subtitle</h3>
+                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                </div>
+            </div>
+        </div>
     </div>
 
-    <div t-name="website.snippets.Builder.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.Builder.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+    <div t-name="website.snippets.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.Builder.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.Builder.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label'>
             Main Title
         </div>
@@ -64,7 +114,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.Builder.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
@@ -99,7 +149,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.Builder.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
         <section class="container oe_snippet_body">
             <div class="row">
                 <div class="col-md-5">
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 247b0e780fd..7ddd483a6fb 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -57,38 +57,4 @@
         </div>
     </t>
 
-    <t t-name="website.carousel">
-        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-            <div class='container'>
-                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
-                    <h1>Your New Banner Slide</h1>
-                    <h3>With another convincing subtitle</h3>
-                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
-                </div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippets">
-        <div class='oe_snippets hide'>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_manipulator">
-        <div class='oe_snippet_manipulator'>
-            <div class='oe_buttons'>
-                <i class='icon-move oe_icon js_move'></i>
-                <i class='icon-remove oe_icon js_remove'></i>
-            </div>
-            <div class='oe_handle n'></div>
-            <div class='oe_handle ne'></div>
-            <div class='oe_handle e'></div>
-            <div class='oe_handle se'></div>
-            <div class='oe_handle s'></div>
-            <div class='oe_handle sw'></div>
-            <div class='oe_handle w'></div>
-            <div class='oe_handle nw'></div>
-        </div>
-    </t>
-
 </templates>
-- 
cgit v1.2.3


From 7bcc4f4d1dcaa245ff23cefb9a3e4acbeadfd72a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 16:49:40 +0200
Subject: [WIP] website: snippets: work

bzr revid: chm@openerp.com-20130909144940-f08v6egk5pijz29b
---
 addons/website/static/src/xml/website.snippets.xml | 8 +++++---
 1 file changed, 5 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 2e889c3357b..e24b9fdfdf4 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -17,13 +17,15 @@
     <div t-name="website.snippets.box" data-snippet-id='box'>
         
         <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_editorbar'>
-            <i class='icon-move oe_icon js_move'></i>
-            <i class='icon-remove oe_icon js_remove'></i>
+        <li class='oe_snippet_editorbar box_resize'>
+            <a href="#" class="button js_box_move"><i class='icon icon-move'></i></a>
+            <a href="#" class="button js_box_remove"><i class="icon icon-remove"></i></a>
         </li>
 
         <!-- custom data for the widget -->
         <div class='oe_handles'>
+            <div class='oe_boxsize'></div>
+            <div class='oe_margin'></div>
             <div class='oe_handle n'></div>
             <div class='oe_handle ne'></div>
             <div class='oe_handle e'></div>
-- 
cgit v1.2.3


From 889309d4c94934ad9f2a5535fce0af923b26fdf5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 17:03:19 +0200
Subject: [WIP] website: snippets: work

bzr revid: chm@openerp.com-20130909150319-x0vkucc9eci7vr18
---
 addons/website/static/src/xml/website.snippets.xml | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 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 e24b9fdfdf4..406212fa78e 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -24,16 +24,17 @@
 
         <!-- custom data for the widget -->
         <div class='oe_handles'>
-            <div class='oe_boxsize'></div>
+            <div class='oe_boxsize'>
+                <div class='oe_handle n'></div>
+                <div class='oe_handle ne'></div>
+                <div class='oe_handle e'></div>
+                <div class='oe_handle se'></div>
+                <div class='oe_handle s'></div>
+                <div class='oe_handle sw'></div>
+                <div class='oe_handle w'></div>
+                <div class='oe_handle nw'></div>
+            </div>
             <div class='oe_margin'></div>
-            <div class='oe_handle n'></div>
-            <div class='oe_handle ne'></div>
-            <div class='oe_handle e'></div>
-            <div class='oe_handle se'></div>
-            <div class='oe_handle s'></div>
-            <div class='oe_handle sw'></div>
-            <div class='oe_handle w'></div>
-            <div class='oe_handle nw'></div>
         </div>
     </div>
 
@@ -79,7 +80,7 @@
 
         <!-- custom data for the widget -->
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-            <div class='container'>
+            <div class='container' data-snippet-id="container">
                 <div class="content" style="padding-top: 90px; padding-bottom:45px;">
                     <h1>Your New Banner Slide</h1>
                     <h3>With another convincing subtitle</h3>
-- 
cgit v1.2.3


From 819eb62490ca4db08d7e787e7de4bfd8f8c7b2f6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 9 Sep 2013 17:32:51 +0200
Subject: [WIP] website: snippets: work carousel insert and vomify

bzr revid: chm@openerp.com-20130909153251-9ixd50vy4ulyecgq
---
 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 406212fa78e..41b955cffbf 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -64,7 +64,7 @@
             <!-- Carousel items -->
             <div class="carousel-inner">
                 <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
-                    <div class="container">
+                    <div class="container" data-snippet-id="container">
                         <div class="content" style="padding-top: 90px; padding-bottom:45px;">
                             <h1>Create Awesome Websites</h1>
                             <h3>Super easy, fully flexible</h3>
@@ -90,11 +90,11 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.darken'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='surprise' data-action='mutate' data-selector='#wrap .container' data-action-function='openerp.website.mutations.vomify'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-action='mutate' data-selector='#wrap .container'>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-- 
cgit v1.2.3


From 7c45e5976e6caf3d7b9eb508f728062704232261 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 9 Sep 2013 23:46:26 +0200
Subject: CMS basic view editing

bzr revid: ddm@openerp.com-20130909214626-51zfydwbw624heqz
---
 addons/website/static/src/xml/website.ace.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.ace.xml

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

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
new file mode 100644
index 00000000000..77cb1243b25
--- /dev/null
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="website.ace_view_editor">
+        <div class="oe_ace_view_editor">
+            <div class="oe_ace_view_editor_title">
+                <button type="button" class="btn btn-default btn-small">Close</button>
+                <button data-action="save-view" type="button" class="btn btn-default btn-small">Save</button>
+                <select id="ace-view-list">
+                    <!-- filled in JS -->
+                </select>
+            </div>
+            <div id="ace-view-editor"/>
+        </div>
+    </t>
+    <t t-name="website.ace_view_option">
+        <option t-att-value="widget.view_id"><t t-esc="widget.view_name"/></option>
+    </t>
+</templates>
\ No newline at end of file
-- 
cgit v1.2.3


From d37594fab32e7df0e210a890250d29468969d42a Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:39:38 +0200
Subject: [FIX] View save now working

bzr revid: ddm@openerp.com-20130910063938-yh6tje9h5y9i0ld6
---
 addons/website/static/src/xml/website.ace.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 77cb1243b25..bdb27a10b3e 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -2,12 +2,12 @@
 <templates id="template" xml:space="preserve">
     <t t-name="website.ace_view_editor">
         <div class="oe_ace_view_editor">
-            <div class="oe_ace_view_editor_title">
-                <button type="button" class="btn btn-default btn-small">Close</button>
-                <button data-action="save-view" type="button" class="btn btn-default btn-small">Save</button>
-                <select id="ace-view-list">
+            <div class="form-inline oe_ace_view_editor_title">
+                <select id="ace-view-list" class="form-control oe_view_list">
                     <!-- filled in JS -->
                 </select>
+                <button data-action="save" type="submit" class="btn btn-success">Save</button>
+                <button data-action="close" type="button" class="btn btn-info pull-right">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From b230cc89af561795afee6563229a7fedd329ad4d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 08:51:13 +0200
Subject: [FIX] Floating button

bzr revid: ddm@openerp.com-20130910065113-uqiltvbays6xpm34
---
 addons/website/static/src/xml/website.ace.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.ace.xml b/addons/website/static/src/xml/website.ace.xml
index bdb27a10b3e..5ead2c849b5 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -7,7 +7,7 @@
                     <!-- filled in JS -->
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
-                <button data-action="close" type="button" class="btn btn-info pull-right">Close</button>
+                <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From 9b1b1f3de014e70964b729c09424c136a8485e15 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 09:07:18 +0200
Subject: [FIX] Slide in

bzr revid: ddm@openerp.com-20130910070718-0x541xioj1udwxnt
---
 addons/website/static/src/xml/website.ace.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.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 5ead2c849b5..0343ebc3e3c 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="website.ace_view_editor">
-        <div class="oe_ace_view_editor">
+        <div class="oe_ace_view_editor oe_ace_closed">
             <div class="form-inline oe_ace_view_editor_title">
                 <select id="ace-view-list" class="form-control oe_view_list">
                     <!-- filled in JS -->
-- 
cgit v1.2.3


From 95a9983f666a1f8e8da4cb57ec82db6acddd7e3e Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 10 Sep 2013 17:12:49 +0200
Subject: [IMP] XML autoformat

bzr revid: ddm@openerp.com-20130910151249-vxn5vm0dewytngzn
---
 addons/website/static/src/xml/website.ace.xml | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/addons/website/static/src/xml/website.ace.xml b/addons/website/static/src/xml/website.ace.xml
index 0343ebc3e3c..b546d41a7ec 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -7,6 +7,7 @@
                     <!-- filled in JS -->
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
+                <button data-action="format" type="button" class="btn btn-warning">Format</button>
                 <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
-- 
cgit v1.2.3


From b3898c8d234564da5813c6e8007613d42704d8fc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Sep 2013 14:56:32 +0200
Subject: [IMP] website: snippet editor and building block

bzr revid: chm@openerp.com-20130911125632-ekcxa8b4lu5ml4eq
---
 addons/website/static/src/xml/website.snippets.xml | 49 ++++++++++------------
 1 file changed, 21 insertions(+), 28 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 41b955cffbf..3fc1bdb20c8 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -4,7 +4,7 @@
     <!-- Editor -->
 
     <t t-name="website.snippets">
-        <div class='oe_snippets hide'>
+        <div id='oe_snippets' class='hide'>
         </div>
     </t>
 
@@ -14,34 +14,27 @@
 
     <!-- Snippets -->
 
-    <div t-name="website.snippets.box" data-snippet-id='box'>
+    <div t-name="website.snippets.container" data-snippet-id='container'>
         
         <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_editorbar box_resize'>
+        <li class='oe_snippet_options box_resize'>
             <a href="#" class="button js_box_move"><i class='icon icon-move'></i></a>
             <a href="#" class="button js_box_remove"><i class="icon icon-remove"></i></a>
         </li>
 
         <!-- custom data for the widget -->
         <div class='oe_handles'>
-            <div class='oe_boxsize'>
-                <div class='oe_handle n'></div>
-                <div class='oe_handle ne'></div>
-                <div class='oe_handle e'></div>
-                <div class='oe_handle se'></div>
-                <div class='oe_handle s'></div>
-                <div class='oe_handle sw'></div>
-                <div class='oe_handle w'></div>
-                <div class='oe_handle nw'></div>
-            </div>
-            <div class='oe_margin'></div>
+            <div class='oe_handle n'></div>
+            <div class='oe_handle e'></div>
+            <div class='oe_handle w'></div>
+            <div class='oe_handle s'></div>
         </div>
     </div>
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='.container'>
         
         <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_editorbar'>
+        <li class='oe_snippet_options'>
             <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
             <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
             <select name="carousel-background">
@@ -60,11 +53,11 @@
         <div class='oe_snippet_thumbnail oe_label'>carousel</div>
 
         <!-- body to insert after drag and drop thumbnail -->
-        <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="100000">
+        <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
                 <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
-                    <div class="container" data-snippet-id="container">
+                    <div class="container">
                         <div class="content" style="padding-top: 90px; padding-bottom:45px;">
                             <h1>Create Awesome Websites</h1>
                             <h3>Super easy, fully flexible</h3>
@@ -80,7 +73,7 @@
 
         <!-- custom data for the widget -->
         <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-            <div class='container' data-snippet-id="container">
+            <div class='container'>
                 <div class="content" style="padding-top: 90px; padding-bottom:45px;">
                     <h1>Your New Banner Slide</h1>
                     <h3>With another convincing subtitle</h3>
@@ -90,23 +83,21 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='#wrap .container'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-action='mutate' data-selector='#wrap .container'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-action='mutate' data-selector='.container'>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-action='insert' data-selector-siblings='#wrap .container'>
-        <div class='oe_snippet_thumbnail oe_label'>
-            Main Title
-        </div>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-action='insert' data-selector-siblings='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Main Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
@@ -117,7 +108,8 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
@@ -152,7 +144,8 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='#wrap .container'>
+    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>header-block</div>
         <section class="container oe_snippet_body">
             <div class="row">
                 <div class="col-md-5">
-- 
cgit v1.2.3


From 134c0899541f036d38885c76771c4a55650a4a5d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 15:26:18 +0200
Subject: [FIX] Proper template filtering + various

bzr revid: ddm@openerp.com-20130911132618-9n599qmiyj3k934p
---
 addons/website/static/src/xml/website.ace.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.ace.xml b/addons/website/static/src/xml/website.ace.xml
index b546d41a7ec..cda74164a28 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -8,7 +8,7 @@
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
                 <button data-action="format" type="button" class="btn btn-warning">Format</button>
-                <button data-action="close" type="button" class="btn btn-info">Close</button>
+                <button data-action="close" type="button" class="btn btn-info pull-right" style="display:none">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From 541c1bc95012fccc5e5cd6c5fe63553ea6a7df80 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Sep 2013 15:37:25 +0200
Subject: [FIX] website: editor snippet click to active

bzr revid: chm@openerp.com-20130911133725-6ivh2n5wq1ib0a31
---
 addons/website/static/src/xml/website.snippets.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 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 3fc1bdb20c8..69a40e9173e 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -17,8 +17,10 @@
     <div t-name="website.snippets.container" data-snippet-id='container'>
         
         <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_options box_resize'>
+        <li class='oe_snippet_options'>
             <a href="#" class="button js_box_move"><i class='icon icon-move'></i></a>
+        </li>
+        <li class='oe_snippet_options'>
             <a href="#" class="button js_box_remove"><i class="icon icon-remove"></i></a>
         </li>
 
@@ -36,12 +38,18 @@
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
             <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
+        </li>
+        <li class='oe_snippet_options'>
             <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
+        </li>
+        <li class='oe_snippet_options'>
             <select name="carousel-background">
                 <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
                 <option value="/website/static/src/img/landscape.png">landscape</option>
                 <option value="/website/static/src/img/aqua.jpg">aqua</option>
             </select>
+        </li>
+        <li class='oe_snippet_options'>
             <select name="carousel-style">
                 <option value="no_image">No image</option>
                 <option value="image_left">Image left</option>
-- 
cgit v1.2.3


From 79cc608e57c1e8b686589ea1c9470a1a1344a17b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 11 Sep 2013 17:20:00 +0200
Subject: [IMP] website: snippet editor: add pill and group by category; fix
 overlay

bzr revid: chm@openerp.com-20130911152000-lzt62hinncodcnoc
---
 addons/website/static/src/xml/website.snippets.xml | 27 ++++++++++++++++------
 1 file changed, 20 insertions(+), 7 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 69a40e9173e..4b8360948ee 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -5,6 +5,19 @@
 
     <t t-name="website.snippets">
         <div id='oe_snippets' class='hide'>
+            <ul class="nav nav-pills">
+              <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_emphasize">Emphasize</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_style">Style</a></li>
+            </ul>
+            <div class="pill-content">
+                <div class="pill-pane active" id="snippet_structure"></div>
+                <div class="pill-pane" id="snippet_content"></div>
+                <div class="pill-pane" id="snippet_emphasize"></div>
+                <div class="pill-pane" id="snippet_style"></div>
+                <div class="pill-pane" id="snippet_unsorted"></div>
+            </div>
         </div>
     </t>
 
@@ -33,7 +46,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='emphasize' data-action='insert' data-selector-siblings='.container'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
@@ -91,20 +104,20 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-action='mutate' data-selector='.container'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-action='mutate' data-selector='.container'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='Content' data-action='mutate' data-selector='.container'>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Main Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -116,7 +129,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -152,7 +165,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>header-block</div>
         <section class="container oe_snippet_body">
             <div class="row">
-- 
cgit v1.2.3


From 1bcae6b62fed65ea5b2797533e3a8bac41760dcb Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 11 Sep 2013 17:45:02 +0200
Subject: [IMP] CSS transparency support

bzr revid: ddm@openerp.com-20130911154502-r2493m71f2x8vvdl
---
 addons/website/static/src/xml/website.ace.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.ace.xml b/addons/website/static/src/xml/website.ace.xml
index cda74164a28..b546d41a7ec 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -8,7 +8,7 @@
                 </select>
                 <button data-action="save" type="submit" class="btn btn-success">Save</button>
                 <button data-action="format" type="button" class="btn btn-warning">Format</button>
-                <button data-action="close" type="button" class="btn btn-info pull-right" style="display:none">Close</button>
+                <button data-action="close" type="button" class="btn btn-info">Close</button>
             </div>
             <div id="ace-view-editor"/>
         </div>
-- 
cgit v1.2.3


From a53dc6f07dcf05074b68f21f6665b7aa73f1764b Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 12 Sep 2013 12:34:09 +0200
Subject: [IMP] SEO refactoring for improvements

bzr revid: ddm@openerp.com-20130912103409-2609es8aufdiwax6
---
 addons/website/static/src/xml/website.seo.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index ed65e318440..f25dccfda16 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -15,10 +15,8 @@
                             <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
                             <dl class="dl-horizontal">
                                 <dt>Suggestions</dt>
-                                <dd>
-                                    <ul class="list-inline js_seo_company_suggestions">
-                                        <!-- filled in JS -->
-                                    </ul>
+                                <dd class="js_seo_suggestions_list">
+                                    <!-- filled in JS -->
                                 </dd>
                             </dl>
                             <div class="form-horizontal" role="form">
-- 
cgit v1.2.3


From 84371dfc8079b951ed20e2ed60a3ef36ed83dae9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 11 Sep 2013 14:25:36 +0200
Subject: [IMP] link dialog wording

bzr revid: xmo@openerp.com-20130911122536-b480ghlf1ne8545v
---
 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 5b2673f16d1..5d42d95aa33 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -54,7 +54,7 @@
                                 Open in new window
                             </label>
                         </div>
-                        <h3 class="list-group-item-heading">Website URL</h3>
+                        <h3 class="list-group-item-heading">External Page</h3>
                         <input type="text" class="form-control url url-source"
                                placeholder="http://openerp.com"/>
                     </li>
-- 
cgit v1.2.3


From 62fff458c57c85cf701d83840f8b85d13e33788c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 11:15:36 +0200
Subject: [IMP] tabify link dialog for simpler layout

bzr revid: xmo@openerp.com-20130912091536-mx8dre2qyiz00h36
---
 addons/website/static/src/xml/website.editor.xml | 47 +++++++++++++-----------
 1 file changed, 26 insertions(+), 21 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 5d42d95aa33..6483413ed05 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -35,35 +35,40 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Link to</t>
             <form>
-                <ul class="list-group form-group">
-                    <li class="list-group-item active">
-                        <h3 class="list-group-item-heading">Page on your website</h3>
-                        <div class="input-group">
-                            <input type="text" class="form-control pages url-source"
-                                    placeholder="Create new page"/>
-                            <div class="input-group-btn existing dropdown">
-                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
-                                <ul class="dropdown-menu pull-right"/>
-                            </div>
-                        </div>
+                <ul class="nav nav-pills nav-justified">
+                    <li class="active">
+                        <a href="#link-existing" data-toggle="pill">Your website</a>
                     </li>
-                    <li class="list-group-item">
+                    <li><a href="#link-new" data-toggle="pill">New page</a></li>
+                    <li><a href="#link-external" data-toggle="pill">External Page</a></li>
+                    <li><a href="#link-email" data-toggle="pill">Email Address</a></li>
+                </ul>
+                <div class="tab-content">
+                    <div id="link-existing" class="tab-pane active form-group">
+                        <select id="link-existing-select"
+                                class="form-control url-source">
+                            <option disabled="disabled">Select existing page:</option>
+                        </select>
+                    </div>
+                    <div id="link-new" class="tab-pane form-group">
+                        <input type="text" class="form-control pages url-source"
+                                placeholder="Enter the name of the new page"/>
+                    </div>
+                    <div id="link-external" class="tab-pane">
+                        <input type="text" class="form-control url url-source"
+                               placeholder="example: http://openerp.com"/>
                         <div class="pull-right">
                             <label>
                                 <input type="checkbox" class="window-new"/>
                                 Open in new window
                             </label>
                         </div>
-                        <h3 class="list-group-item-heading">External Page</h3>
-                        <input type="text" class="form-control url url-source"
-                               placeholder="http://openerp.com"/>
-                    </li>
-                    <li class="list-group-item">
-                        <h3 class="list-group-item-heading">Email Address</h3>
+                    </div>
+                    <div id="link-email" class="tab-pane">
                         <input type="email" class="form-control email-address url-source"
-                               placeholder="you@yourwebsite.com"/>
-                    </li>
-                </ul>
+                               placeholder="example: you@yourwebsite.com"/>
+                    </div>
+                </div>
             </form>
         </t>
     </t>
-- 
cgit v1.2.3


From d124389fa314e57cb27d27ed4fe242322c597c6f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 12:37:52 +0200
Subject: [IMP] tabified image picker dialog

bzr revid: xmo@openerp.com-20130912103752-sg9jmba0b061f7x9
---
 addons/website/static/src/xml/website.editor.xml | 55 +++++++++++++-----------
 1 file changed, 29 insertions(+), 26 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 6483413ed05..e3a49b26af7 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -75,38 +75,41 @@
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
             <t t-set="title">Image:</t>
-            <div class="row">
+            <div>
+                <div>
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                         class="pull-right img-rounded image-preview"
+                         width="100%"/>
+                </div>
                 <form method="POST" action="/website/attach"
                       enctype="multipart/form-data"
-                      target="fileframe"
-                      class="col-sm-8">
-                    <div class="well">
-                        <!-- a href="#" class="pull-left">Find image</a -->
-                        <h3 class="list-group-item-heading">Image URL</h3>
-                        <input type="text" class="form-control url"
-                               placeholder="http://openerp.com"/>
-                    </div>
-                    <div class="text-center">
-                        <p class="">— or —</p>
-                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                        <button type="button" class="btn btn-primary btn-lg filepicker">
-                            Upload an image from your computer
-                        </button>
-                    </div>
-                    <p class="text-center">— or —</p>
-                    <div class="well">
-                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
-                        <div class="existing-attachments"/>
+                      target="fileframe">
+                    <ul class="nav nav-pills nav-justified">
+                        <li class="active"><a href="#image-upload" data-toggle="pill">
+                            Upload
+                        </a></li>
+                        <li><a href="#image-existing" data-toggle="pill">Your images</a></li>
+                        <li><a href="#image-external" data-toggle="pill">External Image</a></li>
+                    </ul>
+                    <div class="tab-content">
+                        <div id="image-upload" class="tab-pane active form-group text-center">
+                            <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                            <button type="button" class="btn btn-primary btn-lg filepicker">
+                                Upload an image from your computer
+                            </button>
+                        </div>
+                        <div id="image-existing" class="tab-pane well">
+                            <div class="existing-attachments"/>
+                        </div>
+                        <div id="image-external" class="tab-pane well form-group">
+                            <input type="text" class="form-control url"
+                                   placeholder="e.g. http://goo.gl/EDC325"/>
+                        </div>
                     </div>
                     <input type="hidden" name="func"/>
                 </form>
-                <div class="col-sm-4">
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded image-preview"
-                         width="100%"/>
-                </div>
+                <iframe src="about:blank" name="fileframe" class="hidden"/>
             </div>
-            <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing">
-- 
cgit v1.2.3


From 75977b4e43026d21ce691f30c0df1043485d83fe Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 12 Sep 2013 13:29:05 +0200
Subject: [ADD] selection of image style in dialog

bzr revid: xmo@openerp.com-20130912112905-6skmq1umsyzcvthz
---
 addons/website/static/src/xml/website.editor.xml | 8 +++++++-
 1 file changed, 7 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 e3a49b26af7..9b8ecc886ab 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -76,10 +76,16 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Image:</t>
             <div>
-                <div>
+                <div class="image-preview-container">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
                          class="pull-right img-rounded image-preview"
                          width="100%"/>
+                    <select class="form-control image-style">
+                        <option value="">No styling</option>
+                        <option value="img-rounded">Rounded corners</option>
+                        <option value="img-thumbnail">Box</option>
+                        <option value="img-circle">Circle</option>
+                    </select>
                 </div>
                 <form method="POST" action="/website/attach"
                       enctype="multipart/form-data"
-- 
cgit v1.2.3


From 9b6760d1f6da37c8dbb71f145f417afd24ce0076 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Sep 2013 13:51:30 +0200
Subject: [IMP] snippet colmd: resizing and add col inside a row

bzr revid: chm@openerp.com-20130912115130-zvqo8nez77919eno
---
 addons/website/static/src/xml/website.snippets.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4b8360948ee..502f72eed1c 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -27,7 +27,7 @@
 
     <!-- Snippets -->
 
-    <div t-name="website.snippets.container" data-snippet-id='container'>
+    <div t-name="website.snippets.resize" data-snippet-id='resize'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
@@ -108,7 +108,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='Content' data-action='mutate' data-selector='.container'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-action='mutate' data-selector='.container'>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-- 
cgit v1.2.3


From e45e3c22f6e0fdd8f76b9462eef2dfea24091a4d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Sep 2013 16:53:02 +0200
Subject: [IMP] website: layout options

bzr revid: chm@openerp.com-20130912145302-39eme37759sjm3rv
---
 addons/website/static/src/xml/website.snippets.xml | 41 +++++++++++++++-------
 1 file changed, 29 insertions(+), 12 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 502f72eed1c..d58676dbde2 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -21,6 +21,24 @@
         </div>
     </t>
 
+    <t t-name="website.snippet_overlay">
+        <div class="oe_overlay">
+            <div class="oe_overlay_options">
+                <div class="dropdown oe_option n w">
+                    <a data-toggle="dropdown" href="#"><i class="icon icon-cog"></i></a>
+                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"></ul>
+                </div>
+                <div class="oe_option n"><a href="#" class="js_box_move"><i class="icon icon-move"></i></a></div>
+                <div class="dropdown oe_option n e">
+                    <a data-toggle="dropdown" href="#"><i class="icon icon-remove"></i></a>
+                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+    </t>
+
     <t t-name="website.snippet_manipulator">
         <div class='oe_snippet_manipulator'></div>
     </t>
@@ -28,15 +46,6 @@
     <!-- Snippets -->
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
-        
-        <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_box_move"><i class='icon icon-move'></i></a>
-        </li>
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_box_remove"><i class="icon icon-remove"></i></a>
-        </li>
-
         <!-- custom data for the widget -->
         <div class='oe_handles'>
             <div class='oe_handle n'></div>
@@ -50,10 +59,18 @@
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_add"><i class="icon icon-plus-sign"></i></a>
+            <a href="#" class="button js_add">Add layer</a>
         </li>
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_remove"><i class="icon icon-minus-sign"></i></a>
+            <a href="#" class="button js_remove">Remove current layer</a>
+        </li>
+        <li>
+            <div class="dropdown">
+                <a data-toggle="dropdown" href="#">test</a>
+                <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                    <li>inside</li>
+                </ul>
+            </div>
         </li>
         <li class='oe_snippet_options'>
             <select name="carousel-background">
@@ -112,7 +129,7 @@
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.spacer" data-snippet-id='spacer' data-category='structure' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.spacer" data-snippet-id='resize' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
         <div class="oe_snippet_body container mt32"></div>
     </div>
-- 
cgit v1.2.3


From 0673d95ff53fa69cf2f09656d51aad54bdf81f97 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 12 Sep 2013 17:33:38 +0200
Subject: [FIX] SEO according to mockup

bzr revid: ddm@openerp.com-20130912153338-00oh2h3qals2h2g9
---
 addons/website/static/src/xml/website.seo.xml | 34 +++++++++++----------------
 1 file changed, 14 insertions(+), 20 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index f25dccfda16..dd7ebab8c81 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -11,14 +11,8 @@
                     </div>
                     <div class="modal-body">
                         <div class="js_seo_tips" />
-                        <section>
+                        <section class="js_seo_keywords_list">
                             <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
-                            <dl class="dl-horizontal">
-                                <dt>Suggestions</dt>
-                                <dd class="js_seo_suggestions_list">
-                                    <!-- filled in JS -->
-                                </dd>
-                            </dl>
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
@@ -32,12 +26,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <dl class="dl-horizontal oe_seo_keywords_list">
-                                <dt>Current selection</dt>
-                                <dd class="js_seo_keywords_list">
-                                    <!-- filled in JS -->
-                                </dd>
-                            </dl>
+                            <!-- filled in JS -->
                         </section>
                         <section>
                             <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
@@ -86,13 +75,18 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <li class="oe_seo_keyword">
-            <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
-                <t t-raw="widget.keyword"/>
-                &amp;nbsp;
-                <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
-            </span>
-        </li>
+        <dl class="dl-horizontal js_seo_keyword">
+            <dt>
+                <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
+                    <t t-raw="widget.keyword"/>
+                    &amp;nbsp;
+                    <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
+                </span>
+            </dt>
+            <dd class="js_seo_keyword_suggestion">
+                <!-- filled in JS -->
+            </dd>
+        </dl>
     </t>
 
     <t t-name="website.seo_suggestion">
-- 
cgit v1.2.3


From 0ba1d96906edf43cf3ebd46f166cf2a2876c2217 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 12 Sep 2013 19:06:52 +0200
Subject: [IMP] website: snippet: apply editor for snippet from a selector

bzr revid: chm@openerp.com-20130912170652-g3jz2z1fo1bjb4t0
---
 addons/website/static/src/xml/website.snippets.xml | 1 +
 1 file changed, 1 insertion(+)

(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 d58676dbde2..88ba194da95 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -126,6 +126,7 @@
     </div>
 
     <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-action='mutate' data-selector='.container'>
+        <div class="oe_snippet_body" style="display: none;"></div>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-- 
cgit v1.2.3


From 410e56289396d880ec11f56604f46f98fe4b9d53 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 12 Sep 2013 19:08:56 +0200
Subject: [IMP] SEO legend

bzr revid: ddm@openerp.com-20130912170856-tay7vc4l7jobznjn
---
 addons/website/static/src/xml/website.seo.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index dd7ebab8c81..f0cbd4913c7 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -26,6 +26,14 @@
                                     </div>
                                 </div>
                             </div>
+                            <dl class="dl-horizontal">
+                                <dt><span class="label label-warning">Keywords</span></dt>
+                                <dd>
+                                    <ul class="list-inline">
+                                        <li><span class="label label-default">Most searched topics related to these keywords</span></li>
+                                    </ul>
+                                </dd>
+                            </dl>
                             <!-- filled in JS -->
                         </section>
                         <section>
@@ -78,9 +86,9 @@
         <dl class="dl-horizontal js_seo_keyword">
             <dt>
                 <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
-                    <t t-raw="widget.keyword"/>
-                    &amp;nbsp;
                     <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
+                    &amp;nbsp;
+                    <t t-raw="widget.keyword"/>
                 </span>
             </dt>
             <dd class="js_seo_keyword_suggestion">
-- 
cgit v1.2.3


From a793a8ff16cec0466a073e9cd9cf40e8fd8116ad Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 10:40:13 +0200
Subject: [REV] tabification of link and image dialogs

bzr revid: xmo@openerp.com-20130913084013-19zu9k9voxplwwhp
---
 addons/website/static/src/xml/website.editor.xml | 108 ++++++++++-------------
 1 file changed, 47 insertions(+), 61 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 9b8ecc886ab..5d42d95aa33 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -35,87 +35,73 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Link to</t>
             <form>
-                <ul class="nav nav-pills nav-justified">
-                    <li class="active">
-                        <a href="#link-existing" data-toggle="pill">Your website</a>
+                <ul class="list-group form-group">
+                    <li class="list-group-item active">
+                        <h3 class="list-group-item-heading">Page on your website</h3>
+                        <div class="input-group">
+                            <input type="text" class="form-control pages url-source"
+                                    placeholder="Create new page"/>
+                            <div class="input-group-btn existing dropdown">
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
+                                <ul class="dropdown-menu pull-right"/>
+                            </div>
+                        </div>
                     </li>
-                    <li><a href="#link-new" data-toggle="pill">New page</a></li>
-                    <li><a href="#link-external" data-toggle="pill">External Page</a></li>
-                    <li><a href="#link-email" data-toggle="pill">Email Address</a></li>
-                </ul>
-                <div class="tab-content">
-                    <div id="link-existing" class="tab-pane active form-group">
-                        <select id="link-existing-select"
-                                class="form-control url-source">
-                            <option disabled="disabled">Select existing page:</option>
-                        </select>
-                    </div>
-                    <div id="link-new" class="tab-pane form-group">
-                        <input type="text" class="form-control pages url-source"
-                                placeholder="Enter the name of the new page"/>
-                    </div>
-                    <div id="link-external" class="tab-pane">
-                        <input type="text" class="form-control url url-source"
-                               placeholder="example: http://openerp.com"/>
+                    <li class="list-group-item">
                         <div class="pull-right">
                             <label>
                                 <input type="checkbox" class="window-new"/>
                                 Open in new window
                             </label>
                         </div>
-                    </div>
-                    <div id="link-email" class="tab-pane">
+                        <h3 class="list-group-item-heading">External Page</h3>
+                        <input type="text" class="form-control url url-source"
+                               placeholder="http://openerp.com"/>
+                    </li>
+                    <li class="list-group-item">
+                        <h3 class="list-group-item-heading">Email Address</h3>
                         <input type="email" class="form-control email-address url-source"
-                               placeholder="example: you@yourwebsite.com"/>
-                    </div>
-                </div>
+                               placeholder="you@yourwebsite.com"/>
+                    </li>
+                </ul>
             </form>
         </t>
     </t>
     <t t-name="website.editor.dialog.image">
         <t t-call="website.editor.dialog">
             <t t-set="title">Image:</t>
-            <div>
-                <div class="image-preview-container">
-                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
-                         class="pull-right img-rounded image-preview"
-                         width="100%"/>
-                    <select class="form-control image-style">
-                        <option value="">No styling</option>
-                        <option value="img-rounded">Rounded corners</option>
-                        <option value="img-thumbnail">Box</option>
-                        <option value="img-circle">Circle</option>
-                    </select>
-                </div>
+            <div class="row">
                 <form method="POST" action="/website/attach"
                       enctype="multipart/form-data"
-                      target="fileframe">
-                    <ul class="nav nav-pills nav-justified">
-                        <li class="active"><a href="#image-upload" data-toggle="pill">
-                            Upload
-                        </a></li>
-                        <li><a href="#image-existing" data-toggle="pill">Your images</a></li>
-                        <li><a href="#image-external" data-toggle="pill">External Image</a></li>
-                    </ul>
-                    <div class="tab-content">
-                        <div id="image-upload" class="tab-pane active form-group text-center">
-                            <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
-                            <button type="button" class="btn btn-primary btn-lg filepicker">
-                                Upload an image from your computer
-                            </button>
-                        </div>
-                        <div id="image-existing" class="tab-pane well">
-                            <div class="existing-attachments"/>
-                        </div>
-                        <div id="image-external" class="tab-pane well form-group">
-                            <input type="text" class="form-control url"
-                                   placeholder="e.g. http://goo.gl/EDC325"/>
-                        </div>
+                      target="fileframe"
+                      class="col-sm-8">
+                    <div class="well">
+                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <h3 class="list-group-item-heading">Image URL</h3>
+                        <input type="text" class="form-control url"
+                               placeholder="http://openerp.com"/>
+                    </div>
+                    <div class="text-center">
+                        <p class="">— or —</p>
+                        <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
+                        <button type="button" class="btn btn-primary btn-lg filepicker">
+                            Upload an image from your computer
+                        </button>
+                    </div>
+                    <p class="text-center">— or —</p>
+                    <div class="well">
+                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
+                        <div class="existing-attachments"/>
                     </div>
                     <input type="hidden" name="func"/>
                 </form>
-                <iframe src="about:blank" name="fileframe" class="hidden"/>
+                <div class="col-sm-4">
+                    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
+                         class="pull-right img-rounded image-preview"
+                         width="100%"/>
+                </div>
             </div>
+            <iframe src="about:blank" name="fileframe" class="hidden"/>
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing">
-- 
cgit v1.2.3


From cf7984b656fbcd39081554c6276a706f7c454c92 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 11:35:18 +0200
Subject: [IMP] website editor snippets: move and add label

bzr revid: chm@openerp.com-20130913093518-kzla5hif1o1ubii5
---
 addons/website/static/src/xml/website.snippets.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 88ba194da95..f4c83c18fb3 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -24,17 +24,14 @@
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
-                <div class="dropdown oe_option n w">
-                    <a data-toggle="dropdown" href="#"><i class="icon icon-cog"></i></a>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"></ul>
-                </div>
-                <div class="oe_option n"><a href="#" class="js_box_move"><i class="icon icon-move"></i></a></div>
-                <div class="dropdown oe_option n e">
-                    <a data-toggle="dropdown" href="#"><i class="icon icon-remove"></i></a>
+                <div class="dropdown oe_options">
+                    <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                         <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
+                <div class="oe_label"></div>
+                <div class="oe_move"><i class="js_box_move icon btn btn-primary icon-move"></i></div>
             </div>
         </div>
     </t>
@@ -53,6 +50,11 @@
             <div class='oe_handle w'></div>
             <div class='oe_handle s'></div>
         </div>
+        <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
+    </div>
+
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-childs='.row'>
+        <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
     <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='emphasize' data-action='insert' data-selector-siblings='.container'>
-- 
cgit v1.2.3


From c52335de5a7c55cfe542105219f84ecf9ede0a41 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 11:15:32 +0200
Subject: [IMP] split new page and existing page sections in link dialog + look
 fixes

* select sections on click within section
* validation in case no value provided for selected section on save

bzr revid: xmo@openerp.com-20130913091532-i037z59odb4j52b7
---
 addons/website/static/src/xml/website.editor.xml | 53 ++++++++++++++++--------
 1 file changed, 35 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 5d42d95aa33..f57524d6453 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -35,33 +35,50 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Link to</t>
             <form>
-                <ul class="list-group form-group">
-                    <li class="list-group-item active">
-                        <h3 class="list-group-item-heading">Page on your website</h3>
-                        <div class="input-group">
-                            <input type="text" class="form-control pages url-source"
-                                    placeholder="Create new page"/>
-                            <div class="input-group-btn existing dropdown">
-                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">Existing page <span class="caret"></span></button>
-                                <ul class="dropdown-menu pull-right"/>
-                            </div>
-                        </div>
+                <ul class="list-group">
+                    <li class="list-group-item form-group active">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-existing" class="control-label">
+                                Existing page
+                            </label>
+                        </h3>
+                        <select class="existing form-control url-source"
+                                id="link-existing">
+                            <option/>
+                        </select>
                     </li>
-                    <li class="list-group-item">
+                    <li class="list-group-item form-group">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-new" class="control-label">
+                                New page
+                            </label>
+                        </h3>
+                        <input type="text" class="form-control pages url-source"
+                               id="link-new" placeholder="Create new page"/>
+                    </li>
+                    <li class="list-group-item form-group clearfix">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-external" class="control-label">
+                                External Page
+                            </label>
+                        </h3>
+                        <input type="text" class="form-control url url-source"
+                               id="link-external" placeholder="http://openerp.com"/>
                         <div class="pull-right">
                             <label>
                                 <input type="checkbox" class="window-new"/>
                                 Open in new window
                             </label>
                         </div>
-                        <h3 class="list-group-item-heading">External Page</h3>
-                        <input type="text" class="form-control url url-source"
-                               placeholder="http://openerp.com"/>
                     </li>
-                    <li class="list-group-item">
-                        <h3 class="list-group-item-heading">Email Address</h3>
+                    <li class="list-group-item form-group">
+                        <h3 class="list-group-item-heading">
+                            <label for="link-email" class="control-label">
+                                Email Address
+                            </label>
+                        </h3>
                         <input type="email" class="form-control email-address url-source"
-                               placeholder="you@yourwebsite.com"/>
+                               id="link-email" placeholder="you@yourwebsite.com"/>
                     </li>
                 </ul>
             </form>
-- 
cgit v1.2.3


From aaa0f7eaca49d731987288a17bd38ff38984663f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 11:55:32 +0200
Subject: [ADD] 'remove link' feature to link dialog, remove icon from sidebar

bzr revid: xmo@openerp.com-20130913095532-s6ex6kcqzqzlm8tc
---
 addons/website/static/src/xml/website.editor.xml | 3 +++
 1 file changed, 3 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 f57524d6453..fabf2185f2a 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -31,6 +31,9 @@
             </div>
         </div>
     </t>
+    <t t-name="website.editor.dialog.link.footer-button">
+        <button type="button" class="btn pull-left remove">Remove Link</button>
+    </t>
     <t t-name="website.editor.dialog.link">
         <t t-call="website.editor.dialog">
             <t t-set="title">Link to</t>
-- 
cgit v1.2.3


From 5086f1e1e13a06d9250ff28e5bf48dbe8cbd0a8a Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 12:19:11 +0200
Subject: [IMP] website editor snippet: vertical selector (eg.: used for drag
 and drop column)

bzr revid: chm@openerp.com-20130913101911-467bx9ddykv23ae6
---
 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 f4c83c18fb3..90a5deebd8b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -53,7 +53,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
     </div>
 
-    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-childs='.row'>
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-vertical-childs='.row'>
         <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
-- 
cgit v1.2.3


From e2676729b0e5b0a58e0d19b109deaf8e1983f791 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 12:47:39 +0200
Subject: [REM] listing of existing attachments in base dialog

bzr revid: xmo@openerp.com-20130913104739-ma8kc0dum1ikvikd
---
 addons/website/static/src/xml/website.editor.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 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 fabf2185f2a..03d0cd19849 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -95,23 +95,18 @@
                       enctype="multipart/form-data"
                       target="fileframe"
                       class="col-sm-8">
-                    <div class="well">
-                        <!-- a href="#" class="pull-left">Find image</a -->
-                        <h3 class="list-group-item-heading">Image URL</h3>
-                        <input type="text" class="form-control url"
-                               placeholder="http://openerp.com"/>
-                    </div>
                     <div class="text-center">
-                        <p class="">— or —</p>
                         <input type="file" name="upload" style="position: absolute; opacity: 0; width: 1px; height: 1px;"/>
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
+                        <p class="">— or —</p>
                     </div>
-                    <p class="text-center">— or —</p>
                     <div class="well">
-                        <h3 class="list-group-item-heading">Pick an existing attachment</h3>
-                        <div class="existing-attachments"/>
+                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <h3 class="list-group-item-heading">Image URL</h3>
+                        <input type="text" class="form-control url"
+                               placeholder="http://openerp.com"/>
                     </div>
                     <input type="hidden" name="func"/>
                 </form>
-- 
cgit v1.2.3


From f16b61cbe61a77cf331a54ea11520322e7730739 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 13:41:43 +0200
Subject: [ADD] separate attachment dialog selector

bzr revid: xmo@openerp.com-20130913114143-v799fvf08rpiox3r
---
 addons/website/static/src/xml/website.editor.xml | 10 +++++++++-
 1 file changed, 9 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 03d0cd19849..98a5af1c184 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -103,7 +103,7 @@
                         <p class="">— or —</p>
                     </div>
                     <div class="well">
-                        <!-- a href="#" class="pull-left">Find image</a -->
+                        <a href="#existing" class="pull-right">Browse your images</a>
                         <h3 class="list-group-item-heading">Image URL</h3>
                         <input type="text" class="form-control url"
                                placeholder="http://openerp.com"/>
@@ -120,6 +120,14 @@
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Pick an existing attachment:</t>
+            <div class="well">
+                <div class="existing-attachments"/>
+            </div>
+        </t>
+    </t>
+    <t t-name="website.editor.dialog.image.existing.content">
         <div class="existing-attachments">
             <div class="row" t-foreach="rows" t-as="row">
                 <div class="col-md-4" t-foreach="row" t-as="attachment">
-- 
cgit v1.2.3


From 74678c7632b7506d360e8a36990136a0dad7d434 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 13 Sep 2013 13:44:56 +0200
Subject: [IMP] website editor snippet: image-text, text-imge, carousel

bzr revid: chm@openerp.com-20130913114456-sacksn4frv2w9re1
---
 addons/website/static/src/xml/website.snippets.xml | 83 ++++++++++++++++------
 1 file changed, 62 insertions(+), 21 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 90a5deebd8b..be1304a9d5c 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -27,6 +27,7 @@
                 <div class="dropdown oe_options">
                     <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                        <li class="divider"></li>
                         <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
@@ -66,28 +67,27 @@
         <li class='oe_snippet_options'>
             <a href="#" class="button js_remove">Remove current layer</a>
         </li>
-        <li>
-            <div class="dropdown">
-                <a data-toggle="dropdown" href="#">test</a>
-                <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                    <li>inside</li>
-                </ul>
-            </div>
-        </li>
         <li class='oe_snippet_options'>
-            <select name="carousel-background">
-                <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
-                <option value="/website/static/src/img/landscape.png">landscape</option>
-                <option value="/website/static/src/img/aqua.jpg">aqua</option>
-            </select>
-        </li>
-        <li class='oe_snippet_options'>
-            <select name="carousel-style">
-                <option value="no_image">No image</option>
-                <option value="image_left">Image left</option>
-                <option value="image_right">Image right</option>
-            </select>
+            <a class="carousel-background">
+                Background
+                <select class="form-control" name="carousel-background">
+                    <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
+                    <option value="/website/static/src/img/landscape.png">landscape</option>
+                    <option value="/website/static/src/img/aqua.jpg">aqua</option>
+                </select>
+                <input class="form-control input-sm" type="text" placeholder="http://...."/>
+            </a>
         </li>
+        <!--li class='oe_snippet_options'>
+            <a class="carousel-style">
+                Style
+                <select class="form-control" name="carousel-style">
+                    <option value="no_image">No image</option>
+                    <option value="image_left">Image left</option>
+                    <option value="image_right">Image right</option>
+                </select>
+            </a>
+        </li-->
 
         <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail oe_label'>carousel</div>
@@ -98,7 +98,7 @@
             <div class="carousel-inner">
                 <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
                     <div class="container">
-                        <div class="content" style="padding-top: 90px; padding-bottom:45px;">
+                        <div class="content mt48 mb48" data-snippet-id='resize'>
                             <h1>Create Awesome Websites</h1>
                             <h3>Super easy, fully flexible</h3>
                             <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
@@ -149,6 +149,47 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-7">
+                    <h4 class="mt16">Mollit Anim</h4>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                </div>
+                <div class="col-md-5">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+                </div>
+            </div>
+        </section>
+    </div>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
+        <section class="oe_snippet_body container">
+            <div class="row">
+                <div class="col-md-5">
+                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+                </div>
+                <div class="col-md-7">
+                    <h4 class="mt16">Mollit Anim</h4>
+                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
+                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+                        consequat.</p>
+                </div>
+            </div>
+        </section>
+    </div>
+
     <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
         <section class="oe_snippet_body container">
-- 
cgit v1.2.3


From 33a96a4e69a0d57fd7a348190e4eb9f10af37bb5 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 13 Sep 2013 14:21:08 +0200
Subject: [IMP] SEO: highlight suggestions when in body

bzr revid: ddm@openerp.com-20130913122108-mxnqz1ymui7asnfg
---
 addons/website/static/src/xml/website.seo.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.seo.xml b/addons/website/static/src/xml/website.seo.xml
index f0cbd4913c7..9471733e25c 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="website.seo_configuration">
-        <div class="modal fade oe_seo_configuration" tabindex="-1" role="dialog">
+        <div class="modal fade oe_seo_configuration js_seo_configuration" tabindex="-1" role="dialog">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-- 
cgit v1.2.3


From 243a9c559b7c603ee1cffb9a186401771e35c871 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 17:13:16 +0200
Subject: [ADD] paginated images

bzr revid: xmo@openerp.com-20130913151316-rzr3rcg1w7h3gw10
---
 addons/website/static/src/xml/website.editor.xml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 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 98a5af1c184..ff95dc2fb65 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -122,19 +122,23 @@
     <t t-name="website.editor.dialog.image.existing">
         <t t-call="website.editor.dialog">
             <t t-set="title">Pick an existing attachment:</t>
-            <div class="well">
-                <div class="existing-attachments"/>
-            </div>
+            <div class="existing-attachments"/>
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing.content">
         <div class="existing-attachments">
-            <div class="row" t-foreach="rows" t-as="row">
-                <div class="col-md-4" t-foreach="row" t-as="attachment">
-                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
-                    <a t-att-href="url" class="thumbnail">
-                        <img t-att-src="url" t-att-alt="attachment.name"/>
-                    </a>
+            <ul class="pager">
+                <li class="previous disabled"><a href="#">← Previous</a></li>
+                <li class="next disabled"><a href="#">Next →</a></li>
+            </ul>
+            <div class="well">
+                <div class="row" t-foreach="rows" t-as="row">
+                    <div class="col-md-4" t-foreach="row" t-as="attachment">
+                        <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
+                        <a t-att-href="url" class="thumbnail">
+                            <img t-att-src="url" t-att-alt="attachment.name"/>
+                        </a>
+                    </div>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 972f5029428a9b7fe023ef0ed08d462589e5594c Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 13 Sep 2013 17:23:08 +0200
Subject: [ADD] reintroduce image style selector

bzr revid: xmo@openerp.com-20130913152308-j250t5ns7iaz6w2n
---
 addons/website/static/src/xml/website.editor.xml | 8 +++++++-
 1 file changed, 7 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 ff95dc2fb65..7960e4dc300 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -110,10 +110,16 @@
                     </div>
                     <input type="hidden" name="func"/>
                 </form>
-                <div class="col-sm-4">
+                <div class="col-sm-4 image-preview-container">
                     <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAC0lEQVQIHWP4zwAAAgEBAMVfG14AAAAASUVORK5CYII%3D"
                          class="pull-right img-rounded image-preview"
                          width="100%"/>
+                    <select class="form-control image-style">
+                        <option value="">No styling</option>
+                        <option value="img-rounded">Rounded corners</option>
+                        <option value="img-thumbnail">Box</option>
+                        <option value="img-circle">Circle</option>
+                    </select>
                 </div>
             </div>
             <iframe src="about:blank" name="fileframe" class="hidden"/>
-- 
cgit v1.2.3


From af0c18496b389c887c796820d1b6a46ee9e848e2 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Sep 2013 17:50:00 +0200
Subject: [IMP] Added Jumbotron Widget

bzr revid: fp@openerp.com-20130914155000-1q08aom0dgrv011j
---
 addons/website/static/src/xml/website.snippets.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(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 be1304a9d5c..ae75f1f84e1 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -190,6 +190,24 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='emphasize' data-action='insert' data-selector-siblings='.container'>
+        <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
+        <section class="oe_snippet_body jumbotron">
+            <div class="container">
+                <h1>Sell Online. Easily.</h1>
+                <p>
+                    Get your online shop ready in a few clicks with OpenERP Commerce.
+                </p>
+                <p>
+                    <a class="btn btn-primary btn-lg" href="/website.contactus">
+                        Contact Us
+                    </a>
+                </p>
+            </div>
+        </section>
+    </div>
+
+
     <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-category='structure' data-action='insert' data-selector-siblings='.container'>
         <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
         <section class="oe_snippet_body container">
-- 
cgit v1.2.3


From 70b518566372cef182f7c0aa7f51883126f084c3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Sep 2013 17:50:36 +0200
Subject: [IMP] typo contact us

bzr revid: fp@openerp.com-20130914155036-99u7psvzqog5m9p0
---
 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 ae75f1f84e1..8b27aeac46d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -200,7 +200,7 @@
                 </p>
                 <p>
                     <a class="btn btn-primary btn-lg" href="/website.contactus">
-                        Contact Us
+                        Contact us
                     </a>
                 </p>
             </div>
-- 
cgit v1.2.3


From 0e149071fb07edbb26125ee3f66669a1b365513f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Sep 2013 18:51:51 +0200
Subject: [NEW] New snippets: well, panel, quotes

bzr revid: fp@openerp.com-20130914165151-r5gctn762rerd1om
---
 addons/website/static/src/xml/website.snippets.xml | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

(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 8b27aeac46d..9814e4c3ab9 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -127,6 +127,38 @@
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-action='insert' data-selector-siblings='div p'>
+        <div class='oe_snippet_thumbnail oe_label'>Well</div>
+        <div class="oe_snippet_body well">
+            Manage your sales funnel with no effort with OpenERP CRM. Attract
+            leads, follow-up on phone calls and meetings. Analyse the quality
+            of your leads to make informed decisions.
+        </div>
+    </div>
+
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-action='insert' data-selector-siblings='div p'>
+        <div class='oe_snippet_thumbnail oe_label'>Quote</div>
+        <blockquote class="oe_snippet_body">
+            <p>
+                OpenERP provides essential platform for our project management.
+                Things are better organized and much more visible with it.
+            </p>
+            <small class="pull-right">John Doe, CEO</small>
+        </blockquote>
+    </div>
+
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-action='insert' data-selector-siblings='div p'>
+        <div class='oe_snippet_thumbnail oe_label'>Panel</div>
+        <div class="oe_snippet_body panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">OpenERP Features</h3>
+            </div>
+            <div class="panel-body">
+                OpenERP's collaborative and realtime project management helps your team get work done. Keep track of everything, from the big picture to the minute details, from the customer contract to the billing.
+            </div>
+        </div>
+    </div>
+
     <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-action='mutate' data-selector='.container'>
         <div class="oe_snippet_body" style="display: none;"></div>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
-- 
cgit v1.2.3


From ae4c9e97cb9768865c5b36c4d90eb6021c5b2634 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Sep 2013 20:30:05 +0200
Subject: [IMP] banner backgrounds

bzr revid: fp@openerp.com-20130914183005-7dkqyd9xjepk293g
---
 addons/website/static/src/xml/website.snippets.xml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 9814e4c3ab9..700429f302b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -71,9 +71,16 @@
             <a class="carousel-background">
                 Background
                 <select class="form-control" name="carousel-background">
-                    <option value="/website/static/src/img/greenfields.jpg">greenfields</option>
-                    <option value="/website/static/src/img/landscape.png">landscape</option>
-                    <option value="/website/static/src/img/aqua.jpg">aqua</option>
+                    <option value="/website/static/src/img/banner/aqua.jpg">Aqua</option>
+                    <option value="/website/static/src/img/banner/baby_blue.jpg">Baby Blue</option>
+                    <option value="/website/static/src/img/banner/black.jpg">Black</option>
+                    <option value="/website/static/src/img/banner/color_splash.jpg">Color Splash</option>
+                    <option value="/website/static/src/img/banner/deep_green.jpg">Deep Green</option>
+                    <option value="/website/static/src/img/banner/flower.jpg">Flower</option>
+                    <option value="/website/static/src/img/banner/greenfields.jpg">Greenfields</option>
+                    <option value="/website/static/src/img/banner/landscape.jpg">Landscape</option>
+                    <option value="/website/static/src/img/banner/mango.jpg">Mango</option>
+                    <option value="/website/static/src/img/banner/ocean.jpg">Ocean</option>
                 </select>
                 <input class="form-control input-sm" type="text" placeholder="http://...."/>
             </a>
@@ -96,7 +103,7 @@
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item active" style="background-image: url(/website/static/src/img/greenfields.jpg); background-size: cover;">
+                <div class="item active" style="background-image: url(/website/static/src/img/banner/greenfields.jpg); background-size: cover;">
                     <div class="container">
                         <div class="content mt48 mb48" data-snippet-id='resize'>
                             <h1>Create Awesome Websites</h1>
-- 
cgit v1.2.3


From ab00ebf05ed76a51f52814f617f3bb40955cadf4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 14 Sep 2013 21:11:12 +0200
Subject: [IMP] some backgrounds more for banner

bzr revid: fp@openerp.com-20130914191112-eo86mj7v7xl630uf
---
 addons/website/static/src/xml/website.snippets.xml | 11 ++++++++---
 1 file changed, 8 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 700429f302b..188bb32aef7 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -74,13 +74,18 @@
                     <option value="/website/static/src/img/banner/aqua.jpg">Aqua</option>
                     <option value="/website/static/src/img/banner/baby_blue.jpg">Baby Blue</option>
                     <option value="/website/static/src/img/banner/black.jpg">Black</option>
+                    <option value="/website/static/src/img/banner/business_guy.jpg">Business Guy</option>
                     <option value="/website/static/src/img/banner/color_splash.jpg">Color Splash</option>
-                    <option value="/website/static/src/img/banner/deep_green.jpg">Deep Green</option>
-                    <option value="/website/static/src/img/banner/flower.jpg">Flower</option>
+                    <option value="/website/static/src/img/banner/flower_field.jpg">Flowers Field</option>
                     <option value="/website/static/src/img/banner/greenfields.jpg">Greenfields</option>
                     <option value="/website/static/src/img/banner/landscape.jpg">Landscape</option>
                     <option value="/website/static/src/img/banner/mango.jpg">Mango</option>
-                    <option value="/website/static/src/img/banner/ocean.jpg">Ocean</option>
+                    <option value="/website/static/src/img/banner/mountains.jpg">Mountains</option>
+                    <option value="/website/static/src/img/banner/orange_red.jpg">Orange Red</option>
+                    <option value="/website/static/src/img/banner/flower.jpg">Purple</option>
+                    <option value="/website/static/src/img/banner/velour.jpg">Velour</option>
+                    <option value="/website/static/src/img/banner/wood.jpg">Wood</option>
+                    <option value="/website/static/src/img/banner/yellow_green.jpg">Yellow Green</option>
                 </select>
                 <input class="form-control input-sm" type="text" placeholder="http://...."/>
             </a>
-- 
cgit v1.2.3


From b7f3383c3c4aef93b6d339a6c8197ce0646d23fe Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 00:13:01 +0200
Subject: [IMP] title node selection

bzr revid: fp@openerp.com-20130914221301-gnt115hzjv61slpe
---
 addons/website/static/src/xml/website.snippets.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 188bb32aef7..c95509c789b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -166,7 +166,10 @@
                 <h3 class="panel-title">OpenERP Features</h3>
             </div>
             <div class="panel-body">
-                OpenERP's collaborative and realtime project management helps your team get work done. Keep track of everything, from the big picture to the minute details, from the customer contract to the billing.
+                OpenERP's collaborative and realtime project management helps
+                your team get work done. Keep track of everything, from the big
+                picture to the minute details, from the customer contract to
+                the billing.
             </div>
         </div>
     </div>
@@ -181,13 +184,13 @@
         <div class="oe_snippet_body container mt32"></div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-siblings='.container'>
-        <div class='oe_snippet_thumbnail oe_label'>Main Title</div>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
                 <div class="col-md-12 text-center">
-                    <h1 class="mt64">Welcome To Your New Homepage,</h1>
-                    <h2 class="mt32 subheader">where <b><em>everything</em></b> can be customized </h2>
+                    <h1>Your Great Title</h1>
+                    <h2 class="text-muted">a slogan reinforcing the title</h2>
                 </div>
             </div>
         </section>
-- 
cgit v1.2.3


From 19caff669a8770c40595d83e6f0037980b151d60 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 13:04:27 +0200
Subject: [IMP] snippets misc improvements

bzr revid: fp@openerp.com-20130915110427-2r2fyzuthmlkh5ua
---
 addons/website/static/src/xml/website.editor.xml   |  42 ++++
 addons/website/static/src/xml/website.snippets.xml | 252 ++++++++++-----------
 2 files changed, 166 insertions(+), 128 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 7960e4dc300..0b3cea36b98 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -119,6 +119,7 @@
                         <option value="img-rounded">Rounded corners</option>
                         <option value="img-thumbnail">Box</option>
                         <option value="img-circle">Circle</option>
+                        <option value="shadow">Shadow</option>
                     </select>
                 </div>
             </div>
@@ -161,4 +162,45 @@
             </tbody>
         </table>
     </t>
+
+    <!-- Snippets -->
+
+    <t t-name="website.snippets">
+        <div id='oe_snippets' class='hide'>
+            <ul class="nav nav-pills">
+              <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_emphasize">Emphasize</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_style">Style</a></li>
+            </ul>
+            <div class="pill-content">
+                <div class="pill-pane active" id="snippet_structure"></div>
+                <div class="pill-pane" id="snippet_content"></div>
+                <div class="pill-pane" id="snippet_emphasize"></div>
+                <div class="pill-pane" id="snippet_style"></div>
+                <div class="pill-pane" id="snippet_unsorted"></div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_overlay">
+        <div class="oe_overlay">
+            <div class="oe_overlay_options">
+                <div class="dropdown oe_options">
+                    <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
+                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                        <li class="divider"></li>
+                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
+                    </ul>
+                </div>
+                <div class="oe_label"></div>
+                <div class="oe_move"><i class="js_box_move icon btn btn-primary icon-move"></i></div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'></div>
+    </t>
+
 </templates>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index c95509c789b..0a4f993f322 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -1,47 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
 
-    <!-- Editor -->
-
-    <t t-name="website.snippets">
-        <div id='oe_snippets' class='hide'>
-            <ul class="nav nav-pills">
-              <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_emphasize">Emphasize</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_style">Style</a></li>
-            </ul>
-            <div class="pill-content">
-                <div class="pill-pane active" id="snippet_structure"></div>
-                <div class="pill-pane" id="snippet_content"></div>
-                <div class="pill-pane" id="snippet_emphasize"></div>
-                <div class="pill-pane" id="snippet_style"></div>
-                <div class="pill-pane" id="snippet_unsorted"></div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_overlay">
-        <div class="oe_overlay">
-            <div class="oe_overlay_options">
-                <div class="dropdown oe_options">
-                    <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                        <li class="divider"></li>
-                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
-                    </ul>
-                </div>
-                <div class="oe_label"></div>
-                <div class="oe_move"><i class="js_box_move icon btn btn-primary icon-move"></i></div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_manipulator">
-        <div class='oe_snippet_manipulator'></div>
-    </t>
-
-    <!-- Snippets -->
+    <!--
+        Snippets to remove:
+          - top-bottom handlers must be on all snippets
+          - left-right handlers must be on all children of row
+    -->
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
         <!-- custom data for the widget -->
@@ -58,7 +22,9 @@
         <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='emphasize' data-action='insert' data-selector-siblings='.container'>
+    <!-- Structure Snippets -->
+
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
@@ -102,13 +68,13 @@
         </li-->
 
         <!-- thumbnail to display inside the bottom widget list editor -->
-        <div class='oe_snippet_thumbnail oe_label'>carousel</div>
+        <div class='oe_snippet_thumbnail oe_label'>Banner</div>
 
         <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item active" style="background-image: url(/website/static/src/img/banner/greenfields.jpg); background-size: cover;">
+                <div class="item active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
                     <div class="container">
                         <div class="content mt48 mb48" data-snippet-id='resize'>
                             <h1>Create Awesome Websites</h1>
@@ -179,11 +145,6 @@
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.spacer" data-snippet-id='resize' data-category='structure' data-action='insert' data-selector-siblings='.container'>
-        <div class='oe_snippet_thumbnail oe_label'>Spacer</div>
-        <div class="oe_snippet_body container mt32"></div>
-    </div>
-
     <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
@@ -196,48 +157,60 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.container'>
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
-        <section class="oe_snippet_body container">
-            <div class="row">
-                <div class="col-md-7">
-                    <h4 class="mt16">Mollit Anim</h4>
-                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                        consequat.</p>
-                </div>
-                <div class="col-md-5">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+        <section class="oe_snippet_body dark">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-6">
+                        <h3 class="mt48">Enterprise Social Network</h3>
+                        <p>
+                            Make every employee feel more connected and engaged
+                            with twitter-like features for your own company. Follow
+                            people, share best practices, 'like' top ideas, etc.
+                        </p><p>
+                            Connect with experts, follow what interests you, share
+                            documents and promote best practices with OpenERP
+                            Social application. Get work done with effective
+                            collaboration across departments, geographies
+                            and business applications.
+                        </p>
+                    </div>
+                    <div class="col-md-6">
+                        <img class="img-responsive shadow mt32 mb32" src="/website/static/src/img/text_image.png"/>
+                    </div>
                 </div>
             </div>
         </section>
     </div>
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.container'>
+
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
-        <section class="oe_snippet_body container">
-            <div class="row">
-                <div class="col-md-5">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
-                </div>
-                <div class="col-md-7">
-                    <h4 class="mt16">Mollit Anim</h4>
-                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-                        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                        consequat.</p>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-6">
+                        <img class="img-responsive shadow mt32 mb32" src="/website/static/src/img/image_text.jpg"/>
+                    </div>
+                    <div class="col-md-6">
+                        <h3 class="mt48">Manage Your Shops</h3>
+                        <p>
+                            OpenERP's Point of Sale introduces a super clean
+                            interface with no installation required that runs
+                            online and offline on modern hardwares.
+                        </p><p>
+                            It's full integration with the company inventory
+                            and accounting, gives you real time statistics and
+                            consolidations amongst all shops without the hassle
+                            of integrating several applications.
+                        </p>
+                    </div>
                 </div>
             </div>
         </section>
     </div>
 
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='emphasize' data-action='insert' data-selector-siblings='.container'>
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
         <section class="oe_snippet_body jumbotron">
             <div class="container">
@@ -254,60 +227,83 @@
         </section>
     </div>
 
-
-    <div t-name="website.snippets.three-collumns" data-snippet-id='three-collumns' data-category='structure' data-action='insert' data-selector-siblings='.container'>
-        <div class='oe_snippet_thumbnail oe_label'>three-collumns</div>
-        <section class="oe_snippet_body container">
-            <div class="row">
-                <div class="col-md-12 text-center">
-                    <h2 class="mt48">Ut enim ad minim veniam</h2>
-                </div>
-            </div>
-            <div class="row mt32">
-                <div class="col-md-4">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
-                    <h4 class="mt16">Cillum Dolore</h4>
-                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                        consequat.</p>
-                </div>
-                <div class="col-md-4">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg"/>
-                    <h4 class="mt16">Mollit Anim</h4>
-                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>
-                </div>
-                <div class="col-md-4">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg"/>
-                    <h4 class="mt16">Nemo Enim Ipsam</h4>
-                    <p>Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium
-                        doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore
-                        veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim
-                        ipsam voluptatem quia voluptas</p>
+    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
+        <section class="oe_snippet_body dark">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center mt32 mb16">
+                        <h2>Work with the hardware you already have...</h2>
+                    </div>
+                    <div class="col-md-12">
+                        <img class="img-responsive" src="/website/static/src/img/big_picture.png" style="margin: 0 auto;"/>
+                    </div>
+                    <div class="col-md-6 col-md-offset-3 mb16 mt16">
+                        <p class="text-center">
+                            <b>No installation required</b>
+                        </p>
+                        <p class="text-center">
+                            OpenERP's Point of Sale introduces a super clean
+                            interface with no installation required that runs
+                            online and offline on modern hardware. Laptops,
+                            tablets, industrial POS, it runs on everything.
+                        </p>
+                        <p class="text-center">
+                            <a href="/page/website.contactus">Get more information »</a>
+                        </p>
+                    </div>
                 </div>
             </div>
         </section>
     </div>
 
-    <div t-name="website.snippets.header-block" data-snippet-id='header-block' data-category='structure' data-action='insert' data-selector-siblings='.container'>
-        <div class='oe_snippet_thumbnail oe_label'>header-block</div>
-        <section class="container oe_snippet_body">
-            <div class="row">
-                <div class="col-md-5">
-                    <img class="img-rounded img-responsive" src="/website/static/src/img/island.jpg"/>
+
+    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center mt16 mb16">
+                        <h2>OpenERP HR Features</h2>
+                        <h3 class="text-muted">Manage your company most important asset: People</h3>
+                    </div>
                 </div>
-                <div class="col-md-6 col-lg-offset-1">
-                    <p class="mt16">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-                        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-                        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-                        consequat.</p>
-                    <p>Duis aute irure dolor in reprehenderit in voluptate velit esse cillum
-                        dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
-                        proident, sunt in culpa qui officia deserunt mollit anim id est laborum</p>
-                    <div class="text-center">
-                        <a href="http://www.openerp.com/start" class="btn btn-default mt16 btn-lg btn-primary">Call To  <em>Action</em></a>
+                <div class="row">
+                    <div class="col-md-4">
+                        <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
+                        <h4 class="mt16">Streamline Recruitments</h4>
+                        <p>
+                            Post job offers and keep track of each application
+                            received. Follow applicants in your recruitment process
+                            with the smart kanban view.
+                        </p><p>
+                            Save time by automating some communications with email
+                            templates. Resumes are indexed automatically, allowing
+                            you to easily find for specific profiles.
+                        </p>
+                    </div>
+                    <div class="col-md-4">
+                        <img class="img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg"/>
+                        <h4 class="mt16">Enterprise Social Network</h4>
+                        <p>
+                            Break down information silos. Share knowledge and best
+                            practices amongst all employees. Follow specific people
+                            or documents and join groups of interests to share
+                            expertise and documents.
+                        </p><p>
+                            Interact with your collegues in real time with live chat.
+                        </p>
+                    </div>
+                    <div class="col-md-4">
+                        <img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg"/>
+                        <h4 class="mt16">Leaves Management</h4>
+                        <p>
+                            Keep track of the vacation days accrued by each
+                            employee. Employees enter their requests (paid
+                            holidays, sick leave, etc), for managers to approve and
+                            validate. It's all done in just a few clicks. The
+                            agenda of each employee is updated accordingly.
+                        </p>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From 596e6a86ec9bd007b168a37771e46ad427924752 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 13:19:25 +0200
Subject: [IMP] snippets text block

bzr revid: fp@openerp.com-20130915111925-sax77eu4a0cxo2mz
---
 addons/website/static/src/xml/website.snippets.xml | 30 ++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(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 0a4f993f322..69b72a9680a 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -227,6 +227,36 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center mt16 mb32">
+                        <h2>OpenERP Project Management</h2>
+                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
+                    </div>
+                    <div class="col-md-12 mb16 mt16">
+                        <p>
+                            OpenERP's <b>collaborative and realtime</b> project
+                            management helps your team get work done. Keep
+                            track of everything, from the big picture to the
+                            minute details, from the customer contract to the
+                            billing.
+                        </p><p>
+                            Organize projects around your own processes. Work
+                            on tasks and issues using the kanban view, schedule
+                            tasks using the gantt chart and control deadlines
+                            in the calendar view. Every project may have it's
+                            own stages allowing teams to optimize their job.
+                        </p>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
+
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark">
-- 
cgit v1.2.3


From db691776bfb48339f20f25fc50ab34800429f74d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 13:26:42 +0200
Subject: [IMP] Simplify darken, if snippets are clean, not need to change DOM

bzr revid: fp@openerp.com-20130915112642-bl9ku5rgkkwtovjr
---
 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 69b72a9680a..27a64d98458 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -101,7 +101,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='.container'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='section'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-- 
cgit v1.2.3


From 4cb35ee740f804fb8d7bec73586213219c5f97cd Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 14:17:10 +0200
Subject: [IMP] Add image gallery snippet

bzr revid: fp@openerp.com-20130915121710-vnlzr46glm6judqn
---
 addons/website/static/src/xml/website.snippets.xml | 40 +++++++++++++++++++++-
 1 file changed, 39 insertions(+), 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 27a64d98458..1e3aae70901 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -256,7 +256,6 @@
         </section>
     </div>
 
-
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark">
@@ -340,4 +339,43 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center mt16 mb32">
+                        <h2>Our Customer References</h2>
+                        <h4 class="text-muted">More than 500 successful projects</h4>
+                    </div>
+                    <div class="col-md-6">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/desert.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/deers_thumb.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/desert_thumb.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/deers_thumb.jpg"/>
+                    </div>
+                    <div class="col-md-6">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/landscape.jpg"/>
+                    </div>
+                    <div class="col-md-3">
+                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
+
 </templates>
-- 
cgit v1.2.3


From e50f8cf342cfba6d3d84603dbf6bde73b925d3c0 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 17:25:22 +0200
Subject: [IMP] banner

bzr revid: fp@openerp.com-20130915152522-9r8uqca0q1cph04r
---
 addons/website/static/src/xml/website.snippets.xml | 42 ++++++++++------------
 1 file changed, 18 insertions(+), 24 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 1e3aae70901..ed1aadf6278 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -56,16 +56,16 @@
                 <input class="form-control input-sm" type="text" placeholder="http://...."/>
             </a>
         </li>
-        <!--li class='oe_snippet_options'>
+        <li class='oe_snippet_options'>
             <a class="carousel-style">
                 Style
                 <select class="form-control" name="carousel-style">
-                    <option value="no_image">No image</option>
-                    <option value="image_left">Image left</option>
-                    <option value="image_right">Image right</option>
+                    <option value="text_only">Text Only</option>
+                    <option value="image_text">Image - Text</option>
+                    <option value="text_image">Text - Image</option>
                 </select>
             </a>
-        </li-->
+        </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail oe_label'>Banner</div>
@@ -73,13 +73,18 @@
         <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
             <!-- Carousel items -->
-            <div class="carousel-inner">
-                <div class="item active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
+            <div class="carousel-inner" style="height: 280px">
+                <div class="item text_only active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
                     <div class="container">
-                        <div class="content mt48 mb48" data-snippet-id='resize'>
+                        <div class="carousel-caption content">
                             <h1>Create Awesome Websites</h1>
                             <h3>Super easy, fully flexible</h3>
-                            <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
+                            <p>
+                                <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
+                            </p>
+                        </div>
+                        <div class="carousel-image">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
                         </div>
                     </div>
                 </div>
@@ -88,17 +93,6 @@
             <a class="carousel-control left" href="#myCarousel" data-slide="prev"></a>
             <a class="carousel-control right" href="#myCarousel" data-slide="next"></a>
         </div>
-
-        <!-- custom data for the widget -->
-        <div class="item" style="background-image: url(/website/static/src/img/china.jpg); background-size: cover; background-position: bottom;" >
-            <div class='container'>
-                <div class="content" style="padding-top: 90px; padding-bottom:45px;">
-                    <h1>Your New Banner Slide</h1>
-                    <h3>With another convincing subtitle</h3>
-                    <a href="/page/website.contactus" class="btn btn-success btn-large mt16">Contact us</a>
-                </div>
-            </div>
-        </div>
     </div>
 
     <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='section'>
@@ -212,7 +206,7 @@
 
     <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
-        <section class="oe_snippet_body jumbotron">
+        <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
                 <h1>Sell Online. Easily.</h1>
                 <p>
@@ -229,7 +223,7 @@
 
     <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
-        <section class="oe_snippet_body">
+        <section class="oe_snippet_body mt16 mb16">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb32">
@@ -258,7 +252,7 @@
 
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
-        <section class="oe_snippet_body dark">
+        <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt32 mb16">
@@ -289,7 +283,7 @@
 
     <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
-        <section class="oe_snippet_body">
+        <section class="oe_snippet_body mt16 mb16">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb16">
-- 
cgit v1.2.3


From 74285592a1c8f4d1c374da7d2df25d8b24398562 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 18:14:01 +0200
Subject: [FIX] Carousel, add slide

bzr revid: fp@openerp.com-20130915161401-h9wg36481ayaj2qu
---
 addons/website/static/src/xml/website.snippets.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 ed1aadf6278..f367c3f297b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -74,11 +74,11 @@
         <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner" style="height: 280px">
-                <div class="item text_only active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
+                <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
                     <div class="container">
                         <div class="carousel-caption content">
-                            <h1>Create Awesome Websites</h1>
-                            <h3>Super easy, fully flexible</h3>
+                            <h1>Set Your Banner Title</h1>
+                            <h3>Customize with the top-left menu</h3>
                             <p>
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
                             </p>
@@ -90,8 +90,8 @@
                 </div>
             </div>
             <!-- Carousel nav -->
-            <a class="carousel-control left" href="#myCarousel" data-slide="prev"></a>
-            <a class="carousel-control right" href="#myCarousel" data-slide="next"></a>
+            <a class="carousel-control left" href="#myCarousel" data-slide="prev" style="width: 10%"></a>
+            <a class="carousel-control right" href="#myCarousel" data-slide="next" style="width: 10%"></a>
         </div>
     </div>
 
-- 
cgit v1.2.3


From 364995c7f4eedaa4558cee9d459c3569ea72b74a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 19:25:37 +0200
Subject: [IMP] oe_structure, cleaning of wrap

bzr revid: fp@openerp.com-20130915172537-jbd04hmgqvzz71qb
---
 addons/website/static/src/xml/website.snippets.xml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 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 f367c3f297b..aa3080a4576 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -24,14 +24,14 @@
 
     <!-- Structure Snippets -->
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_add">Add layer</a>
+            <a href="#" class="button js_add">Add Slide</a>
         </li>
         <li class='oe_snippet_options'>
-            <a href="#" class="button js_remove">Remove current layer</a>
+            <a href="#" class="button js_remove">Remove Slide</a>
         </li>
         <li class='oe_snippet_options'>
             <a class="carousel-background">
@@ -139,7 +139,7 @@
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -151,7 +151,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
         <section class="oe_snippet_body dark">
             <div class="container">
@@ -178,7 +178,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -204,7 +204,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
@@ -221,7 +221,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -250,7 +250,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
@@ -281,7 +281,7 @@
     </div>
 
 
-    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -333,7 +333,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='#wrap, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
         <section class="oe_snippet_body">
             <div class="container">
-- 
cgit v1.2.3


From 1870e0322b41677d1a372c0b2c21acab40b8dfe3 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 21:15:18 +0200
Subject: [NEW] Pricing Snippet

bzr revid: fp@openerp.com-20130915191518-tm3da2adv40r2q9u
---
 addons/website/static/src/xml/website.snippets.xml | 111 ++++++++++++++++++++-
 1 file changed, 106 insertions(+), 5 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 aa3080a4576..94301f868b0 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -99,7 +99,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-action='insert' data-selector-siblings='div p'>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
@@ -108,18 +108,18 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-action='insert' data-selector-siblings='div p'>
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
                 OpenERP provides essential platform for our project management.
-                Things are better organized and much more visible with it.
+                Things are better organized and more visible with it.
             </p>
-            <small class="pull-right">John Doe, CEO</small>
+            <small>John Doe, CEO</small>
         </blockquote>
     </div>
 
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-action='insert' data-selector-siblings='div p'>
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
@@ -371,5 +371,106 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='emphasize' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Pricing</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+              <div class="row">
+                <div class="col-md-12 text-center mt16 mb32">
+                    <h2>Our Offers</h2>
+                </div>
+
+                <div class="col-md-4">
+                    <div class="panel panel-info">
+                      <!-- Default panel contents -->
+                      <div class="panel-heading text-center">
+                          <h2 style="margin: 0">Beginner</h2>
+                          <p style="margin: 0" class="text-muted">
+                              Starter package
+                          </p>
+                      </div>
+                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
+                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">450</b><small>.00</small></h2>
+                        <div>per month</div>
+                      </div>
+
+                      <!-- List group -->
+                      <ul class="list-group">
+                        <li class="list-group-item">Battery: 8 hours</li>
+                        <li class="list-group-item">Screen: 2.5 inch</li>
+                        <li class="list-group-item">Weight: 1.1 ounces</li>
+                        <li class="list-group-item">No support</li>
+                      </ul>
+                      <div class="panel-footer text-center">
+                          <p class="text-muted">
+                              <i>Free shipping, satisfied or reimbursed.</i>
+                          </p>
+                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Order now</a>
+                      </div>
+                    </div>
+                </div>
+                <div class="col-md-4">
+                    <div class="panel panel-primary">
+                      <!-- Default panel contents -->
+                      <div class="panel-heading text-center">
+                          <h2 style="margin: 0">Professional</h2>
+                          <p style="margin: 0">
+                              Enterprise package
+                          </p>
+                      </div>
+                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
+                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">590</b><small>.00</small></h2>
+                        <div>per month</div>
+                      </div>
+
+                      <!-- List group -->
+                      <ul class="list-group">
+                        <li class="list-group-item">Battery: 12 hours</li>
+                        <li class="list-group-item">Screen: 2.8 inch</li>
+                        <li class="list-group-item">Weight: 1.2 ounces</li>
+                        <li class="list-group-item">Limited support</li>
+                      </ul>
+                      <div class="panel-footer text-center">
+                          <p class="text-muted">
+                              <i>Free shipping, satisfied or reimbursed.</i>
+                          </p>
+                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Order now</a>
+                      </div>
+                    </div>
+                </div>
+                <div class="col-md-4">
+                    <div class="panel panel-info">
+                      <!-- Default panel contents -->
+                      <div class="panel-heading text-center">
+                          <h2 style="margin: 0">Expert</h2>
+                          <p style="margin: 0" class="text-muted">
+                              The top of the top
+                          </p>
+                      </div>
+                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
+                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">890</b><small>.00</small></h2>
+                        <div>per month</div>
+                      </div>
+
+                      <!-- List group -->
+                      <ul class="list-group">
+                        <li class="list-group-item">Battery: 20 hours</li>
+                        <li class="list-group-item">Screen: 2.8 inch</li>
+                        <li class="list-group-item">Weight: 1.2 ounces</li>
+                        <li class="list-group-item">Unlimited support</li>
+                      </ul>
+                      <div class="panel-footer text-center">
+                          <p class="text-muted">
+                              <i>Free shipping, satisfied or reimbursed.</i>
+                          </p>
+                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
+                      </div>
+                    </div>
+
+                </div>
+              </div>
+            </div>
+        </section>
+    </div>
 
 </templates>
-- 
cgit v1.2.3


From 07c85656d2da859107cebe0b8d0250ed96f7949c Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 21:25:25 +0200
Subject: [IMP] comparison snippet

bzr revid: fp@openerp.com-20130915192525-csvdkg8pvomx4r6h
---
 addons/website/static/src/xml/website.editor.xml   | 4 ++--
 addons/website/static/src/xml/website.snippets.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 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 0b3cea36b98..670565bebc5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -170,13 +170,13 @@
             <ul class="nav nav-pills">
               <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_emphasize">Emphasize</a></li>
+              <li class=""><a data-toggle="pill" href="#snippet_business">Business</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_style">Style</a></li>
             </ul>
             <div class="pill-content">
                 <div class="pill-pane active" id="snippet_structure"></div>
                 <div class="pill-pane" id="snippet_content"></div>
-                <div class="pill-pane" id="snippet_emphasize"></div>
+                <div class="pill-pane" id="snippet_business"></div>
                 <div class="pill-pane" id="snippet_style"></div>
                 <div class="pill-pane" id="snippet_unsorted"></div>
             </div>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 94301f868b0..c762042d3c2 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -371,8 +371,8 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='emphasize' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Pricing</div>
+    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Comparisons</div>
         <section class="oe_snippet_body">
             <div class="container">
               <div class="row">
-- 
cgit v1.2.3


From 1f76b5a280420d72305ecd9054463355953acc6e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 21:36:31 +0200
Subject: [NEW] Snippet: call-to-actions

bzr revid: fp@openerp.com-20130915193631-htdxekbv8fvnrz7b
---
 addons/website/static/src/xml/website.snippets.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(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 c762042d3c2..cc332f71b54 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -473,4 +473,19 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Call-to-actions</div>
+        <section class="oe_snippet_body dark">
+            <div class="container">
+              <div class="row">
+                <div class="col-md-12 text-center mt16 mb16">
+                    <a href="/shop" class="btn btn-info btn-lg">View Products</a>
+                    <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
+                </div>
+              </div>
+            </div>
+        </section>
+    </div>
+
+
 </templates>
-- 
cgit v1.2.3


From 5979e68e54bed7ec9fdd43ec93be290c1f903aeb Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 15 Sep 2013 22:00:58 +0200
Subject: [IMP] smaller buttons

bzr revid: fp@openerp.com-20130915200058-ig5atgdxz1b3qrwi
---
 addons/website/static/src/xml/website.editor.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 670565bebc5..fdbcd08ff95 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -187,14 +187,14 @@
         <div class="oe_overlay">
             <div class="oe_overlay_options">
                 <div class="dropdown oe_options">
-                    <i data-toggle="dropdown" class="btn btn-primary icon icon-cog"></i>
+                    <i data-toggle="dropdown" class="btn btn-primary btn-sm icon icon-cog"></i>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                         <li class="divider"></li>
                         <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
                 <div class="oe_label"></div>
-                <div class="oe_move"><i class="js_box_move icon btn btn-primary icon-move"></i></div>
+                <div class="oe_move"><i class="js_box_move icon btn btn-primary btn-sm icon-move"></i></div>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From bab696f0d958acba37c9b023bc760c36b2283677 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 10:25:33 +0200
Subject: [FIX] website: snippets

bzr revid: chm@openerp.com-20130916082533-f0jaa7jaiz8swc9l
---
 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 cc332f71b54..37fd6be40a2 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -95,7 +95,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='section'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='section, .container'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-- 
cgit v1.2.3


From 516496612edef2ae871e4f60f2aa51e2a837ae5b Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 10:57:55 +0200
Subject: [FIX] website snippets

bzr revid: chm@openerp.com-20130916085755-kj9t48ilpxb83fbv
---
 addons/website/static/src/xml/website.snippets.xml | 34 +++++++++++-----------
 1 file changed, 17 insertions(+), 17 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 37fd6be40a2..4a975fe19b1 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -18,13 +18,13 @@
         <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
     </div>
 
-    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-action='insert' data-selector-vertical-childs='.row'>
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-childs='.row'>
         <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
     <!-- Structure Snippets -->
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
@@ -95,11 +95,11 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-action='mutate' data-selector='section, .container'>
+    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-selector='section'>
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
@@ -108,7 +108,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
@@ -119,7 +119,7 @@
         </blockquote>
     </div>
 
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-action='insert' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
@@ -134,12 +134,12 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-action='mutate' data-selector='.container'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector='.container'>
         <div class="oe_snippet_body" style="display: none;"></div>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -151,7 +151,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
         <section class="oe_snippet_body dark">
             <div class="container">
@@ -178,7 +178,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -204,7 +204,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
@@ -221,7 +221,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -250,7 +250,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
@@ -281,7 +281,7 @@
     </div>
 
 
-    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -333,7 +333,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -371,7 +371,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Comparisons</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -473,7 +473,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-action='insert' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-childs='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Call-to-actions</div>
         <section class="oe_snippet_body dark">
             <div class="container">
-- 
cgit v1.2.3


From 5278b1bedf6454cb377811aaf2025888f196feb7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 11:17:01 +0200
Subject: [FIX] website snippet vomify

bzr revid: chm@openerp.com-20130916091701-o0t0db1c0vuzzrrh
---
 addons/website/static/src/xml/website.snippets.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 4a975fe19b1..69c7db68b80 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -134,8 +134,8 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector='.container'>
-        <div class="oe_snippet_body" style="display: none;"></div>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-childs='.oe_structure'>
+        <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-- 
cgit v1.2.3


From ef0d17312108a18a5a529e1b9140ede5f3b9d890 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 13:28:34 +0200
Subject: [IMP] website snippet: snippet list on top and open per default. hide
 when drag and drop

bzr revid: chm@openerp.com-20130916112834-5wj11850ehimxkco
---
 addons/website/static/src/xml/website.editor.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 fdbcd08ff95..5424d418717 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -9,7 +9,6 @@
                             class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
-                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Building Blocks</button></li>
                 </ul>
             </div>
         </t>
@@ -166,7 +165,7 @@
     <!-- Snippets -->
 
     <t t-name="website.snippets">
-        <div id='oe_snippets' class='hide'>
+        <div id='oe_snippets' style="margin-top: -170px">
             <ul class="nav nav-pills">
               <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
-- 
cgit v1.2.3


From 00a4fe922942dc89a542f22ee4f52d3406e33b4f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 13:51:48 +0200
Subject: [IMP] website: snippet: css auto hide

bzr revid: chm@openerp.com-20130916115148-wx6a1ux1iq0dupyg
---
 addons/website/static/src/xml/website.editor.xml | 2 +-
 addons/website/static/src/xml/website.xml        | 2 +-
 2 files changed, 2 insertions(+), 2 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 5424d418717..08b3c4e63be 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -165,7 +165,7 @@
     <!-- Snippets -->
 
     <t t-name="website.snippets">
-        <div id='oe_snippets' style="margin-top: -170px">
+        <div id='oe_snippets'>
             <ul class="nav nav-pills">
               <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 7ddd483a6fb..f40966c89b7 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -4,7 +4,7 @@
 <templates id="template" xml:space="preserve">
 
     <t t-name="website.editorbar">
-        <div class="navbar navbar-inverse navbar-fixed-top">
+        <div id="website-top-navbar" class="navbar navbar-inverse navbar-fixed-top">
             <div id="website-top-view">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-edit-collapse">
-- 
cgit v1.2.3


From 7dfad6c3baf76efc31059bd4c9b27b4b3263833f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 14:13:19 +0200
Subject: [IMP] website snippets: duplicate a snippet

bzr revid: chm@openerp.com-20130916121319-7flpb5s52dp8kyli
---
 addons/website/static/src/xml/website.editor.xml | 1 +
 1 file changed, 1 insertion(+)

(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 08b3c4e63be..88a759a2426 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -189,6 +189,7 @@
                     <i data-toggle="dropdown" class="btn btn-primary btn-sm icon icon-cog"></i>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                         <li class="divider"></li>
+                        <li><a href="#" class="button js_box_clone">Duplicate this snippet</a></li>
                         <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
-- 
cgit v1.2.3


From b6022c5724dad47a8b1635d5830561634d3af279 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 14:29:42 +0200
Subject: [FIX] website: snippet content; + add method dom_filter instead of
 change selector

bzr revid: chm@openerp.com-20130916122942-szdvqcg4tszrgeo3
---
 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 69c7db68b80..6c1904b629b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -99,7 +99,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
@@ -108,7 +108,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
@@ -119,7 +119,7 @@
         </blockquote>
     </div>
 
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='div p h1 h2 h3 blockquote'>
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
-- 
cgit v1.2.3


From dff6d399dc820a805aa8938e97fc947ec0e9b40f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 14:32:57 +0200
Subject: [IMP] website: snippet: rename chils to children

bzr revid: chm@openerp.com-20130916123257-h9g7tpszs4mzlxxl
---
 addons/website/static/src/xml/website.snippets.xml | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 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 6c1904b629b..007429ee89e 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -18,13 +18,13 @@
         <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
     </div>
 
-    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-childs='.row'>
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'>
         <div class='oe_snippet_thumbnail oe_label'>Column</div>
     </div>
 
     <!-- Structure Snippets -->
 
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
         <li class='oe_snippet_options'>
@@ -134,12 +134,12 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-childs='.oe_structure'>
+    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-children='.oe_structure'>
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Title</div>
         <section class="oe_snippet_body container">
             <div class="row">
@@ -151,7 +151,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
         <section class="oe_snippet_body dark">
             <div class="container">
@@ -178,7 +178,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -204,7 +204,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
@@ -221,7 +221,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -250,7 +250,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
@@ -281,7 +281,7 @@
     </div>
 
 
-    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -333,7 +333,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -371,7 +371,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Comparisons</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -473,7 +473,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-childs='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Call-to-actions</div>
         <section class="oe_snippet_body dark">
             <div class="container">
-- 
cgit v1.2.3


From 24a63ccea7bb9f2cf65afffcccd7c41fe3b91cc9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 16 Sep 2013 16:42:35 +0200
Subject: [IMP] website snippet: add button 'insert block' on top bar

bzr revid: chm@openerp.com-20130916144235-mxm63fikqlf0jv8s
---
 addons/website/static/src/xml/website.editor.xml | 1 +
 addons/website/static/src/xml/website.xml        | 3 +--
 2 files changed, 2 insertions(+), 2 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 88a759a2426..44406f22ca5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -9,6 +9,7 @@
                             class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
+                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
                 </ul>
             </div>
         </t>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index f40966c89b7..04c2403eda2 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -14,8 +14,7 @@
                         <span class="icon-bar"></span>
                     </button>
                     <form class="navbar-form navbar-left">
-                        <button type="button" data-action="edit"
-                                class="btn btn-primary">Edit</button>
+                        <button type="button" data-action="edit" class="btn btn-primary">Edit</button>
                     </form>
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
-- 
cgit v1.2.3


From da7a4cb2094bd25b2444e27ca33773eb099b671b Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 16 Sep 2013 17:59:27 +0200
Subject: [IMP] new snippets

bzr revid: fp@tinyerp.com-20130916155927-0stttdjxvi29418h
---
 addons/website/static/src/xml/website.snippets.xml | 128 +++++++++++++++++++++
 1 file changed, 128 insertions(+)

(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 007429ee89e..9b59a398bdb 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -333,6 +333,35 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.portfolio" data-snippet-id='portfolio' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Portfolio</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 text-center mt16 mb32">
+                        <h2>Our Porfolio</h2>
+                        <h4 class="text-muted">More than 500 successful projects</h4>
+                    </div>
+                    <div class="col-md-4">
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/deers.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
+                    </div>
+                    <div class="col-md-4">
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/deers.jpg"/>
+                    </div>
+                    <div class="col-md-4">
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/landscape.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
+                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
     <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
         <section class="oe_snippet_body">
@@ -487,5 +516,104 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.faq" data-snippet-id='faq' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>FAQ</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <h2 class="page-header">
+                    Point of Sale Questions <small>v7</small>
+                </h2>
+                <h3>
+                    Which hardware does OpenERP POS support?
+                </h3>
+                <p>
+                    OpenERP's POS is a web application that can run on any device that
+                    can display websites with little to no setup required.
+                </p><p>
+                    The Point of Sale works perfectly on any kind of touch enabled
+                    device, whether it's multi-touch tablets like an iPad or
+                    keyboardless resistive touchscreen terminals.
+                </p>
+                <h3>
+                    Does it works offline?
+                </h3>
+                <p>
+                    Deploy new stores with just an internet connection: no
+                    installation, no specific hardware required. It works with any
+                    iPad, Tablet PC, laptop or industrial POS machine.
+                </p><p>
+                    While an internet connection is required to start the Point of
+                    Sale, it will stay operational even after a complete disconnection.
+                </p>
+
+                <h2 class="page-header">
+                    Project Management Questions <small>v7</small>
+                </h2>
+                <h3>
+                    Can I use it to manage projects based on agile methodologies?
+                </h3>
+                <p>
+                    Yes.
+                </p>
+            </div>
+        </section>
+    </div>
+
+
+    <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>References</div>
+        <section class="oe_snippet_body mb32 mt16">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12">
+                        <h1 class="text-center">
+                            Our References
+                        </h1>
+                        <h3 class="text-muted text-center">
+                            More than 500 happy customers.
+                        </h3>
+                    </div>
+                    <div class="col-md-4 col-md-offset-1">
+                        <blockquote class="mt16 mb16" data-snippet-id="quote">
+                            <p>
+                                OpenERP provides essential platform for our project management.
+                                Things are better organized and more visible with it.
+                            </p>
+                            <small>John Doe, CEO</small>
+                        </blockquote>
+                    </div>
+                    <div class="col-md-4 col-md-offset-2">
+                        <blockquote class="mt16 mb16" data-snippet-id="quote">
+                            <p>
+                                OpenERP provides essential platform for our project management.
+                                Things are better organized and more visible with it.
+                            </p>
+                            <small>John Doe, CEO</small>
+                        </blockquote>
+                    </div>
+                    <div class="clearfix"/>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                    <div class="col-md-2">
+                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
 
 </templates>
-- 
cgit v1.2.3


From 57101de618f41a37065e3f2f5f589909f5b8d431 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 16 Sep 2013 23:34:32 +0200
Subject: [IMP] small improvements in snippets

bzr revid: fp@openerp.com-20130916213432-yd178jth6y3x4el3
---
 addons/website/static/src/xml/website.snippets.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 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 9b59a398bdb..2b0a838327e 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -503,7 +503,7 @@
     </div>
 
     <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Call-to-actions</div>
+        <div class='oe_snippet_thumbnail oe_label'>Buttons</div>
         <section class="oe_snippet_body dark">
             <div class="container">
               <div class="row">
@@ -574,7 +574,7 @@
                         </h3>
                     </div>
                     <div class="col-md-4 col-md-offset-1">
-                        <blockquote class="mt16 mb16" data-snippet-id="quote">
+                        <blockquote class="mt16 mb32" data-snippet-id="quote">
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
@@ -583,7 +583,7 @@
                         </blockquote>
                     </div>
                     <div class="col-md-4 col-md-offset-2">
-                        <blockquote class="mt16 mb16" data-snippet-id="quote">
+                        <blockquote class="mt16 mb32" data-snippet-id="quote">
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
@@ -592,10 +592,7 @@
                         </blockquote>
                     </div>
                     <div class="clearfix"/>
-                    <div class="col-md-2">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                    <div class="col-md-2">
+                    <div class="col-md-2 col-md-offset-1">
                         <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
                     </div>
                     <div class="col-md-2">
-- 
cgit v1.2.3


From 36c726a738facf5d46d5abeff439ff60ad67a666 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 16 Sep 2013 23:36:42 +0200
Subject: [IMP] style

bzr revid: fp@openerp.com-20130916213642-mijv1ugypg9hy8jw
---
 addons/website/static/src/xml/website.editor.xml | 14 +++++++-------
 1 file changed, 7 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 44406f22ca5..b9fa99db7d7 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -32,7 +32,7 @@
         </div>
     </t>
     <t t-name="website.editor.dialog.link.footer-button">
-        <button type="button" class="btn pull-left remove">Remove Link</button>
+        <button type="button" class="btn pull-left remove btn-danger">Remove Link</button>
     </t>
     <t t-name="website.editor.dialog.link">
         <t t-call="website.editor.dialog">
@@ -60,6 +60,12 @@
                                id="link-new" placeholder="Create new page"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
                         <h3 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
                                 External Page
@@ -67,12 +73,6 @@
                         </h3>
                         <input type="text" class="form-control url url-source"
                                id="link-external" placeholder="http://openerp.com"/>
-                        <div class="pull-right">
-                            <label>
-                                <input type="checkbox" class="window-new"/>
-                                Open in new window
-                            </label>
-                        </div>
                     </li>
                     <li class="list-group-item form-group">
                         <h3 class="list-group-item-heading">
-- 
cgit v1.2.3


From 7ba0b187838bab6430b10b854c26d9c284ef9462 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Mon, 16 Sep 2013 23:45:00 +0200
Subject: [IMP] hr snippet

bzr revid: fp@openerp.com-20130916214500-onc0m8vfp1kre2ux
---
 addons/website/static/src/xml/website.snippets.xml | 7 +++++++
 1 file changed, 7 insertions(+)

(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 2b0a838327e..3b2cf2ea383 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -250,6 +250,13 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail oe_label'>Separator</div>
+        <hr class="oe_snippet_body">
+        </hr>
+    </div>
+
+
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
         <section class="oe_snippet_body dark mt16 mb16">
-- 
cgit v1.2.3


From c09e7544c328e0805d28b2483fdfd3a4510922a7 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 09:40:50 +0200
Subject: [IMP] website snippet: increase speed of dom_filter

bzr revid: chm@openerp.com-20130917074050-ab22448v4x1d26lf
---
 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 3b2cf2ea383..8d471479570 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -99,7 +99,7 @@
         <div class='oe_snippet_thumbnail oe_label'>Darken</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
@@ -108,7 +108,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
@@ -119,7 +119,7 @@
         </blockquote>
     </div>
 
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='div, p, h1, h2, h3, blockquote'>
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail oe_label'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
-- 
cgit v1.2.3


From f5253824749762774194c96a51233086d4c9c06e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 09:48:47 +0200
Subject: [IMP] website snippet: dom_filter and remove title snippet

bzr revid: chm@openerp.com-20130917074847-oxlvppxpmbwijtmp
---
 addons/website/static/src/xml/website.snippets.xml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 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 8d471479570..bfa7c7d6ff1 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -139,18 +139,6 @@
         <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Title</div>
-        <section class="oe_snippet_body container">
-            <div class="row">
-                <div class="col-md-12 text-center">
-                    <h1>Your Great Title</h1>
-                    <h2 class="text-muted">a slogan reinforcing the title</h2>
-                </div>
-            </div>
-        </section>
-    </div>
-
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
         <section class="oe_snippet_body dark">
@@ -227,8 +215,10 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb32">
-                        <h2>OpenERP Project Management</h2>
-                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
+                        <h1>
+                            OpenERP Project Management<br/>
+                            <small>Infinitely flexible. Incredibly easy to use.</small>
+                        </h1>
                     </div>
                     <div class="col-md-12 mb16 mt16">
                         <p>
-- 
cgit v1.2.3


From e9ba1ea6e870247f4adb1157cbcc5bb4467ed103 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 10:01:55 +0200
Subject: [FIX] website snippet hr

bzr revid: chm@openerp.com-20130917080155-5vnfz1rbjxy2cqw9
---
 addons/website/static/src/xml/website.snippets.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 bfa7c7d6ff1..fe589ddf92f 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -242,8 +242,7 @@
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Separator</div>
-        <hr class="oe_snippet_body">
-        </hr>
+        <div class="oe_snippet_body"><hr/></div>
     </div>
 
 
-- 
cgit v1.2.3


From 71871546250e87f0411c3a35eeaefdd866901e01 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 13:00:43 +0200
Subject: [IMP] website snippet: resize margin (not padding)

bzr revid: chm@openerp.com-20130917110043-9cru69n0gh81mmt0
---
 addons/website/static/src/xml/website.snippets.xml | 15 ++++++++++++---
 1 file changed, 12 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 fe589ddf92f..19b86056a0a 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -27,6 +27,15 @@
     <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
+        <li class='oe_snippet_options'>
+            <a class="carousel-style">
+                <select class="form-control" name="carousel-size">
+                    <option value="big">Big</option>
+                    <option value="small">Small</option>
+                </select>
+            </a>
+        </li>
+        <li class="divider"></li>
         <li class='oe_snippet_options'>
             <a href="#" class="button js_add">Add Slide</a>
         </li>
@@ -71,9 +80,9 @@
         <div class='oe_snippet_thumbnail oe_label'>Banner</div>
 
         <!-- body to insert after drag and drop thumbnail -->
-        <div id="myCarousel" class="oe_snippet_body carousel slide" data-interval="10000">
+        <div id="myCarousel" class="oe_snippet_body carousel slide oe_big" data-interval="10000">
             <!-- Carousel items -->
-            <div class="carousel-inner" style="height: 280px">
+            <div class="carousel-inner">
                 <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
                     <div class="container">
                         <div class="carousel-caption content">
@@ -242,7 +251,7 @@
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail oe_label'>Separator</div>
-        <div class="oe_snippet_body"><hr/></div>
+        <hr class="oe_snippet_body"/>
     </div>
 
 
-- 
cgit v1.2.3


From 7b190b1a56c268deea33a10d47573ec02b3828ac Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 15:31:44 +0200
Subject: [IMP] website snippet: preview

bzr revid: chm@openerp.com-20130917133144-jbgre8v0g29kzrdy
---
 addons/website/static/src/xml/website.snippets.xml | 65 +++++++++++++++++++---
 1 file changed, 58 insertions(+), 7 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 19b86056a0a..08028f18087 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -77,7 +77,11 @@
         </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
-        <div class='oe_snippet_thumbnail oe_label'>Banner</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <img src="/website/static/src/img/banner/color_splash.jpg" style="position: absolute; left: 0; top: 40px; max-width: 100%"/>
+            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 10px; top: 52px; max-width: 25%"/>
+            <span style="position: absolute; top: 50px; right: 10px;">Banner</span>
+        </div>
 
         <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide oe_big" data-interval="10000">
@@ -149,7 +153,10 @@
     </div>
 
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Text-Image</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
+            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; right: 5px; top: 50px; max-width: 28%"/>
+        </div>
         <section class="oe_snippet_body dark">
             <div class="container">
                 <div class="row">
@@ -176,7 +183,10 @@
     </div>
 
     <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Image-Text</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 5px; top: 50px; max-width: 28%"/>
+            <span style="position: absolute; top: 50px; right: 5px;">Image-Text</span>
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
@@ -202,7 +212,17 @@
     </div>
 
     <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Jumbotron</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <div style="position: absolute; top: 30px; background-color: #eee; width: 100%; padding: 8px 0 6px 4px;">
+                <div style="color: #000; display: block; text-align: left;">
+                    Jumbotron
+                    <div style="font-size: 9px; line-height: 9px; text-shadow: none;">
+                        Jumbotron Sub-title
+                        <br/><span class="label label-primary">Contact us</span>
+                    </div>
+                </div>
+            </div>
+        </div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
                 <h1>Sell Online. Easily.</h1>
@@ -219,7 +239,23 @@
     </div>
 
     <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Text Block</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <div style="position: absolute; top: 26px; left: 5px;  width: 94%;">
+                <div style="display: block;">
+                    Text Block
+                    <div style="text-shadow: none;font-size: 9px; line-height: 9px; color: #bbb;margin-bottom: 5px;">
+                        Jumbotron Sub-title
+                    </div>
+                    <div style="text-shadow: none;font-size: 6px; line-height: 6px; text-align: left;">
+                        Organize projects around your own processes. Work
+                        on tasks and issues using the kanban view, schedule
+                        tasks using the gantt chart and control deadlines
+                        in the calendar view. Every project may have it's
+                        own stages allowing teams to optimize their job.
+                    </div>
+                </div>
+            </div>
+        </div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
                 <div class="row">
@@ -250,13 +286,28 @@
     </div>
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Separator</div>
+        <div class="oe_snippet_thumbnail oe_label">
+            <hr style="position: absolute;top: 61px;margin: 0;width: 100%;border-color: #888;"/>
+            <div style="position: absolute;width: 100%;top: 51px;">Separator</div>
+        </div>
         <hr class="oe_snippet_body"/>
     </div>
 
 
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Big Picture</div>
+        <div class='oe_snippet_thumbnail oe_label'>
+            <div style="position: absolute; top: 14px; left: 5px;  width: 94%;">
+                <div style="display: block;">
+                    Big Picture
+                    <img src="/website/static/src/img/big_picture.png" style="max-width: 100%"/>
+                    <div style="text-shadow: none;font-size: 6px; line-height: 6px; margin: 5px 10px">
+                        OpenERP's Point of Sale introduces a super clean
+                        interface with no installation required.
+                    </div>
+                </div>
+            </div>
+
+        </div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
                 <div class="row">
-- 
cgit v1.2.3


From 6a48537430250226e5c32f5380eae932f3123d2c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 17 Sep 2013 16:06:54 +0200
Subject: [IMP] website snippet: preview

bzr revid: chm@openerp.com-20130917140654-olvmy3ckaycv18w3
---
 addons/website/static/src/xml/website.snippets.xml | 87 ++++++++++++++++------
 1 file changed, 66 insertions(+), 21 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 08028f18087..6aa60b60bab 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -15,11 +15,11 @@
             <div class='oe_handle w'></div>
             <div class='oe_handle s'></div>
         </div>
-        <div class='oe_snippet_thumbnail oe_label'>Margin resize</div>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>Margin resize</div>
     </div>
 
     <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'>
-        <div class='oe_snippet_thumbnail oe_label'>Column</div>
+        <div class='oe_snippet_label'>Column</div>
     </div>
 
     <!-- Structure Snippets -->
@@ -77,7 +77,8 @@
         </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_label'>Banner</div>
+        <div class='oe_snippet_thumbnail'>
             <img src="/website/static/src/img/banner/color_splash.jpg" style="position: absolute; left: 0; top: 40px; max-width: 100%"/>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 10px; top: 52px; max-width: 25%"/>
             <span style="position: absolute; top: 50px; right: 10px;">Banner</span>
@@ -109,11 +110,11 @@
     </div>
 
     <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-selector='section'>
-        <div class='oe_snippet_thumbnail oe_label'>Darken</div>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>Darken</div>
     </div>
 
     <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail oe_label'>Well</div>
+        <div class='oe_snippet_thumbnail'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
             leads, follow-up on phone calls and meetings. Analyse the quality
@@ -122,7 +123,7 @@
     </div>
 
     <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail oe_label'>Quote</div>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
                 OpenERP provides essential platform for our project management.
@@ -133,7 +134,7 @@
     </div>
 
     <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail oe_label'>Panel</div>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">OpenERP Features</h3>
@@ -149,11 +150,11 @@
 
     <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-children='.oe_structure'>
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
-        <div class='oe_snippet_thumbnail oe_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
+        <div class='oe_snippet_thumbnail oe_snippet_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>
             <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; right: 5px; top: 50px; max-width: 28%"/>
         </div>
@@ -183,7 +184,7 @@
     </div>
 
     <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_thumbnail oe_snippet_label'>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 5px; top: 50px; max-width: 28%"/>
             <span style="position: absolute; top: 50px; right: 5px;">Image-Text</span>
         </div>
@@ -212,7 +213,8 @@
     </div>
 
     <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_label'>Jumbotron</div>
+        <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 30px; background-color: #eee; width: 100%; padding: 8px 0 6px 4px;">
                 <div style="color: #000; display: block; text-align: left;">
                     Jumbotron
@@ -239,7 +241,8 @@
     </div>
 
     <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_label'>Text Block</div>
+        <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 26px; left: 5px;  width: 94%;">
                 <div style="display: block;">
                     Text Block
@@ -286,7 +289,7 @@
     </div>
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail oe_label">
+        <div class="oe_snippet_thumbnail oe_snippet_label">
             <hr style="position: absolute;top: 61px;margin: 0;width: 100%;border-color: #888;"/>
             <div style="position: absolute;width: 100%;top: 51px;">Separator</div>
         </div>
@@ -295,7 +298,8 @@
 
 
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>
+        <div class='oe_snippet_label'>Big Picture</div>
+        <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 14px; left: 5px;  width: 94%;">
                 <div style="display: block;">
                     Big Picture
@@ -338,7 +342,26 @@
 
 
     <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Three Columns</div>
+        <div class='oe_snippet_label'>Three Columns</div>
+        <div class="oe_snippet_thumbnail">
+            <div style="padding-top: 22px;">
+                Three Columns
+                <div class="clearfix" style="font-size: 6px;text-shadow: none;">
+                    <div class="pull-left" style="width: 33%;line-height: 6px;">
+                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 90%;"/>
+                        Post job offers and keep track of each application received.
+                    </div>
+                    <div class="pull-left" style="width: 33%;line-height: 6px;">
+                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 90%;"/>
+                        Break down information silos. Share knowledge and best practices amongst all employees.
+                    </div>
+                    <div class="pull-left" style="width: 33%; line-height: 6px;">
+                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 90%;"/>
+                        The agenda of each employee is updated accordingly.
+                    </div>
+                </div>
+            </div>
+        </div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
                 <div class="row">
@@ -390,7 +413,8 @@
     </div>
 
     <div t-name="website.snippets.portfolio" data-snippet-id='portfolio' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Portfolio</div>
+        <div class='oe_snippet_label'>Portfolio</div>
+        <div class='oe_snippet_thumbnail'>Portfolio</div>
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
@@ -419,7 +443,24 @@
     </div>
 
     <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Image Gallery</div>
+        <div class='oe_snippet_label'>Image Gallery</div>
+        <div class='oe_snippet_thumbnail'>
+            <div style="padding-top: 22px;">
+                Image Gallery
+                <div class="clearfix">
+                    <div style="float: right; width: 58px;height: 32px;">
+                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
+                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 27px;"/>
+                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 27px;"/>
+                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
+                    </div>
+                    <img src="/website/static/src/img/desert.jpg" style="float-left; width: 56px;height: 34px;margin-top: 2px;"/>
+                    <img src="/website/static/src/img/deers_thumb.jpg" style="float-left; max-width: 27px;"/>
+                    <img src="/website/static/src/img/landscape.jpg" style="float-left; max-width: 54px;"/>
+                    <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
+                </div>
+            </div>
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
@@ -457,7 +498,8 @@
     </div>
 
     <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Comparisons</div>
+        <div class='oe_snippet_label'>Comparisons</div>
+        <div class='oe_snippet_thumbnail'>Comparisons</div>
         <section class="oe_snippet_body">
             <div class="container">
               <div class="row">
@@ -559,7 +601,8 @@
     </div>
 
     <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>Buttons</div>
+        <div class='oe_snippet_label'>Buttons</div>
+        <div class='oe_snippet_thumbnail'>Buttons</div>
         <section class="oe_snippet_body dark">
             <div class="container">
               <div class="row">
@@ -573,7 +616,8 @@
     </div>
 
     <div t-name="website.snippets.faq" data-snippet-id='faq' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>FAQ</div>
+        <div class='oe_snippet_label'>FAQ</div>
+        <div class='oe_snippet_thumbnail'>FAQ</div>
         <section class="oe_snippet_body">
             <div class="container">
                 <h2 class="page-header">
@@ -617,7 +661,8 @@
 
 
     <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_label'>References</div>
+        <div class='oe_snippet_label'>References</div>
+        <div class='oe_snippet_thumbnail'>References</div>
         <section class="oe_snippet_body mb32 mt16">
             <div class="container">
                 <div class="row">
-- 
cgit v1.2.3


From a95f2137789c3315a9dff9130017467e18244e30 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 21:31:46 +0200
Subject: [IMP] snippets by categories, better menu structure

bzr revid: fp@openerp.com-20130917193146-auw1elwdmlk2eb0n
---
 addons/website/static/src/xml/website.editor.xml   | 6 ++++--
 addons/website/static/src/xml/website.snippets.xml | 2 +-
 2 files changed, 5 insertions(+), 3 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 b9fa99db7d7..1890382de88 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -9,7 +9,9 @@
                             class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
-                    <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
+                    <li class="navbar-form">
+                      <button type="button" data-action="snippet" class="btn btn-primary">Building Blocks <span class="caret" style="border-top-color: white"/></button>
+                    </li>
                 </ul>
             </div>
         </t>
@@ -167,7 +169,7 @@
 
     <t t-name="website.snippets">
         <div id='oe_snippets'>
-            <ul class="nav nav-pills">
+            <ul class="nav nav-pills nav-stacked col-sm-1">
               <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
               <li class=""><a data-toggle="pill" href="#snippet_business">Business</a></li>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 6aa60b60bab..0f58f2d0da0 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -442,7 +442,7 @@
         </section>
     </div>
 
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
+    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_label'>Image Gallery</div>
         <div class='oe_snippet_thumbnail'>
             <div style="padding-top: 22px;">
-- 
cgit v1.2.3


From d282697fdf8c12095c7f757213db6c639199cd85 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 21:58:39 +0200
Subject: [IMP] style editor bar

bzr revid: fp@openerp.com-20130917195839-4lb2nzuwxl507qn7
---
 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 0f58f2d0da0..d5cd3cecd0f 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -85,7 +85,7 @@
         </div>
 
         <!-- body to insert after drag and drop thumbnail -->
-        <div id="myCarousel" class="oe_snippet_body carousel slide oe_big" data-interval="10000">
+        <div id="myCarousel" class="oe_snippet_body carousel slide oe_big mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
                 <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
-- 
cgit v1.2.3


From c96d19b4309215e119300b682c8e138e9b75c436 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 17 Sep 2013 22:50:34 +0200
Subject: [IMP] Custom Footer

bzr revid: fp@openerp.com-20130917205034-1u7biygxj9uj8dgx
---
 addons/website/static/src/xml/website.snippets.xml | 1 -
 1 file changed, 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 d5cd3cecd0f..60fe1eeeeef 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -340,7 +340,6 @@
         </section>
     </div>
 
-
     <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_label'>Three Columns</div>
         <div class="oe_snippet_thumbnail">
-- 
cgit v1.2.3


From 23d04e1601af63410a570e85e77a558166baa5d6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 18 Sep 2013 10:04:40 +0200
Subject: [FIX] website snippet change layout

bzr revid: chm@openerp.com-20130918080440-1a271yw2yz0hsndg
---
 addons/website/static/src/xml/website.snippets.xml | 27 +++++++++++-----------
 1 file changed, 14 insertions(+), 13 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 60fe1eeeeef..1b231fa3275 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -30,8 +30,9 @@
         <li class='oe_snippet_options'>
             <a class="carousel-style">
                 <select class="form-control" name="carousel-size">
-                    <option value="big">Big</option>
                     <option value="small">Small</option>
+                    <option value="medium">Medium</option>
+                    <option value="big">Big</option>
                 </select>
             </a>
         </li>
@@ -85,7 +86,7 @@
         </div>
 
         <!-- body to insert after drag and drop thumbnail -->
-        <div id="myCarousel" class="oe_snippet_body carousel slide oe_big mb32" data-interval="10000">
+        <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
                 <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
@@ -300,7 +301,7 @@
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_label'>Big Picture</div>
         <div class='oe_snippet_thumbnail'>
-            <div style="position: absolute; top: 14px; left: 5px;  width: 94%;">
+            <div style="position: absolute; top: 8px; left: 5px;  width: 94%;">
                 <div style="display: block;">
                     Big Picture
                     <img src="/website/static/src/img/big_picture.png" style="max-width: 100%"/>
@@ -447,16 +448,16 @@
             <div style="padding-top: 22px;">
                 Image Gallery
                 <div class="clearfix">
-                    <div style="float: right; width: 58px;height: 32px;">
-                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
-                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 27px;"/>
-                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 27px;"/>
-                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
-                    </div>
-                    <img src="/website/static/src/img/desert.jpg" style="float-left; width: 56px;height: 34px;margin-top: 2px;"/>
-                    <img src="/website/static/src/img/deers_thumb.jpg" style="float-left; max-width: 27px;"/>
-                    <img src="/website/static/src/img/landscape.jpg" style="float-left; max-width: 54px;"/>
-                    <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 27px;"/>
+                    <div style="float: right; width: 56px;height: 30px;">
+                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
+                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 24px;"/>
+                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 24px;"/>
+                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
+                    </div>
+                    <img src="/website/static/src/img/desert.jpg" style="float-left; width: 50px;height: 31px;margin-top: 4px;"/>
+                    <img src="/website/static/src/img/deers_thumb.jpg" style="float-left; max-width: 24px;"/>
+                    <img src="/website/static/src/img/landscape.jpg" style="float-left; max-width: 50px;"/>
+                    <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From e0662b11d094514711ef6ae4e7420f15d0cbb03d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 18 Sep 2013 16:50:28 +0200
Subject: [FIX] wrap the wrapper in order to allow RTE on all of the page
 (except the toolbar)

CKEditor does not work directly on body, and it's a bad idea anyway
(editing the edition toolbar won't end well).

A big wrapper around all of the page's content can be used as RTE hook
to give access to the body as well as the header and footers.

bzr revid: xmo@openerp.com-20130918145028-6ppi9sro2un0quh5
---
 addons/website/static/src/xml/website.ace.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.ace.xml b/addons/website/static/src/xml/website.ace.xml
index b546d41a7ec..6ed823ed10c 100644
--- a/addons/website/static/src/xml/website.ace.xml
+++ b/addons/website/static/src/xml/website.ace.xml
@@ -16,4 +16,4 @@
     <t t-name="website.ace_view_option">
         <option t-att-value="widget.view_id"><t t-esc="widget.view_name"/></option>
     </t>
-</templates>
\ No newline at end of file
+</templates>
-- 
cgit v1.2.3


From 823cc5549d1333da16749d5957d20e8e1ceb76e2 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 18 Sep 2013 17:48:31 +0200
Subject: [IMP] website snippets: horizontal scolling

bzr revid: chm@openerp.com-20130918154831-qiyin8xx07x20qj2
---
 addons/website/static/src/xml/website.editor.xml   | 44 -------------------
 addons/website/static/src/xml/website.snippets.xml | 51 +++++++++++++++++++---
 2 files changed, 46 insertions(+), 49 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 1890382de88..dec159b96dd 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -9,9 +9,6 @@
                             class="btn">Cancel</button>
                 </form>
                 <ul class="nav navbar-nav pull-right">
-                    <li class="navbar-form">
-                      <button type="button" data-action="snippet" class="btn btn-primary">Building Blocks <span class="caret" style="border-top-color: white"/></button>
-                    </li>
                 </ul>
             </div>
         </t>
@@ -165,45 +162,4 @@
         </table>
     </t>
 
-    <!-- Snippets -->
-
-    <t t-name="website.snippets">
-        <div id='oe_snippets'>
-            <ul class="nav nav-pills nav-stacked col-sm-1">
-              <li class="active"><a data-toggle="pill" href="#snippet_structure">Structure</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_content">Content</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_business">Business</a></li>
-              <li class=""><a data-toggle="pill" href="#snippet_style">Style</a></li>
-            </ul>
-            <div class="pill-content">
-                <div class="pill-pane active" id="snippet_structure"></div>
-                <div class="pill-pane" id="snippet_content"></div>
-                <div class="pill-pane" id="snippet_business"></div>
-                <div class="pill-pane" id="snippet_style"></div>
-                <div class="pill-pane" id="snippet_unsorted"></div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_overlay">
-        <div class="oe_overlay">
-            <div class="oe_overlay_options">
-                <div class="dropdown oe_options">
-                    <i data-toggle="dropdown" class="btn btn-primary btn-sm icon icon-cog"></i>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                        <li class="divider"></li>
-                        <li><a href="#" class="button js_box_clone">Duplicate this snippet</a></li>
-                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
-                    </ul>
-                </div>
-                <div class="oe_label"></div>
-                <div class="oe_move"><i class="js_box_move icon btn btn-primary btn-sm icon-move"></i></div>
-            </div>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_manipulator">
-        <div class='oe_snippet_manipulator'></div>
-    </t>
-
 </templates>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 1b231fa3275..58031a1c3f9 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -1,11 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
 
-    <!--
-        Snippets to remove:
-          - top-bottom handlers must be on all snippets
-          - left-right handlers must be on all children of row
-    -->
+    <!-- Snippet loader -->
+    <t t-name="website.snippets_button">
+        <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
+    </t>
+
+    <t t-name="website.snippets">
+        <div id='oe_snippets'>
+            <div class="scroll">
+                <ul class="nav navbar-nav">
+                  <li><a href="#snippet_structure">Structure</a></li>
+                  <li><a href="#snippet_content">Content</a></li>
+                  <li><a href="#snippet_business">Business</a></li>
+                  <li><a href="#snippet_style">Style</a></li>
+                </ul>
+                <div class="pill-content">
+                    <div id="snippet_structure"><label><div>Structure</div></label></div>
+                    <div id="snippet_content"><label><div>Content</div></label></div>
+                    <div id="snippet_business"><label><div>Business</div></label></div>
+                    <div id="snippet_style"><label><div>Style</div></label></div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_overlay">
+        <div class="oe_overlay">
+            <div class="oe_overlay_options">
+                <div class="dropdown oe_options">
+                    <i data-toggle="dropdown" class="btn btn-primary btn-sm icon icon-cog"></i>
+                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                        <li class="divider"></li>
+                        <li><a href="#" class="button js_box_clone">Duplicate this snippet</a></li>
+                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
+                    </ul>
+                </div>
+                <div class="oe_label"></div>
+                <div class="oe_move"><i class="js_box_move icon btn btn-primary btn-sm icon-move"></i></div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'></div>
+    </t>
+
+    <!-- snippet objects -->
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
         <!-- custom data for the widget -->
-- 
cgit v1.2.3


From fd24ee28c0b00c4b92d193bdb12cb8c1af120a4f Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 12:20:14 +0200
Subject: [IMP] website snippets: change style of edit button; add font and fix
 bootstrap; add style menu

bzr revid: chm@openerp.com-20130919102014-vf8etjniyevj40n3
---
 addons/website/static/src/xml/website.snippets.xml | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 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 58031a1c3f9..c70b961e9e2 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -5,6 +5,16 @@
     <t t-name="website.snippets_button">
         <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
     </t>
+    <t t-name="website.snippets_style">
+        <li class="navbar-form">
+            <div class="btn-group">
+                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                    Block style <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" id="oe_snippets_style" role="menu"></ul>
+            </div>
+        </li>
+    </t>
 
     <t t-name="website.snippets">
         <div id='oe_snippets'>
@@ -13,13 +23,11 @@
                   <li><a href="#snippet_structure">Structure</a></li>
                   <li><a href="#snippet_content">Content</a></li>
                   <li><a href="#snippet_business">Business</a></li>
-                  <li><a href="#snippet_style">Style</a></li>
                 </ul>
                 <div class="pill-content">
                     <div id="snippet_structure"><label><div>Structure</div></label></div>
                     <div id="snippet_content"><label><div>Content</div></label></div>
                     <div id="snippet_business"><label><div>Business</div></label></div>
-                    <div id="snippet_style"><label><div>Style</div></label></div>
                 </div>
             </div>
         </div>
@@ -29,15 +37,15 @@
         <div class="oe_overlay">
             <div class="oe_overlay_options">
                 <div class="dropdown oe_options">
-                    <i data-toggle="dropdown" class="btn btn-primary btn-sm icon icon-cog"></i>
+                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-cog"/></a>
                     <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
                         <li class="divider"></li>
-                        <li><a href="#" class="button js_box_clone">Duplicate this snippet</a></li>
-                        <li><a href="#" class="button js_box_remove">Remove this snippet</a></li>
                     </ul>
                 </div>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_clone"><span class="glyphicon glyphicon-tags"/></a>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_move"><span class="glyphicon glyphicon-move"/></a>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_remove"><span class="glyphicon glyphicon-remove"/></a>
                 <div class="oe_label"></div>
-                <div class="oe_move"><i class="js_box_move icon btn btn-primary btn-sm icon-move"></i></div>
             </div>
         </div>
     </t>
@@ -152,7 +160,8 @@
     </div>
 
     <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-selector='section'>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>Darken</div>
+        <div class='oe_snippet_label'>Darken</div>
+        <div class='oe_snippet_class'>dark</div>
     </div>
 
     <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
@@ -200,7 +209,7 @@
             <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; right: 5px; top: 50px; max-width: 28%"/>
         </div>
-        <section class="oe_snippet_body dark">
+        <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
                     <div class="col-md-6">
-- 
cgit v1.2.3


From 5bb8fb451c7c6f5cdba73a6fec7e91ee1d4007fb Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 14:32:06 +0200
Subject: [IMP] website snippets: customize and style options inside overlay

bzr revid: chm@openerp.com-20130919123206-kmn3tjxvqykvk0z6
---
 addons/website/static/src/xml/website.snippets.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 c70b961e9e2..44e6ea4f35b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -37,14 +37,16 @@
         <div class="oe_overlay">
             <div class="oe_overlay_options">
                 <div class="dropdown oe_options">
-                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm"><span class="glyphicon glyphicon-cog"/></a>
-                    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-                        <li class="divider"></li>
-                    </ul>
+                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Customize">Customize <span class="glyphicon glyphicon-cog"/></a>
+                    <ul class="dropdown-menu" role="menu"></ul>
+                </div>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
+                <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
+                <div class="dropdown oe_styles">
+                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Styles"><span class="glyphicon glyphicon-cog"/> Styles</a>
+                    <ul class="dropdown-menu" role="menu"></ul>
                 </div>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_clone"><span class="glyphicon glyphicon-tags"/></a>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_move"><span class="glyphicon glyphicon-move"/></a>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_remove"><span class="glyphicon glyphicon-remove"/></a>
                 <div class="oe_label"></div>
             </div>
         </div>
-- 
cgit v1.2.3


From b8086bc9a6b2d5e6abf9051e34ffaa490529af18 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 14:58:54 +0200
Subject: [IMP] website snippets: get parent container

bzr revid: chm@openerp.com-20130919125854-w9g395r71vbzbjts
---
 addons/website/static/src/xml/website.snippets.xml | 1 +
 1 file changed, 1 insertion(+)

(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 44e6ea4f35b..51da2f8e5af 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -36,6 +36,7 @@
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
+                <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
                 <div class="dropdown oe_options">
                     <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Customize">Customize <span class="glyphicon glyphicon-cog"/></a>
                     <ul class="dropdown-menu" role="menu"></ul>
-- 
cgit v1.2.3


From 20b391d6c812cb161d34056ef6255579ffef6119 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 19 Sep 2013 15:50:01 +0200
Subject: [IMP] website snippet: add alert for drop error

bzr revid: chm@openerp.com-20130919135001-cfrzyq69ewftu16s
---
 addons/website/static/src/xml/website.snippets.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(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 51da2f8e5af..415cdb6c74d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -15,6 +15,22 @@
             </div>
         </li>
     </t>
+    <t t-name="website.snippets_modal">
+        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" 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">&amp;times;</button>
+                        <h4 class="modal-title">
+                            Nothing Added<br/>
+                            <small>Please drop in a valid zone</small>
+                        </h4>
+                    </div>
+                    <div class="modal-footer"></div>
+                </div>
+            </div>
+        </div>
+    </t>
 
     <t t-name="website.snippets">
         <div id='oe_snippets'>
-- 
cgit v1.2.3


From 69bc7fc9edce23a8610e74329b7732f1387f5569 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Sep 2013 17:57:01 +0200
Subject: [IMP] warning dialog for undrop widget

bzr revid: fp@tinyerp.com-20130919155701-szh6spszvfg1kuc1
---
 addons/website/static/src/xml/website.snippets.xml | 31 ++++++++++++++++++----
 1 file changed, 26 insertions(+), 5 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 415cdb6c74d..87bf0390d26 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -16,17 +16,38 @@
         </li>
     </t>
     <t t-name="website.snippets_modal">
-        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal" id="oe_droperror" tabindex="-1" role="dialog">
             <div class="modal-dialog">
                 <div class="modal-content">
                     <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&amp;times;</button>
+                        <button type="button" class="close" data-dismiss="modal">&amp;times;</button>
                         <h4 class="modal-title">
-                            Nothing Added<br/>
-                            <small>Please drop in a valid zone</small>
+                            Building Block Not Inserted
                         </h4>
                     </div>
-                    <div class="modal-footer"></div>
+                    <div class="modal-body">
+                        <p>
+                            The building block has not been inserted in your
+                            page because you did not drop it in a valid zone.
+                            Valid zone are represented by rectangle like this:
+                        </p>
+                        <div class="row">
+                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
+                                drop in this zone
+                            </div>
+                        </div>
+                        <p class="text-muted">
+                            When your cursor is in a valid zone, OpenERP shows
+                            you a preview of the building block in your page.
+                            You must release the block when the preview is visible.
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                        <div class="pull-left">
+                            <input type="checkbox" value="1"/> Never show this tip again
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 6b7e32155d948b6b01911514f996a3e098fd7364 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Sep 2013 18:48:55 +0200
Subject: [IMP] Image selector

bzr revid: fp@tinyerp.com-20130919164855-0xmiofe2a2mkqmq2
---
 addons/website/static/src/xml/website.editor.xml | 34 +++++++++++++++---------
 1 file changed, 21 insertions(+), 13 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 dec159b96dd..c38159f3a6d 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -99,7 +99,7 @@
                         <button type="button" class="btn btn-primary btn-lg filepicker">
                             Upload an image from your computer
                         </button>
-                        <p class="">— or —</p>
+                        <p class="text-muted mt16">— or —</p>
                     </div>
                     <div class="well">
                         <a href="#existing" class="pull-right">Browse your images</a>
@@ -126,10 +126,22 @@
         </t>
     </t>
     <t t-name="website.editor.dialog.image.existing">
-        <t t-call="website.editor.dialog">
-            <t t-set="title">Pick an existing attachment:</t>
-            <div class="existing-attachments"/>
-        </t>
+        <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog select-image">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                        <h3 class="modal-title">Select a Picture</h3>
+                    </div>
+                    <div class="modal-body">
+                        <div class="existing-attachments"/>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal" aria-hidden="true">Discard</button>
+                    </div>
+                </div>
+            </div>
+        </div>
     </t>
     <t t-name="website.editor.dialog.image.existing.content">
         <div class="existing-attachments">
@@ -137,14 +149,10 @@
                 <li class="previous disabled"><a href="#">← Previous</a></li>
                 <li class="next disabled"><a href="#">Next →</a></li>
             </ul>
-            <div class="well">
-                <div class="row" t-foreach="rows" t-as="row">
-                    <div class="col-md-4" t-foreach="row" t-as="attachment">
-                        <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
-                        <a t-att-href="url" class="thumbnail">
-                            <img t-att-src="url" t-att-alt="attachment.name"/>
-                        </a>
-                    </div>
+            <div class="row mt16" t-foreach="rows" t-as="row">
+                <div class="col-sm-3" t-foreach="row" t-as="attachment">
+                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
+                    <img t-att-src="url" t-att-alt="attachment.name" class="img thumbnail"/>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 21b7b689c8d999b003250d805fb88256d1b1934a Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 19 Sep 2013 18:55:25 +0200
Subject: [IMP] more images on selector

bzr revid: fp@tinyerp.com-20130919165525-3gaeb5s3iczfsvg6
---
 addons/website/static/src/xml/website.editor.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 c38159f3a6d..fb5b0977671 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -150,9 +150,9 @@
                 <li class="next disabled"><a href="#">Next →</a></li>
             </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
-                <div class="col-sm-3" t-foreach="row" t-as="attachment">
+                <div class="col-sm-2" t-foreach="row" t-as="attachment">
                     <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
-                    <img t-att-src="url" t-att-alt="attachment.name" class="img thumbnail"/>
+                    <img t-att-src="url" t-att-alt="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From a71804b74d661d4d5b2a74c8dce2585aa4207fb7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 20 Sep 2013 07:10:29 +0200
Subject: [IMP] Attachments with default images

bzr revid: fp@openerp.com-20130920051029-0t61gy4zz68dfckl
---
 addons/website/static/src/xml/website.editor.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 fb5b0977671..f17a5335e4c 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -151,8 +151,7 @@
             </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
                 <div class="col-sm-2" t-foreach="row" t-as="attachment">
-                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
-                    <img t-att-src="url" t-att-alt="attachment.name" class="img img-responsive"/>
+                    <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From 2ad3c4da07ac64888194c194829b8b8f05fa61aa Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 20 Sep 2013 07:13:30 +0200
Subject: [IMP] dropdown icon for top menu on snippets

bzr revid: fp@openerp.com-20130920051330-1mpk156cleckmsox
---
 addons/website/static/src/xml/website.snippets.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 87bf0390d26..427a0531f1d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -75,14 +75,14 @@
             <div class="oe_overlay_options">
                 <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
                 <div class="dropdown oe_options">
-                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Customize">Customize <span class="glyphicon glyphicon-cog"/></a>
+                    <a href="#" data-toggle="dropdown" class="btn btn-default 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_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
                 <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
                 <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
                 <div class="dropdown oe_styles">
-                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Styles"><span class="glyphicon glyphicon-cog"/> Styles</a>
+                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Styles">Styles <span class="caret"/></a>
                     <ul class="dropdown-menu" role="menu"></ul>
                 </div>
                 <div class="oe_label"></div>
-- 
cgit v1.2.3


From a8e7a55fbe1fb38bd01cdf3a82ca7785380bd30d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 20 Sep 2013 07:26:33 +0200
Subject: [IMP] small wording

bzr revid: fp@openerp.com-20130920052633-pdtv5wlq0tcbvylu
---
 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 f17a5335e4c..cbc34068118 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -102,7 +102,7 @@
                         <p class="text-muted mt16">— or —</p>
                     </div>
                     <div class="well">
-                        <a href="#existing" class="pull-right">Browse your images</a>
+                        <a href="#existing" class="pull-right">Browse existing images</a>
                         <h3 class="list-group-item-heading">Image URL</h3>
                         <input type="text" class="form-control url"
                                placeholder="http://openerp.com"/>
-- 
cgit v1.2.3


From 3dadd6e729c86e84a2b739e56aac26ad930d8398 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 20 Sep 2013 12:36:43 +0530
Subject: Added product snippet for test and added the data-snippet-id in
 product of resizing product.

bzr revid: psa@tinyerp.com-20130920070643-cmdq57j04hgx764c
---
 addons/website/static/src/xml/website.snippets.xml | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(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 87bf0390d26..18c39e1ab99 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -749,6 +749,29 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.product" data-snippet-id='product' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_label'>Product</div>
+        <div class='oe_snippet_thumbnail'>Product</div>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-3 oe_product text-center">
+                            <div class="oe_product_name">
+                                <a>
+                                    <h5>Product Name</h5>
+                                </a>
+                                <small>This is the product description.</small><br/>
+                            </div>
+                            <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/landscape.jpg"/>
+                            <div class="oe_product_price">
+                                <b>100 €</b><br/>
+                                <a href="/page/website.contactus" class="btn btn-default btn-sm btn-success">Add to basket</a>
+                            </div>
+                        </div>
+                </div>
+            </div>
+        </section>
+    </div>
 
     <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_label'>References</div>
-- 
cgit v1.2.3


From 8e85305ee1cf1a23c3c10c277dfc9df6e21744ed Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 10:49:52 +0200
Subject: [IMP] website snippet: join overlay buttons; remove label

bzr revid: chm@openerp.com-20130920084952-j1aqk6371neq1xgt
---
 addons/website/static/src/xml/website.snippets.xml | 36 ++++++----------------
 1 file changed, 9 insertions(+), 27 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 427a0531f1d..ea62f25fcad 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -74,18 +74,13 @@
         <div class="oe_overlay">
             <div class="oe_overlay_options">
                 <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
-                <div class="dropdown oe_options">
+                <div class="dropdown oe_options hidden">
                     <a href="#" data-toggle="dropdown" class="btn btn-default 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_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
                 <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
                 <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
-                <div class="dropdown oe_styles">
-                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Styles">Styles <span class="caret"/></a>
-                    <ul class="dropdown-menu" role="menu"></ul>
-                </div>
-                <div class="oe_label"></div>
             </div>
         </div>
     </t>
@@ -104,12 +99,10 @@
             <div class='oe_handle w'></div>
             <div class='oe_handle s'></div>
         </div>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>Margin resize</div>
+        <div class='oe_snippet_thumbnail'>Margin resize</div>
     </div>
 
-    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'>
-        <div class='oe_snippet_label'>Column</div>
-    </div>
+    <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'></div>
 
     <!-- Structure Snippets -->
 
@@ -167,7 +160,6 @@
         </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
-        <div class='oe_snippet_label'>Banner</div>
         <div class='oe_snippet_thumbnail'>
             <img src="/website/static/src/img/banner/color_splash.jpg" style="position: absolute; left: 0; top: 40px; max-width: 100%"/>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 10px; top: 52px; max-width: 25%"/>
@@ -214,7 +206,7 @@
     </div>
 
     <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>Quote</div>
+        <div class='oe_snippet_thumbnail'>Quote</div>
         <blockquote class="oe_snippet_body">
             <p>
                 OpenERP provides essential platform for our project management.
@@ -225,7 +217,7 @@
     </div>
 
     <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>Panel</div>
+        <div class='oe_snippet_thumbnail'>Panel</div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">OpenERP Features</h3>
@@ -241,11 +233,11 @@
 
     <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-children='.oe_structure'>
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
-        <div class='oe_snippet_thumbnail oe_snippet_label' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
+        <div class='oe_snippet_thumbnail' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
 
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>
+        <div class='oe_snippet_thumbnail'>
             <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; right: 5px; top: 50px; max-width: 28%"/>
         </div>
@@ -275,7 +267,7 @@
     </div>
 
     <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail oe_snippet_label'>
+        <div class='oe_snippet_thumbnail'>
             <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 5px; top: 50px; max-width: 28%"/>
             <span style="position: absolute; top: 50px; right: 5px;">Image-Text</span>
         </div>
@@ -304,7 +296,6 @@
     </div>
 
     <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Jumbotron</div>
         <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 30px; background-color: #eee; width: 100%; padding: 8px 0 6px 4px;">
                 <div style="color: #000; display: block; text-align: left;">
@@ -332,7 +323,6 @@
     </div>
 
     <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Text Block</div>
         <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 26px; left: 5px;  width: 94%;">
                 <div style="display: block;">
@@ -380,7 +370,7 @@
     </div>
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail oe_snippet_label">
+        <div class="oe_snippet_thumbnail">
             <hr style="position: absolute;top: 61px;margin: 0;width: 100%;border-color: #888;"/>
             <div style="position: absolute;width: 100%;top: 51px;">Separator</div>
         </div>
@@ -389,7 +379,6 @@
 
 
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Big Picture</div>
         <div class='oe_snippet_thumbnail'>
             <div style="position: absolute; top: 8px; left: 5px;  width: 94%;">
                 <div style="display: block;">
@@ -432,7 +421,6 @@
     </div>
 
     <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Three Columns</div>
         <div class="oe_snippet_thumbnail">
             <div style="padding-top: 22px;">
                 Three Columns
@@ -503,7 +491,6 @@
     </div>
 
     <div t-name="website.snippets.portfolio" data-snippet-id='portfolio' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Portfolio</div>
         <div class='oe_snippet_thumbnail'>Portfolio</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -533,7 +520,6 @@
     </div>
 
     <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Image Gallery</div>
         <div class='oe_snippet_thumbnail'>
             <div style="padding-top: 22px;">
                 Image Gallery
@@ -588,7 +574,6 @@
     </div>
 
     <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Comparisons</div>
         <div class='oe_snippet_thumbnail'>Comparisons</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -691,7 +676,6 @@
     </div>
 
     <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>Buttons</div>
         <div class='oe_snippet_thumbnail'>Buttons</div>
         <section class="oe_snippet_body dark">
             <div class="container">
@@ -706,7 +690,6 @@
     </div>
 
     <div t-name="website.snippets.faq" data-snippet-id='faq' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>FAQ</div>
         <div class='oe_snippet_thumbnail'>FAQ</div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -751,7 +734,6 @@
 
 
     <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_label'>References</div>
         <div class='oe_snippet_thumbnail'>References</div>
         <section class="oe_snippet_body mb32 mt16">
             <div class="container">
-- 
cgit v1.2.3


From efa72cae7b75f19fd4498d2ff6b17ccbb9dad5f9 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 12:08:21 +0200
Subject: [FIX] website snippet: drop zone for column with firefox

bzr revid: chm@openerp.com-20130920100821-qyy7n8j8612pzg3k
---
 addons/website/static/src/xml/website.snippets.xml | 2 --
 1 file changed, 2 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 ea62f25fcad..279a362fec7 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -447,8 +447,6 @@
                         <h2>OpenERP HR Features</h2>
                         <h3 class="text-muted">Manage your company most important asset: People</h3>
                     </div>
-                </div>
-                <div class="row">
                     <div class="col-md-4">
                         <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
                         <h4 class="mt16">Streamline Recruitments</h4>
-- 
cgit v1.2.3


From 3c47d5bacff96e41eb7c243c0a129028c28ccbaa Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 20 Sep 2013 12:22:28 +0200
Subject: [FIX] label in link dialog

bzr revid: xmo@openerp.com-20130920102228-elxpjazmk8nq1l03
---
 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 fabf2185f2a..34127a836c9 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -62,7 +62,7 @@
                     <li class="list-group-item form-group clearfix">
                         <h3 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
-                                External Page
+                                External Website
                             </label>
                         </h3>
                         <input type="text" class="form-control url url-source"
-- 
cgit v1.2.3


From 824c098aeffc53383b9d58116c7b87824ac001a8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 14:22:32 +0200
Subject: [FIX] seo whitespace

bzr revid: ddm@openerp.com-20130920122232-58di0ozyax9qy4or
---
 addons/website/static/src/xml/website.seo.xml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 9471733e25c..9d5b1700a91 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -26,14 +26,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <dl class="dl-horizontal">
-                                <dt><span class="label label-warning">Keywords</span></dt>
-                                <dd>
-                                    <ul class="list-inline">
-                                        <li><span class="label label-default">Most searched topics related to these keywords</span></li>
-                                    </ul>
-                                </dd>
-                            </dl>
+                            <span class="text-muted">Here are the most searched topics related to these keywords, ordered by importance:</span>
                             <!-- filled in JS -->
                         </section>
                         <section>
@@ -83,12 +76,10 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <dl class="dl-horizontal js_seo_keyword">
+        <dl class="dl-horizontal">
             <dt>
-                <span t-attf-class="label label-#{ widget.type } js_seo_keyword" t-att-data-keyword="widget.keyword">
-                    <a href="#" class="oe_remove" data-action="remove-keyword">x</a>
-                    &amp;nbsp;
-                    <t t-raw="widget.keyword"/>
+                <span t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
+                    <a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
                 </span>
             </dt>
             <dd class="js_seo_keyword_suggestion">
@@ -99,7 +90,7 @@
 
     <t t-name="website.seo_suggestion">
         <li class="oe_seo_suggestion">
-            <span t-attf-class="label label-#{ widget.type } js_seo_suggestion" t-att-data-keyword="widget.keyword">
+            <span t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_suggestion" t-att-data-keyword="widget.keyword">
                 <t t-raw="widget.keyword"/>
             </span>
         </li>
-- 
cgit v1.2.3


From a139fb4d4898fb19448752a50534ecbca86ca17f Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 15:28:32 +0200
Subject: [IMP] small SEO usability improvements

bzr revid: ddm@openerp.com-20130920132832-zlbbg4qk9t7gt4sb
---
 addons/website/static/src/xml/website.seo.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 9d5b1700a91..d77dacd10bc 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -26,7 +26,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="text-muted">Here are the most searched topics related to these keywords, ordered by importance:</span>
+                            <span class="text-muted">Most searched topics related your keywords, ordered by importance:</span>
                             <!-- filled in JS -->
                         </section>
                         <section>
@@ -69,16 +69,15 @@
     </t>
 
     <t t-name="website.seo_tip">
-        <div t-attf-class="alert alert-#{widget.type}">
-              <button title="Dismiss" type="button" class="close" data-action="close" data-dismiss="alert" aria-hidden="true">×</button>
-              <t t-raw="widget.message"/>
+        <div t-attf-class="alert alert-#{ widget.type }">
+            <t t-raw="widget.message"/>
         </div>
     </t>
 
     <t t-name="website.seo_keyword">
         <dl class="dl-horizontal">
             <dt>
-                <span t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
+                <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
                     <a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
                 </span>
             </dt>
@@ -90,7 +89,7 @@
 
     <t t-name="website.seo_suggestion">
         <li class="oe_seo_suggestion">
-            <span t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_suggestion" t-att-data-keyword="widget.keyword">
+            <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_suggestion" t-att-data-keyword="widget.keyword">
                 <t t-raw="widget.keyword"/>
             </span>
         </li>
-- 
cgit v1.2.3


From 8989d0c7d976b3e3765a1b7056460aaf91600e42 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 15:36:49 +0200
Subject: [IMP] Hide SEO image section when unused

bzr revid: ddm@openerp.com-20130920133649-akgg8blxmaxy9i5b
---
 addons/website/static/src/xml/website.seo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index d77dacd10bc..cc209cf0fe2 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -46,10 +46,10 @@
                                 </div>
                             </div>
                         </section>
-                        <section>
+                        <section class="js_image_section">
                             <h3 class="page-header">3. Describe your images</h3>
                             <div class="row js_seo_image_list">
-                                  <!-- filled in JS -->
+                                <!-- filled in JS -->
                             </div>
                         </section>
                         <hr/>
-- 
cgit v1.2.3


From e37e53976a25d00b593a79db510eca57345d9b9c Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 20 Sep 2013 16:29:02 +0200
Subject: [IMP] SEO UI improvements

bzr revid: ddm@openerp.com-20130920142902-hxo6e3ypgje2hzjz
---
 addons/website/static/src/xml/website.seo.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index cc209cf0fe2..4630e1f294b 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -6,8 +6,8 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
-                        <h2 class="modal-title">Promote <small class="js_seo_page_url"></small></h2>
-                        <h4>Get your page efficiently referenced in Google to attract more visitors.</h4>
+                        <h3 class="modal-title js_seo_page_url"></h3>
+                        <h4 class="text-muted">Get this page efficiently referenced in Google to attract more visitors.</h4>
                     </div>
                     <div class="modal-body">
                         <div class="js_seo_tips" />
-- 
cgit v1.2.3


From 279c07ccc2e78ac161fcdb45c135ee8d8be09894 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 16:49:22 +0200
Subject: [FIX] website swnippet: button, column

bzr revid: chm@openerp.com-20130920144922-g9121ukw4pqm0heo
---
 addons/website/static/src/xml/website.snippets.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 279a362fec7..67dc7a5696b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -73,14 +73,16 @@
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
-                <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
-                <div class="dropdown oe_options hidden">
-                    <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Customize">Customize <span class="caret"/></a>
-                    <ul class="dropdown-menu" role="menu"></ul>
+                <div class="btn-group">
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
+                    <div class="dropdown oe_options hidden btn-group">
+                        <a href="#" data-toggle="dropdown" class="btn btn-default 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_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
                 </div>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
-                <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From ead4175d5eb42862195ccf950d85a415b55c8bb6 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 20 Sep 2013 18:57:34 +0200
Subject: [IMP] small improvements on snippets

bzr revid: fp@tinyerp.com-20130920165734-q3720n0uq21bpfmr
---
 addons/website/static/src/xml/website.snippets.xml | 44 +++++++++++++---------
 1 file changed, 27 insertions(+), 17 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 67dc7a5696b..b3f50e7d888 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -246,8 +246,8 @@
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
-                    <div class="col-md-6">
-                        <h3 class="mt48">Enterprise Social Network</h3>
+                    <div class="col-md-6 mt32">
+                        <h3>Enterprise Social Network</h3>
                         <p>
                             Make every employee feel more connected and engaged
                             with twitter-like features for your own company. Follow
@@ -260,8 +260,8 @@
                             and business applications.
                         </p>
                     </div>
-                    <div class="col-md-6">
-                        <img class="img-responsive shadow mt32 mb32" src="/website/static/src/img/text_image.png"/>
+                    <div class="col-md-6 mt16 mb16">
+                        <img class="img-responsive shadow" src="/website/static/src/img/text_image.png"/>
                     </div>
                 </div>
             </div>
@@ -276,11 +276,11 @@
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
-                    <div class="col-md-6">
-                        <img class="img-responsive shadow mt32 mb32" src="/website/static/src/img/image_text.jpg"/>
+                    <div class="col-md-6 mt16 mb16">
+                        <img class="img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
                     </div>
-                    <div class="col-md-6">
-                        <h3 class="mt48">Manage Your Shops</h3>
+                    <div class="col-md-6 mt32">
+                        <h3>Manage Your Shops</h3>
                         <p>
                             OpenERP's Point of Sale introduces a super clean
                             interface with no installation required that runs
@@ -346,10 +346,10 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb32">
-                        <h1>
-                            OpenERP Project Management<br/>
-                            <small>Infinitely flexible. Incredibly easy to use.</small>
-                        </h1>
+                        <h2>
+                            OpenERP Project Management
+                        </h2>
+                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
                     </div>
                     <div class="col-md-12 mb16 mt16">
                         <p>
@@ -359,7 +359,7 @@
                             minute details, from the customer contract to the
                             billing.
                         </p><p>
-                            Organize projects around your own processes. Work
+                            Organize projects around <b>your own processes</b>. Work
                             on tasks and issues using the kanban view, schedule
                             tasks using the gantt chart and control deadlines
                             in the calendar view. Every project may have it's
@@ -371,6 +371,16 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class="oe_snippet_thumbnail">Title</div>
+        <div class="oe_snippet_body row">
+            <div class="col-md-12">
+                <h2>Your Website Title</h2>
+                <h3 class="text-muted">Great products for great people</h3>
+            </div>
+        </div>
+    </div>
+
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class="oe_snippet_thumbnail">
             <hr style="position: absolute;top: 61px;margin: 0;width: 100%;border-color: #888;"/>
@@ -746,8 +756,8 @@
                             More than 500 happy customers.
                         </h3>
                     </div>
-                    <div class="col-md-4 col-md-offset-1">
-                        <blockquote class="mt16 mb32" data-snippet-id="quote">
+                    <div class="col-md-4 col-md-offset-1 mt16 mb32">
+                        <blockquote data-snippet-id="quote">
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
@@ -755,8 +765,8 @@
                             <small>John Doe, CEO</small>
                         </blockquote>
                     </div>
-                    <div class="col-md-4 col-md-offset-2">
-                        <blockquote class="mt16 mb32" data-snippet-id="quote">
+                    <div class="col-md-4 col-md-offset-2 mt16 mb32">
+                        <blockquote data-snippet-id="quote">
                             <p>
                                 OpenERP provides essential platform for our project management.
                                 Things are better organized and more visible with it.
-- 
cgit v1.2.3


From 97eb279f6ec736126f23dc7c40f8a54d1fd9a8e7 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 20 Sep 2013 18:59:15 +0200
Subject: [IMP] small improvements on snippets

bzr revid: fp@tinyerp.com-20130920165915-dv87re3c1lcavtcq
---
 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 b3f50e7d888..12aef5ef1c3 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -407,7 +407,7 @@
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
                 <div class="row">
-                    <div class="col-md-12 text-center mt32 mb16">
+                    <div class="col-md-12 text-center mt32 mb32">
                         <h2>Work with the hardware you already have...</h2>
                     </div>
                     <div class="col-md-12">
-- 
cgit v1.2.3


From 33ab9a60d6102076413ba837877ad5fb1f5a4467 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 20 Sep 2013 20:42:11 +0200
Subject: [IMP] website snippet: test with cache and highlight

bzr revid: chm@openerp.com-20130920184211-t7aa6e2nna1th6yi
---
 addons/website/static/src/xml/website.snippets.xml | 4 ----
 1 file changed, 4 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 12aef5ef1c3..abf402ab3ec 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -87,10 +87,6 @@
         </div>
     </t>
 
-    <t t-name="website.snippet_manipulator">
-        <div class='oe_snippet_manipulator'></div>
-    </t>
-
     <!-- snippet objects -->
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
-- 
cgit v1.2.3


From 76ad91d3dad70d09c666502d0eb5ad6dab097237 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 21 Sep 2013 11:51:16 +0200
Subject: [IMP] manifest

bzr revid: fp@openerp.com-20130921095116-z7e6yo0x1eplfadx
---
 addons/website/static/src/xml/website.snippets.xml | 4 ++++
 1 file changed, 4 insertions(+)

(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 abf402ab3ec..12aef5ef1c3 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -87,6 +87,10 @@
         </div>
     </t>
 
+    <t t-name="website.snippet_manipulator">
+        <div class='oe_snippet_manipulator'></div>
+    </t>
+
     <!-- snippet objects -->
 
     <div t-name="website.snippets.resize" data-snippet-id='resize'>
-- 
cgit v1.2.3


From 3d5bd6e9a192e9ae6d100b25bb9237b3b2b0107f Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 21 Sep 2013 14:24:15 +0200
Subject: [iMP] Manifest: added grid

bzr revid: fp@openerp.com-20130921122415-rh7b90ay0ef37ywr
---
 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 12aef5ef1c3..2881e4e3039 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -181,7 +181,7 @@
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
                             </p>
                         </div>
-                        <div class="carousel-image">
+                        <div class="carousel-image hidden-xs">
                             <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
                         </div>
                     </div>
-- 
cgit v1.2.3


From 4b481b3509b8c3e71a60f87a15b3fc1b792bc5f9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 23 Sep 2013 11:49:26 +0200
Subject: [IMP] page name validation on new page creation

bzr revid: xmo@openerp.com-20130923094926-q2as7cn6etpp36la
---
 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 34127a836c9..6422830ebf5 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -57,7 +57,7 @@
                             </label>
                         </h3>
                         <input type="text" class="form-control pages url-source"
-                               id="link-new" placeholder="Create new page"/>
+                               id="link-new" pattern="[\\w/-]+"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
                         <h3 class="list-group-item-heading">
-- 
cgit v1.2.3


From b1fc013fae5f7dbc962f0fb04a2835db07efe83e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 23 Sep 2013 11:51:22 +0200
Subject: [IMP] website snippet: add drop zone for end of table

bzr revid: chm@openerp.com-20130923095122-vnaaw1z5jz0x3i37
---
 addons/website/static/src/xml/website.snippets.xml | 1 -
 1 file changed, 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 752aa66fc34..109d920c5f0 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -773,7 +773,6 @@
                             <small>John Doe, CEO</small>
                         </blockquote>
                     </div>
-                    <div class="clearfix"/>
                     <div class="col-md-2 col-md-offset-1">
                         <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
                     </div>
-- 
cgit v1.2.3


From 5bd6c371d0300fd23c693ae3ecdaa572db3e67b4 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 23 Sep 2013 12:56:04 +0200
Subject: [IMP] website snippet: carousel options with sub menu. Change on
 mouse hover

bzr revid: chm@openerp.com-20130923105604-w8dukt0u8bdxw5ui
---
 addons/website/static/src/xml/website.snippets.xml | 73 ++++++++++------------
 1 file changed, 34 insertions(+), 39 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 109d920c5f0..a96b4415015 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -111,14 +111,13 @@
     <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         
         <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_options'>
-            <a class="carousel-style">
-                <select class="form-control" name="carousel-size">
-                    <option value="small">Small</option>
-                    <option value="medium">Medium</option>
-                    <option value="big">Big</option>
-                </select>
-            </a>
+        <li class='oe_snippet_options dropdown-submenu'>
+            <a tabindex="-1" href="#">Size</a>
+            <ul class="dropdown-menu" name="carousel-size">
+                <li data-value="oe_small"><a>Small</a></li>
+                <li data-value="oe_medium"><a>Medium</a></li>
+                <li data-value="oe_big"><a>Big</a></li>
+            </ul>
         </li>
         <li class="divider"></li>
         <li class='oe_snippet_options'>
@@ -127,38 +126,34 @@
         <li class='oe_snippet_options'>
             <a href="#" class="button js_remove">Remove Slide</a>
         </li>
-        <li class='oe_snippet_options'>
-            <a class="carousel-background">
-                Background
-                <select class="form-control" name="carousel-background">
-                    <option value="/website/static/src/img/banner/aqua.jpg">Aqua</option>
-                    <option value="/website/static/src/img/banner/baby_blue.jpg">Baby Blue</option>
-                    <option value="/website/static/src/img/banner/black.jpg">Black</option>
-                    <option value="/website/static/src/img/banner/business_guy.jpg">Business Guy</option>
-                    <option value="/website/static/src/img/banner/color_splash.jpg">Color Splash</option>
-                    <option value="/website/static/src/img/banner/flower_field.jpg">Flowers Field</option>
-                    <option value="/website/static/src/img/banner/greenfields.jpg">Greenfields</option>
-                    <option value="/website/static/src/img/banner/landscape.jpg">Landscape</option>
-                    <option value="/website/static/src/img/banner/mango.jpg">Mango</option>
-                    <option value="/website/static/src/img/banner/mountains.jpg">Mountains</option>
-                    <option value="/website/static/src/img/banner/orange_red.jpg">Orange Red</option>
-                    <option value="/website/static/src/img/banner/flower.jpg">Purple</option>
-                    <option value="/website/static/src/img/banner/velour.jpg">Velour</option>
-                    <option value="/website/static/src/img/banner/wood.jpg">Wood</option>
-                    <option value="/website/static/src/img/banner/yellow_green.jpg">Yellow Green</option>
-                </select>
-                <input class="form-control input-sm" type="text" placeholder="http://...."/>
-            </a>
+        <li class="oe_snippet_options dropdown-submenu">
+            <a tabindex="-1" href="#">Background</a>
+            <ul class="dropdown-menu" name="carousel-background">
+                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
+                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
+                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
+                <li data-value="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
+                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
+                <li data-value="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
+                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
+                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
+                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
+                <li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
+                <li data-value="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
+                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
+                <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
+                <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
+                <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
+                <li><input class="form-control input-sm" type="text" placeholder="http://...."/></li>
+            </ul>
         </li>
-        <li class='oe_snippet_options'>
-            <a class="carousel-style">
-                Style
-                <select class="form-control" name="carousel-style">
-                    <option value="text_only">Text Only</option>
-                    <option value="image_text">Image - Text</option>
-                    <option value="text_image">Text - Image</option>
-                </select>
-            </a>
+        <li class='oe_snippet_options dropdown-submenu'>
+            <a tabindex="-1" href="#">Style</a>
+            <ul class="dropdown-menu" name="carousel-style">
+                <li data-value="text_only"><a>Text Only</a></li>
+                <li data-value="image_text"><a>Image - Text</a></li>
+                <li data-value="text_image"><a>Text - Image</a></li>
+            </ul>
         </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
-- 
cgit v1.2.3


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')

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 ddee2798dc01acecc1ceec8a889438ac6e511e83 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 23 Sep 2013 14:15:03 +0200
Subject: [IMP] website snippet: select background of banner

bzr revid: chm@openerp.com-20130923121503-1etp4iwkj0eog48m
---
 addons/website/static/src/xml/website.snippets.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 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 a96b4415015..7564147f28b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -123,9 +123,6 @@
         <li class='oe_snippet_options'>
             <a href="#" class="button js_add">Add Slide</a>
         </li>
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
         <li class="oe_snippet_options dropdown-submenu">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu" name="carousel-background">
@@ -144,7 +141,7 @@
                 <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
                 <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
                 <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li><input class="form-control input-sm" type="text" placeholder="http://...."/></li>
+                <li class="oe_custom_bg"><b></b></li>
             </ul>
         </li>
         <li class='oe_snippet_options dropdown-submenu'>
@@ -155,6 +152,9 @@
                 <li data-value="text_image"><a>Text - Image</a></li>
             </ul>
         </li>
+        <li class='oe_snippet_options'>
+            <a href="#" class="button js_remove">Remove Slide</a>
+        </li>
 
         <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail'>
@@ -167,7 +167,8 @@
         <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg); background-size: cover;">
+                <div class="item image_text active">
+                    <img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
                     <div class="container">
                         <div class="carousel-caption content">
                             <h1>Set Your Banner Title</h1>
-- 
cgit v1.2.3


From fdd1aa5e37d51d118461c7090d10fb844df12c36 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 23 Sep 2013 14:33:59 +0200
Subject: [fix] website snippet: change layer and add arrow

bzr revid: chm@openerp.com-20130923123359-v6bt5sq8fhj3i3ff
---
 addons/website/static/src/xml/website.snippets.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 7564147f28b..af562606bbe 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -184,8 +184,8 @@
                 </div>
             </div>
             <!-- Carousel nav -->
-            <a class="carousel-control left" href="#myCarousel" data-slide="prev" style="width: 10%"></a>
-            <a class="carousel-control right" href="#myCarousel" data-slide="next" style="width: 10%"></a>
+            <a class="carousel-control left hidden" href="#myCarousel" data-slide="prev" style="width: 10%"><span class="glyphicon glyphicon-circle-arrow-left"><span class="hidden">.</span></span></a>
+            <a class="carousel-control right hidden" href="#myCarousel" data-slide="next" style="width: 10%"><span class="glyphicon glyphicon-circle-arrow-right"><span class="hidden">.</span></span></a>
         </div>
     </div>
 
-- 
cgit v1.2.3


From 54647f7b01f309fbf1b7307e6f1365ede87a819c Mon Sep 17 00:00:00 2001
From: bth-openerp <bth@tinyerp.com>
Date: Mon, 23 Sep 2013 18:18:29 +0530
Subject: [IMP]Added description snippet.

bzr revid: bth@tinyerp.com-20130923124829-d5jd6kg4mssn2piz
---
 addons/website/static/src/xml/website.snippets.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 752aa66fc34..ee97aea86f5 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -237,7 +237,13 @@
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
         <div class='oe_snippet_thumbnail' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
     </div>
-
+	
+    <div t-name="website.snippets.description" data-snippet-id='description' data-category='content' data-selector-siblings='p, h1, h2, h3,div,,span, blockquote'>
+        <div class='oe_snippet_thumbnail'>Description</div>
+        <div class="oe_snippet_body">
+            Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.
+        </div>
+    </div>
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
             <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
@@ -794,5 +800,4 @@
         </section>
     </div>
 
-
 </templates>
-- 
cgit v1.2.3


From 4c3afa60788766edbc1e3aad7da56691df0f2189 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 23 Sep 2013 15:13:01 +0200
Subject: [IMP] Activate translation when language is not the default one

bzr revid: fme@openerp.com-20130923131301-mjr0tmth2z1qamfa
---
 addons/website/static/src/xml/website.xml | 1 -
 1 file changed, 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 04c2403eda2..c2f7abe6ed2 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -22,7 +22,6 @@
                         <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></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><a href="#">Translate</a></li>
                         <li class="dropdown">
                             <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">
-- 
cgit v1.2.3


From 2c4560aca631630237ace6a222ab4929d2fb3a20 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 24 Sep 2013 15:51:20 +0200
Subject: [ADD] edition of link labels via dialog

bzr revid: xmo@openerp.com-20130924135120-epq1w7wb1a6jfxqn
---
 addons/website/static/src/xml/website.editor.xml | 11 +++++++++++
 1 file changed, 11 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 f3ddfc4f112..e25e301b19c 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -83,6 +83,17 @@
                                id="link-email" placeholder="you@yourwebsite.com"/>
                     </li>
                 </ul>
+                <div class="form-horizontal">
+                    <div class="form-group">
+                        <label for="link-text" class="col-sm-2 control-label">
+                            Link text
+                        </label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control"
+                                   id="link-text"/>
+                        </div>
+                    </div>
+                </div>
             </form>
         </t>
     </t>
-- 
cgit v1.2.3


From 261b1f5ca16bd95d75581cf8eb983f5fae40cf06 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 26 Sep 2013 19:47:23 +0200
Subject: [IMP] Parallax Snippet

bzr revid: fp@tinyerp.com-20130926174723-bm0mt96x36u21c5q
---
 addons/website/static/src/xml/website.snippets.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(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 af562606bbe..c73060ca8c5 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -60,11 +60,13 @@
                   <li><a href="#snippet_structure">Structure</a></li>
                   <li><a href="#snippet_content">Content</a></li>
                   <li><a href="#snippet_business">Business</a></li>
+                  <li><a href="#snippet_effect">Effects</a></li>
                 </ul>
                 <div class="pill-content">
                     <div id="snippet_structure"><label><div>Structure</div></label></div>
                     <div id="snippet_content"><label><div>Content</div></label></div>
                     <div id="snippet_business"><label><div>Business</div></label></div>
+                    <div id="snippet_effect"><label><div>Effects</div></label></div>
                 </div>
             </div>
         </div>
@@ -789,5 +791,23 @@
         </section>
     </div>
 
+    <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
+        <div class='oe_snippet_thumbnail'>Parallax</div>
+        <section class="oe_snippet_body parallax_full oe_structure">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12 mt128 mb32">
+                        <h1 class="text-center">
+                            <b>Our References</b>
+                        </h1>
+                        <h3 class="text-center">
+                            More than 500 happy customers.
+                        </h3>
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+
 
 </templates>
-- 
cgit v1.2.3


From e614c0d35d40f73ad5cb4cf0c5341957405da279 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 07:06:38 +0200
Subject: [IMP] Title snippet

bzr revid: fp@openerp.com-20130927050638-p93afqafx7i3xfd5
---
 addons/website/static/src/xml/website.snippets.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 c73060ca8c5..085d6e40aea 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -371,12 +371,16 @@
 
     <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class="oe_snippet_thumbnail">Title</div>
-        <div class="oe_snippet_body row">
-            <div class="col-md-12">
-                <h2>Your Website Title</h2>
-                <h3 class="text-muted">Great products for great people</h3>
+        <section class="oe_snippet_body">
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-12">
+                        <h2 class="text-center">Your Website Title</h2>
+                        <h3 class="text-muted text-center">Great products for great people</h3>
+                    </div>
+                </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-- 
cgit v1.2.3


From f1ccbedd2a880bc5ae07423b5d1f5cc546f8b9e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 07:17:27 +0200
Subject: [iMP] fix wrong view in customize

bzr revid: fp@openerp.com-20130927051727-8jlr62kdhmxmxjjd
---
 addons/website/static/src/xml/website.editor.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.editor.xml b/addons/website/static/src/xml/website.editor.xml
index e25e301b19c..157d19b56c0 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -59,6 +59,12 @@
                                id="link-new" pattern="[\\w/-]+"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
+                        <div class="pull-right">
+                            <label>
+                                <input type="checkbox" class="window-new"/>
+                                Open in new window
+                            </label>
+                        </div>
                         <h3 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
                                 External Website
@@ -66,12 +72,6 @@
                         </h3>
                         <input type="text" class="form-control url url-source"
                                id="link-external" placeholder="http://openerp.com"/>
-                        <div class="pull-right">
-                            <label>
-                                <input type="checkbox" class="window-new"/>
-                                Open in new window
-                            </label>
-                        </div>
                     </li>
                     <li class="list-group-item form-group">
                         <h3 class="list-group-item-heading">
-- 
cgit v1.2.3


From b81d0e399cc8b1112aabacaee15e87f8cff439da Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 08:12:03 +0200
Subject: [IMP] Add slide near remove slide

bzr revid: fp@openerp.com-20130927061203-pp9oyz69vfcmp0rf
---
 addons/website/static/src/xml/website.snippets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 085d6e40aea..6ecda744d36 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -121,10 +121,6 @@
                 <li data-value="oe_big"><a>Big</a></li>
             </ul>
         </li>
-        <li class="divider"></li>
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
         <li class="oe_snippet_options dropdown-submenu">
             <a tabindex="-1" href="#">Background</a>
             <ul class="dropdown-menu" name="carousel-background">
@@ -154,6 +150,10 @@
                 <li data-value="text_image"><a>Text - Image</a></li>
             </ul>
         </li>
+        <li class="oe_snippet_options divider"></li>
+        <li class='oe_snippet_options'>
+            <a href="#" class="button js_add">Add Slide</a>
+        </li>
         <li class='oe_snippet_options'>
             <a href="#" class="button js_remove">Remove Slide</a>
         </li>
-- 
cgit v1.2.3


From 54d13852e41f44eb59e724438d7440dba57753de Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 08:21:25 +0200
Subject: [IMP] Font awesome instead of glyphicon

bzr revid: fp@openerp.com-20130927062125-dh9sypcv5rj1b9vd
---
 addons/website/static/src/xml/website.snippets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 6ecda744d36..cb99f3be369 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -76,14 +76,14 @@
         <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="Get Container Block"><span class="glyphicon glyphicon-open"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Get Container Block"><span class="icon-upload-alt"/></a>
                     <div class="dropdown oe_options hidden btn-group">
                         <a href="#" data-toggle="dropdown" class="btn btn-default 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_clone" title="Duplicate"><span class="glyphicon glyphicon-tags"/></a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="glyphicon glyphicon-move"/></a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="glyphicon glyphicon-remove"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_clone" title="Duplicate"><span class="icon-paste"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="icon-move"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="icon-remove"/></a>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From c673aa1ac46688167cbb0bf977c3cc741aa4907e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 08:30:04 +0200
Subject: [IMP] d&d snippets

bzr revid: fp@openerp.com-20130927063004-0y7dlmvjgu0oe97n
---
 addons/website/static/src/xml/website.snippets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 cb99f3be369..0733485a38d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -76,14 +76,14 @@
         <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="Get Container Block"><span class="icon-upload-alt"/></a>
+                    <a href="#" class="btn btn-default btn-sm oe_snippet_parent" title="Select Container Block"><span class="icon-upload-alt"/></a>
                     <div class="dropdown oe_options hidden btn-group">
                         <a href="#" data-toggle="dropdown" class="btn btn-default 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_clone" title="Duplicate"><span class="icon-paste"/></a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_move" title="move"><span class="icon-move"/></a>
-                    <a href="#" class="btn btn-default btn-sm oe_snippet_remove" title="Remove"><span class="icon-remove"/></a>
+                    <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>
                 </div>
             </div>
         </div>
-- 
cgit v1.2.3


From f7489bd1d7974078101a91d389084590012fc686 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 08:32:47 +0200
Subject: [IMP] h1 > h2

bzr revid: fp@openerp.com-20130927063247-1asz4pg9vvcvp19b
---
 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 0733485a38d..8c438aa8874 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -173,7 +173,7 @@
                     <img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
                     <div class="container">
                         <div class="carousel-caption content">
-                            <h1>Set Your Banner Title</h1>
+                            <h2>Set Your Banner Title</h2>
                             <h3>Customize with the top-left menu</h3>
                             <p>
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
-- 
cgit v1.2.3


From ab846283a6b269a8e6d7f9cb096e76d09aeb0e05 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Fri, 27 Sep 2013 08:36:43 +0200
Subject: [iMP] h1 >h2

bzr revid: fp@openerp.com-20130927063643-zxcco1aja2od0dew
---
 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 8c438aa8874..856f0837a29 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -375,7 +375,7 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12">
-                        <h2 class="text-center">Your Website Title</h2>
+                        <h1 class="text-center">Your Website Title</h1>
                         <h3 class="text-muted text-center">Great products for great people</h3>
                     </div>
                 </div>
@@ -802,10 +802,10 @@
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
                         <h1 class="text-center">
-                            <b>Our References</b>
+                            <b>OpenERP Events Management</b>
                         </h1>
                         <h3 class="text-center">
-                            More than 500 happy customers.
+                            Sell tickets online with the Event app
                         </h3>
                     </div>
                 </div>
-- 
cgit v1.2.3


From 60e2a03700a073b50bd31102b6b562d56f0cc5dc Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 27 Sep 2013 14:41:16 +0200
Subject: [IMP] website snippet: background option for paralax and fix banner

bzr revid: chm@openerp.com-20130927124116-o2244s5ufu18pvcx
---
 addons/website/static/src/xml/website.snippets.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 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 856f0837a29..b885126adf9 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -797,7 +797,24 @@
 
     <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>Parallax</div>
-        <section class="oe_snippet_body parallax_full oe_structure">
+
+        <li class="oe_snippet_options dropdown-submenu">
+            <a tabindex="-1" href="#">Background</a>
+            <ul class="dropdown-menu" name="parallax-background">
+                <li data-value="/website/static/src/img/parallax/parallax_bg.jpg"><a>Parallax</a></li>
+                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
+                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
+                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
+                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
+                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
+                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
+                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
+                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
+                <li class="oe_custom_bg"><b></b></li>
+            </ul>
+        </li>
+
+        <section class="oe_snippet_body parallax_full oe_structure" style="background-image: url(/website/static/src/img/parallax/parallax_bg.jpg)">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
-- 
cgit v1.2.3


From 1a869abd0d058fd46110157bfe85e8e390e976ed Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 29 Sep 2013 10:48:53 +0200
Subject: [IMP] Website Blogs

bzr revid: fp@openerp.com-20130929084853-whow6sq3ns007fqx
---
 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 b885126adf9..05146e5f34f 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -828,7 +828,7 @@
                 </div>
             </div>
         </section>
-    </div>
 
+    </div>
 
 </templates>
-- 
cgit v1.2.3


From 36a10309a9d4e24438e9452ea89ef745cc55559e Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 30 Sep 2013 17:32:50 +0200
Subject: [IMP] website snippet: edit background and snippet image with rte
 editor, and reduce code

bzr revid: chm@openerp.com-20130930153250-408yct764u9i6q3p
---
 addons/website/static/src/xml/website.snippets.xml | 5 ++---
 1 file changed, 2 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 05146e5f34f..1a80487fb0e 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -169,8 +169,7 @@
         <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item image_text active">
-                    <img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
+                <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg)">
                     <div class="container">
                         <div class="carousel-caption content">
                             <h2>Set Your Banner Title</h2>
@@ -810,7 +809,7 @@
                 <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
                 <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
                 <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
-                <li class="oe_custom_bg"><b></b></li>
+                <li class="oe_custom_bg"><a><b>Enter your image</b></a></li>
             </ul>
         </li>
 
-- 
cgit v1.2.3


From 78ac1f2a765321057b33c79e2d9f38f530a9568d Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 30 Sep 2013 17:38:44 +0200
Subject: [IMP] website snippet: edit background for banner

bzr revid: chm@openerp.com-20130930153844-taziqm3vogx07e4s
---
 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 1a80487fb0e..e4c0cfc5670 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -139,7 +139,7 @@
                 <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
                 <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
                 <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li class="oe_custom_bg"><b></b></li>
+                <li class="oe_custom_bg"><a><b>Enter your image</b></a></li>
             </ul>
         </li>
         <li class='oe_snippet_options dropdown-submenu'>
-- 
cgit v1.2.3


From 634a4d534841fb9eda22670af1f3b2fa23de33c9 Mon Sep 17 00:00:00 2001
From: Nicolas Wisniewski <nwi@openerp.com>
Date: Tue, 1 Oct 2013 15:43:04 +0200
Subject: [IMP] Improve look & feel of snippets ( test purpose )

bzr revid: nwi@openerp.com-20131001134304-cldj2bynoqt5bsb9
---
 addons/website/static/src/xml/website.snippets.xml | 183 ++++++++-------------
 1 file changed, 69 insertions(+), 114 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 e4c0cfc5670..db3f551d963 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -63,10 +63,10 @@
                   <li><a href="#snippet_effect">Effects</a></li>
                 </ul>
                 <div class="pill-content">
-                    <div id="snippet_structure"><label><div>Structure</div></label></div>
-                    <div id="snippet_content"><label><div>Content</div></label></div>
-                    <div id="snippet_business"><label><div>Business</div></label></div>
-                    <div id="snippet_effect"><label><div>Effects</div></label></div>
+                    <div id="snippet_structure"></div>
+                    <div id="snippet_content"></div>
+                    <div id="snippet_business"></div>
+                    <div id="snippet_effect"></div>
                 </div>
             </div>
         </div>
@@ -139,7 +139,7 @@
                 <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
                 <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
                 <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li class="oe_custom_bg"><a><b>Enter your image</b></a></li>
+                <li class="oe_custom_bg"><b></b></li>
             </ul>
         </li>
         <li class='oe_snippet_options dropdown-submenu'>
@@ -160,16 +160,15 @@
 
         <!-- thumbnail to display inside the bottom widget list editor -->
         <div class='oe_snippet_thumbnail'>
-            <img src="/website/static/src/img/banner/color_splash.jpg" style="position: absolute; left: 0; top: 40px; max-width: 100%"/>
-            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 10px; top: 52px; max-width: 25%"/>
-            <span style="position: absolute; top: 50px; right: 10px;">Banner</span>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_banner.png"/>
+            <span class="oe_snippet_thumbnail_title">Banner</span>         
         </div>
-
         <!-- body to insert after drag and drop thumbnail -->
         <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item image_text active" style="background-image: url(/website/static/src/img/banner/color_splash.jpg)">
+                <div class="item image_text active">
+                    <img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
                     <div class="container">
                         <div class="carousel-caption content">
                             <h2>Set Your Banner Title</h2>
@@ -195,17 +194,20 @@
         <div class='oe_snippet_class'>dark</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
+    <!-- <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail'>Well</div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
             leads, follow-up on phone calls and meetings. Analyse the quality
             of your leads to make informed decisions.
         </div>
-    </div>
+    </div> -->
 
     <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>Quote</div>
+        <div class='oe_snippet_thumbnail'>            
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quote.png"/>
+            <span class="oe_snippet_thumbnail_title">Quote</span>
+        </div>
         <blockquote class="oe_snippet_body">
             <p>
                 OpenERP provides essential platform for our project management.
@@ -216,7 +218,10 @@
     </div>
 
     <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>Panel</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_panel.png"/>
+            <span class="oe_snippet_thumbnail_title">Panel</span>
+        </div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
                 <h3 class="panel-title">OpenERP Features</h3>
@@ -232,13 +237,16 @@
 
     <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-children='.oe_structure'>
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
-        <div class='oe_snippet_thumbnail' style='background-image:radial-gradient(red,orange,yellow,green,blue);'>Surprise!</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_surprise.png"/>
+            <span class="oe_snippet_thumbnail_title">Surprise!</span>
+        </div>
     </div>
 
     <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <span style="position: absolute; top: 50px; left: 5px;">Text-Image</span>
-            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; right: 5px; top: 50px; max-width: 28%"/>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
+            <span class="oe_snippet_thumbnail_title">Text-Image</span>
         </div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -267,8 +275,8 @@
 
     <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <img src="/website/static/src/img/banner/banner_picture.png" style="position: absolute; left: 5px; top: 50px; max-width: 28%"/>
-            <span style="position: absolute; top: 50px; right: 5px;">Image-Text</span>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
+            <span class="oe_snippet_thumbnail_title">Image-Text</span>
         </div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -296,15 +304,8 @@
 
     <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <div style="position: absolute; top: 30px; background-color: #eee; width: 100%; padding: 8px 0 6px 4px;">
-                <div style="color: #000; display: block; text-align: left;">
-                    Jumbotron
-                    <div style="font-size: 9px; line-height: 9px; text-shadow: none;">
-                        Jumbotron Sub-title
-                        <br/><span class="label label-primary">Contact us</span>
-                    </div>
-                </div>
-            </div>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
+            <span class="oe_snippet_thumbnail_title">Jumbotron</span>
         </div>
         <section class="oe_snippet_body jumbotron mt16 mb16">
             <div class="container">
@@ -323,21 +324,8 @@
 
     <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <div style="position: absolute; top: 26px; left: 5px;  width: 94%;">
-                <div style="display: block;">
-                    Text Block
-                    <div style="text-shadow: none;font-size: 9px; line-height: 9px; color: #bbb;margin-bottom: 5px;">
-                        Jumbotron Sub-title
-                    </div>
-                    <div style="text-shadow: none;font-size: 6px; line-height: 6px; text-align: left;">
-                        Organize projects around your own processes. Work
-                        on tasks and issues using the kanban view, schedule
-                        tasks using the gantt chart and control deadlines
-                        in the calendar view. Every project may have it's
-                        own stages allowing teams to optimize their job.
-                    </div>
-                </div>
-            </div>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
+            <span class="oe_snippet_thumbnail_title">Text Block</span>
         </div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -369,7 +357,10 @@
     </div>
 
     <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail">Title</div>
+        <div class="oe_snippet_thumbnail">
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_title.png"/>
+            <span class="oe_snippet_thumbnail_title">Title</span>
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
@@ -384,8 +375,8 @@
 
     <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class="oe_snippet_thumbnail">
-            <hr style="position: absolute;top: 61px;margin: 0;width: 100%;border-color: #888;"/>
-            <div style="position: absolute;width: 100%;top: 51px;">Separator</div>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
+            <span class="oe_snippet_thumbnail_title">Separator</span>        
         </div>
         <hr class="oe_snippet_body"/>
     </div>
@@ -393,17 +384,8 @@
 
     <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <div style="position: absolute; top: 8px; left: 5px;  width: 94%;">
-                <div style="display: block;">
-                    Big Picture
-                    <img src="/website/static/src/img/big_picture.png" style="max-width: 100%"/>
-                    <div style="text-shadow: none;font-size: 6px; line-height: 6px; margin: 5px 10px">
-                        OpenERP's Point of Sale introduces a super clean
-                        interface with no installation required.
-                    </div>
-                </div>
-            </div>
-
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
+            <span class="oe_snippet_thumbnail_title">Big Picture</span>          
         </div>
         <section class="oe_snippet_body dark mt16 mb16">
             <div class="container">
@@ -435,23 +417,8 @@
 
     <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class="oe_snippet_thumbnail">
-            <div style="padding-top: 22px;">
-                Three Columns
-                <div class="clearfix" style="font-size: 6px;text-shadow: none;">
-                    <div class="pull-left" style="width: 33%;line-height: 6px;">
-                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 90%;"/>
-                        Post job offers and keep track of each application received.
-                    </div>
-                    <div class="pull-left" style="width: 33%;line-height: 6px;">
-                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 90%;"/>
-                        Break down information silos. Share knowledge and best practices amongst all employees.
-                    </div>
-                    <div class="pull-left" style="width: 33%; line-height: 6px;">
-                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 90%;"/>
-                        The agenda of each employee is updated accordingly.
-                    </div>
-                </div>
-            </div>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_three_columns.png"/>
+            <span class="oe_snippet_thumbnail_title">Three Columns</span>            
         </div>
         <section class="oe_snippet_body mt16 mb16">
             <div class="container">
@@ -502,7 +469,10 @@
     </div>
 
     <div t-name="website.snippets.portfolio" data-snippet-id='portfolio' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>Portfolio</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_portfolio.png"/>
+            <span class="oe_snippet_thumbnail_title">Portfolio</span>      
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
                 <div class="row">
@@ -532,21 +502,8 @@
 
     <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
         <div class='oe_snippet_thumbnail'>
-            <div style="padding-top: 22px;">
-                Image Gallery
-                <div class="clearfix">
-                    <div style="float: right; width: 56px;height: 30px;">
-                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
-                        <img src="/website/static/src/img/deers_thumb.jpg" style="max-width: 24px;"/>
-                        <img src="/website/static/src/img/desert_thumb.jpg" style="max-width: 24px;"/>
-                        <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
-                    </div>
-                    <img src="/website/static/src/img/desert.jpg" style="float-left; width: 50px;height: 31px;margin-top: 4px;"/>
-                    <img src="/website/static/src/img/deers_thumb.jpg" style="float-left; max-width: 24px;"/>
-                    <img src="/website/static/src/img/landscape.jpg" style="float-left; max-width: 50px;"/>
-                    <img src="/website/static/src/img/china_thumb.jpg" style="max-width: 24px;"/>
-                </div>
-            </div>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_gallery.png"/>
+            <span class="oe_snippet_thumbnail_title">Image Gallery</span> 
         </div>
         <section class="oe_snippet_body">
             <div class="container">
@@ -585,7 +542,10 @@
     </div>
 
     <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>Comparisons</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
+            <span class="oe_snippet_thumbnail_title">Comparisons</span>         
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
               <div class="row">
@@ -687,7 +647,10 @@
     </div>
 
     <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>Buttons</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
+            <span class="oe_snippet_thumbnail_title">Button</span>   
+        </div>
         <section class="oe_snippet_body dark">
             <div class="container">
               <div class="row">
@@ -701,7 +664,10 @@
     </div>
 
     <div t-name="website.snippets.faq" data-snippet-id='faq' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>FAQ</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_faq.png"/>
+            <span class="oe_snippet_thumbnail_title">FAQ</span>  
+        </div>
         <section class="oe_snippet_body">
             <div class="container">
                 <h2 class="page-header">
@@ -744,7 +710,10 @@
     </div>
 
     <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>References</div>
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_references.png"/>
+            <span class="oe_snippet_thumbnail_title">References</span> 
+        </div>
         <section class="oe_snippet_body mb32 mt16">
             <div class="container">
                 <div class="row">
@@ -795,25 +764,11 @@
     </div>
 
     <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>Parallax</div>
-
-        <li class="oe_snippet_options dropdown-submenu">
-            <a tabindex="-1" href="#">Background</a>
-            <ul class="dropdown-menu" name="parallax-background">
-                <li data-value="/website/static/src/img/parallax/parallax_bg.jpg"><a>Parallax</a></li>
-                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
-                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
-                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
-                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
-                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
-                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
-                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
-                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
-                <li class="oe_custom_bg"><a><b>Enter your image</b></a></li>
-            </ul>
-        </li>
-
-        <section class="oe_snippet_body parallax_full oe_structure" style="background-image: url(/website/static/src/img/parallax/parallax_bg.jpg)">
+        <div class='oe_snippet_thumbnail'>
+            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/>
+            <span class="oe_snippet_thumbnail_title">Parallax</span>        
+        </div>
+        <section class="oe_snippet_body parallax_full oe_structure">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
@@ -827,7 +782,7 @@
                 </div>
             </div>
         </section>
-
     </div>
 
+
 </templates>
-- 
cgit v1.2.3


From 2c49630a8bf3c7d7f0974dc2d58d61e2e11eef24 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 1 Oct 2013 16:38:17 +0200
Subject: [FIX] website: some fixes for firefox

bzr revid: chm@openerp.com-20131001143817-mu7lkvuwfip2fz2u
---
 addons/website/static/src/xml/website.snippets.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 db3f551d963..ae5d544d41b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -167,8 +167,7 @@
         <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
             <!-- Carousel items -->
             <div class="carousel-inner">
-                <div class="item image_text active">
-                    <img src="/website/static/src/img/banner/color_splash.jpg" width="100%" height="100%"/>
+                <div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
                     <div class="container">
                         <div class="carousel-caption content">
                             <h2>Set Your Banner Title</h2>
-- 
cgit v1.2.3


From 41ee5e22ba79ee44f0b6aac5ac710eff94b4d301 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Tue, 1 Oct 2013 20:34:41 +0200
Subject: [IMP] show well

bzr revid: fp@openerp.com-20131001183441-tzy781p0coircu9y
---
 addons/website/static/src/xml/website.snippets.xml | 8 +++++---
 1 file changed, 5 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 ae5d544d41b..263c383ff4b 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -193,14 +193,16 @@
         <div class='oe_snippet_class'>dark</div>
     </div>
 
-    <!-- <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>Well</div>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
+        <div class='oe_snippet_thumbnail'>
+            <span class="oe_snippet_thumbnail_title">Well</span>
+        </div>
         <div class="oe_snippet_body well">
             Manage your sales funnel with no effort with OpenERP CRM. Attract
             leads, follow-up on phone calls and meetings. Analyse the quality
             of your leads to make informed decisions.
         </div>
-    </div> -->
+    </div>
 
     <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail'>            
-- 
cgit v1.2.3


From 0c2d204bb16b08bba3e5e7a196b64606214752e4 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 2 Oct 2013 10:50:18 +0200
Subject: [FIX] Add editor tour missing files

bzr revid: ddm@openerp.com-20131002085018-af7yc5oyjx4opr9j
---
 addons/website/static/src/xml/website.tour.xml | 33 ++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.tour.xml

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
new file mode 100644
index 00000000000..13219b471ed
--- /dev/null
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="website.tour_simple">
+        <div class="popover tour">
+            <div class="arrow"></div>
+            <h3 class="popover-title"></h3>
+            <div class="popover-content"></div>
+            <nav class="popover-navigation">
+                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
+            </nav>
+            <!--
+            <nav class="popover-navigation">
+                <div class="btn-group">
+                    <button class="btn btn-sm btn-default" data-role="prev">« Prev</button>
+                    <button class="btn btn-sm btn-default" data-role="next">Next »</button>
+                </div>
+                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
+            </nav>
+            -->
+        </div>
+    </t>
+    <t t-name="website.tour_confirm">
+        <div class="popover tour">
+            <div class="arrow"></div>
+            <h3 class="popover-title"></h3>
+            <div class="popover-content"></div>
+            <nav class="popover-navigation">
+                <button class="btn btn-sm btn-default" data-role="next">OK, what's next?</button>
+                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
+            </nav>
+        </div>
+    </t>
+</templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 3492c4ce651c78dae1c7e311217434bca37ab966 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 2 Oct 2013 15:57:23 +0200
Subject: [IMP] Basic first tour

bzr revid: ddm@openerp.com-20131002135723-cxt0mhjeumr2bciq
---
 addons/website/static/src/xml/website.tour.xml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 13219b471ed..4651ac1046f 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -5,18 +5,6 @@
             <div class="arrow"></div>
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
-            <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
-            </nav>
-            <!--
-            <nav class="popover-navigation">
-                <div class="btn-group">
-                    <button class="btn btn-sm btn-default" data-role="prev">« Prev</button>
-                    <button class="btn btn-sm btn-default" data-role="next">Next »</button>
-                </div>
-                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
-            </nav>
-            -->
         </div>
     </t>
     <t t-name="website.tour_confirm">
@@ -25,9 +13,11 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next">OK, what's next?</button>
-                <button class="btn btn-sm btn-default" data-role="end">Stop tour</button>
+                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="confirm"/></button>
             </nav>
         </div>
     </t>
+    <t t-name="website.tour_title">
+        <t t-esc="title"/><button title="Close" type="button" class="close" data-role="end">×</button>
+    </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 530c7ff2ebcc13fcf255fb26a18f31f26742fbaf Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 3 Oct 2013 10:40:11 +0200
Subject: [FIX] website snippet: paralax background

bzr revid: chm@openerp.com-20131003084011-gtqzu02rkrz2busz
---
 addons/website/static/src/xml/website.snippets.xml | 25 ++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 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 a345ac0b06d..25053b3be62 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -139,7 +139,7 @@
                 <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
                 <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
                 <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li class="oe_custom_bg"><b></b></li>
+                <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
             </ul>
         </li>
         <li class='oe_snippet_options dropdown-submenu'>
@@ -769,7 +769,28 @@
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/>
             <span class="oe_snippet_thumbnail_title">Parallax</span>        
         </div>
-        <section class="oe_snippet_body parallax_full oe_structure">
+        <li class="oe_snippet_options dropdown-submenu">
+            <a tabindex="-1" href="#">Background</a>
+            <ul class="dropdown-menu" name="parallax-background">
+                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
+                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
+                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
+                <li data-value="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
+                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
+                <li data-value="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
+                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
+                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
+                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
+                <li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
+                <li data-value="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
+                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
+                <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
+                <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
+                <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
+                <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
+            </ul>
+        </li>
+        <section class="oe_snippet_body parallax_full oe_structure" style="background-image: url('/website/static/src/img/banner/greenfields.jpg')">
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
-- 
cgit v1.2.3


From 15007aa592e12e5897194028ce7ede1ad3c0124c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 3 Oct 2013 16:34:29 +0200
Subject: [FIX] website snippets: body click; surprise

bzr revid: chm@openerp.com-20131003143429-agukrwas7c34grrf
---
 addons/website/static/src/xml/website.snippets.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 25053b3be62..6c7b6c46d88 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -193,7 +193,7 @@
         <div class='oe_snippet_class'>dark</div>
     </div>
 
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote, div'>
+    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail'>
             <span class="oe_snippet_thumbnail_title">Well</span>
         </div>
@@ -204,7 +204,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote, div'>
+    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail'>            
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quote.png"/>
             <span class="oe_snippet_thumbnail_title">Quote</span>
@@ -218,7 +218,7 @@
         </blockquote>
     </div>
 
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote, div'>
+    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
         <div class='oe_snippet_thumbnail'>
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_panel.png"/>
             <span class="oe_snippet_thumbnail_title">Panel</span>
@@ -236,7 +236,7 @@
         </div>
     </div>
 
-    <div t-name="website.snippets.surprise" data-snippet-id='vomify' data-category='content' data-selector-children='.oe_structure'>
+    <div t-name="website.snippets.surprise" data-snippet-id='surprise' data-category='content' data-selector-children='.oe_structure'>
         <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
         <div class='oe_snippet_thumbnail'>
             <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_surprise.png"/>
-- 
cgit v1.2.3


From bc93c67c16851fff259c4fd19d453b647c487917 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 3 Oct 2013 19:06:15 +0200
Subject: [IMP] Multi-step tour

bzr revid: ddm@openerp.com-20131003170615-9na7692ql6464bnq
---
 addons/website/static/src/xml/website.tour.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 4651ac1046f..d0d6b7630c0 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -17,6 +17,16 @@
             </nav>
         </div>
     </t>
+    <t t-name="website.tour_end">
+        <div class="popover tour">
+            <div class="arrow"></div>
+            <h3 class="popover-title"></h3>
+            <div class="popover-content"></div>
+            <nav class="popover-navigation">
+                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="confirm"/></button>
+            </nav>
+        </div>
+    </t>
     <t t-name="website.tour_title">
         <t t-esc="title"/><button title="Close" type="button" class="close" data-role="end">×</button>
     </t>
-- 
cgit v1.2.3


From b1c4741154caefbf9d75c38cab34e9589e5d486d Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 4 Oct 2013 11:37:40 +0200
Subject: [IMP] Support for multiple tutorials

bzr revid: ddm@openerp.com-20131004093740-3dxcktks5x2xb4t2
---
 addons/website/static/src/xml/website.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 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 c2f7abe6ed2..a47449606bc 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,11 +23,17 @@
                         <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">
-                            <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
+                            <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize<span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">
                                 <!-- filled in JS -->
                             </ul>
                         </li>
+                        <li class="dropdown">
+                            <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 -->
+                            </ul>
+                        </li>
                         <li>
                             <a href="/admin#action=website.action_module_website">Apps</a>
                         </li>
-- 
cgit v1.2.3


From e76ce7da829cb5665fcd953ecb1697a50fa2e7f8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 4 Oct 2013 12:03:15 +0200
Subject: [IMP] Minor tutorial improvements

bzr revid: ddm@openerp.com-20131004100315-hshfanxesnm478n3
---
 addons/website/static/src/xml/website.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a47449606bc..b3e4cacd32a 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,13 +23,13 @@
                         <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">
-                            <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize<span class="caret"></span></a>
+                            <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">
                                 <!-- filled in JS -->
                             </ul>
                         </li>
                         <li class="dropdown">
-                            <a id="help-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Help<span class="caret"></span></a>
+                            <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 -->
                             </ul>
-- 
cgit v1.2.3


From 865a7cb53a0aa8c3b639f6abb96c0e23c69260ea Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 4 Oct 2013 12:41:33 +0200
Subject: [IMP] website: xml snippets server side + improve loading speed

bzr revid: chm@openerp.com-20131004104133-q1p2fdf153izeqyj
---
 addons/website/static/src/xml/website.snippets.xml | 716 +--------------------
 1 file changed, 1 insertion(+), 715 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 6c7b6c46d88..164b612fcaf 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -54,22 +54,7 @@
     </t>
 
     <t t-name="website.snippets">
-        <div id='oe_snippets'>
-            <div class="scroll">
-                <ul class="nav navbar-nav">
-                  <li><a href="#snippet_structure">Structure</a></li>
-                  <li><a href="#snippet_content">Content</a></li>
-                  <li><a href="#snippet_business">Business</a></li>
-                  <li><a href="#snippet_effect">Effects</a></li>
-                </ul>
-                <div class="pill-content">
-                    <div id="snippet_structure"></div>
-                    <div id="snippet_content"></div>
-                    <div id="snippet_business"></div>
-                    <div id="snippet_effect"></div>
-                </div>
-            </div>
-        </div>
+        <div id='oe_snippets'></div>
     </t>
 
     <t t-name="website.snippet_overlay">
@@ -108,703 +93,4 @@
 
     <div t-name="website.snippets.colmd" data-snippet-id='colmd' data-selector-vertical-children='.row'></div>
 
-    <!-- Structure Snippets -->
-
-    <div t-name="website.snippets.carousel" data-snippet-id='carousel' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        
-        <!-- editor bar to display inside the top edit bar -->
-        <li class='oe_snippet_options dropdown-submenu'>
-            <a tabindex="-1" href="#">Size</a>
-            <ul class="dropdown-menu" name="carousel-size">
-                <li data-value="oe_small"><a>Small</a></li>
-                <li data-value="oe_medium"><a>Medium</a></li>
-                <li data-value="oe_big"><a>Big</a></li>
-            </ul>
-        </li>
-        <li class="oe_snippet_options dropdown-submenu">
-            <a tabindex="-1" href="#">Background</a>
-            <ul class="dropdown-menu" name="carousel-background">
-                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
-                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
-                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
-                <li data-value="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
-                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
-                <li data-value="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
-                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
-                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
-                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
-                <li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
-                <li data-value="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
-                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
-                <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
-                <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
-                <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
-            </ul>
-        </li>
-        <li class='oe_snippet_options dropdown-submenu'>
-            <a tabindex="-1" href="#">Style</a>
-            <ul class="dropdown-menu" name="carousel-style">
-                <li data-value="text_only"><a>Text Only</a></li>
-                <li data-value="image_text"><a>Image - Text</a></li>
-                <li data-value="text_image"><a>Text - Image</a></li>
-            </ul>
-        </li>
-        <li class="oe_snippet_options divider"></li>
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_add">Add Slide</a>
-        </li>
-        <li class='oe_snippet_options'>
-            <a href="#" class="button js_remove">Remove Slide</a>
-        </li>
-
-        <!-- thumbnail to display inside the bottom widget list editor -->
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_banner.png"/>
-            <span class="oe_snippet_thumbnail_title">Banner</span>         
-        </div>
-        <!-- body to insert after drag and drop thumbnail -->
-        <div id="myCarousel" class="oe_snippet_body carousel slide oe_medium mb32" data-interval="10000">
-            <!-- Carousel items -->
-            <div class="carousel-inner">
-                <div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
-                    <div class="container">
-                        <div class="carousel-caption content">
-                            <h2>Set Your Banner Title</h2>
-                            <h3>Customize with the top-left menu</h3>
-                            <p>
-                                <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
-                            </p>
-                        </div>
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image"/>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <!-- Carousel nav -->
-            <a class="carousel-control left hidden" href="#myCarousel" data-slide="prev" style="width: 10%"><span class="glyphicon glyphicon-circle-arrow-left"><span class="hidden">.</span></span></a>
-            <a class="carousel-control right hidden" href="#myCarousel" data-slide="next" style="width: 10%"><span class="glyphicon glyphicon-circle-arrow-right"><span class="hidden">.</span></span></a>
-        </div>
-    </div>
-
-    <div t-name="website.snippets.darken" data-snippet-id='darken' data-category='style' data-selector='section'>
-        <div class='oe_snippet_label'>Darken</div>
-        <div class='oe_snippet_class'>dark</div>
-    </div>
-
-    <div t-name="website.snippets.well" data-snippet-id='well' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>
-            <span class="oe_snippet_thumbnail_title">Well</span>
-        </div>
-        <div class="oe_snippet_body well">
-            Manage your sales funnel with no effort with OpenERP CRM. Attract
-            leads, follow-up on phone calls and meetings. Analyse the quality
-            of your leads to make informed decisions.
-        </div>
-    </div>
-
-    <div t-name="website.snippets.quote" data-snippet-id='quote' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>            
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_quote.png"/>
-            <span class="oe_snippet_thumbnail_title">Quote</span>
-        </div>
-        <blockquote class="oe_snippet_body">
-            <p>
-                OpenERP provides essential platform for our project management.
-                Things are better organized and more visible with it.
-            </p>
-            <small>John Doe, CEO</small>
-        </blockquote>
-    </div>
-
-    <div t-name="website.snippets.panel" data-snippet-id='panel' data-category='content' data-selector-siblings='p, h1, h2, h3, blockquote'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_panel.png"/>
-            <span class="oe_snippet_thumbnail_title">Panel</span>
-        </div>
-        <div class="oe_snippet_body panel panel-default">
-            <div class="panel-heading">
-                <h3 class="panel-title">OpenERP Features</h3>
-            </div>
-            <div class="panel-body">
-                OpenERP's collaborative and realtime project management helps
-                your team get work done. Keep track of everything, from the big
-                picture to the minute details, from the customer contract to
-                the billing.
-            </div>
-        </div>
-    </div>
-
-    <div t-name="website.snippets.surprise" data-snippet-id='surprise' data-category='content' data-selector-children='.oe_structure'>
-        <div class="oe_snippet_body" style="height: 0; position: absolute;"></div>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_surprise.png"/>
-            <span class="oe_snippet_thumbnail_title">Surprise!</span>
-        </div>
-    </div>
-	
-    <div t-name="website.snippets.text-image" data-snippet-id='text-image' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_image.png"/>
-            <span class="oe_snippet_thumbnail_title">Text-Image</span>
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-6 mt32">
-                        <h3>Enterprise Social Network</h3>
-                        <p>
-                            Make every employee feel more connected and engaged
-                            with twitter-like features for your own company. Follow
-                            people, share best practices, 'like' top ideas, etc.
-                        </p><p>
-                            Connect with experts, follow what interests you, share
-                            documents and promote best practices with OpenERP
-                            Social application. Get work done with effective
-                            collaboration across departments, geographies
-                            and business applications.
-                        </p>
-                    </div>
-                    <div class="col-md-6 mt16 mb16">
-                        <img class="img-responsive shadow" src="/website/static/src/img/text_image.png"/>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.image-text" data-snippet-id='image-text' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_text.png"/>
-            <span class="oe_snippet_thumbnail_title">Image-Text</span>
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-6 mt16 mb16">
-                        <img class="img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
-                    </div>
-                    <div class="col-md-6 mt32">
-                        <h3>Manage Your Shops</h3>
-                        <p>
-                            OpenERP's Point of Sale introduces a super clean
-                            interface with no installation required that runs
-                            online and offline on modern hardwares.
-                        </p><p>
-                            It's full integration with the company inventory
-                            and accounting, gives you real time statistics and
-                            consolidations amongst all shops without the hassle
-                            of integrating several applications.
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.jumbotron" data-snippet-id='jumbotron' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_jumbotron.png"/>
-            <span class="oe_snippet_thumbnail_title">Jumbotron</span>
-        </div>
-        <section class="oe_snippet_body jumbotron mt16 mb16">
-            <div class="container">
-                <h1>Sell Online. Easily.</h1>
-                <p>
-                    Get your online shop ready in a few clicks with OpenERP Commerce.
-                </p>
-                <p>
-                    <a class="btn btn-primary btn-lg" href="/website.contactus">
-                        Contact us
-                    </a>
-                </p>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.text-block" data-snippet-id='text-block' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_text_block.png"/>
-            <span class="oe_snippet_thumbnail_title">Text Block</span>
-        </div>
-        <section class="oe_snippet_body mt16 mb16">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 text-center mt16 mb32">
-                        <h2>
-                            OpenERP Project Management
-                        </h2>
-                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
-                    </div>
-                    <div class="col-md-12 mb16 mt16">
-                        <p>
-                            OpenERP's <b>collaborative and realtime</b> project
-                            management helps your team get work done. Keep
-                            track of everything, from the big picture to the
-                            minute details, from the customer contract to the
-                            billing.
-                        </p><p>
-                            Organize projects around <b>your own processes</b>. Work
-                            on tasks and issues using the kanban view, schedule
-                            tasks using the gantt chart and control deadlines
-                            in the calendar view. Every project may have it's
-                            own stages allowing teams to optimize their job.
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.title" data-snippet-id='title' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_title.png"/>
-            <span class="oe_snippet_thumbnail_title">Title</span>
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12">
-                        <h1 class="text-center">Your Website Title</h1>
-                        <h3 class="text-muted text-center">Great products for great people</h3>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.hr" data-snippet-id='hr' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_separator.png"/>
-            <span class="oe_snippet_thumbnail_title">Separator</span>        
-        </div>
-        <hr class="oe_snippet_body"/>
-    </div>
-
-
-    <div t-name="website.snippets.big-picture" data-snippet-id='big-picture' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_big_picture.png"/>
-            <span class="oe_snippet_thumbnail_title">Big Picture</span>          
-        </div>
-        <section class="oe_snippet_body dark mt16 mb16">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 text-center mt32 mb32">
-                        <h2>Work with the hardware you already have...</h2>
-                    </div>
-                    <div class="col-md-12">
-                        <img class="img-responsive" src="/website/static/src/img/big_picture.png" style="margin: 0 auto;"/>
-                    </div>
-                    <div class="col-md-6 col-md-offset-3 mb16 mt16">
-                        <p class="text-center">
-                            <b>No installation required</b>
-                        </p>
-                        <p class="text-center">
-                            OpenERP's Point of Sale introduces a super clean
-                            interface with no installation required that runs
-                            online and offline on modern hardware. Laptops,
-                            tablets, industrial POS, it runs on everything.
-                        </p>
-                        <p class="text-center">
-                            <a href="/page/website.contactus">Get more information »</a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.three-columns" data-snippet-id='three-columns' data-category='structure' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class="oe_snippet_thumbnail">
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_three_columns.png"/>
-            <span class="oe_snippet_thumbnail_title">Three Columns</span>            
-        </div>
-        <section class="oe_snippet_body mt16 mb16">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 text-center mt16 mb16">
-                        <h2>OpenERP HR Features</h2>
-                        <h3 class="text-muted">Manage your company most important asset: People</h3>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
-                        <h4 class="mt16">Streamline Recruitments</h4>
-                        <p>
-                            Post job offers and keep track of each application
-                            received. Follow applicants in your recruitment process
-                            with the smart kanban view.
-                        </p><p>
-                            Save time by automating some communications with email
-                            templates. Resumes are indexed automatically, allowing
-                            you to easily find for specific profiles.
-                        </p>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg"/>
-                        <h4 class="mt16">Enterprise Social Network</h4>
-                        <p>
-                            Break down information silos. Share knowledge and best
-                            practices amongst all employees. Follow specific people
-                            or documents and join groups of interests to share
-                            expertise and documents.
-                        </p><p>
-                            Interact with your collegues in real time with live chat.
-                        </p>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg"/>
-                        <h4 class="mt16">Leaves Management</h4>
-                        <p>
-                            Keep track of the vacation days accrued by each
-                            employee. Employees enter their requests (paid
-                            holidays, sick leave, etc), for managers to approve and
-                            validate. It's all done in just a few clicks. The
-                            agenda of each employee is updated accordingly.
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.portfolio" data-snippet-id='portfolio' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_portfolio.png"/>
-            <span class="oe_snippet_thumbnail_title">Portfolio</span>      
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 text-center mt16 mb32">
-                        <h2>Our Porfolio</h2>
-                        <h4 class="text-muted">More than 500 successful projects</h4>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/deers.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/deers.jpg"/>
-                    </div>
-                    <div class="col-md-4">
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/landscape.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/china.jpg"/>
-                        <img class="img-thumbnail img-responsive" src="/website/static/src/img/desert.jpg"/>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.image-gallery" data-snippet-id='image-gallery' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_image_gallery.png"/>
-            <span class="oe_snippet_thumbnail_title">Image Gallery</span> 
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 text-center mt16 mb32">
-                        <h2>Our Customer References</h2>
-                        <h4 class="text-muted">More than 500 successful projects</h4>
-                    </div>
-                    <div class="col-md-6">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/desert.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/deers_thumb.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/desert_thumb.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/deers_thumb.jpg"/>
-                    </div>
-                    <div class="col-md-6">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/landscape.jpg"/>
-                    </div>
-                    <div class="col-md-3">
-                        <img class="img-thumbnail img-responsive mb16" src="/website/static/src/img/china_thumb.jpg"/>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.pricing" data-snippet-id='pricing' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_comparison.png"/>
-            <span class="oe_snippet_thumbnail_title">Comparisons</span>         
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-              <div class="row">
-                <div class="col-md-12 text-center mt16 mb32">
-                    <h2>Our Offers</h2>
-                </div>
-
-                <div class="col-md-4">
-                    <div class="panel panel-info">
-                      <!-- Default panel contents -->
-                      <div class="panel-heading text-center">
-                          <h2 style="margin: 0">Beginner</h2>
-                          <p style="margin: 0" class="text-muted">
-                              Starter package
-                          </p>
-                      </div>
-                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
-                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">450</b><small>.00</small></h2>
-                        <div>per month</div>
-                      </div>
-
-                      <!-- List group -->
-                      <ul class="list-group">
-                        <li class="list-group-item">Battery: 8 hours</li>
-                        <li class="list-group-item">Screen: 2.5 inch</li>
-                        <li class="list-group-item">Weight: 1.1 ounces</li>
-                        <li class="list-group-item">No support</li>
-                      </ul>
-                      <div class="panel-footer text-center">
-                          <p class="text-muted">
-                              <i>Free shipping, satisfied or reimbursed.</i>
-                          </p>
-                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Order now</a>
-                      </div>
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="panel panel-primary">
-                      <!-- Default panel contents -->
-                      <div class="panel-heading text-center">
-                          <h2 style="margin: 0">Professional</h2>
-                          <p style="margin: 0">
-                              Enterprise package
-                          </p>
-                      </div>
-                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
-                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">590</b><small>.00</small></h2>
-                        <div>per month</div>
-                      </div>
-
-                      <!-- List group -->
-                      <ul class="list-group">
-                        <li class="list-group-item">Battery: 12 hours</li>
-                        <li class="list-group-item">Screen: 2.8 inch</li>
-                        <li class="list-group-item">Weight: 1.2 ounces</li>
-                        <li class="list-group-item">Limited support</li>
-                      </ul>
-                      <div class="panel-footer text-center">
-                          <p class="text-muted">
-                              <i>Free shipping, satisfied or reimbursed.</i>
-                          </p>
-                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Order now</a>
-                      </div>
-                    </div>
-                </div>
-                <div class="col-md-4">
-                    <div class="panel panel-info">
-                      <!-- Default panel contents -->
-                      <div class="panel-heading text-center">
-                          <h2 style="margin: 0">Expert</h2>
-                          <p style="margin: 0" class="text-muted">
-                              The top of the top
-                          </p>
-                      </div>
-                      <div class="panel-body text-center text-muted" style="background-color: rgba(0,0,0,0.1)">
-                        <h2 style="margin: 0"><span>$</span><b style="font-size: 60px">890</b><small>.00</small></h2>
-                        <div>per month</div>
-                      </div>
-
-                      <!-- List group -->
-                      <ul class="list-group">
-                        <li class="list-group-item">Battery: 20 hours</li>
-                        <li class="list-group-item">Screen: 2.8 inch</li>
-                        <li class="list-group-item">Weight: 1.2 ounces</li>
-                        <li class="list-group-item">Unlimited support</li>
-                      </ul>
-                      <div class="panel-footer text-center">
-                          <p class="text-muted">
-                              <i>Free shipping, satisfied or reimbursed.</i>
-                          </p>
-                          <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
-                      </div>
-                    </div>
-
-                </div>
-              </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.cta" data-snippet-id='cta' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_button.png"/>
-            <span class="oe_snippet_thumbnail_title">Button</span>   
-        </div>
-        <section class="oe_snippet_body dark">
-            <div class="container">
-              <div class="row">
-                <div class="col-md-12 text-center mt16 mb16">
-                    <a href="/shop" class="btn btn-info btn-lg">View Products</a>
-                    <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
-                </div>
-              </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.faq" data-snippet-id='faq' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_faq.png"/>
-            <span class="oe_snippet_thumbnail_title">FAQ</span>  
-        </div>
-        <section class="oe_snippet_body">
-            <div class="container">
-                <h2 class="page-header">
-                    Point of Sale Questions <small>v7</small>
-                </h2>
-                <h3>
-                    Which hardware does OpenERP POS support?
-                </h3>
-                <p>
-                    OpenERP's POS is a web application that can run on any device that
-                    can display websites with little to no setup required.
-                </p><p>
-                    The Point of Sale works perfectly on any kind of touch enabled
-                    device, whether it's multi-touch tablets like an iPad or
-                    keyboardless resistive touchscreen terminals.
-                </p>
-                <h3>
-                    Does it works offline?
-                </h3>
-                <p>
-                    Deploy new stores with just an internet connection: no
-                    installation, no specific hardware required. It works with any
-                    iPad, Tablet PC, laptop or industrial POS machine.
-                </p><p>
-                    While an internet connection is required to start the Point of
-                    Sale, it will stay operational even after a complete disconnection.
-                </p>
-
-                <h2 class="page-header">
-                    Project Management Questions <small>v7</small>
-                </h2>
-                <h3>
-                    Can I use it to manage projects based on agile methodologies?
-                </h3>
-                <p>
-                    Yes.
-                </p>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.references" data-snippet-id='references' data-category='business' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_references.png"/>
-            <span class="oe_snippet_thumbnail_title">References</span> 
-        </div>
-        <section class="oe_snippet_body mb32 mt16">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12">
-                        <h1 class="text-center">
-                            Our References
-                        </h1>
-                        <h3 class="text-muted text-center">
-                            More than 500 happy customers.
-                        </h3>
-                    </div>
-                    <div class="col-md-4 col-md-offset-1 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
-                            <p>
-                                OpenERP provides essential platform for our project management.
-                                Things are better organized and more visible with it.
-                            </p>
-                            <small>John Doe, CEO</small>
-                        </blockquote>
-                    </div>
-                    <div class="col-md-4 col-md-offset-2 mt16 mb32">
-                        <blockquote data-snippet-id="quote">
-                            <p>
-                                OpenERP provides essential platform for our project management.
-                                Things are better organized and more visible with it.
-                            </p>
-                            <small>John Doe, CEO</small>
-                        </blockquote>
-                    </div>
-                    <div class="col-md-2 col-md-offset-1">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                    <div class="col-md-2">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                    <div class="col-md-2">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                    <div class="col-md-2">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                    <div class="col-md-2">
-                        <img src="/website/static/src/img/openerp_logo.png" class="img-responsive img-thumbnail"/>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-    <div t-name="website.snippets.parallax" data-snippet-id='parallax' data-category='effect' data-selector-children='.oe_structure, [data-oe-type=html]'>
-        <div class='oe_snippet_thumbnail'>
-            <img class="oe_snippet_thumbnail_img" src="/website/static/src/img/blocks/block_parallax.png"/>
-            <span class="oe_snippet_thumbnail_title">Parallax</span>        
-        </div>
-        <li class="oe_snippet_options dropdown-submenu">
-            <a tabindex="-1" href="#">Background</a>
-            <ul class="dropdown-menu" name="parallax-background">
-                <li data-value="/website/static/src/img/banner/aqua.jpg"><a>Aqua</a></li>
-                <li data-value="/website/static/src/img/banner/baby_blue.jpg"><a>Baby Blue</a></li>
-                <li data-value="/website/static/src/img/banner/black.jpg"><a>Black</a></li>
-                <li data-value="/website/static/src/img/banner/business_guy.jpg"><a>Business Guy</a></li>
-                <li data-value="/website/static/src/img/banner/color_splash.jpg"><a>Color Splash</a></li>
-                <li data-value="/website/static/src/img/banner/flower_field.jpg"><a>Flowers Field</a></li>
-                <li data-value="/website/static/src/img/banner/greenfields.jpg"><a>Greenfields</a></li>
-                <li data-value="/website/static/src/img/banner/landscape.jpg"><a>Landscape</a></li>
-                <li data-value="/website/static/src/img/banner/mango.jpg"><a>Mango</a></li>
-                <li data-value="/website/static/src/img/banner/mountains.jpg"><a>Mountains</a></li>
-                <li data-value="/website/static/src/img/banner/orange_red.jpg"><a>Orange Red</a></li>
-                <li data-value="/website/static/src/img/banner/flower.jpg"><a>Purple</a></li>
-                <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
-                <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
-                <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
-                <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
-            </ul>
-        </li>
-        <section class="oe_snippet_body parallax_full oe_structure" style="background-image: url('/website/static/src/img/banner/greenfields.jpg')">
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-12 mt128 mb32">
-                        <h1 class="text-center">
-                            <b>OpenERP Events Management</b>
-                        </h1>
-                        <h3 class="text-center">
-                            Sell tickets online with the Event app
-                        </h3>
-                    </div>
-                </div>
-            </div>
-        </section>
-    </div>
-
-
 </templates>
-- 
cgit v1.2.3


From 55a46265c3b246cff3737420b90669d4fddce495 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 4 Oct 2013 16:41:28 +0200
Subject: [IMP] building blocks zone

bzr revid: fp@tinyerp.com-20131004144128-5e4l3dze02m1b2vr
---
 addons/website/static/src/xml/website.snippets.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 164b612fcaf..38e3b82529d 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -27,19 +27,19 @@
                     </div>
                     <div class="modal-body">
                         <p>
-                            The building block has not been inserted in your
-                            page because you did not drop it in a valid zone.
-                            Valid zone are represented by rectangle like this:
+                            Please drop building blocks in a valid zone, like
+                            this one:
                         </p>
                         <div class="row">
                             <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                drop in this zone
+                                <span class="mt16">drop in this zone</span>
                             </div>
                         </div>
-                        <p class="text-muted">
-                            When your cursor is in a valid zone, OpenERP shows
-                            you a preview of the building block in your page.
-                            You must release the block when the preview is visible.
+                        <div class="text-muted">
+                            <b>Tip:</b> when your cursor is in a valid zone,
+                            OpenERP shows you a preview of the building block
+                            in the page.  You must release the block when the
+                            preview is visible.
                         </p>
                     </div>
                     <div class="modal-footer">
-- 
cgit v1.2.3


From 3c33f42dddd4a0785918f82ef1190f2010b97e02 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 4 Oct 2013 17:32:07 +0200
Subject: [FIX] building blocks zone tags

bzr revid: chm@openerp.com-20131004153207-ofnj0g09ws272lvn
---
 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 38e3b82529d..c75e32893a0 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -35,7 +35,7 @@
                                 <span class="mt16">drop in this zone</span>
                             </div>
                         </div>
-                        <div class="text-muted">
+                        <p class="text-muted">
                             <b>Tip:</b> when your cursor is in a valid zone,
                             OpenERP shows you a preview of the building block
                             in the page.  You must release the block when the
-- 
cgit v1.2.3


From d7b75724cb3d0f96941304d3736590e7f0f6d202 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 4 Oct 2013 18:37:54 +0200
Subject: [IMP] Building Block Zone, SEO Style, bootstrap style by default

bzr revid: fp@tinyerp.com-20131004163754-rwa3t1gcmfok4v0w
---
 addons/website/static/src/xml/website.seo.xml      | 35 +++++++++++++---------
 addons/website/static/src/xml/website.snippets.xml |  4 +--
 2 files changed, 23 insertions(+), 16 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 4630e1f294b..96a38a75d32 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -6,16 +6,18 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
-                        <h3 class="modal-title js_seo_page_url"></h3>
-                        <h4 class="text-muted">Get this page efficiently referenced in Google to attract more visitors.</h4>
+                        <div class="h2">Promote This Page</div>
+                        <div class="text-muted">
+                            Get this page efficiently referenced in Google to attract more visitors.
+                        </div>
                     </div>
                     <div class="modal-body">
                         <div class="js_seo_tips" />
                         <section class="js_seo_keywords_list">
-                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
-                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Add keywords:</label>
                                     <div class="col-lg-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
@@ -26,12 +28,12 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="text-muted">Most searched topics related your keywords, ordered by importance:</span>
+                            <span class="text-muted">Most searched topics related to your keywords, ordered by importance:</span>
                             <!-- filled in JS -->
                         </section>
                         <section>
-                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
-                            <div class="form-horizontal" role="form">
+                            <h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
+                            <div class="form-horizontal mt16" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
                                     <div class="col-lg-8">
@@ -52,22 +54,27 @@
                                 <!-- filled in JS -->
                             </div>
                         </section>
-                        <hr/>
-                        <section>
-                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
-                        </section>
+                    </div><div class="modal-footer">
+                        <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>
         </div>
     </t>
 
-    <t t-name="website.seo_list">
-        <ul class="list-inline">
+    <t t-name="website.seo_suggestion_list">
+        <ul class="list-inline mb0">
             <!-- filled in JS -->
         </ul>
     </t>
 
+    <t t-name="website.seo_list">
+        <div>
+            <!-- filled in JS -->
+        </div>
+    </t>
+
     <t t-name="website.seo_tip">
         <div t-attf-class="alert alert-#{ widget.type }">
             <t t-raw="widget.message"/>
@@ -75,7 +82,7 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <dl class="dl-horizontal">
+        <dl class="dl-horizontal mt8 mb8">
             <dt>
                 <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
                     <a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index c75e32893a0..e5dde368154 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -35,12 +35,12 @@
                                 <span class="mt16">drop in this zone</span>
                             </div>
                         </div>
-                        <p class="text-muted">
+                        <div class="text-muted">
                             <b>Tip:</b> when your cursor is in a valid zone,
                             OpenERP shows you a preview of the building block
                             in the page.  You must release the block when the
                             preview is visible.
-                        </p>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-- 
cgit v1.2.3


From 5a9d5f40ed48dd6ccc9bb118e792ed4d13e0368c Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Mon, 7 Oct 2013 14:07:43 +0200
Subject: [FIX] Start tour only when coming from admin

bzr revid: ddm@openerp.com-20131007120743-yevkncvcw655mljh
---
 addons/website/static/src/xml/website.tour.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index d0d6b7630c0..6d2ef140610 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -13,7 +13,7 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="confirm"/></button>
+                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
             </nav>
         </div>
     </t>
@@ -23,7 +23,18 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="confirm"/></button>
+                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
+            </nav>
+        </div>
+    </t>
+    <t t-name="website.tour_full">
+        <div class="popover tour">
+            <div class="arrow"></div>
+            <h3 class="popover-title"></h3>
+            <div class="popover-content"></div>
+            <nav class="popover-navigation">
+                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
+                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
             </nav>
         </div>
     </t>
-- 
cgit v1.2.3


From 75bf46996c0e7b782f43c782a25adf6edef293b8 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 9 Oct 2013 17:20:15 +0200
Subject: [FIX] Tour reset bug

bzr revid: ddm@openerp.com-20131009152015-s2p3hjkivls16yk2
---
 addons/website/static/src/xml/website.tour.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 6d2ef140610..b9398340983 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -13,7 +13,7 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
+                <button class="btn btn-sm btn-success" data-role="next"><t t-esc="next"/></button>
             </nav>
         </div>
     </t>
@@ -23,7 +23,7 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
+                <button class="btn btn-sm btn-danger" data-role="end"><t t-esc="end"/></button>
             </nav>
         </div>
     </t>
@@ -33,8 +33,8 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
-                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
+                <button class="btn btn-sm btn-success" data-role="next"><t t-esc="next"/></button>
+                <button class="btn btn-sm btn-danger" data-role="end"><t t-esc="end"/></button>
             </nav>
         </div>
     </t>
-- 
cgit v1.2.3


From 0ca2b26ead126c240311e6f028a515ae726ec1d0 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 9 Oct 2013 18:31:14 +0200
Subject: [IMP] Better 'close' caption

bzr revid: ddm@openerp.com-20131009163114-jl3v5757fcwmh010
---
 addons/website/static/src/xml/website.tour.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index b9398340983..75ffe0fe505 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -13,7 +13,7 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-success" data-role="next"><t t-esc="next"/></button>
+                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
             </nav>
         </div>
     </t>
@@ -23,7 +23,7 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-danger" data-role="end"><t t-esc="end"/></button>
+                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
             </nav>
         </div>
     </t>
@@ -33,12 +33,12 @@
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
             <nav class="popover-navigation">
-                <button class="btn btn-sm btn-success" data-role="next"><t t-esc="next"/></button>
-                <button class="btn btn-sm btn-danger" data-role="end"><t t-esc="end"/></button>
+                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
+                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
             </nav>
         </div>
     </t>
     <t t-name="website.tour_title">
-        <t t-esc="title"/><button title="Close" type="button" class="close" data-role="end">×</button>
+        <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From fc012b1c9ca07203f96afb1038250e129e1635d9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 10 Oct 2013 09:28:09 +0200
Subject: [IMP] slugify page names on creation

bzr revid: xmo@openerp.com-20131010072809-p8f5j9bcnnfnkhtj
---
 addons/website/static/src/xml/website.editor.xml | 3 +--
 1 file changed, 1 insertion(+), 2 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 157d19b56c0..66da9692d8e 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -55,8 +55,7 @@
                                 New page
                             </label>
                         </h3>
-                        <input type="text" class="form-control pages url-source"
-                               id="link-new" pattern="[\\w/-]+"/>
+                        <input type="text" class="form-control pages url-source" id="link-new"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
                         <div class="pull-right">
-- 
cgit v1.2.3


From e5ef2e27e4fb932963155584e7e437af6a6f18a0 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 11 Oct 2013 16:00:44 +0200
Subject: [IMP] Wait for DOM element if necessary

bzr revid: ddm@openerp.com-20131011140044-2haoqqfsj0hwdn68
---
 addons/website/static/src/xml/website.tour.xml | 45 +++++++-------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 75ffe0fe505..1bd3e77517f 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -1,44 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
-    <t t-name="website.tour_simple">
+    <t t-name="website.tour_popover">
         <div class="popover tour">
             <div class="arrow"></div>
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
+            <t t-if="next or end">
+                <nav class="popover-navigation">
+                    <t t-if="next">
+                        <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
+                    </t>
+                    <t t-if="end">
+                        <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
+                    </t>
+                </nav>
+            </t>
         </div>
     </t>
-    <t t-name="website.tour_confirm">
-        <div class="popover tour">
-            <div class="arrow"></div>
-            <h3 class="popover-title"></h3>
-            <div class="popover-content"></div>
-            <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
-            </nav>
-        </div>
-    </t>
-    <t t-name="website.tour_end">
-        <div class="popover tour">
-            <div class="arrow"></div>
-            <h3 class="popover-title"></h3>
-            <div class="popover-content"></div>
-            <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
-            </nav>
-        </div>
-    </t>
-    <t t-name="website.tour_full">
-        <div class="popover tour">
-            <div class="arrow"></div>
-            <h3 class="popover-title"></h3>
-            <div class="popover-content"></div>
-            <nav class="popover-navigation">
-                <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
-                <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
-            </nav>
-        </div>
-    </t>
-    <t t-name="website.tour_title">
+    <t t-name="website.tour_popover_title">
         <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
 </templates>
\ No newline at end of file
-- 
cgit v1.2.3


From 69b242cb4f5110141588bab6f1d7ddd17eb9332e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 12 Oct 2013 08:05:52 +0200
Subject: [IMP] placeholder for page name format

bzr revid: fp@openerp.com-20131012060552-b33khbi0cow0g31d
---
 addons/website/static/src/xml/website.editor.xml | 3 ++-
 1 file changed, 2 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 66da9692d8e..685712d3411 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -55,7 +55,8 @@
                                 New page
                             </label>
                         </h3>
-                        <input type="text" class="form-control pages url-source" id="link-new"/>
+                        <input type="text" class="form-control pages url-source"
+                            id="link-new" placeholder="Page Name"/>
                     </li>
                     <li class="list-group-item form-group clearfix">
                         <div class="pull-right">
-- 
cgit v1.2.3


From f5cee1def262888bf6bc84e93bad1b7f3f299a99 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sat, 12 Oct 2013 18:51:38 +0200
Subject: [IMP] Tutorial Wording

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

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

diff --git a/addons/website/static/src/xml/website.tour.xml b/addons/website/static/src/xml/website.tour.xml
index 1bd3e77517f..d2f562dec61 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -10,7 +10,11 @@
                     <t t-if="next">
                         <button class="btn btn-sm btn-default" data-role="next"><t t-esc="next"/></button>
                     </t>
-                    <t t-if="end">
+                    <small t-if="next &amp;&amp; end">
+                        <span class="text-muted"> or </span>
+                        <button class="btn-link" data-role="end" style="float: none; padding: 0"><t t-esc="end"/></button>
+                    </small>
+                    <t t-if="end &amp;&amp; ! next">
                         <button class="btn btn-sm btn-default" data-role="end"><t t-esc="end"/></button>
                     </t>
                 </nav>
@@ -20,4 +24,4 @@
     <t t-name="website.tour_popover_title">
         <t t-esc="title"/><button title="Close Tutorial" type="button" class="close" data-role="end">×</button>
     </t>
-</templates>
\ No newline at end of file
+</templates>
-- 
cgit v1.2.3


From 1cec2a5b6f392902adb7c19935a5519834366eaa Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 16 Oct 2013 11:32:48 +0200
Subject: [REM] Obsolete route /admin

bzr revid: fme@openerp.com-20131016093248-2q2c8ppkxxhfx1su
---
 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 b3e4cacd32a..409d73f1f27 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -35,7 +35,7 @@
                             </ul>
                         </li>
                         <li>
-                            <a href="/admin#action=website.action_module_website">Apps</a>
+                            <a href="/web#action=website.action_module_website">Apps</a>
                         </li>
                     </ul>
                 </div>
-- 
cgit v1.2.3


From 641477141f39ac02bcd933fb8b0a6f15cf1526de Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 16 Oct 2013 12:10:55 +0200
Subject: [IMP] website snippet: improve visibility of drop zone

bzr revid: chm@openerp.com-20131016101055-p6vhiijvladtbn87
---
 addons/website/static/src/xml/website.snippets.xml | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 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 e5dde368154..6aaf256b523 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -31,8 +31,8 @@
                             this one:
                         </p>
                         <div class="row">
-                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
-                                <span class="mt16">drop in this zone</span>
+                            <div class="col-sm-6 col-sm-offset-3 oe_drop_zone_style text-center">
+                                <div>drop in this zone</div>
                             </div>
                         </div>
                         <div class="text-muted">
@@ -57,6 +57,25 @@
         <div id='oe_snippets'></div>
     </t>
 
+    <t t-name="website.snippet_drop_zone">
+        <div class='oe_drop_zone oe_insert'>
+            <div>Drag your block here (move your mouse in this zone)</div>
+            <div class="oe_active">Drop your block</div>
+        </div>
+    </t>
+
+    <t t-name="website.snippet_dark_for_dropzone">
+        <div id="dark_for_dropzone">
+            <table width="100%" height="100%">
+                <tbody>
+                    <tr><td colspan="3"></td></tr>
+                    <tr><td></td><td class="center"></td><td></td></tr>
+                    <tr><td colspan="3"></td></tr>
+                </tbody>
+            </table>
+        </div>
+    </t>
+
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
-- 
cgit v1.2.3


From 1625eb29ae716874761626e31e99c493fb90dcdb Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Wed, 16 Oct 2013 16:39:39 +0200
Subject: [FIX] SEO metadata saving

bzr revid: ddm@openerp.com-20131016143939-v0v1tcopq4zoqgxf
---
 addons/website/static/src/xml/website.seo.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 96a38a75d32..580779283ad 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -48,12 +48,13 @@
                                 </div>
                             </div>
                         </section>
+                        <!--
                         <section class="js_image_section">
                             <h3 class="page-header">3. Describe your images</h3>
                             <div class="row js_seo_image_list">
-                                <!-- filled in JS -->
                             </div>
                         </section>
+                        -->
                     </div><div class="modal-footer">
                         <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>
-- 
cgit v1.2.3


From 99723a8a9ffa70f8e41806e92de32c52583fc2ad Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 17 Oct 2013 16:19:59 +0200
Subject: [REVERT] snippets drop zone too complex

bzr revid: fp@tinyerp.com-20131017141959-fpkds0a7e1m1sfrw
---
 addons/website/static/src/xml/website.snippets.xml | 23 ++--------------------
 1 file changed, 2 insertions(+), 21 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 6aaf256b523..e5dde368154 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -31,8 +31,8 @@
                             this one:
                         </p>
                         <div class="row">
-                            <div class="col-sm-6 col-sm-offset-3 oe_drop_zone_style text-center">
-                                <div>drop in this zone</div>
+                            <div class="col-sm-4 col-sm-offset-4 oe_drop_zone_style text-center">
+                                <span class="mt16">drop in this zone</span>
                             </div>
                         </div>
                         <div class="text-muted">
@@ -57,25 +57,6 @@
         <div id='oe_snippets'></div>
     </t>
 
-    <t t-name="website.snippet_drop_zone">
-        <div class='oe_drop_zone oe_insert'>
-            <div>Drag your block here (move your mouse in this zone)</div>
-            <div class="oe_active">Drop your block</div>
-        </div>
-    </t>
-
-    <t t-name="website.snippet_dark_for_dropzone">
-        <div id="dark_for_dropzone">
-            <table width="100%" height="100%">
-                <tbody>
-                    <tr><td colspan="3"></td></tr>
-                    <tr><td></td><td class="center"></td><td></td></tr>
-                    <tr><td colspan="3"></td></tr>
-                </tbody>
-            </table>
-        </div>
-    </t>
-
     <t t-name="website.snippet_overlay">
         <div class="oe_overlay">
             <div class="oe_overlay_options">
-- 
cgit v1.2.3


From 6835151fb2e855f13fc9ffcdedb91ea3f24b5bac Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Fri, 18 Oct 2013 18:33:41 +0200
Subject: [FIX] Typo

bzr revid: ddm@openerp.com-20131018163341-j5bf8sqj4wz8yp14
---
 addons/website/static/src/xml/website.seo.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.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 580779283ad..17d68fb70f0 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -17,7 +17,7 @@
                             <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
-                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Add keywords:</label>
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Add keyword:</label>
                                     <div class="col-lg-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
-- 
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')

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 eb7b1362cdaeb7a2221e542f1dad1ea483305477 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Fri, 25 Oct 2013 17:24:46 +0200
Subject: [WIP] Menu working from database (not yet multi-website)

bzr revid: fme@openerp.com-20131025152446-si9gsjujzcn40hip
---
 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 685712d3411..894ea0baffe 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -50,6 +50,13 @@
                         </select>
                     </li>
                     <li class="list-group-item form-group">
+                        <div class="pull-right">
+                            <label>
+                                <select class="add-to-menu">
+                                    <option>Create a menu entry in ...</option>
+                                </select>
+                            </label>
+                        </div>
                         <h3 class="list-group-item-heading">
                             <label for="link-new" class="control-label">
                                 New page
-- 
cgit v1.2.3


From 2fc5da3f95497820e5d8c0a92cd2491b2daef76c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 28 Oct 2013 17:28:15 +0100
Subject: [WIP] Add menu

bzr revid: fme@openerp.com-20131028162815-2nou1okxovo8thkr
---
 addons/website/static/src/xml/website.menu.xml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 addons/website/static/src/xml/website.menu.xml

(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
new file mode 100644
index 00000000000..de029846c8b
--- /dev/null
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -0,0 +1,7 @@
+<templates id="template" xml:space="preserve">
+    <t t-name="website.menu.dialog" t-extend="website.editor.dialog.link">
+        <t t-jquery="t[t-set='title']" t-operation="inner">
+            Add Menu
+        </t>
+    </t>
+</templates>
-- 
cgit v1.2.3


From 7ac3061c42428c3650374901420b12c14da55d6b Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 12:24:50 +0100
Subject: [WIP] Edit menu dialog

bzr revid: fme@openerp.com-20131029112450-gnu2c3fl9ddypdf1
---
 addons/website/static/src/xml/website.menu.xml | 48 +++++++++++++++++++++++---
 1 file changed, 44 insertions(+), 4 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 de029846c8b..7d8cdef4c2b 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,7 +1,47 @@
 <templates id="template" xml:space="preserve">
-    <t t-name="website.menu.dialog" t-extend="website.editor.dialog.link">
-        <t t-jquery="t[t-set='title']" t-operation="inner">
-            Add Menu
-        </t>
+<t t-name="website.menu.dialog.submenu">
+    <li>
+        <div>
+            <t t-esc="submenu.name"/>
+            <button type="button" class="btn-xs pull-right delete-menu btn-danger">
+                <i class="icon-trash"/>
+            </button>
+            <button type="button" class="btn-xs pull-right edit-menu btn-primary">
+                <i class="icon-edit"/>
+            </button>
+        </div>
+        <t t-set="children" t-value="submenu.children"/>
+        <ul t-if="children">
+            <t t-foreach="children" t-as="submenu">
+                <t t-call="website.menu.dialog.submenu"/>
+            </t>
+        </ul>
+    </li>
+</t>
+<t t-name="website.menu.dialog.footer-button">
+    <button type="button" class="btn pull-left add-menu btn-success">
+        <i class="icon-plus-sign"/> Add Menu Item
+    </button>
+</t>
+<t t-name="website.menu.dialog.edit">
+    <t t-call="website.editor.dialog">
+        <t t-set="title">Edit Menu</t>
+        <ul class="oe_menu_editor">
+            <t t-foreach="widget.menu.children" t-as="submenu">
+                <t t-call="website.menu.dialog.submenu"/>
+            </t>
+        </ul>
     </t>
+</t>
+<t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
+    <t t-jquery="t[t-set='title']" t-operation="inner">
+        Add Menu Entry
+    </t>
+    <t t-jquery="select.add-to-menu">
+        this.css('display', 'none');
+    </t>
+    <t t-jquery="label[for='link-text']" t-operation="replace">
+        Menu Label
+    </t>
+</t>
 </templates>
-- 
cgit v1.2.3


From 07b9cf0f024e1f22e0a34059870115710b744661 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 29 Oct 2013 15:33:46 +0100
Subject: [IMP] Save menu is working

bzr revid: fme@openerp.com-20131029143346-nu9skoj5s06hwgw6
---
 addons/website/static/src/xml/website.menu.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.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 7d8cdef4c2b..f4f5e1948a9 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,6 +1,6 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.menu.dialog.submenu">
-    <li>
+    <li t-att-data-menu-id="submenu.id">
         <div>
             <t t-esc="submenu.name"/>
             <button type="button" class="btn-xs pull-right delete-menu btn-danger">
-- 
cgit v1.2.3


From 418e10c382cb0354c85fa62b41ce2cee7f3c0b54 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 15:02:16 +0100
Subject: [IMP] Misc menu improvements

bzr revid: fme@openerp.com-20131030140216-f2fz7p3waur3l8j7
---
 addons/website/static/src/xml/website.menu.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 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 f4f5e1948a9..8b2580e89bd 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -2,13 +2,16 @@
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
         <div>
+            <i class="icon-reorder"/>
             <t t-esc="submenu.name"/>
-            <button type="button" class="btn-xs pull-right delete-menu btn-danger">
-                <i class="icon-trash"/>
-            </button>
-            <button type="button" class="btn-xs pull-right edit-menu btn-primary">
-                <i class="icon-edit"/>
-            </button>
+            <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
+                <button type="button" class="btn js_edit_menu">
+                    <i class="icon-edit"/>
+                </button>
+                <button type="button" class="btn js_delete_menu">
+                    <i class="icon-trash"/>
+                </button>
+            </div>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -19,7 +22,7 @@
     </li>
 </t>
 <t t-name="website.menu.dialog.footer-button">
-    <button type="button" class="btn pull-left add-menu btn-success">
+    <button type="button" class="btn pull-left js_add_menu btn-success">
         <i class="icon-plus-sign"/> Add Menu Item
     </button>
 </t>
-- 
cgit v1.2.3


From a87196eece2c193d2ee8e26377d9e489b466ad6a Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 16:12:01 +0100
Subject: [REM] Removed useless feature

bzr revid: fme@openerp.com-20131030151201-liz3qyn4mkv2ukc2
---
 addons/website/static/src/xml/website.editor.xml | 7 -------
 addons/website/static/src/xml/website.menu.xml   | 3 ---
 2 files changed, 10 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 894ea0baffe..685712d3411 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -50,13 +50,6 @@
                         </select>
                     </li>
                     <li class="list-group-item form-group">
-                        <div class="pull-right">
-                            <label>
-                                <select class="add-to-menu">
-                                    <option>Create a menu entry in ...</option>
-                                </select>
-                            </label>
-                        </div>
                         <h3 class="list-group-item-heading">
                             <label for="link-new" class="control-label">
                                 New page
diff --git a/addons/website/static/src/xml/website.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 8b2580e89bd..cafedcad119 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -40,9 +40,6 @@
     <t t-jquery="t[t-set='title']" t-operation="inner">
         Add Menu Entry
     </t>
-    <t t-jquery="select.add-to-menu">
-        this.css('display', 'none');
-    </t>
     <t t-jquery="label[for='link-text']" t-operation="replace">
         Menu Label
     </t>
-- 
cgit v1.2.3


From aa2f9217c0baf6f92600a8e074331f0ecfffb4cc Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 30 Oct 2013 17:04:05 +0100
Subject: [IMP] Menu entry dialog

bzr revid: fme@openerp.com-20131030160405-crxjr6agtmf2x89p
---
 addons/website/static/src/xml/website.menu.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 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 cafedcad119..d2ba62b68fa 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -23,7 +23,7 @@
 </t>
 <t t-name="website.menu.dialog.footer-button">
     <button type="button" class="btn pull-left js_add_menu btn-success">
-        <i class="icon-plus-sign"/> Add Menu Item
+        <i class="icon-plus-sign"/> Add Menu Entry
     </button>
 </t>
 <t t-name="website.menu.dialog.edit">
@@ -40,8 +40,19 @@
     <t t-jquery="t[t-set='title']" t-operation="inner">
         Add Menu Entry
     </t>
-    <t t-jquery="label[for='link-text']" t-operation="replace">
-        Menu Label
+    <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
+    <t t-jquery="ul.list-group" t-operation="before">
+        <div class="list-group">
+            <div class="form-group list-group-item">
+                <h3 class="list-group-item-heading">
+                    <label for="link-new" class="control-label">
+                        Menu Label
+                    </label>
+                </h3>
+                <input type="text" class="form-control"
+                       id="link-text" autofocus="autofocus"/>
+            </div>
+        </div>
     </t>
 </t>
 </templates>
-- 
cgit v1.2.3


From 9f97b243181bf38e701de7c43ab79f57cc149a2c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Oct 2013 17:02:11 +0100
Subject: [ADD] Edit menu entry

bzr revid: fme@openerp.com-20131031160211-zwxmdtokf59s5sq3
---
 addons/website/static/src/xml/website.menu.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 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 d2ba62b68fa..75f03209026 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -3,7 +3,7 @@
     <li t-att-data-menu-id="submenu.id">
         <div>
             <i class="icon-reorder"/>
-            <t t-esc="submenu.name"/>
+            <span><t t-esc="submenu.name"/></span>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
@@ -38,7 +38,8 @@
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
     <t t-jquery="t[t-set='title']" t-operation="inner">
-        Add Menu Entry
+        <t t-if="!widget.update_mode">Add Menu Entry</t>
+        <t t-if="widget.update_mode">Edit Menu Entry</t>
     </t>
     <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
     <t t-jquery="ul.list-group" t-operation="before">
-- 
cgit v1.2.3


From 35d469d51f52d1dac7c99e8bab42d0b0a22122c5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 31 Oct 2013 17:51:17 +0100
Subject: [FIX] Reuse website.editor.LinkDialog#bind_data()

bzr revid: fme@openerp.com-20131031165117-13yo8nrfg1ru4cp8
---
 addons/website/static/src/xml/website.menu.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.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 75f03209026..ce111693957 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -44,7 +44,7 @@
     <t t-jquery="form > div.form-horizontal" t-operation="replace"/>
     <t t-jquery="ul.list-group" t-operation="before">
         <div class="list-group">
-            <div class="form-group list-group-item">
+            <div class="form-group list-group-item active">
                 <h3 class="list-group-item-heading">
                     <label for="link-new" class="control-label">
                         Menu Label
-- 
cgit v1.2.3


From f880400e43dcbf94230401b7ffbbb34344d7e579 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Mon, 4 Nov 2013 12:34:12 +0100
Subject: [IMP] Improved menu link dialog

bzr revid: fme@openerp.com-20131104113412-q5d8263741pq9wna
---
 addons/website/static/src/xml/website.menu.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.menu.xml b/addons/website/static/src/xml/website.menu.xml
index ce111693957..883cf02231f 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -51,7 +51,7 @@
                     </label>
                 </h3>
                 <input type="text" class="form-control"
-                       id="link-text" autofocus="autofocus"/>
+                       id="link-text" required="required"/>
             </div>
         </div>
     </t>
-- 
cgit v1.2.3


From bfc8f61984b54444a544df0a10f7433320e22806 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 4 Nov 2013 16:52:30 +0100
Subject: [FIX] website: can choose an other controller to publish data.
 Website sale: add a contraint for address and organizer for publish an event.
 Auto publish address and organizer in front end. Clean website_hr_recruitment
 publisher

bzr revid: chm@openerp.com-20131104155230-j36l2e1fez0vnkwi
---
 addons/website/static/src/xml/website.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(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 409d73f1f27..05ef380048f 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -61,4 +61,27 @@
         </div>
     </t>
 
+    <t t-name="website.error_dialog">
+        <div class="modal fade" 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>
+                        <div class="h2"><t t-esc="title"/></div>
+                    </div>
+                    <div class="modal-body">
+                        <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>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" data-dismiss="modal" href="#" class="close btn btn-default">Close</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
 </templates>
-- 
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.editor.xml     | 18 +++++++++---------
 addons/website/static/src/xml/website.seo.xml        |  2 +-
 addons/website/static/src/xml/website.translator.xml |  4 ++--
 3 files changed, 12 insertions(+), 12 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 685712d3411..fd89e70d2e1 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -39,22 +39,22 @@
             <form>
                 <ul class="list-group">
                     <li class="list-group-item form-group active">
-                        <h3 class="list-group-item-heading">
+                        <h4 class="list-group-item-heading">
                             <label for="link-existing" class="control-label">
                                 Existing page
                             </label>
-                        </h3>
+                        </h4>
                         <select class="existing form-control url-source"
                                 id="link-existing">
                             <option/>
                         </select>
                     </li>
                     <li class="list-group-item form-group">
-                        <h3 class="list-group-item-heading">
+                        <h4 class="list-group-item-heading">
                             <label for="link-new" class="control-label">
                                 New page
                             </label>
-                        </h3>
+                        </h4>
                         <input type="text" class="form-control pages url-source"
                             id="link-new" placeholder="Page Name"/>
                     </li>
@@ -65,20 +65,20 @@
                                 Open in new window
                             </label>
                         </div>
-                        <h3 class="list-group-item-heading">
+                        <h4 class="list-group-item-heading">
                             <label for="link-external" class="control-label">
-                                External Website
+                                URL
                             </label>
-                        </h3>
+                        </h4>
                         <input type="text" class="form-control url url-source"
                                id="link-external" placeholder="http://openerp.com"/>
                     </li>
                     <li class="list-group-item form-group">
-                        <h3 class="list-group-item-heading">
+                        <h4 class="list-group-item-heading">
                             <label for="link-email" class="control-label">
                                 Email Address
                             </label>
-                        </h3>
+                        </h4>
                         <input type="email" class="form-control email-address url-source"
                                id="link-email" placeholder="you@yourwebsite.com"/>
                     </li>
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 17d68fb70f0..2c3f8cab52a 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -32,7 +32,7 @@
                             <!-- filled in JS -->
                         </section>
                         <section>
-                            <h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
+                            <h3 class="page-header">2. Reference Your Page <small>using above suggested keywords</small></h3>
                             <div class="form-horizontal mt16" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
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 3f7252e44436cb870d6bcb31eea52fdc6f3ffbea Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Nov 2013 10:11:17 +0100
Subject: [ADD] Structure topmenu button

bzr revid: fme@openerp.com-20131105091117-hgzbnrxju3ftzmyx
---
 addons/website/static/src/xml/website.menu.xml | 2 +-
 addons/website/static/src/xml/website.xml      | 1 +
 2 files changed, 2 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 883cf02231f..c9c73c32ae7 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -28,7 +28,7 @@
 </t>
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
-        <t t-set="title">Edit Menu</t>
+        <t t-set="title">Edit Structure</t>
         <ul class="oe_menu_editor">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 05ef380048f..5b16176f99d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -21,6 +21,7 @@
                     <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 class="divider-vertical"></li>
+                        <li><a data-action="edit-structure" href="#"><span title="Edit website structure">Structure</span></a></li>
                         <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
                         <li class="dropdown">
                             <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
-- 
cgit v1.2.3


From 6ba57343da4124ab79996413a6c4f7b0d66e630c Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Nov 2013 16:16:51 +0100
Subject: [WIP] Trying to use t-fields for menus

Not working quite well
Working it out

bzr revid: fme@openerp.com-20131105151651-8jn1po2fhyojum2c
---
 addons/website/static/src/xml/website.snippets.xml |  2 +-
 addons/website/static/src/xml/website.xml          | 10 ++++++++--
 2 files changed, 9 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 e5dde368154..dbcc077e1e7 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -3,7 +3,7 @@
 
     <!-- Snippet loader -->
     <t t-name="website.snippets_button">
-        <li class="navbar-form"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
+        <li class="navbar-form js_hide_on_translate"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
     </t>
     <t t-name="website.snippets_style">
         <li class="navbar-form">
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 5b16176f99d..e864d304795 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -21,9 +21,15 @@
                     <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 class="divider-vertical"></li>
-                        <li><a data-action="edit-structure" href="#"><span title="Edit website structure">Structure</span></a></li>
+                        <li class="dropdown js_hide_on_translate">
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Structure <span class="caret"></span></a>
+                            <ul class="dropdown-menu" role="menu">
+                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Top Menu</span></a></li>
+                                <!-- <a data-action="edit-footer" href="#"><span title="Edit Footer">Footer</span></a></li> -->
+                            </ul>
+                        </li>
                         <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
-                        <li class="dropdown">
+                        <li class="dropdown js_hide_on_translate">
                             <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">
                                 <!-- filled in JS -->
-- 
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')

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 20899155c5881f2ca1a576b01fb68da876e6e2a9 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 6 Nov 2013 16:24:12 +0100
Subject: [IMP] during image upload, disable save button

hide it and replace it with a button telling the user what we're
currently doing (uploading the image).

Leave the possibility of discarding the whole thing and going away
though.

bzr revid: xmo@openerp.com-20131106152412-eb283vghb18aafyr
---
 addons/website/static/src/xml/website.editor.xml | 1 +
 1 file changed, 1 insertion(+)

(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 fd89e70d2e1..66b82ae7cbe 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -24,6 +24,7 @@
                     <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 hidden wait" disabled="disabled"/>
                         <button type="button" class="btn btn-primary save">Save Changes</button>
                     </div>
                 </div>
-- 
cgit v1.2.3


From bc5772ab7e1ac2c49b1ffaa5ca67bbe7326da009 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 6 Nov 2013 17:39:27 +0100
Subject: [FIX] website snippet: editor overlay (bounce, display after click on
 insert block)

bzr revid: chm@openerp.com-20131106163927-vdqxfamnkspnb193
---
 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 dbcc077e1e7..103392a23b7 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -63,7 +63,7 @@
                 <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>
                     <div class="dropdown oe_options hidden btn-group">
-                        <a href="#" data-toggle="dropdown" class="btn btn-default btn-sm" title="Customize">Customize <span class="caret"/></a>
+                        <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>
-- 
cgit v1.2.3


From ef86f6d12ae12c3d450bb6feba1f40f9d7fa3b54 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 7 Nov 2013 10:42:56 +0100
Subject: [FIX] website snippet: the 'insert block' button is loaded before the
 editor widget -> confusing in slow connectivity

bzr revid: chm@openerp.com-20131107094256-nqp5coey0fy732pl
---
 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 103392a23b7..587c36a71bc 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -3,7 +3,7 @@
 
     <!-- Snippet loader -->
     <t t-name="website.snippets_button">
-        <li class="navbar-form js_hide_on_translate"><button type="button" data-action="snippet" class="btn btn-primary">Insert Blocks</button></li>
+        <li class="navbar-form js_hide_on_translate"><button type="button" data-action="snippet" class="hidden btn btn-primary">Insert Blocks</button></li>
     </t>
     <t t-name="website.snippets_style">
         <li class="navbar-form">
-- 
cgit v1.2.3


From d58b41a1605d084b4f7bcd9fdec79fba078adce1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 9 Nov 2013 15:43:50 +0100
Subject: [IMP] menus

bzr revid: fp@openerp.com-20131109144350-34tyjox2q5r9lc35
---
 addons/website/static/src/xml/website.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 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 e864d304795..e7fa3d2cecf 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -22,10 +22,15 @@
                         <li><a data-action="show-mobile-preview" href="#"><span title="Mobile preview" class="icon-mobile-phone"/></a></li>
                         <li class="divider-vertical"></li>
                         <li class="dropdown js_hide_on_translate">
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Structure <span class="caret"></span></a>
+                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Top Menu</span></a></li>
-                                <!-- <a data-action="edit-footer" href="#"><span title="Edit Footer">Footer</span></a></li> -->
+                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
+                                <li class="divider"> </li> <!-- Todo: Implement with inheritancy -->
+                                <li><a href="">New Page</a></li>
+                                <li><a href="">New Blog Post</a></li>
+                                <li><a href="">New Product</a></li>
+                                <li><a href="">New Event</a></li>
+                                <li><a href="">New Job Offer</a></li>
                             </ul>
                         </li>
                         <li><a data-action="promote-current-page" href="#"><span title="Promote page on the web">Promote</span></a></li>
-- 
cgit v1.2.3


From 854916ce54817dc23ed887e249586237882a94ae Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 9 Nov 2013 16:06:13 +0100
Subject: [IMP] Reorder menu

bzr revid: fp@openerp.com-20131109150613-scepw4gdw7my4s76
---
 addons/website/static/src/xml/website.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 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 e7fa3d2cecf..c064444af38 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -21,19 +21,19 @@
                     <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 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">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu">
-                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
-                                <li class="divider"> </li> <!-- Todo: Implement with inheritancy -->
-                                <li><a href="">New Page</a></li>
+                                <li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy -->
                                 <li><a href="">New Blog Post</a></li>
                                 <li><a href="">New Product</a></li>
                                 <li><a href="">New Event</a></li>
                                 <li><a href="">New Job Offer</a></li>
+                                <li class="divider"> </li>
+                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
                             </ul>
                         </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">
                             <a id="customize-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Customize <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu" id="customize-menu">
@@ -46,9 +46,6 @@
                                 <!-- filled in JS -->
                             </ul>
                         </li>
-                        <li>
-                            <a href="/web#action=website.action_module_website">Apps</a>
-                        </li>
                     </ul>
                 </div>
             </div>
-- 
cgit v1.2.3


From c960a04a6519281109da358ec07486e482c4e573 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 9 Nov 2013 19:58:47 +0100
Subject: [IMP] order of menu

bzr revid: fp@openerp.com-20131109185847-rrejtk6e0i77yln2
---
 addons/website/static/src/xml/website.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.xml b/addons/website/static/src/xml/website.xml
index c064444af38..c9731aa95ee 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -25,13 +25,13 @@
                         <li class="dropdown js_hide_on_translate">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
                             <ul class="dropdown-menu" role="menu">
+                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
+                                <li class="divider"> </li>
                                 <li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy -->
                                 <li><a href="">New Blog Post</a></li>
-                                <li><a href="">New Product</a></li>
                                 <li><a href="">New Event</a></li>
                                 <li><a href="">New Job Offer</a></li>
-                                <li class="divider"> </li>
-                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
+                                <li><a href="">New Product</a></li>
                             </ul>
                         </li>
                         <li class="dropdown js_hide_on_translate">
-- 
cgit v1.2.3


From 1f691bbbd9537b68897711fa91c37450e56a3381 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 9 Nov 2013 20:43:06 +0100
Subject: [IMP] better about us page

bzr revid: fp@openerp.com-20131109194306-h3d25wgbuvsk2fm2
---
 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 c9731aa95ee..d3232767714 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -27,7 +27,7 @@
                             <ul class="dropdown-menu" role="menu">
                                 <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
                                 <li class="divider"> </li>
-                                <li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy -->
+                                <li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy in each module-->
                                 <li><a href="">New Blog Post</a></li>
                                 <li><a href="">New Event</a></li>
                                 <li><a href="">New Job Offer</a></li>
-- 
cgit v1.2.3


From 7390b48a89511df0176e3e8b5940305bed63c3d3 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 12 Nov 2013 11:13:32 +0100
Subject: [IMP] Moved Add menu item to the dialog's body

bzr revid: fme@openerp.com-20131112101332-k8md3tiysoydn224
---
 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 c9c73c32ae7..6eea8b25466 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -21,19 +21,19 @@
         </ul>
     </li>
 </t>
-<t t-name="website.menu.dialog.footer-button">
-    <button type="button" class="btn pull-left js_add_menu btn-success">
-        <i class="icon-plus-sign"/> Add Menu Entry
-    </button>
-</t>
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
-        <t t-set="title">Edit Structure</t>
+        <t t-set="title">Edit Menu</t>
         <ul class="oe_menu_editor">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
         </ul>
+        <p class="mt32">
+            <a href="#" class="js_add_menu">
+                <i class="icon-plus-sign"/> Add Menu Entry
+            </a>
+        </p>
     </t>
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
-- 
cgit v1.2.3


From 465aaf6bbc2af9d9c8188f8d68385d7b7333d215 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Tue, 12 Nov 2013 19:00:07 +0100
Subject: [IMP] website view modile: sweeter

bzr revid: chm@openerp.com-20131112180007-d9qqxcrrguo3y8ts
---
 addons/website/static/src/xml/website.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 d3232767714..8ce2b155d7a 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -61,9 +61,16 @@
                         <h3 class="modal-title">Mobile preview</h3>
                     </div>
                     <div class="modal-body">
-                        <div>
-                            <iframe id="mobile-viewport" class="oe_mobile_viewport" src="?mobile-preview=true"></iframe>
-                        </div>
+                        <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>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


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 7598bcdb98795d7e95a6a7b3eacdf018766f1328 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 13 Nov 2013 18:14:38 +0100
Subject: [ADD] Content menu links splitted per modules

TODO: website.prompt() should be finished for Add a blog post link

Added @id=editable_scripts_hook in layout template so modules can easly add *.editor.js files

bzr revid: fme@openerp.com-20131113171438-3l0wo08ta5vsulq3
---
 addons/website/static/src/xml/website.xml | 35 +++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 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 8ce2b155d7a..e24d93bf257 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -24,14 +24,10 @@
                         <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">
                             <a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
-                            <ul class="dropdown-menu" role="menu">
+                            <ul class="dropdown-menu oe_content_menu" role="menu">
                                 <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
                                 <li class="divider"> </li>
-                                <li><a href="">New Page</a></li> <!-- Todo: Implement with inheritancy in each module-->
-                                <li><a href="">New Blog Post</a></li>
-                                <li><a href="">New Event</a></li>
-                                <li><a href="">New Job Offer</a></li>
-                                <li><a href="">New Product</a></li>
+                                <li><a href="#" data-action="new_page">New Page</a></li>
                             </ul>
                         </li>
                         <li class="dropdown js_hide_on_translate">
@@ -100,4 +96,31 @@
             </div>
         </div>
     </t>
+
+    <t t-name="website.prompt">
+        <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"><t t-esc="window_title"/></h3>
+                    </div>
+                    <div class="modal-body">
+                        <h4 class="list-group-item-heading">
+                            <label for="page-name" class="control-label">
+                                <t t-esc="field_name"/>
+                            </label>
+                        </h4>
+                        <!-- TODO: support other types -->
+                        <input type="text" class="form-control" required="required" t-att-placeholder="field_name"/>
+                    </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">Ok</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 95f63af9921b4f48ba7b9e2a656418b916aa2dd8 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Nov 2013 10:32:14 +0100
Subject: [IMP] Improved openerp.website.prompt() and write documentation

Yeah ! You read me ! I (fme) wrote documentation !

Yeaaaaaaaaaaaaah !!!

bzr revid: fme@openerp.com-20131114093214-isjmwwbzsj3ahr61
---
 addons/website/static/src/xml/website.xml | 9 +++++----
 1 file changed, 5 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 e24d93bf257..7131b41fb1b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -101,18 +101,19 @@
         <div class="modal" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog">
                 <div class="modal-content">
-                    <div class="modal-header">
+                    <div class="modal-header" t-if="window_title">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </div>
                     <div class="modal-body">
-                        <h4 class="list-group-item-heading">
+                        <h4 class="list-group-item-heading" t-if="field_name">
                             <label for="page-name" class="control-label">
                                 <t t-esc="field_name"/>
                             </label>
                         </h4>
-                        <!-- TODO: support other types -->
-                        <input type="text" class="form-control" required="required" t-att-placeholder="field_name"/>
+                        <input t-if="field_type == 'input'" type="text" class="form-control" required="required" t-att-placeholder="field_name"/>
+                        <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5" t-att-placeholder="field_name"></textarea>
+                        <select t-if="field_type == 'select'" class="form-control"></select>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn" data-dismiss="modal" aria-hidden="true">Cancel</button>
-- 
cgit v1.2.3


From 0d2bf3b02e7a6a128db759136dd89d2af4d41814 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 14 Nov 2013 17:14:02 +0100
Subject: [IMP] help on menu multi-level

bzr revid: fp@tinyerp.com-20131114161402-8cyfgl322qc4t44h
---
 addons/website/static/src/xml/website.menu.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 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 6eea8b25466..de2142193cf 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -29,11 +29,16 @@
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
         </ul>
-        <p class="mt32">
-            <a href="#" class="js_add_menu">
-                <i class="icon-plus-sign"/> Add Menu Entry
-            </a>
-        </p>
+        <div class="mt16">
+            <div class="pull-right text-muted">
+                Right indent for multi-level menus
+            </div>
+            <div>
+                <a href="#" class="js_add_menu">
+                    <i class="icon-plus-sign"/> Add Menu Entry
+                </a>
+            </div>
+        </div>
     </t>
 </t>
 <t t-name="website.menu.dialog.add" t-extend="website.editor.dialog.link">
-- 
cgit v1.2.3


From bf5fcc7b13d543844acc41240f5a27d555ffb4bf Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Thu, 14 Nov 2013 17:17:40 +0100
Subject: [IMP] Website builder tour (first steps)

bzr revid: ddm@openerp.com-20131114161740-ymggmzdwwyacz60f
---
 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 7131b41fb1b..2c7fbfc9568 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -23,7 +23,7 @@
                         <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">
-                            <a class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
+                            <a id="content-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
                             <ul class="dropdown-menu oe_content_menu" role="menu">
                                 <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
                                 <li class="divider"> </li>
-- 
cgit v1.2.3


From cf5dfe897e98e7659c854f9ca0926a12ef9ff16d Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Thu, 14 Nov 2013 22:11:32 +0100
Subject: [IMP] Menu editor: home icon on right

bzr revid: fme@openerp.com-20131114211132-bjrkreuy9b0fhqey
---
 addons/website/static/src/xml/website.menu.xml | 1 +
 1 file changed, 1 insertion(+)

(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 de2142193cf..a5d9e64a514 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,6 +4,7 @@
         <div>
             <i class="icon-reorder"/>
             <span><t t-esc="submenu.name"/></span>
+            <i class="icon-home"/>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
-- 
cgit v1.2.3


From 85265aefb9959bf148c499b6879afd8c277a0aa1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Thu, 14 Nov 2013 22:28:56 +0100
Subject: [IMP] layout of website.prompt

bzr revid: fp@openerp.com-20131114212856-ff42xtka5dlv8c8c
---
 addons/website/static/src/xml/website.xml | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 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 2c7fbfc9568..1b4254ca19b 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -106,18 +106,22 @@
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </div>
                     <div class="modal-body">
-                        <h4 class="list-group-item-heading" t-if="field_name">
-                            <label for="page-name" class="control-label">
-                                <t t-esc="field_name"/>
+                        <form class="form-horizontal" role="form">
+                        <div class="form-group mb0">
+                            <label for="page-name" class="col-sm-3 control-label">
+                                <t t-esc="field_name"/>:
                             </label>
-                        </h4>
-                        <input t-if="field_type == 'input'" type="text" class="form-control" required="required" t-att-placeholder="field_name"/>
-                        <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5" t-att-placeholder="field_name"></textarea>
-                        <select t-if="field_type == 'select'" class="form-control"></select>
+                            <div class="col-sm-9">
+                                <input t-if="field_type == 'input'" type="text" class="form-control" required="required"/>
+                                <textarea t-if="field_type == 'textarea'" class="form-control" required="required" rows="5"></textarea>
+                                <select t-if="field_type == 'select'" class="form-control"></select>
+                            </div>
+                        </div>
+                        </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">Ok</button>
+                        <button type="button" class="btn btn-primary">Continue</button>
                     </div>
                 </div>
             </div>
-- 
cgit v1.2.3


From 9570a51bcd65f20f8a84014049c7755100a03f23 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Thu, 14 Nov 2013 22:45:54 +0100
Subject: [IMP] style menu editor

bzr revid: fp@openerp.com-20131114214554-lak8rntdpq6clcpm
---
 addons/website/static/src/xml/website.menu.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 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 a5d9e64a514..b755f0af1e0 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -4,7 +4,6 @@
         <div>
             <i class="icon-reorder"/>
             <span><t t-esc="submenu.name"/></span>
-            <i class="icon-home"/>
             <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
                 <button type="button" class="btn js_edit_menu">
                     <i class="icon-edit"/>
@@ -13,6 +12,7 @@
                     <i class="icon-trash"/>
                 </button>
             </div>
+            <i class="icon-home pull-right"/>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -32,7 +32,7 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                Right indent for multi-level menus
+                <span class="icon-indent-right"/> right indent for multi-level menus
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-- 
cgit v1.2.3


From 14edb56bb3623f4966dc18b866bd0abe0ab6f218 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 15 Nov 2013 12:51:22 +0100
Subject: [IMP] CSS cleaning: edit menu

bzr revid: fp@tinyerp.com-20131115115122-zzg6xeisa85n45e1
---
 addons/website/static/src/xml/website.menu.xml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 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 b755f0af1e0..22bec817778 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -1,18 +1,20 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.menu.dialog.submenu">
     <li t-att-data-menu-id="submenu.id">
-        <div>
-            <i class="icon-reorder"/>
-            <span><t t-esc="submenu.name"/></span>
-            <div class="btn-group btn-group-xs pull-right oe_menu_buttons">
-                <button type="button" class="btn js_edit_menu">
+        <div class="input-group">
+            <span class="input-group-addon icon-reorder"/>
+            <span type="text" class="form-control">
+                <t t-esc="submenu.name"/>
+                <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 js_delete_menu">
+                <button type="button" class="btn btn-danger js_delete_menu">
                     <i class="icon-trash"/>
                 </button>
-            </div>
-            <i class="icon-home pull-right"/>
+            </span>
         </div>
         <t t-set="children" t-value="submenu.children"/>
         <ul t-if="children">
@@ -25,7 +27,7 @@
 <t t-name="website.menu.dialog.edit">
     <t t-call="website.editor.dialog">
         <t t-set="title">Edit Menu</t>
-        <ul class="oe_menu_editor">
+        <ul class="oe_menu_editor list-unstyled">
             <t t-foreach="widget.menu.children" t-as="submenu">
                 <t t-call="website.menu.dialog.submenu"/>
             </t>
-- 
cgit v1.2.3


From 7bb8d484fcfc5a81ebb59a3f759cdcf5f5193767 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sun, 17 Nov 2013 12:30:44 +0100
Subject: [IMP] small fixes in layout

bzr revid: fp@openerp.com-20131117113044-7ly3zt2yz78r8ng2
---
 addons/website/static/src/xml/website.menu.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.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 22bec817778..ea505d94b28 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -3,7 +3,7 @@
     <li t-att-data-menu-id="submenu.id">
         <div class="input-group">
             <span class="input-group-addon icon-reorder"/>
-            <span type="text" class="form-control">
+            <span class="form-control" style="padding-top: 0; padding-bottom: 0;">
                 <t t-esc="submenu.name"/>
                 <i class="pull-right icon-home" style="margin-top: 3px"/>
             </span>
-- 
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


From 7b5f713c93e842ffebac50432b6c6c425c6922af Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 31 Dec 2013 11:13:38 +0100
Subject: [FIX] Fixed popovers in banner tour

bzr revid: ddm@openerp.com-20131231101338-91q7yt5d62joldwd
---
 addons/website/static/src/xml/website.tour.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.tour.xml b/addons/website/static/src/xml/website.tour.xml
index d2f562dec61..1365ba08307 100644
--- a/addons/website/static/src/xml/website.tour.xml
+++ b/addons/website/static/src/xml/website.tour.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <templates id="template" xml:space="preserve">
     <t t-name="website.tour_popover">
-        <div class="popover tour">
+        <div t-attf-class="#{ fixed ? 'popover tour fixed' : 'popover tour' }">
             <div class="arrow"></div>
             <h3 class="popover-title"></h3>
             <div class="popover-content"></div>
-- 
cgit v1.2.3


From 3d96b4c2a38cc117068c89d55a7c2c21202752a5 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 8 Jan 2014 13:21:13 +0100
Subject: [IMP] website: snippets: add resize bar on snippet overlay; resising
 % 8px; remove size class

bzr revid: chm@openerp.com-20140108122113-d2zcyaobkahixlpa
---
 addons/website/static/src/xml/website.snippets.xml | 1 +
 1 file changed, 1 insertion(+)

(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 ecc3bb8cc38..ca5cf01705f 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -86,6 +86,7 @@
             <div class='oe_handle n'></div>
             <div class='oe_handle e'></div>
             <div class='oe_handle w'></div>
+            <div class='oe_handle size'></div>
             <div class='oe_handle s'></div>
         </div>
         <div class='oe_snippet_thumbnail'>Margin resize</div>
-- 
cgit v1.2.3


From fd14481dd34aab6536f11f18892a04cae726ed66 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Wed, 15 Jan 2014 13:59:23 +0100
Subject: [IMP] website snippet: create snippets.sass, imrpove css and resizing
 layout

bzr revid: chm@openerp.com-20140115125923-eggv51bsvokc7a06
---
 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 ca5cf01705f..cf3996bdba4 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -86,7 +86,7 @@
             <div class='oe_handle n'></div>
             <div class='oe_handle e'></div>
             <div class='oe_handle w'></div>
-            <div class='oe_handle size'></div>
+            <div class='oe_handle size'><div class="oe_handle_button size">Resize</div><div class="oe_border"/></div>
             <div class='oe_handle s'></div>
         </div>
         <div class='oe_snippet_thumbnail'>Margin resize</div>
-- 
cgit v1.2.3


From e2fede3fe78c0f1c036f4f1695ebf7348655590f Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 16 Jan 2014 10:47:47 +0100
Subject: [ADD] dialog for fontawesome glyph manipulation

bzr revid: xmo@openerp.com-20140116094747-w1uey27l39fy66zc
---
 addons/website/static/src/xml/website.editor.xml | 48 ++++++++++++++++++++++++
 1 file changed, 48 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 15f1fec8bbd..12fd0774f39 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -203,4 +203,52 @@
         </button>
     </t>
 
+    <t t-name="website.editor.dialog.font-icons">
+        <t t-call="website.editor.dialog">
+            <t t-set="title">Icon:</t>
+            <form>
+                <div class="form-group">
+                    Preview: <span id="fa-preview"/>
+                </div>
+                <div class="form-group">
+                    <label for="fa-icon">icon</label>
+                    <input type="hidden" id="fa-icon" class="form-control"/>
+                </div>
+                <div class="form-group">
+                    <label for="fa-size">size</label>
+                    <select id="fa-size" class="form-control">
+                        <option value="">Default</option>
+                        <option value="fa-lg">Large</option>
+                        <option value="fa-2x">x2</option>
+                        <option value="fa-3x">x3</option>
+                        <option value="fa-4x">x4</option>
+                        <option value="fa-5x">x5</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label for="fa-rotation">Rotation</label>
+                    <select id="fa-rotation" class="form-control">
+                        <option value="">None</option>
+                        <option value="fa-spin">Spin</option>
+                        <option value="fa-rotate-90">Rotate 90º</option>
+                        <option value="fa-rotate-180">Rotate 180º</option>
+                        <option value="fa-rotate-270">Rotate 270º</option>
+                        <option value="fa-flip-horizontal">Horizontal flip</option>
+                        <option value="fa-flip-vertical">Vertical flip</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label>
+                        <input type="checkbox" id="fa-fixed"/> fixed width
+                    </label>
+                </div>
+                <div class="form-group">
+                    <label>
+                        <input type="checkbox" id="fa-border"/> bordered
+                    </label>
+                </div>
+            </form>
+        </t>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From 4ff74cbf9929ad41a01fd22c9e3c6050277a6214 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 16 Jan 2014 19:05:35 +0100
Subject: [IMP] website: editor menus is displayed in function of users groups
 (event, blog...)

bzr revid: chm@openerp.com-20140116180535-c736cuxn12qghiea
---
 addons/website/static/src/xml/website.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 ceec9c161d8..0998a03c66d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -14,7 +14,7 @@
                         <span class="icon-bar"></span>
                     </button>
                     <form class="navbar-form navbar-left">
-                        <button type="button" data-action="edit" class="btn btn-primary">Edit</button>
+                        <button type="button" data-action="edit" class="btn btn-primary hidden">Edit</button>
                     </form>
                 </div>
                 <div class="collapse navbar-collapse navbar-edit-collapse">
@@ -22,12 +22,12 @@
                         <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">
+                        <li class="hidden dropdown js_hide_on_translate">
                             <a id="content-menu-button" class="dropdown-toggle" data-toggle="dropdown" href="#">Content <span class="caret"></span></a>
                             <ul class="dropdown-menu oe_content_menu" role="menu">
-                                <li><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
-                                <li class="divider"> </li>
-                                <li><a href="#" data-action="new_page">New Page</a></li>
+                                <li class="hidden"><a data-action="edit-structure" href="#"><span title="Edit Top Menu">Edit Menu</span></a></li>
+                                <li class="hidden divider"> </li>
+                                <li class="hidden"><a href="#" data-action="new_page">New Page</a></li>
                             </ul>
                         </li>
                         <li class="dropdown js_hide_on_translate">
-- 
cgit v1.2.3


From 501e88d3ebb628774d30eaccff6a93327853a033 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 16:36:10 +0100
Subject: [IMP] replace select2 by grid for icons selection

bzr revid: xmo@openerp.com-20140120153610-xktkxjfbpl59xnpz
---
 addons/website/static/src/xml/website.editor.xml | 9 ++++++++-
 1 file changed, 8 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 12fd0774f39..fa408ef796b 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -210,9 +210,16 @@
                 <div class="form-group">
                     Preview: <span id="fa-preview"/>
                 </div>
-                <div class="form-group">
+                <div class="form-group fa">
                     <label for="fa-icon">icon</label>
                     <input type="hidden" id="fa-icon" class="form-control"/>
+                    <div class="font-icons-icons">
+                        <span t-foreach="widget.icons" t-as="icon"
+                              class="fa font-icons-icon"
+                              t-att-data-id="icon.id">
+                            <t t-esc="icon.text"/>
+                        </span>
+                    </div>
                 </div>
                 <div class="form-group">
                     <label for="fa-size">size</label>
-- 
cgit v1.2.3


From ca02581993f0ead8a0c3a6e7111537bf61fc65be Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 20 Jan 2014 17:26:04 +0100
Subject: [IMP] replace icon size select by selectable multi-size preview

bzr revid: xmo@openerp.com-20140120162604-yoyg21bf1z306hwg
---
 addons/website/static/src/xml/website.editor.xml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 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 fa408ef796b..1f102ec4a1a 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -207,12 +207,12 @@
         <t t-call="website.editor.dialog">
             <t t-set="title">Icon:</t>
             <form>
-                <div class="form-group">
-                    Preview: <span id="fa-preview"/>
+                <div class="form-group" id="fa-preview">
+
                 </div>
                 <div class="form-group fa">
-                    <label for="fa-icon">icon</label>
                     <input type="hidden" id="fa-icon" class="form-control"/>
+                    <input type="hidden" id="fa-size" class="form-control"/>
                     <div class="font-icons-icons">
                         <span t-foreach="widget.icons" t-as="icon"
                               class="fa font-icons-icon"
@@ -221,17 +221,6 @@
                         </span>
                     </div>
                 </div>
-                <div class="form-group">
-                    <label for="fa-size">size</label>
-                    <select id="fa-size" class="form-control">
-                        <option value="">Default</option>
-                        <option value="fa-lg">Large</option>
-                        <option value="fa-2x">x2</option>
-                        <option value="fa-3x">x3</option>
-                        <option value="fa-4x">x4</option>
-                        <option value="fa-5x">x5</option>
-                    </select>
-                </div>
                 <div class="form-group">
                     <label for="fa-rotation">Rotation</label>
                     <select id="fa-rotation" class="form-control">
-- 
cgit v1.2.3


From 51f6977f3947b74c7d6f18bea0d9d0e30a9a4454 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 21 Jan 2014 11:04:08 +0100
Subject: [IMP] icons selection dialog

remove fixed size checkbox
add fayt for icons (by name)

bzr revid: xmo@openerp.com-20140121100408-64e32iio9r77yx9m
---
 addons/website/static/src/xml/website.editor.xml | 25 ++++++++++++------------
 1 file changed, 13 insertions(+), 12 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 1f102ec4a1a..448c615bb07 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -210,15 +210,14 @@
                 <div class="form-group" id="fa-preview">
 
                 </div>
-                <div class="form-group fa">
+                <div class="form-group font-icons fa fa-search">
                     <input type="hidden" id="fa-icon" class="form-control"/>
                     <input type="hidden" id="fa-size" class="form-control"/>
+                    <input type="search" class="form-control" id="icon-search"/>
                     <div class="font-icons-icons">
-                        <span t-foreach="widget.icons" t-as="icon"
-                              class="fa font-icons-icon"
-                              t-att-data-id="icon.id">
-                            <t t-esc="icon.text"/>
-                        </span>
+                        <t t-call="website.editor.dialog.font-icons.icons">
+                            <t t-set="icons" t-value="widget.icons"/>
+                        </t>
                     </div>
                 </div>
                 <div class="form-group">
@@ -235,16 +234,18 @@
                 </div>
                 <div class="form-group">
                     <label>
-                        <input type="checkbox" id="fa-fixed"/> fixed width
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label>
-                        <input type="checkbox" id="fa-border"/> bordered
+                        <input type="checkbox" id="fa-border"/> border
                     </label>
                 </div>
             </form>
         </t>
     </t>
+    <t t-name="website.editor.dialog.font-icons.icons">
+        <span t-foreach="icons" t-as="icon"
+              class="fa font-icons-icon"
+              t-att-data-id="icon.id">
+            <t t-esc="icon.text"/>
+        </span>
+    </t>
 
 </templates>
-- 
cgit v1.2.3


From 35b8850ecc8d3cda929f77993e6a3c5bacab1276 Mon Sep 17 00:00:00 2001
From: "ddm@openerp.com" <>
Date: Tue, 21 Jan 2014 13:53:25 +0100
Subject: [IMP] add SEO preview

bzr revid: ddm@openerp.com-20140121125325-641psvqr4w96lsci
---
 addons/website/static/src/xml/website.seo.xml | 33 ++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

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

diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index be9414ca37f..0c055487dd8 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -43,19 +43,24 @@
                                 <div class="form-group">
                                     <label for="seo_page_description" class="col-lg-2 control-label">Description</label>
                                     <div class="col-lg-8">
-                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" size="160"/>
+                                        <textarea name="seo_page_description" class="form-control" rows="3" cols="70" t-att-maxlength="widget.maxDescriptionSize"/>
                                     </div>
                                 </div>
                             </div>
                         </section>
+                        <section>
+                            <h3 class="page-header">3. Preview <small>how your page will be listed on Google</small></h3>
+                            <div class="js_seo_preview"></div>
+                        </section>
                         <!--
                         <section class="js_image_section">
-                            <h3 class="page-header">3. Describe your images</h3>
+                            <h3 class="page-header">4. Describe your images</h3>
                             <div class="row js_seo_image_list">
                             </div>
                         </section>
                         -->
-                    </div><div class="modal-footer">
+                    </div>
+                    <div class="modal-footer">
                         <button type="button" data-action="update" class="btn btn-primary">Save</button>
                         or
                         <a data-action="discard" data-dismiss="modal" href="#" >Discard</a>
@@ -111,4 +116,26 @@
         </div>
     </t>
 
+    <t t-name="website.seo_preview">
+        <li class="oe_seo_preview_g">
+            <div class="rc">
+                <span class="altcts"></span>
+                <h3 class="r">
+                    <a t-att-href="url">
+                        <em><t t-esc="widget.title"/></em>
+                    </a>
+                </h3>
+                <div class="s">
+                    <div>
+                        <div class="f kv" style="white-space:nowrap">
+                            <cite><t t-esc="widget.url"/></cite>
+                        </div>
+                        <div class="f slp"></div>
+                        <span class="st"><t t-esc="widget.description"/></span>
+                    </div>
+                </div>
+            </div>
+        </li>
+    </t>
+
 </templates>
-- 
cgit v1.2.3


From bb4c13a2ecb29b6516022edc2ea0c2476bfffb0a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 28 Jan 2014 16:20:47 +0100
Subject: [FIX] website better instructions for submenus

bzr revid: al@openerp.com-20140128152047-kbt87i66zndf1kxr
---
 addons/website/static/src/xml/website.menu.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.menu.xml b/addons/website/static/src/xml/website.menu.xml
index 9277b0d4bc2..5afc927a8bc 100644
--- a/addons/website/static/src/xml/website.menu.xml
+++ b/addons/website/static/src/xml/website.menu.xml
@@ -32,7 +32,7 @@
         </ul>
         <div class="mt16">
             <div class="pull-right text-muted">
-                <span class="fa fa-indent"/> right indent for multi-level menus
+                Drag a menu to the right to create a sub-menu
             </div>
             <div>
                 <a href="#" class="js_add_menu">
-- 
cgit v1.2.3


From 4a9d1489b35adae9555c811e8c1a5c2640ece5ae Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jan 2014 16:49:09 +0100
Subject: [CHG] Make templates less readable by removing t-href and t-action

bzr revid: fme@openerp.com-20140128154909-oau6aq702rw062gy
---
 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 0998a03c66d..e2df9fd84fc 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -80,7 +80,7 @@
                             <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}">
+                                or fix the issue in <a t-att-href="url_for(backend_url)">
                                 the classic OpenERP interface</a>.
                             </p>
                         </section>
-- 
cgit v1.2.3


From 40c7ce4b1ce93703ca4539a0af02366be38ec08f Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Jan 2014 17:15:31 +0100
Subject: [REV] Revert t-href and t-action removal

bzr revid: fme@openerp.com-20140128161531-t0m0hqpk5u871rwg
---
 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 e2df9fd84fc..0998a03c66d 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -80,7 +80,7 @@
                             <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-att-href="url_for(backend_url)">
+                                or fix the issue in <a t-href="#{backend_url}">
                                 the classic OpenERP interface</a>.
                             </p>
                         </section>
-- 
cgit v1.2.3


From d4bbe13963d885ed043bb7e73134681e101df6f3 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Tue, 28 Jan 2014 21:50:17 +0100
Subject: [REM] t-href is now t-attf-href

bzr revid: al@openerp.com-20140128205017-47rxm2xbb84dmjas
---
 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 0998a03c66d..5890350e2dc 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -80,7 +80,7 @@
                             <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}">
+                                or fix the issue in <a t-attf-href="#{backend_url}">
                                 the classic OpenERP interface</a>.
                             </p>
                         </section>
-- 
cgit v1.2.3