Mercurial > altnet-hispano

changeset 164:93aa103f75ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author nelopauselli
date Fri, 05 Aug 2011 21:55:45 -0300
parents d104bc8b39f4 (current diff) 4241a930cab2 (diff)
children 56f62516c172
files
diffstat 3 files changed, 18 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Web/Content/Site.css	Fri Aug 05 21:55:27 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Content/Site.css	Fri Aug 05 21:55:45 2011 -0300
@@ -140,7 +140,7 @@
 ----------------------------------------------------------*/
 ul#menu
 {
-    padding: 0 0 0px;
+    padding: 50px 0px 0px;
     position: relative;
     margin: 0;
     text-align: right;
@@ -260,7 +260,8 @@
 
 #menucontainer
 {
-    margin-top:40px;
+    margin-top: 7px;
+    height: 80px;
 }
 
 div#title
@@ -273,26 +274,28 @@
 #logindisplay
 {
 	display: block;
-    font-size:1.1em;
-    text-align:right;
-    margin:10px;
+	font-size: 1.1em;
+	text-align: right;
+	margin: 10px;
+	margin-top: -17px;
+	color: #ccc;
 }
 
 #logindisplay a:link
 {
-    color: #575757;
+    color: #ccc;
     text-decoration: underline;
 }
 
 #logindisplay a:visited
 {
-    color: #575757;
+    color: #ccc;
     text-decoration: underline;
 }
 
 #logindisplay a:hover
 {
-    color: #575757;
+    color: #ccc;
     text-decoration: none;
 }
 
@@ -363,6 +366,7 @@
     position: relative;
     margin: 0;
     text-align: left;
+    display:inline;
 }
 
 ul#portalmenu li
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Fri Aug 05 21:55:27 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Fri Aug 05 21:55:45 2011 -0300
@@ -19,8 +19,9 @@
 </head>
 
 <body>
-	<div id="portal">
-		@Html.Partial("_MenuPortal")
+	@Html.Partial("_MenuPortal")
+	<div id="logindisplay">
+		@Html.Partial("_LogOnPartial")
 	</div>
 
     <div class="page">
@@ -29,10 +30,6 @@
                 <h1>Gestión de VANs</h1>
             </div>
 
-			<div id="logindisplay">
-				@Html.Partial("_LogOnPartial")
-			</div>
-
             <div id="menucontainer">
 				@Html.Partial("_Menu")
             </div>
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_LogOnPartial.cshtml	Fri Aug 05 21:55:27 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_LogOnPartial.cshtml	Fri Aug 05 21:55:45 2011 -0300
@@ -1,7 +1,7 @@
 @if(Request.IsAuthenticated) {
-    <text>Welcome <b>@Html.DisplayName()</b>!
-    [ @Html.ActionLink("Log Off", "LogOff", "Account") ]</text>
+    <text>Bienvenido <b>@Html.DisplayName()</b>!
+    [ @Html.ActionLink("Salir", "LogOff", "Account") ]</text>
 }
 else {
-    @:[ @Html.ActionLink("Log On", "LogOn", "Account") ]
+    @:[ @Html.ActionLink("Ingresar", "LogOn", "Account") ]
 }