From 49cba4ced812c52f6b4461db417b363ea2491ca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Wed, 31 Aug 2011 12:55:20 +0200
Subject: [PATCH] Change custom logo position

---
 .../src/main/webapp/common/css/navalplan_zk.css          | 8 ++++++++
 .../src/main/webapp/common/layout/template.zul           | 9 ++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 839f4bc6d..f05ce2c50 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1762,3 +1762,11 @@ select {
     border-right: 1px solid #9ECAD8;
     border-left: 1px solid #d9f3ff;
 }
+
+.logo-area img {
+    margin-right:10px;
+}
+
+.logo-area {
+    width: 1px;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 04a513590..c0a6887a6 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -52,9 +52,11 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
 
 <n:table width="100%" border="0" cellpadding="0" cellspacing="0">
   <n:tr>
-    <n:td width="180" valign="center">
+    <n:td valign="center" class="logo-area">
         <n:a href="${contextPath}/">
-        <n:img src="${contextPath}/common/img/${i18n:_('en')}/logo.png" /></n:a></n:td>
+            <n:img height="40" src="${templateCtrl.companyLogoURL}" if="${templateCtrl.companyLogoURL!=''}" />
+            <n:img src="${contextPath}/common/img/${i18n:_('en')}/logo.png" if="${templateCtrl.companyLogoURL==''}" />
+        </n:a></n:td>
   <n:td valign="top">
   <n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
     <n:tr>
@@ -122,9 +124,6 @@ signature="java.lang.Boolean isDefaultPasswordsControl()"?>
 <south border="none">
 <n:table width="100%">
   <n:tr class="footer">
-    <n:td height="40" align="left" valign="bottom">
-        <n:img height="40" src="${templateCtrl.companyLogoURL}" if="${templateCtrl.companyLogoURL!=''}" />
-    </n:td>
     <n:td  valign="center">
         <n:div if="${project:passwd_control()}" id="warningDefaultPasswdadmin"
             class="footer-messages-area"