From 32cd30b7f5f87ae1e8684070ef89f1c1a0ded9e5 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 28 Feb 2012 15:26:41 +0100
Subject: [PATCH] [ADD] Added new logo and footer

bzr revid: fme@openerp.com-20120228142641-p4qsssmutq30r0z3
---
 addons/web/static/src/css/base.css  | 29 ++++++++++++++++++++++++++++-
 addons/web/static/src/css/base.sass | 24 +++++++++++++++++++++++-
 addons/web/static/src/xml/base.xml  |  7 +++----
 3 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 59ae0011dce..c36e8c61a2b 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -86,6 +86,33 @@
   text-align: center;
   bottom: 8px;
 }
+.openerp2 a.oe_logo {
+  display: block;
+  text-align: center;
+  height: 70px;
+  line-height: 70px;
+}
+.openerp2 a.oe_logo img {
+  height: 40px;
+  width: 157px;
+  margin: 14px 0;
+}
+.openerp2 .oe_footer {
+  position: absolute;
+  width: 205px;
+  text-align: center;
+  bottom: 8px;
+}
+.openerp2 .oe_footer a {
+  font-weight: 800;
+  font-family: serif;
+  font-size: 16px;
+  color: black;
+}
+.openerp2 .oe_footer a span {
+  color: #c81010;
+  font-style: italic;
+}
 .openerp2 .oe_menu {
   float: left;
   padding: 0;
@@ -216,7 +243,7 @@
 .openerp2 .oe_dropdown_menu .oe_dropdown {
   position: relative;
 }
-.openerp2 .oe_dropdown_menu .dropdown-toggle:after {
+.openerp2 .oe_dropdown_menu .oe_dropdown_toggle:after {
   width: 0;
   height: 0;
   display: inline-block;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index c1df1b61226..f62841896bd 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -127,6 +127,28 @@ $colour4: #8a89ba
             width: 205px
             text-align: center
             bottom: 8px
+    a.oe_logo
+        display: block
+        text-align: center
+        height: 70px
+        line-height: 70px
+        img
+            height: 40px
+            width: 157px
+            margin: 14px 0
+    .oe_footer
+        position: absolute
+        width: 205px
+        text-align: center
+        bottom: 8px
+        a
+            font-weight: 800
+            font-family: serif
+            font-size: 16px
+            color: black
+            span
+                color: #c81010
+                font-style: italic
     // }}}
 
     // Menu {{{
@@ -231,7 +253,7 @@ $colour4: #8a89ba
         .oe_dropdown
             position: relative
 
-        .dropdown-toggle:after
+        .oe_dropdown_toggle:after
             width: 0
             height: 0
             display: inline-block
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 66c6b316393..d2d30c5d580 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -24,14 +24,13 @@
             <div class="oe_dropdown_menu_placeholder"/>
         </div>
         <div class="oe_leftbar">
+            <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a>
+
             <div class="oe_secondary_menus_container"/>
-            <!--
-            <a href="#" class="oe_logo"><img src="img/logo.png"/></a>
 
             <div class="oe_footer">
-                Powered by <a href="http://www.openerp.com" class="openerp"><span class="red">Open</span>ERP</a>
+                Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a>
             </div>
-            -->
         </div>
         <div class="oe_application"/>
     </div>