[IMP] Allow logo in header

bzr revid: fp@openerp.com-20140119120858-43rgeymrjmt42f11

diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass
index 69a50c0..f739bfd 100644 (file)
--- a/addons/website/static/src/css/website.sass
+++ b/addons/website/static/src/css/website.sass
@@ -61,6 +61,13 @@ img.shadow
 h1.text-muted, h2.text-muted, h3.text-muted
     margin-top: 10px
 
+header
+    a.navbar-brand
+        img
+            margin-top: -10px
+            margin-bottom: -10px
+            height: 45px
+
 /* ----- BOOTSTRAP FIX ----- */
 
 .container

diff --git a/addons/website/static/src/img/odoo_logo.png b/addons/website/static/src/img/odoo_logo.png
new file mode 100644 (file)
index 0000000..b7e132e
Binary files /dev/null and b/addons/website/static/src/img/odoo_logo.png differ

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index fe34309..5fccfd3 100644 (file)
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -195,6 +195,14 @@
     </html>
 </template>
 
+<template id="layout_logo_show" inherit_option_id="website.layout" name="Show Logo">
+    <xpath expr="//header//a[@class='navbar-brand']" position="replace">
+        <a class="navbar-brand" href="/">
+            <img src="/website/static/src/img/odoo_logo.png"/>
+        </a>
+    </xpath>
+</template>
+
 <template id="editor_head" inherit_id="website.layout" name="Editor" groups="base.group_website_publisher">
     <xpath expr='//t[@name="layout_head"]' position="before">
         <link rel='stylesheet' href='/website/static/src/css/snippets.css'/>