From 5ec0f27cde677ca0ab4e3ff7fe32081019931559 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Thu, 7 Nov 2013 14:19:49 +0100
Subject: [PATCH] [IMP] website: real custom footer (no dynamic datas)

bzr revid: chm@openerp.com-20131107131949-3uotg47a79r4vml6
---
 addons/website/views/website_templates.xml    | 46 ++++++++++---------
 .../views/website_blog_templates.xml          |  8 +---
 addons/website_event/views/website_event.xml  |  4 +-
 3 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 24d00de89a2..149bb356d7f 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -227,30 +227,32 @@
 
         <template id="footer_custom" inherit_option_id="website.layout" name="Custom Footer">
             <xpath expr="//div[@id='footer_container']" position="before">
-                <section data-snippet-id='three-columns' class="mt16 mb16">
-                    <div class="container">
-                        <div class="row">
-                            <div class="col-md-4">
-                                <h4 class="mt16">Subtitle</h4>
-                                <p>
-                                    <a t-href="/">Homepage</a>
-                                </p>
-                            </div>
-                            <div class="col-md-4">
-                                <h4 class="mt16">Subtitle 2</h4>
-                                <p>
-                                    ...
-                                </p>
-                            </div>
-                            <div class="col-md-4">
-                                <h4 class="mt16">Subtitle 3</h4>
-                                <p>
-                                    ...
-                                </p>
+                <div class="oe_structure">
+                    <section data-snippet-id='three-columns' class="mt16 mb16">
+                        <div class="container">
+                            <div class="row">
+                                <div class="col-md-4">
+                                    <h4 class="mt16">Subtitle</h4>
+                                    <p>
+                                        <a href="/">Homepage</a>
+                                    </p>
+                                </div>
+                                <div class="col-md-4">
+                                    <h4 class="mt16">Subtitle 2</h4>
+                                    <p>
+                                        ...
+                                    </p>
+                                </div>
+                                <div class="col-md-4">
+                                    <h4 class="mt16">Subtitle 3</h4>
+                                    <p>
+                                        ...
+                                    </p>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </section>
+                    </section>
+                </div>
             </xpath>
             <xpath expr="//div[@id='footer_container']" position="attributes">
                 <attribute name="style">display: none</attribute>
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index e34d2193154..4e605907ed8 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -2,18 +2,12 @@
 <openerp>
 <data>
     <!-- Layout add nav and footer -->
-    <template id="header_footer_custom" inherit_id="website.layout">
+    <template id="header_footer_custom" inherit_id="website.layout" name="Footer News Blog Link">
         <xpath expr="//footer//div[@name='info']/ul" position="inside">
             <li><a t-href="/blog/cat/%(website_blog.blog_category_1)d/">News</a></li>
         </xpath>
     </template>
 
-    <template id="footer_custom" inherit_option_id="website.layout" name="Job Announces">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
-            <li><a t-href="/blog/%(website_blog.blog_category_2)d/">Jobs</a></li>
-        </xpath>
-    </template>
-
     <!-- Blog Post Summary -->
     <template id="blog_post_short" name="Blog Post Summary">
         <div>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 02d6d1b15ea..abfa6232cf0 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -3,8 +3,8 @@
 <data>
 
     <!-- Layout add nav and footer -->
-    <template id="header_footer_custom" inherit_id="website.layout">
-        <xpath expr="//footer//div[@name='info']/ul" position="inside">
+    <template id="header_footer_custom" inherit_id="website.layout" name="Footer Events Link">
+        <xpath expr="//footer//ul[@name='products']" position="inside">
             <li><a t-href="/event">Events</a></li>
         </xpath>
     </template>