Mercurial > altnet-hispano

changeset 48:08dbe42fdde1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cambios menores en UI
author nelopauselli
date Fri, 13 May 2011 20:11:05 -0300
parents dcd8fc8d479c
children be7a9720fb96
files Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj Agendas/trunk/src/Agendas.Web/Content/Site.css Agendas/trunk/src/Agendas.Web/Content/altnetlogo.png Agendas/trunk/src/Agendas.Web/Views/Account/ChangePassword.cshtml Agendas/trunk/src/Agendas.Web/Views/Account/ChangePasswordSuccess.cshtml Agendas/trunk/src/Agendas.Web/Views/Account/LogOn.cshtml Agendas/trunk/src/Agendas.Web/Views/Account/Register.cshtml Agendas/trunk/src/Agendas.Web/Views/Evento/Edit.cshtml Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Evento/New.cshtml Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml Agendas/trunk/src/Agendas.Web/Views/Home/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Propuesta/Edit.cshtml Agendas/trunk/src/Agendas.Web/Views/Propuesta/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Propuesta/New.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/Error.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/_Menu.cshtml
diffstat 18 files changed, 33 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj	Fri May 13 20:11:05 2011 -0300
@@ -72,6 +72,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Content\altnetlogo.png" />
     <Content Include="Global.asax" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
@@ -150,6 +151,9 @@
       <Name>Agendas.Factories</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Shared\_Menu.cshtml" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/Agendas/trunk/src/Agendas.Web/Content/Site.css	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Content/Site.css	Fri May 13 20:11:05 2011 -0300
@@ -13,6 +13,10 @@
     color: #696969;
 }
 
+.logo {
+	float: right;
+}
+
 a:link
 {
     color: #034af3;
Binary file Agendas/trunk/src/Agendas.Web/Content/altnetlogo.png has changed
--- a/Agendas/trunk/src/Agendas.Web/Views/Account/ChangePassword.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Account/ChangePassword.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,9 +1,4 @@
 @model AltNetHispano.Agendas.Web.Models.ChangePasswordModel
-
-@{
-    ViewBag.Title = "Change Password";
-}
-
 <h2>Change Password</h2>
 <p>
     Use the form below to change your password. 
--- a/Agendas/trunk/src/Agendas.Web/Views/Account/ChangePasswordSuccess.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Account/ChangePasswordSuccess.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,4 @@
-@{
-    ViewBag.Title = "Change Password";
-}
-
-<h2>Change Password</h2>
+<h2>Change Password</h2>
 <p>
     Your password has been changed successfully.
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Account/LogOn.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Account/LogOn.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,9 +1,4 @@
 @model AltNetHispano.Agendas.Web.Models.LogOnModel
-
-@{
-    ViewBag.Title = "Log On";
-}
-
 <h2>Log On</h2>
 <p>
     Please enter your username and password. @Html.ActionLink("Register", "Register") if you don't have an account.
--- a/Agendas/trunk/src/Agendas.Web/Views/Account/Register.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Account/Register.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,9 +1,4 @@
 @model AltNetHispano.Agendas.Web.Models.RegisterModel
-
-@{
-    ViewBag.Title = "Register";
-}
-
 <h2>Create a New Account</h2>
 <p>
     Use the form below to create a new account. 
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/Edit.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/Edit.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,15 +1,9 @@
 @model AltNetHispano.Agendas.Web.Models.AgendaEditModel
-@{
-    ViewBag.Title = "Agenda";
-}
-
+<h2>Agenda</h2>
 <p>
     Modifique los datos que desea corregir y presione guardar
 </p>
 
-<link href="@Url.Content("~/Content/themes/base/jquery-ui.css")" rel="stylesheet" type="text/css" />
-<script src="@Url.Content("~/Scripts/jquery-ui.js")" type="text/javascript"></script>
-
 <script src="@Url.Content("~/Scripts/jquery.validate.min.js")" type="text/javascript"></script>
 <script src="@Url.Content("~/Scripts/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
 
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model AltNetHispano.Agendas.Web.Models.EventoIndexModel
-@{
-    ViewBag.Title = "Agenda";
-}
-
+<h2>Agenda</h2>
 <p>
     Los próximos eventos son:
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/New.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/New.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model AltNetHispano.Agendas.Web.Models.EventoNewModel
-@{
-    ViewBag.Title = "Agenda";
-}
-
+<h2>Agenda</h2>
 <p>
     Complete los siguiente datos para agendar un nuevo evento
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,6 +1,4 @@
-@{
-    ViewBag.Title = "About Us";
-}
+<h2>About Us</h2>
 
 <p>
      Desarrollado por colaboradores de la comunidad
--- a/Agendas/trunk/src/Agendas.Web/Views/Home/Index.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Home/Index.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,6 +1,4 @@
-@{
-    ViewBag.Title = "Home Page";
-}
+<h2>Home Page</h2>
 
 <p>
     Bienvenido al módulo de gestión de VANs de <a href='http://www.altnethispano.org/'>alt.net-hispano</a>, desde aquí podrá:
--- a/Agendas/trunk/src/Agendas.Web/Views/Propuesta/Edit.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Propuesta/Edit.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model AltNetHispano.Agendas.Web.Models.PropuestaEditModel
-@{
-    ViewBag.Title = "Propuestas";
-}
-
+<h2>Propuestas</h2>
 <p>
     Modifique los datos que desea corregir y presione guardar
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Propuesta/Index.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Propuesta/Index.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model AltNetHispano.Agendas.Web.Models.PropuestaIndexModel
-@{
-    ViewBag.Title = "Propuestas";
-}
-
+<h2>Propuestas</h2>
 <p>
     Temas propuestos aun no agendados
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Propuesta/New.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Propuesta/New.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model AltNetHispano.Agendas.Web.Models.PropuestaNewModel
-@{
-    ViewBag.Title = "Agenda";
-}
-
+<h2>Agenda</h2>
 <p>
     Complete los siguiente datos para proponer un nuevo tema
 </p>
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/Error.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/Error.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -1,8 +1,5 @@
 @model System.Web.Mvc.HandleErrorInfo
-
-@{
-    ViewBag.Title = "Error";
-}
+<h2>Error</h2>
 
 <h2>
     Sorry, an error occurred while processing your request.
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Fri May 13 18:23:05 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -4,6 +4,9 @@
     <title>Gestión de VANs</title>
     <link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
     <script src="@Url.Content("~/Scripts/jquery-1.4.4.min.js")" type="text/javascript"></script>
+
+	<link href="@Url.Content("~/Content/themes/base/jquery-ui.css")" rel="stylesheet" type="text/css" />
+	<script src="@Url.Content("~/Scripts/jquery-ui.js")" type="text/javascript"></script>
 </head>
 
 <body>
@@ -18,20 +21,14 @@
             </div>
 
             <div id="menucontainer">
-
-                <ul id="menu">
-                    <li>@Html.ActionLink("Home", "Index", "Home")</li>
-                    <li>@Html.ActionLink("Propuestas", "Index", "Propuesta")</li>
-                    <li>@Html.ActionLink("Eventos", "Index", "Evento")</li>
-                    <li>@Html.ActionLink("Histórico", "Index", "Histórico")</li>
-                    <li>@Html.ActionLink("About", "About", "Home")</li>
-                </ul>
-
+				@Html.Partial("_Menu")
             </div>
         </div>
 
         <div id="main">
-            <h2>@ViewBag.Title</h2>
+			<div class="logo">
+				<img alt="logo" src="@Url.Content("~/Content/altnetlogo.png")" />
+			</div>
             @RenderBody()
             <div id="footer">
             </div>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Menu.cshtml	Fri May 13 20:11:05 2011 -0300
@@ -0,0 +1,8 @@
+<ul id="menu">
+    <li>@Html.ActionLink("Home", "Index", "Home")</li>
+    <li>@Html.ActionLink("Propuestas", "Index", "Propuesta")</li>
+    <li>@Html.ActionLink("Eventos", "Index", "Evento")</li>
+    <li>@Html.ActionLink("Histórico", "Index", "Histórico")</li>
+    <li>@Html.ActionLink("About", "About", "Home")</li>
+</ul>
+