# HG changeset patch # User nelopauselli # Date 1312592145 10800 # Node ID 93aa103f75ec76d8b3b5cae971c75b8428a34210 # Parent d104bc8b39f49fb88c648fd39d375b123b2325be# Parent 4241a930cab2ae8e77ccaef51e31fac079c4b384 Merge diff -r d104bc8b39f4 -r 93aa103f75ec Agendas/trunk/src/Agendas.Web/Content/Site.css --- 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 diff -r d104bc8b39f4 -r 93aa103f75ec Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml --- 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 @@ -

- @Html.Partial("_MenuPortal") + @Html.Partial("_MenuPortal") +

+ @Html.Partial("_LogOnPartial")

@@ -29,10 +30,6 @@

Gestión de VANs

-

- @Html.Partial("_LogOnPartial") -

-

@Html.Partial("_Menu")

diff -r d104bc8b39f4 -r 93aa103f75ec Agendas/trunk/src/Agendas.Web/Views/Shared/_LogOnPartial.cshtml --- 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) { - Welcome @Html.DisplayName()! - [ @Html.ActionLink("Log Off", "LogOff", "Account") ] + Bienvenido @Html.DisplayName()! + [ @Html.ActionLink("Salir", "LogOff", "Account") ] } else { - @:[ @Html.ActionLink("Log On", "LogOn", "Account") ] + @:[ @Html.ActionLink("Ingresar", "LogOn", "Account") ] }