From 5b1268d5e7c04fbfc36997ad5a9314a7050b8958 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Oct 2013 12:41:44 +0530
Subject: [PATCH 01/19] [IMP] Improved the layout of homepage.

bzr revid: psa@tinyerp.com-20131017071144-k58tomhtjit4n126
---
 addons/website/views/website_templates.xml   | 109 ++++++++++++++++++-
 addons/website_event/views/website_event.xml |  22 ++++
 addons/website_sale/views/website_sale.xml   |  21 ++++
 3 files changed, 151 insertions(+), 1 deletion(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 7702e6391bd..4ea832ce8b5 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -403,7 +403,114 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
         <template id="homepage" name="Homepage" page="True">
             <t t-call="website.layout">
-              <div id="wrap" class="oe_structure oe_empty"></div>
+
+                <section data-snippet-id="title" class="mt32 mb32">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12" data-snippet-id="colmd">
+                                <h1 class="text-center">Build Great Website</h1>
+                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="image-text" class="mt32 mb32 dark">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
+                            </div>
+                            <div class="col-md-6 mt32" data-snippet-id="colmd">
+                                <h3>A Section Subtitle</h3>
+                                <p>
+                                    Write one or two paragraphs describing your product,
+                                    services or a specific feature. To be successful
+                                    your content needs to be useful to your readers.
+                                </p>
+                                <p>
+                                    Start with the customer – find out what they want
+                                    and give it to them.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax_full oe_structure mt32 mb32" data-snippet-id="parallax">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
+                                <h1 class="text-center">
+                                    <b>A Great Title</b>
+                                </h1>
+                                <h3 class="text-center">
+                                    And a motivating subtitle
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="mt32 mb32" data-snippet-id="three-columns">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                                <h2>A Great Title</h2>
+                                <h3 class="text-muted">And a good subtitle</h3>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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>
+
+                <section class="mt32 mb32" data-snippet-id="cta">
+                    <div class="container">
+                      <div class="row">
+                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                            <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 id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
 
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index c93420c5a34..684e17a7551 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,6 +2,28 @@
 <openerp>
 <data>
 
+    <!-- Events Banner for Homepage  -->
+
+    <template id="homepage_event_banner" inherit_id="website.layout" name="Homepage Event Banner">
+        <xpath expr="//div[@id='wrap']" position="before">
+            <div class="carousel-inner">
+                <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only">
+                    <div contenteditable="true" class="container">
+                        <div class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
+                            <h3>Sell Tickets Online</h3>
+                            <p><a href="/page/website.contactus" class="btn btn-success btn-large">Sample Of Events</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>
+        </xpath>
+    </template>
+
+
     <!-- Layout add nav and footer -->
     <template id="header_footer_custom" inherit_id="website.layout">
         <xpath expr="//header//ul[@id='top_menu']/li[@name='contactus']" position="before">
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index a263a01ed2e..0e0a6bb7736 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,6 +2,27 @@
 <openerp>
 <data>
 
+    <!-- Shopping Banner for Homepage -->
+
+    <template id="homepage_shopping_banner" inherit_id="website.layout" name="Homepage Shopping Banner">
+        <xpath expr="//div[@id='wrap']" position="before">
+            <div class="carousel-inner">
+                <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
+                    <div contenteditable="true" class="container">
+                        <div class="carousel-caption content">
+                            <h2>OpenERP e-Commerce</h2>
+                            <h3>An Awesome Shopping Experience</h3>
+                            <p><a href="/page/website.contactus" class="btn btn-success btn-large">Visit Shop</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>
+        </xpath>
+    </template>
+
     <!-- Layout add nav and footer -->
 
     <template id="header" inherit_id="website.layout" name="Custom Header">

From e126969eab2207e01c414a12fe95c9655e6acc97 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Oct 2013 15:21:25 +0530
Subject: [PATCH 02/19] For the sack removed the banner from homepage.

bzr revid: psa@tinyerp.com-20131017095125-uf4dm2jfy7a0sla4
---
 addons/website_event/views/website_event.xml | 22 --------------------
 addons/website_sale/views/website_sale.xml   | 21 -------------------
 2 files changed, 43 deletions(-)

diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 684e17a7551..c93420c5a34 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -2,28 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Events Banner for Homepage  -->
-
-    <template id="homepage_event_banner" inherit_id="website.layout" name="Homepage Event Banner">
-        <xpath expr="//div[@id='wrap']" position="before">
-            <div class="carousel-inner">
-                <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only">
-                    <div contenteditable="true" class="container">
-                        <div class="carousel-caption content">
-                            <h2>Promote Your Events</h2>
-                            <h3>Sell Tickets Online</h3>
-                            <p><a href="/page/website.contactus" class="btn btn-success btn-large">Sample Of Events</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>
-        </xpath>
-    </template>
-
-
     <!-- Layout add nav and footer -->
     <template id="header_footer_custom" inherit_id="website.layout">
         <xpath expr="//header//ul[@id='top_menu']/li[@name='contactus']" position="before">
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 0e0a6bb7736..a263a01ed2e 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,27 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Shopping Banner for Homepage -->
-
-    <template id="homepage_shopping_banner" inherit_id="website.layout" name="Homepage Shopping Banner">
-        <xpath expr="//div[@id='wrap']" position="before">
-            <div class="carousel-inner">
-                <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
-                    <div contenteditable="true" class="container">
-                        <div class="carousel-caption content">
-                            <h2>OpenERP e-Commerce</h2>
-                            <h3>An Awesome Shopping Experience</h3>
-                            <p><a href="/page/website.contactus" class="btn btn-success btn-large">Visit Shop</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>
-        </xpath>
-    </template>
-
     <!-- Layout add nav and footer -->
 
     <template id="header" inherit_id="website.layout" name="Custom Header">

From 67b6faf955ba18e14099625608bdba589076ad9a Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Oct 2013 18:34:21 +0530
Subject: [PATCH 03/19] [IMP]ADded banner for shop.

bzr revid: psa@tinyerp.com-20131017130421-fnir86hberl2t6qy
---
 addons/website_sale/views/website_sale.xml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index a263a01ed2e..7ecb67e6e42 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,6 +2,40 @@
 <openerp>
 <data>
 
+    <!-- Shopping Banner for Homepage -->
+
+    <template id="homepage_shopping_banner" inherit_id="website.homepage" name="Homepage Shopping Banner">
+        <xpath expr="//section" position="before">
+            <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
+            <ol class="carousel-indicators hidden">
+                <li data-slide-to="0" class="active" data-target="#myCarousel1"></li>
+            </ol>
+
+                <div class="carousel-inner">
+                    <div style="background-image: url(http://trunk-website-demodata-prod-desc-psa-22850.runbot.openerp.com/website/static/src/img/banner/color_splash.jpg);" class="item active text_only">
+                        <div class="container">
+                            <div contenteditable="false" class="carousel-caption content">
+                                <h2>OpenERP e-Commerce</h2>
+
+                                <h3>An Awesome Shopping Experience</h3>
+
+                                <p>
+                                    <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
+                                </p>
+                            </div>
+
+                            <div class="carousel-image hidden-xs">
+                                <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left hidden"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
+                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right hidden"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
+            </div>
+        </xpath>
+    </template>
+
     <!-- Layout add nav and footer -->
 
     <template id="header" inherit_id="website.layout" name="Custom Header">

From 70dd2ebc14112af4c74e23809cd70ea449d5d9db Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Thu, 17 Oct 2013 18:43:21 +0530
Subject: [PATCH 04/19] [IMP] Improved path.

bzr revid: psa@tinyerp.com-20131017131321-uyyyp9nii5ab8ejx
---
 addons/website_sale/views/website_sale.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 7ecb67e6e42..c20ad00f8c0 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -12,7 +12,7 @@
             </ol>
 
                 <div class="carousel-inner">
-                    <div style="background-image: url(http://trunk-website-demodata-prod-desc-psa-22850.runbot.openerp.com/website/static/src/img/banner/color_splash.jpg);" class="item active text_only">
+                    <div style="background-image: url(/website/static/src/img/banner/color_splash.jpg);" class="item active text_only">
                         <div class="container">
                             <div contenteditable="false" class="carousel-caption content">
                                 <h2>OpenERP e-Commerce</h2>

From 5732f1552ef2f9f9b3d41564306d4bf1a69b5c41 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 18 Oct 2013 18:02:44 +0530
Subject: [PATCH 05/19] [IMP]Added the demodata for homepage.

bzr revid: psa@tinyerp.com-20131018123244-ueuj25lto0ugs6mj
---
 addons/website/data/website_demo.xml       | 117 +++++++++++++++++++++
 addons/website/views/website_templates.xml | 107 -------------------
 addons/website_sale/views/website_sale.xml |  34 ------
 addons/website_sale/website_sale_demo.xml  |  31 ++++++
 4 files changed, 148 insertions(+), 141 deletions(-)

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 672f2f3d29d..52935fddc68 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -9,5 +9,122 @@
             <field name="social_linkedin">http://www.linkedin.com/company/openerp</field>
         </record>
 
+
+        <template id="default_website_homepage" inherit_id="website.homepage" name="Homepage for Website">
+
+            <xpath expr="//div[@id='wrap']" position="attributes">
+                <attribute name="class">oe_structure</attribute>
+            </xpath>
+
+            <xpath expr="//div[@id='wrap']" position="after">
+                <section data-snippet-id="title" class="mt32 mb32">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12" data-snippet-id="colmd">
+                                <h1 class="text-center">Build Great Website</h1>
+                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="image-text" class="mt32 mb32 dark">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
+                            </div>
+                            <div class="col-md-6 mt32" data-snippet-id="colmd">
+                                <h3>A Section Subtitle</h3>
+                                <p>
+                                    Write one or two paragraphs describing your product,
+                                    services or a specific feature. To be successful
+                                    your content needs to be useful to your readers.
+                                </p>
+                                <p>
+                                    Start with the customer – find out what they want
+                                    and give it to them.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax_full oe_structure mt32 mb32" data-snippet-id="parallax">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
+                                <h1 class="text-center">
+                                    <b>A Great Title</b>
+                                </h1>
+                                <h3 class="text-center">
+                                    And a motivating subtitle
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="mt32 mb32" data-snippet-id="three-columns">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                                <h2>A Great Title</h2>
+                                <h3 class="text-muted">And a good subtitle</h3>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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>
+
+                <section class="mt32 mb32" data-snippet-id="cta">
+                    <div class="container">
+                      <div class="row">
+                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                            <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>
+            </xpath>
+
+        </template>
+
     </data>
 </openerp>
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 4ea832ce8b5..4ac301ed262 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -403,113 +403,6 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
         <template id="homepage" name="Homepage" page="True">
             <t t-call="website.layout">
-
-                <section data-snippet-id="title" class="mt32 mb32">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12" data-snippet-id="colmd">
-                                <h1 class="text-center">Build Great Website</h1>
-                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section data-snippet-id="image-text" class="mt32 mb32 dark">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
-                            </div>
-                            <div class="col-md-6 mt32" data-snippet-id="colmd">
-                                <h3>A Section Subtitle</h3>
-                                <p>
-                                    Write one or two paragraphs describing your product,
-                                    services or a specific feature. To be successful
-                                    your content needs to be useful to your readers.
-                                </p>
-                                <p>
-                                    Start with the customer – find out what they want
-                                    and give it to them.
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax_full oe_structure mt32 mb32" data-snippet-id="parallax">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
-                                <h1 class="text-center">
-                                    <b>A Great Title</b>
-                                </h1>
-                                <h3 class="text-center">
-                                    And a motivating subtitle
-                                </h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section class="mt32 mb32" data-snippet-id="three-columns">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                                <h2>A Great Title</h2>
-                                <h3 class="text-muted">And a good subtitle</h3>
-                            </div>
-                            <div class="col-md-4" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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>
-
-                <section class="mt32 mb32" data-snippet-id="cta">
-                    <div class="container">
-                      <div class="row">
-                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                            <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 id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index c20ad00f8c0..a263a01ed2e 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,40 +2,6 @@
 <openerp>
 <data>
 
-    <!-- Shopping Banner for Homepage -->
-
-    <template id="homepage_shopping_banner" inherit_id="website.homepage" name="Homepage Shopping Banner">
-        <xpath expr="//section" position="before">
-            <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
-            <ol class="carousel-indicators hidden">
-                <li data-slide-to="0" class="active" data-target="#myCarousel1"></li>
-            </ol>
-
-                <div class="carousel-inner">
-                    <div style="background-image: url(/website/static/src/img/banner/color_splash.jpg);" class="item active text_only">
-                        <div class="container">
-                            <div contenteditable="false" class="carousel-caption content">
-                                <h2>OpenERP e-Commerce</h2>
-
-                                <h3>An Awesome Shopping Experience</h3>
-
-                                <p>
-                                    <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
-                                </p>
-                            </div>
-
-                            <div class="carousel-image hidden-xs">
-                                <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left hidden"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
-                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right hidden"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
-            </div>
-        </xpath>
-    </template>
-
     <!-- Layout add nav and footer -->
 
     <template id="header" inherit_id="website.layout" name="Custom Header">
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index ef47ae7db59..125ed1e6b5a 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -2,6 +2,37 @@
 <openerp>
     <data noupdate="1">
 
+        <!--  Shop Banner for homepage -->
+
+        <template id="default_website_sale_homepage" inherit_id="website.homepage" name="Homepage for Website">
+            <xpath expr="//div" position="before">
+
+                <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
+                    <div class="carousel-inner">
+                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
+                            <div class="container">
+                                <div contenteditable="false" class="carousel-caption content">
+                                    <h2>OpenERP e-Commerce</h2>
+
+                                    <h3>An Awesome Shopping Experience</h3>
+
+                                    <p>
+                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
+                                    </p>
+                                </div>
+
+                                <div class="carousel-image hidden-xs">
+                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
+            </xpath>
+        </template>
+
         <record id="product.product_product_consultant" model="product.product">
             <field name="image" type="base64" file="website/static/description/website_edit.png"/>
         </record>

From 7baf49139a7ebbb96e88f7be499b10e1fed3a1a3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 18 Oct 2013 18:32:56 +0530
Subject: [PATCH 06/19] [IMP] Added event banner for homepage.

bzr revid: psa@tinyerp.com-20131018130256-gr9ikd0iiszvgsmg
---
 addons/website_event/data/event_demo.xml  | 34 +++++++++++++++++++++++
 addons/website_sale/website_sale_demo.xml |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index d45aa6cc9e1..7dc693add61 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,6 +2,40 @@
 <openerp>
     <data>
 
+        <!-- Events banner for homepage -->
+
+        <template id="default_website_event_homepage" inherit_id="website.homepage" name="Event banner for Homepage">
+            <xpath expr="//*[@id='myCarousel1']/div" position="before">
+                <ol class="carousel-indicators">
+                    <li data-slide-to="0" data-target="#myCarousel1" class="active"></li>
+                    <li data-target="#myCarousel" data-slide-to="1" class=""></li>
+                </ol>
+            </xpath>
+
+            <xpath expr="//*[@id='myCarousel1']/div" position="inside">
+                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                    <div class="container">
+                        <div contenteditable="false" class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
+
+                            <h3>Sell Tickets Online</h3>
+
+                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                        </div>
+
+                        <div class="carousel-image hidden-xs">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+
+            <xpath expr="//*[@id='myCarousel1']/div" position="after">
+                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
+                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
+            </xpath>
+        </template>
+
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index 125ed1e6b5a..8f8a5a79a1b 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -4,7 +4,7 @@
 
         <!--  Shop Banner for homepage -->
 
-        <template id="default_website_sale_homepage" inherit_id="website.homepage" name="Homepage for Website">
+        <template id="default_website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
             <xpath expr="//div" position="before">
 
                 <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">

From ee7c90cae744ce05839252c4fbe8082263378bde Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 18 Oct 2013 19:00:10 +0530
Subject: [PATCH 07/19] Removed event banner

bzr revid: psa@tinyerp.com-20131018133010-3zuv4ibxqpzx0jvj
---
 addons/website_event/data/event_demo.xml | 34 ------------------------
 1 file changed, 34 deletions(-)

diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 7dc693add61..d45aa6cc9e1 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,40 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Events banner for homepage -->
-
-        <template id="default_website_event_homepage" inherit_id="website.homepage" name="Event banner for Homepage">
-            <xpath expr="//*[@id='myCarousel1']/div" position="before">
-                <ol class="carousel-indicators">
-                    <li data-slide-to="0" data-target="#myCarousel1" class="active"></li>
-                    <li data-target="#myCarousel" data-slide-to="1" class=""></li>
-                </ol>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="inside">
-                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
-                    <div class="container">
-                        <div contenteditable="false" class="carousel-caption content">
-                            <h2>Promote Your Events</h2>
-
-                            <h3>Sell Tickets Online</h3>
-
-                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
-                        </div>
-
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="after">
-                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
-                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
-            </xpath>
-        </template>
-
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>

From 231c29add2993db7dd9783b5e0f33d74d0ef74b7 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 18 Oct 2013 19:11:49 +0530
Subject: [PATCH 08/19] [IMP] Added banner for event on homepage

bzr revid: psa@tinyerp.com-20131018134149-1s7goa7nsm1tz2tg
---
 addons/website_event/data/event_demo.xml | 34 ++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index d45aa6cc9e1..6d9c9adaf2d 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,6 +2,40 @@
 <openerp>
     <data>
 
+        <!-- Events banner for homepage -->
+
+        <template id="default_website_event_homepage" inherit_id="website_sale.default_website_sale_homepage" name="Event banner for Homepage">
+            <xpath expr="//*[@id='myCarousel1']/div" position="before">
+                <ol class="carousel-indicators">
+                    <li data-slide-to="0" data-target="#myCarousel1" class="active"></li>
+                    <li data-target="#myCarousel" data-slide-to="1" class=""></li>
+                </ol>
+            </xpath>
+
+            <xpath expr="//*[@id='myCarousel1']/div" position="inside">
+                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                    <div class="container">
+                        <div contenteditable="false" class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
+
+                            <h3>Sell Tickets Online</h3>
+
+                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                        </div>
+
+                        <div class="carousel-image hidden-xs">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+
+            <xpath expr="//*[@id='myCarousel1']/div" position="after">
+                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
+                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
+            </xpath>
+        </template>
+
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>

From e174a059bb79982d96398fa7664cf5e1a3a13996 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Fri, 18 Oct 2013 19:34:36 +0530
Subject: [PATCH 09/19] Indent fix

bzr revid: psa@tinyerp.com-20131018140436-go7nyqsrw2u6ncu3
---
 addons/website/views/website_templates.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 77c2a1c0c06..48b241654f8 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -408,7 +408,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
 
         <template id="homepage" name="Homepage" page="True">
             <t t-call="website.layout">
-                <div id="wrap" class="oe_structure oe_empty"></div>
+              <div id="wrap" class="oe_structure oe_empty"></div>
             </t>
         </template>
 

From 5f3aa19035b9ea731879f5854cb6d174616e67d3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 13:18:17 +0530
Subject: [PATCH 10/19] [IMP] Improved code and make file for demo data.

bzr revid: psa@tinyerp.com-20131021074817-3yren0baw8fqijie
---
 addons/website/data/website_demo.xml          | 117 -----------------
 addons/website/demo/website_homepage_demo.xml | 122 ++++++++++++++++++
 addons/website_event/__openerp__.py           |   3 +-
 addons/website_event/data/event_demo.xml      |  34 -----
 .../demo/website_event_homepage_demo.xml      |  30 +++++
 addons/website_sale/__openerp__.py            |   1 +
 .../demo/website_sale_homepage_demo.xml       |  37 ++++++
 addons/website_sale/website_sale_demo.xml     |  31 -----
 8 files changed, 192 insertions(+), 183 deletions(-)
 create mode 100644 addons/website/demo/website_homepage_demo.xml
 create mode 100644 addons/website_event/demo/website_event_homepage_demo.xml
 create mode 100644 addons/website_sale/demo/website_sale_homepage_demo.xml

diff --git a/addons/website/data/website_demo.xml b/addons/website/data/website_demo.xml
index 52935fddc68..672f2f3d29d 100644
--- a/addons/website/data/website_demo.xml
+++ b/addons/website/data/website_demo.xml
@@ -9,122 +9,5 @@
             <field name="social_linkedin">http://www.linkedin.com/company/openerp</field>
         </record>
 
-
-        <template id="default_website_homepage" inherit_id="website.homepage" name="Homepage for Website">
-
-            <xpath expr="//div[@id='wrap']" position="attributes">
-                <attribute name="class">oe_structure</attribute>
-            </xpath>
-
-            <xpath expr="//div[@id='wrap']" position="after">
-                <section data-snippet-id="title" class="mt32 mb32">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12" data-snippet-id="colmd">
-                                <h1 class="text-center">Build Great Website</h1>
-                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section data-snippet-id="image-text" class="mt32 mb32 dark">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
-                            </div>
-                            <div class="col-md-6 mt32" data-snippet-id="colmd">
-                                <h3>A Section Subtitle</h3>
-                                <p>
-                                    Write one or two paragraphs describing your product,
-                                    services or a specific feature. To be successful
-                                    your content needs to be useful to your readers.
-                                </p>
-                                <p>
-                                    Start with the customer – find out what they want
-                                    and give it to them.
-                                </p>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax_full oe_structure mt32 mb32" data-snippet-id="parallax">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
-                                <h1 class="text-center">
-                                    <b>A Great Title</b>
-                                </h1>
-                                <h3 class="text-center">
-                                    And a motivating subtitle
-                                </h3>
-                            </div>
-                        </div>
-                    </div>
-                </section>
-
-                <section class="mt32 mb32" data-snippet-id="three-columns">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                                <h2>A Great Title</h2>
-                                <h3 class="text-muted">And a good subtitle</h3>
-                            </div>
-                            <div class="col-md-4" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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" data-snippet-id="colmd">
-                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
-                                <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>
-
-                <section class="mt32 mb32" data-snippet-id="cta">
-                    <div class="container">
-                      <div class="row">
-                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                            <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>
-            </xpath>
-
-        </template>
-
     </data>
 </openerp>
diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
new file mode 100644
index 00000000000..044aa163380
--- /dev/null
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <template id="website_homepage_demo" inherit_id="website.homepage" name="Homepage for Website">
+
+            <xpath expr="//div[@id='wrap']" position="attributes">
+                <attribute name="class">oe_structure</attribute>
+            </xpath>
+
+            <xpath expr="//div[@id='wrap']" position="after">
+                <section data-snippet-id="title" class="mt32 mb32">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12" data-snippet-id="colmd">
+                                <h1 class="text-center">Build Great Website</h1>
+                                <h3 class="text-muted text-center">Super Easy. Fully Inline Edition.</h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section data-snippet-id="image-text" class="mt32 mb32 dark">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-6 mt16 mb16" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/image_text.jpg" class="img-responsive shadow"/>
+                            </div>
+                            <div class="col-md-6 mt32" data-snippet-id="colmd">
+                                <h3>A Section Subtitle</h3>
+                                <p>
+                                    Write one or two paragraphs describing your product,
+                                    services or a specific feature. To be successful
+                                    your content needs to be useful to your readers.
+                                </p>
+                                <p>
+                                    Start with the customer – find out what they want
+                                    and give it to them.
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32" data-snippet-id="parallax">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
+                                <h1 class="text-center">
+                                    <b>A Great Title</b>
+                                </h1>
+                                <h3 class="text-center">
+                                    And a motivating subtitle
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+
+                <section class="mt32 mb32" data-snippet-id="three-columns">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                                <h2>A Great Title</h2>
+                                <h3 class="text-muted">And a good subtitle</h3>
+                            </div>
+                            <div class="col-md-4" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/china_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/desert_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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" data-snippet-id="colmd">
+                                <img src="/website/static/src/img/deers_thumb.jpg" class="img-rounded img-responsive"/>
+                                <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>
+
+                <section class="mt32 mb32" data-snippet-id="cta">
+                    <div class="container">
+                      <div class="row">
+                        <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
+                            <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>
+            </xpath>
+
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index 26a1e084564..a836eafee15 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -20,7 +20,8 @@ Online Events
     ],
     'qweb': ['static/src/xml/*.xml'],
     'demo': [
-        'data/event_demo.xml'
+        'data/event_demo.xml',
+        'demo/website_event_homepage_page.xml',
     ],
     'installable': True,
 }
diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml
index 6d9c9adaf2d..d45aa6cc9e1 100644
--- a/addons/website_event/data/event_demo.xml
+++ b/addons/website_event/data/event_demo.xml
@@ -2,40 +2,6 @@
 <openerp>
     <data>
 
-        <!-- Events banner for homepage -->
-
-        <template id="default_website_event_homepage" inherit_id="website_sale.default_website_sale_homepage" name="Event banner for Homepage">
-            <xpath expr="//*[@id='myCarousel1']/div" position="before">
-                <ol class="carousel-indicators">
-                    <li data-slide-to="0" data-target="#myCarousel1" class="active"></li>
-                    <li data-target="#myCarousel" data-slide-to="1" class=""></li>
-                </ol>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="inside">
-                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
-                    <div class="container">
-                        <div contenteditable="false" class="carousel-caption content">
-                            <h2>Promote Your Events</h2>
-
-                            <h3>Sell Tickets Online</h3>
-
-                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
-                        </div>
-
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-
-            <xpath expr="//*[@id='myCarousel1']/div" position="after">
-                <a data-slide="prev" href="#myCarousel1" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
-                <a data-slide="next" href="#myCarousel1" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
-            </xpath>
-        </template>
-
         <record id="event.event_0" model="event.event">
             <field name="website_published">True</field>
             <field name="twitter_hashtag">openerp</field>
diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
new file mode 100644
index 00000000000..3d50db4eb75
--- /dev/null
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!-- Events banner for homepage -->
+
+        <template id="website_event_homepage_page" inherit_id="website_sale.website_sale_homepage_page" name="Event banner for Homepage">
+
+            <xpath expr="//*[@id='shop_banner']/div" position="inside">
+                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                    <div class="container">
+                        <div contenteditable="false" class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
+
+                            <h3>Sell Tickets Online</h3>
+
+                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                        </div>
+
+                        <div class="carousel-image hidden-xs">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 634078fe149..0a022cbc78b 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -19,6 +19,7 @@ OpenERP E-Commerce
     ],
     'demo': [
         'website_sale_demo.xml',
+        'demo/website_sale_homepage_page.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
new file mode 100644
index 00000000000..5221ba320ce
--- /dev/null
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+
+        <!--  Shop Banner for homepage -->
+
+        <template id="website_sale_homepage_demo" inherit_id="website.homepage" name="Shop banner for Homepage">
+            <xpath expr="//div[@id='wrap']" position="before">
+
+                <div id="shop_banner" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
+                    <div class="carousel-inner">
+                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
+                            <div class="container">
+                                <div contenteditable="false" class="carousel-caption content">
+                                    <h2>OpenERP e-Commerce</h2>
+
+                                    <h3>An Awesome Shopping Experience</h3>
+
+                                    <p>
+                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
+                                    </p>
+                                </div>
+
+                                <div class="carousel-image hidden-xs">
+                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+
+            </xpath>
+        </template>
+
+    </data>
+</openerp>
diff --git a/addons/website_sale/website_sale_demo.xml b/addons/website_sale/website_sale_demo.xml
index 8f8a5a79a1b..ef47ae7db59 100644
--- a/addons/website_sale/website_sale_demo.xml
+++ b/addons/website_sale/website_sale_demo.xml
@@ -2,37 +2,6 @@
 <openerp>
     <data noupdate="1">
 
-        <!--  Shop Banner for homepage -->
-
-        <template id="default_website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
-            <xpath expr="//div" position="before">
-
-                <div id="myCarousel1" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
-                    <div class="carousel-inner">
-                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
-                            <div class="container">
-                                <div contenteditable="false" class="carousel-caption content">
-                                    <h2>OpenERP e-Commerce</h2>
-
-                                    <h3>An Awesome Shopping Experience</h3>
-
-                                    <p>
-                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
-                                    </p>
-                                </div>
-
-                                <div class="carousel-image hidden-xs">
-                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                </div>
-
-            </xpath>
-        </template>
-
         <record id="product.product_product_consultant" model="product.product">
             <field name="image" type="base64" file="website/static/description/website_edit.png"/>
         </record>

From 32124e7db53ad9d7e61ca370a0d0fbcef0364945 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 14:27:25 +0530
Subject: [PATCH 11/19] [IMP] Little Improvement.

bzr revid: psa@tinyerp.com-20131021085725-wls4ocyjo38tnq7w
---
 addons/website/__openerp__.py                             | 1 +
 addons/website_event/__openerp__.py                       | 2 +-
 addons/website_event/demo/website_event_homepage_demo.xml | 4 ++--
 addons/website_sale/__openerp__.py                        | 2 +-
 addons/website_sale/demo/website_sale_homepage_demo.xml   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/addons/website/__openerp__.py b/addons/website/__openerp__.py
index d421357e996..e2e2280be71 100644
--- a/addons/website/__openerp__.py
+++ b/addons/website/__openerp__.py
@@ -21,5 +21,6 @@ OpenERP Website CMS
     ],
     'demo': [
         'data/website_demo.xml',
+        'demo/website_homepage_demo.xml',
     ]
 }
diff --git a/addons/website_event/__openerp__.py b/addons/website_event/__openerp__.py
index a836eafee15..2caf95894c7 100644
--- a/addons/website_event/__openerp__.py
+++ b/addons/website_event/__openerp__.py
@@ -21,7 +21,7 @@ Online Events
     'qweb': ['static/src/xml/*.xml'],
     'demo': [
         'data/event_demo.xml',
-        'demo/website_event_homepage_page.xml',
+        'demo/website_event_homepage_demo.xml',
     ],
     'installable': True,
 }
diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index 3d50db4eb75..a7f647c1229 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -4,9 +4,9 @@
 
         <!-- Events banner for homepage -->
 
-        <template id="website_event_homepage_page" inherit_id="website_sale.website_sale_homepage_page" name="Event banner for Homepage">
+        <template id="website_event_homepage" inherit_id="website_sale.website_sale_homepage" name="Event banner for Homepage">
 
-            <xpath expr="//*[@id='shop_banner']/div" position="inside">
+            <xpath expr="//div[@id='shop_banner']/div" position="inside">
                 <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
                     <div class="container">
                         <div contenteditable="false" class="carousel-caption content">
diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 0a022cbc78b..4883541bdf2 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -19,7 +19,7 @@ OpenERP E-Commerce
     ],
     'demo': [
         'website_sale_demo.xml',
-        'demo/website_sale_homepage_page.xml',
+        'demo/website_sale_homepage_demo.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
index 5221ba320ce..820cdf8e4d1 100644
--- a/addons/website_sale/demo/website_sale_homepage_demo.xml
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -4,7 +4,7 @@
 
         <!--  Shop Banner for homepage -->
 
-        <template id="website_sale_homepage_demo" inherit_id="website.homepage" name="Shop banner for Homepage">
+        <template id="website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
             <xpath expr="//div[@id='wrap']" position="before">
 
                 <div id="shop_banner" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">

From 3b56e23da68c0896656a14865c0cbe67cdea4a3e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 14:31:12 +0530
Subject: [PATCH 12/19] [IMP] Improved button section in website demo

bzr revid: psa@tinyerp.com-20131021090112-s4rzbn6zld9tbv05
---
 addons/website/demo/website_homepage_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
index 044aa163380..74c0f609cad 100644
--- a/addons/website/demo/website_homepage_demo.xml
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -108,7 +108,7 @@
                     <div class="container">
                       <div class="row">
                         <div class="col-md-12 text-center mt16 mb16" data-snippet-id="colmd">
-                            <a href="/shop" class="btn btn-info btn-lg">View Products</a>
+                            <a href="/page/website.aboutus" class="btn btn-info btn-lg">About us</a>
                             <a href="/page/website.contactus" class="btn btn-primary btn-lg">Contact us</a>
                         </div>
                       </div>

From 789c7ef1db44da8cd558d7005910806b988118a3 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 14:48:31 +0530
Subject: [PATCH 13/19] [IMP] Parallax section big by default in demo

bzr revid: psa@tinyerp.com-20131021091831-k1wzaipa5sqqjnfd
---
 addons/website/demo/website_homepage_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
index 74c0f609cad..fc48c9f229f 100644
--- a/addons/website/demo/website_homepage_demo.xml
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -42,7 +42,7 @@
                     </div>
                 </section>
 
-                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32" data-snippet-id="parallax">
+                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32 oe_big" data-snippet-id="parallax">
                     <div class="container">
                         <div class="row">
                             <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">

From a2794d34c73ffdd36e910b47edf08445c40da914 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 15:42:59 +0530
Subject: [PATCH 14/19] [IMP] Added left right carousel control for banner when
 two banners are there.

bzr revid: psa@tinyerp.com-20131021101259-q0kujdxebeuuodsd
---
 addons/website_event/demo/website_event_homepage_demo.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index a7f647c1229..c189a5e9d30 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -24,6 +24,11 @@
                 </div>
             </xpath>
 
+            <xpath expr="//div[@id='shop_banner']/div" position="after">
+                <a data-slide="prev" href="#shop_banner" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
+                <a data-slide="next" href="#shop_banner" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
+            </xpath>
+
         </template>
 
     </data>

From 6befd7d6c513dbeb0f7dd230e0827fb7d6eb24bb Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Mon, 21 Oct 2013 18:59:01 +0530
Subject: [PATCH 15/19] [IMP]Improved code.

bzr revid: psa@tinyerp.com-20131021132901-up1ianuz5rtg3hly
---
 addons/website/demo/website_homepage_demo.xml |  2 +-
 .../demo/website_event_homepage_demo.xml      | 48 ++++++++++++++-----
 .../demo/website_sale_homepage_demo.xml       |  5 +-
 3 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
index fc48c9f229f..ffa63d1fcca 100644
--- a/addons/website/demo/website_homepage_demo.xml
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -8,7 +8,7 @@
                 <attribute name="class">oe_structure</attribute>
             </xpath>
 
-            <xpath expr="//div[@id='wrap']" position="after">
+            <xpath expr="//div[@id='wrap']" position="inside">
                 <section data-snippet-id="title" class="mt32 mb32">
                     <div class="container">
                         <div class="row">
diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index c189a5e9d30..f96bfb5d059 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -5,28 +5,50 @@
         <!-- Events banner for homepage -->
 
         <template id="website_event_homepage" inherit_id="website_sale.website_sale_homepage" name="Event banner for Homepage">
+            <xpath expr="//div[@id='shop_banner']" position="replace">
 
-            <xpath expr="//div[@id='shop_banner']/div" position="inside">
-                <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
-                    <div class="container">
-                        <div contenteditable="false" class="carousel-caption content">
-                            <h2>Promote Your Events</h2>
+                <div id="shop_banner" class="oe_snippet_body carousel slide oe_medium mb32" contenteditable="false" data-snippet-id="carousel">
+                    <ol class="carousel-indicators">
+                        <li data-slide-to="0" data-target="#shop_banner" class="active"></li>
+                        <li data-target="#shop_banner" data-slide-to="1" class=""></li>
+                    </ol>
+                    <div class="carousel-inner">
+                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
+                            <div class="container">
+                                <div contenteditable="false" class="carousel-caption content">
+                                    <h2>OpenERP e-Commerce</h2>
 
-                            <h3>Sell Tickets Online</h3>
+                                    <h3>An Awesome Shopping Experience</h3>
 
-                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                                    <p>
+                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
+                                    </p>
+                                </div>
+
+                                <div class="carousel-image hidden-xs">
+                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                                </div>
+                            </div>
                         </div>
 
-                        <div class="carousel-image hidden-xs">
-                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                        <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                            <div class="container">
+                                <div contenteditable="false" class="carousel-caption content">
+                                    <h2>Promote Your Events</h2>
+
+                                    <h3>Sell Tickets Online</h3>
+
+                                    <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
+                                </div>
+
+                                <div class="carousel-image hidden-xs">
+                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
-            </xpath>
 
-            <xpath expr="//div[@id='shop_banner']/div" position="after">
-                <a data-slide="prev" href="#shop_banner" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
-                <a data-slide="next" href="#shop_banner" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
             </xpath>
 
         </template>
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
index 820cdf8e4d1..e99b299cc12 100644
--- a/addons/website_sale/demo/website_sale_homepage_demo.xml
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -5,9 +5,9 @@
         <!--  Shop Banner for homepage -->
 
         <template id="website_sale_homepage" inherit_id="website.homepage" name="Shop banner for Homepage">
-            <xpath expr="//div[@id='wrap']" position="before">
+            <xpath expr="//div[@id='wrap']/section" position="before">
 
-                <div id="shop_banner" contenteditable="false" class="carousel slide oe_medium mb32" data-snippet-id="carousel">
+                <div id="shop_banner" contenteditable="false" class="oe_snippet_body carousel slide oe_medium mb32" data-snippet-id="carousel">
                     <div class="carousel-inner">
                         <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
                             <div class="container">
@@ -27,7 +27,6 @@
                             </div>
                         </div>
                     </div>
-
                 </div>
 
             </xpath>

From bb1a77e7526295df40af1d3a8efc4c0d6d98c23e Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 22 Oct 2013 10:33:17 +0530
Subject: [PATCH 16/19] [FIX] Fixed image proper path.

bzr revid: psa@tinyerp.com-20131022050317-ttwckuyomjccak7l
---
 addons/website_event/demo/website_event_homepage_demo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index f96bfb5d059..10ca70eb55f 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -31,7 +31,7 @@
                             </div>
                         </div>
 
-                        <div style="background-image: url(http://localhost:8069/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                        <div style="background-image: url(/website/static/src/img/banner/aqua.jpg);" class="item text_only">
                             <div class="container">
                                 <div contenteditable="false" class="carousel-caption content">
                                     <h2>Promote Your Events</h2>

From 4266d44b616b8ba5cabfbec5be4bbbc13ec21133 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 22 Oct 2013 11:34:36 +0530
Subject: [PATCH 17/19] [IMP] Improvd the banners.

bzr revid: psa@tinyerp.com-20131022060436-39jpcp2rxrx8okq9
---
 .../demo/website_event_homepage_demo.xml      | 56 +++++++------------
 .../demo/website_sale_homepage_demo.xml       |  2 +-
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index 10ca70eb55f..02118e2dac2 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -5,52 +5,38 @@
         <!-- Events banner for homepage -->
 
         <template id="website_event_homepage" inherit_id="website_sale.website_sale_homepage" name="Event banner for Homepage">
-            <xpath expr="//div[@id='shop_banner']" position="replace">
 
-                <div id="shop_banner" class="oe_snippet_body carousel slide oe_medium mb32" contenteditable="false" data-snippet-id="carousel">
-                    <ol class="carousel-indicators">
-                        <li data-slide-to="0" data-target="#shop_banner" class="active"></li>
-                        <li data-target="#shop_banner" data-slide-to="1" class=""></li>
-                    </ol>
-                    <div class="carousel-inner">
-                        <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
-                            <div class="container">
-                                <div contenteditable="false" class="carousel-caption content">
-                                    <h2>OpenERP e-Commerce</h2>
+            <xpath expr="//div[@id='shop_banner']/div" position="before">
+                <ol class="carousel-indicators">
+                    <li data-slide-to="0" data-target="#shop_banner" class="active"></li>
+                    <li data-target="#shop_banner" data-slide-to="1" class=""></li>
+                </ol>
+            </xpath>
 
-                                    <h3>An Awesome Shopping Experience</h3>
+            <xpath expr="//div[@id='shop_banner']/div" position="inside">
+                <div style="background-image: url(/website/static/src/img/banner/aqua.jpg);" class="item text_only">
+                    <div class="container">
+                        <div contenteditable="true" class="carousel-caption content">
+                            <h2>Promote Your Events</h2>
 
-                                    <p>
-                                        <a href="/shop" class="btn btn-success btn-large">Visit Shop</a>
-                                    </p>
-                                </div>
+                            <h3>Sell Tickets Online</h3>
 
-                                <div class="carousel-image hidden-xs">
-                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                                </div>
-                            </div>
+                            <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
                         </div>
 
-                        <div style="background-image: url(/website/static/src/img/banner/aqua.jpg);" class="item text_only">
-                            <div class="container">
-                                <div contenteditable="false" class="carousel-caption content">
-                                    <h2>Promote Your Events</h2>
-
-                                    <h3>Sell Tickets Online</h3>
-
-                                    <p><a href="/event" class="btn btn-success btn-large">Sample of Events</a></p>
-                                </div>
-
-                                <div class="carousel-image hidden-xs">
-                                    <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
-                                </div>
-                            </div>
+                        <div class="carousel-image hidden-xs">
+                            <img src="/website/static/src/img/banner/banner_picture.png" alt="Banner OpenERP Image" contenteditable="true"/>
                         </div>
                     </div>
                 </div>
-
             </xpath>
 
+            <xpath expr="//*[@id='shop_banner']/div" position="after">
+                <a data-slide="prev" href="#shop_banner" style="width: 10%" class="carousel-control left"><span class="glyphicon glyphicon-chevron-left"><span class="hidden">.</span></span></a>
+                <a data-slide="next" href="#shop_banner" style="width: 10%" class="carousel-control right"><span class="glyphicon glyphicon-chevron-right"><span class="hidden">.</span></span></a>
+            </xpath>
+
+
         </template>
 
     </data>
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
index e99b299cc12..e98cb2a1d83 100644
--- a/addons/website_sale/demo/website_sale_homepage_demo.xml
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -11,7 +11,7 @@
                     <div class="carousel-inner">
                         <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
                             <div class="container">
-                                <div contenteditable="false" class="carousel-caption content">
+                                <div contenteditable="true" class="carousel-caption content">
                                     <h2>OpenERP e-Commerce</h2>
 
                                     <h3>An Awesome Shopping Experience</h3>

From 5d233599ce43d7263017703191e8555e1a0ac614 Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 22 Oct 2013 12:08:41 +0530
Subject: [PATCH 18/19] contenteditable false.

bzr revid: psa@tinyerp.com-20131022063841-5vtzxns0ho2heuld
---
 addons/website_event/demo/website_event_homepage_demo.xml | 2 +-
 addons/website_sale/demo/website_sale_homepage_demo.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/website_event/demo/website_event_homepage_demo.xml b/addons/website_event/demo/website_event_homepage_demo.xml
index 02118e2dac2..6c99429b4f4 100644
--- a/addons/website_event/demo/website_event_homepage_demo.xml
+++ b/addons/website_event/demo/website_event_homepage_demo.xml
@@ -16,7 +16,7 @@
             <xpath expr="//div[@id='shop_banner']/div" position="inside">
                 <div style="background-image: url(/website/static/src/img/banner/aqua.jpg);" class="item text_only">
                     <div class="container">
-                        <div contenteditable="true" class="carousel-caption content">
+                        <div contenteditable="false" class="carousel-caption content">
                             <h2>Promote Your Events</h2>
 
                             <h3>Sell Tickets Online</h3>
diff --git a/addons/website_sale/demo/website_sale_homepage_demo.xml b/addons/website_sale/demo/website_sale_homepage_demo.xml
index e98cb2a1d83..e99b299cc12 100644
--- a/addons/website_sale/demo/website_sale_homepage_demo.xml
+++ b/addons/website_sale/demo/website_sale_homepage_demo.xml
@@ -11,7 +11,7 @@
                     <div class="carousel-inner">
                         <div style="background-image: url('/website/static/src/img/banner/color_splash.jpg')" class="item text_only active">
                             <div class="container">
-                                <div contenteditable="true" class="carousel-caption content">
+                                <div contenteditable="false" class="carousel-caption content">
                                     <h2>OpenERP e-Commerce</h2>
 
                                     <h3>An Awesome Shopping Experience</h3>

From e253750c83396d12a33ac981770dce3dbee5bc7d Mon Sep 17 00:00:00 2001
From: Paramjit Singh Sahota <psa@tinyerp.com>
Date: Tue, 22 Oct 2013 14:40:15 +0530
Subject: [PATCH 19/19] [IMP] Little improvement for the parallax.

bzr revid: psa@tinyerp.com-20131022091015-s8rnmls6jvqk3snh
---
 addons/website/demo/website_homepage_demo.xml | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/addons/website/demo/website_homepage_demo.xml b/addons/website/demo/website_homepage_demo.xml
index ffa63d1fcca..da772adc6ed 100644
--- a/addons/website/demo/website_homepage_demo.xml
+++ b/addons/website/demo/website_homepage_demo.xml
@@ -42,20 +42,22 @@
                     </div>
                 </section>
 
-                <section style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32 oe_big" data-snippet-id="parallax">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
-                                <h1 class="text-center">
-                                    <b>A Great Title</b>
-                                </h1>
-                                <h3 class="text-center">
-                                    And a motivating subtitle
-                                </h3>
+                <div data-snippet-id="parallax">
+                    <div style="background-image: url('/website/static/src/img/banner/greenfields.jpg')" class="parallax oe_structure mt32 mb32 oe_big">
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-md-12 mt128 mb32" data-snippet-id="colmd">
+                                    <h1 class="text-center">
+                                        <b>A Great Title</b>
+                                    </h1>
+                                    <h3 class="text-center">
+                                        And a motivating subtitle
+                                    </h3>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </section>
+                </div>
 
                 <section class="mt32 mb32" data-snippet-id="three-columns">
                     <div class="container">