From e14d00fbefeb75da03e7affce115261e680aa0b8 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Thu, 3 Dec 2009 14:30:49 +0100
Subject: [PATCH]  ItEr37S16RFMaquetacionDesenhoAplicacionItEr36S18:
 Recolocated user and help links in mainmenu

---
 .../src/main/webapp/common/css/navalpro_v01.css    | 14 +++++++++++++-
 .../src/main/webapp/common/layout/template.zul     |  2 +-
 2 files changed, 14 insertions(+), 2 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 f1f04f039..8c6bd3369 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_v01.css
@@ -4,6 +4,7 @@ body {
     margin-right: 0px;
     margin-left: 0px;
 }
+
 .menuup {
     font-family: Tahoma, Arial, Helvetica, sans-serif;
     text-decoration: none;
@@ -19,6 +20,7 @@ body {
     background-position: -4px 0px;
     padding-bottom: 5px;
 }
+
 a.menuup:hover {
     background-image: url(../img/pestana_sobre.gif);
 }
@@ -48,6 +50,7 @@ a.menuup:hover {
     padding-right: 3px;
     padding-left: 3px;
 }
+
 a.sub_menu:hover {
     color: #FFFFFF;
     text-decoration: underline;
@@ -96,6 +99,7 @@ a.sub_menu:hover {
     background-repeat: no-repeat;
     background-position: -4px 0px;
 }
+
 .usuario {
     font-family: Tahoma, Arial, Helvetica, sans-serif;
     font-size: 11px;
@@ -103,6 +107,7 @@ a.sub_menu:hover {
     text-align: right;
     padding-right: 15px;
 }
+
 .cerrar_sesion {
     font-family: Tahoma, Arial, Helvetica, sans-serif;
     font-size: 11px;
@@ -112,12 +117,14 @@ a.sub_menu:hover {
     color: #009900;
     display: block;
 }
+
 .ruta {
     font-family: Tahoma, Arial, Helvetica, sans-serif;
     font-size: 11px;
     color: #3B89B7;
     text-decoration: none;
 }
+
 .ruta span {
     font-weight:bold;
 }
@@ -127,6 +134,7 @@ a.sub_menu:hover {
     background-position: right top;
     background-repeat: no-repeat;
 }
+
 .migas_linea {
     border-top-width: 1px;
     border-bottom-width: 1px;
@@ -138,4 +146,8 @@ a.sub_menu:hover {
 
 .ruta div {
     padding-bottom:3px;
-}
\ No newline at end of file
+}
+
+.mainmenu {
+    margin-top:10px;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 7be0d14f0..e1f602777 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -33,7 +33,7 @@
         <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:tr>
-      <n:td><n:table width="98%"  border="0" cellspacing="0" cellpadding="0">
+      <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>