From b1535f7c9252e1bfd28fa261051a40544e9aeab2 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Fri, 4 Dec 2009 13:08:04 +0100
Subject: [PATCH]  ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18: Revamped
 user information area and help link

---
 .../main/webapp/common/css/navalpro_v01.css   | 34 ++++++++++++++++++-
 .../main/webapp/common/layout/_customMenu.zul |  4 +++
 .../main/webapp/common/layout/template.zul    | 29 ++++++++--------
 3 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css
index 8c6bd3369..7404da7a3 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css
@@ -106,16 +106,23 @@ a.sub_menu:hover {
     text-decoration: none;
     text-align: right;
     padding-right: 15px;
+    color: #3195D7;
+    font-weight: bold;
 }
 
 .cerrar_sesion {
     font-family: Tahoma, Arial, Helvetica, sans-serif;
     font-size: 11px;
-    text-decoration: underline;
+    text-decoration: none;
     text-align: right;
     padding-right: 15px;
     color: #009900;
     display: block;
+    font-weight: bold;
+}
+
+.cerrar_sesion:hover {
+    text-decoration: underline;
 }
 
 .ruta {
@@ -123,6 +130,7 @@ a.sub_menu:hover {
     font-size: 11px;
     color: #3B89B7;
     text-decoration: none;
+    vertical-align: middle;
 }
 
 .ruta span {
@@ -151,3 +159,27 @@ a.sub_menu:hover {
 .mainmenu {
     margin-top:10px;
 }
+
+.help-link {
+    width: 180px;
+}
+
+.help-link a {
+    font-family: Verdana,Arial,Helvetica,sans-serif,Tahoma;
+    font-size:11px;
+    color: #0068B1;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+.help-link a span {
+    position: relative;
+    top:-6px;
+}
+
+.user-area {
+    position: absolute;
+    top:14px;
+    right:0;
+    z-index:2;
+}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
index cd3a6c35a..7f69879c7 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/_customMenu.zul
@@ -44,6 +44,10 @@
           <n:td><div id="breadcrumbs"></div></n:td>
         </n:tr>
     </n:table></n:td>
+    <n:td valign="top" align="right" class="help-link"><n:a href="https://naval.igalia.com/fileadmin/templates/doc/index.html" target="_blank">
+        <n:span>${i18n:_('Help')}</n:span>
+        <n:img src="/navalplanner-webapp/common/img/axuda.gif" alt="Axuda" width="23" height="24" border="0" style="margin-top:4px;"/>
+    </n:a></n:td>
   </n:tr>
     </n:table>
 
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index e1f602777..ad46fe3fd 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -31,28 +31,29 @@
     <n:td width="180" valign="center">
         <n:a href="/navalplanner-webapp/">
         <n:img src="/navalplanner-webapp/common/img/logo1.gif" width="180" height="45" /></n:a></n:td>
-  <n:td valign="top"><n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
+  <n:td valign="top">
+  <n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
     <n:tr>
-      <n:td><n:table width="98%"  border="0" cellspacing="0" cellpadding="0" style="float:right;">
-        <n:tr>
-          <n:td height="20" align="right"><n:table border="0" cellspacing="0" cellpadding="0">
-            <n:tr>
-              <n:td class="usuario">${i18n:_('user')}: ${desktop.execution.userPrincipal.name}</n:td>
-              <n:td><n:a href="/navalplanner-webapp/j_spring_security_logout" class="cerrar_sesion">${i18n:_('SIGN OUT')}</n:a></n:td>
-            <n:td><n:a href="https://naval.igalia.com/fileadmin/templates/doc/index.html"><n:img src="/navalplanner-webapp/common/img/axuda.gif" alt="Axuda" width="23" height="24" border="0" /></n:a></n:td>
-            </n:tr>
-          </n:table></n:td>
-        </n:tr>
-      </n:table>
+      <n:td>
 
         <customMenu top_id="customMenu" title="${i18n:_('Main menu')}"/>
 
-          </n:td>
+        </n:td>
     </n:tr>
   </n:table></n:td>
   </n:tr>
 </n:table>
 
+
+      <n:div class="user-area">
+          <n:table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <n:tr>
+              <n:td class="usuario">${i18n:_('user')}: ${desktop.execution.userPrincipal.name}</n:td>
+              <n:td><n:a href="/navalplanner-webapp/j_spring_security_logout" class="cerrar_sesion">[${i18n:_('Sign out')}]</n:a></n:td>
+            </n:tr>
+          </n:table>
+        </n:div>
+
 <n:table width="100%"  border="0" cellspacing="0" cellpadding="0">
   <n:tr>
     <n:td height="400px" valign="top">
@@ -79,4 +80,4 @@
 </n:table>
 </n:div>
 <div />
-</zk>
+</zk>
\ No newline at end of file