From 78cf0eb9995e1de537eee928a7555f2a310d9c27 Mon Sep 17 00:00:00 2001
From: Olivier Mayer <blind1009@gmail.com>
Date: Tue, 24 Mar 2015 20:25:59 +0900
Subject: [PATCH] fix #34

---
 templates/web/common/menubar.html.twig |   4 ++--
 www/skins/logos/logo.png               | Bin 0 -> 2230 bytes
 www/skins/prod/000000/prodcolor.css    |   5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 www/skins/logos/logo.png

diff --git a/templates/web/common/menubar.html.twig b/templates/web/common/menubar.html.twig
index 03c101a310..e473fecfe8 100644
--- a/templates/web/common/menubar.html.twig
+++ b/templates/web/common/menubar.html.twig
@@ -2,8 +2,8 @@
     <div class="PNB" style="right:auto;overflow:hidden;">
       <ol>
         <li>
-            <span class="title {% if module == "prod" %}selected{% endif %}">
-              {%  block menu_bar_title %}Phraseanet{% endblock %}
+            <span class="title">
+              <img src="/skins/logos/logo.png" alt="" id="mainLogo">
             </span>
         </li>
         {% if module is defined and module != "lightbox" and app['authentication'].isAuthenticated() %}
diff --git a/www/skins/logos/logo.png b/www/skins/logos/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a50943cbe2be43e8893acfd933556d4aa16a442e
GIT binary patch
literal 2230
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

literal 0
HcmV?d00001

diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css
index c42ad1bc98..741b59e38d 100644
--- a/www/skins/prod/000000/prodcolor.css
+++ b/www/skins/prod/000000/prodcolor.css
@@ -2993,6 +2993,11 @@ DIV.thesaurus U.w {
     vertical-align: middle;
 }
 
+#mainMenu #mainLogo {
+    margin:0 10px;
+    margin-top: -4px;
+}
+
 #mainMenu li, #mainMenu li span {
     height: 40px;
     line-height: 40px;