Mercurial > altnet-hispano
changeset 168:97e51ddeeb58
Cambios menores en UI
| author | nelopauselli |
|---|---|
| date | Sat, 06 Aug 2011 03:34:45 -0300 |
| parents | ea85bd893247 |
| children | 5c94b052d838 |
| files | Agendas/trunk/src/Agendas.Web/Content/Site.css Agendas/trunk/src/Agendas.Web/Controllers/PerfilController.cs Agendas/trunk/src/Agendas.Web/Models/PerfilModel.cs Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Perfil/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Persona/Index.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/DefaultEditor.cshtml Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml |
| diffstat | 8 files changed, 168 insertions(+), 129 deletions(-) [+] |
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Web/Content/Site.css Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Content/Site.css Sat Aug 06 03:34:45 2011 -0300 @@ -124,6 +124,11 @@ _height: 1px; /* only IE6 applies CSS properties starting with an underscore */ } +#content +{ + margin-bottom: 20px; +} + #footer { color: #999; @@ -411,4 +416,13 @@ { background-color: #fff; color: #000; +} + +/* Buttons */ +.buttons a +{ + text-align: center; + vertical-align: middle; + padding: 10px 10px 10px 10px; + color: #000; } \ No newline at end of file
--- a/Agendas/trunk/src/Agendas.Web/Controllers/PerfilController.cs Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Controllers/PerfilController.cs Sat Aug 06 03:34:45 2011 -0300 @@ -22,7 +22,10 @@ var model = new PerfilIndexModel { + Id = persona.Id, DisplayName = persona.Nombre, + Email = persona.Mail, + Blog = persona.Blog, Cuentas = from c in persona.Cuentas select new CuentaDto
--- a/Agendas/trunk/src/Agendas.Web/Models/PerfilModel.cs Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Models/PerfilModel.cs Sat Aug 06 03:34:45 2011 -0300 @@ -1,4 +1,6 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; namespace AltNetHispano.Agendas.Web.Models { @@ -9,8 +11,16 @@ Cuentas = new CuentaDto[] {}; } + public Guid Id { get; set; } + public string DisplayName { get; set; } + [DataType(DataType.EmailAddress)] + public string Email { get; set; } + + [DataType(DataType.Url)] + public string Blog { get; set; } + public IEnumerable<CuentaDto> Cuentas { get; set; } }
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml Sat Aug 06 03:34:45 2011 -0300 @@ -3,70 +3,71 @@ <p> Los próximos eventos son: </p> -<table> - <thead> - <tr> - <th>Fecha</th> - <th>Evento</th> - <th>Estado</th> - <th>Acciones</th> - </tr> - </thead> - <tbody> - @foreach (var item in Model.ProximosEventos) - { - <tr> - <td>@item.Fecha</td> - <td>@item.Titulo</td> - <td>@item.Estado</td> - <td> - @if (item.PuedeAgendar) - { - @Html.ActionLink("Agendar", "Agendar", "Evento", new {id = item.Id}, null) - <span> </span> - } - @if (item.PuedeModificar) - { - @Html.ActionLink("Modificar", "Modificar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedeConfirmar) - { - @Html.ActionLink("Confirmar", "Confirmar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedePublicar) - { - @Html.ActionLink("Publicar", "Publicar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedeCancelar) - { - @Html.ActionLink("Cancelar", "Cancelar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedeDescartar) - { - @Html.ActionLink("Descartar", "Descartar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedeReAgendar) - { - @Html.ActionLink("Re-Agendar", "ReAgendar", new { id = item.Id }) - <span> </span> - } - @if (item.PuedeReProponer) - { - @Html.ActionLink("Re-Proponer", "ReProponer", new { id = item.Id }) - <span> </span> - } - </td> - </tr> - } - </tbody> -</table> - -<p> -@Html.ActionLink("Nuevo", "Nuevo") -@Html.ActionLink("Proponer", "Proponer") -</p> +<div id="content"> + <table> + <thead> + <tr> + <th>Fecha</th> + <th>Evento</th> + <th>Estado</th> + <th>Acciones</th> + </tr> + </thead> + <tbody> + @foreach (var item in Model.ProximosEventos) + { + <tr> + <td>@item.Fecha</td> + <td>@item.Titulo</td> + <td>@item.Estado</td> + <td class="buttons"> + @if (item.PuedeAgendar) + { + @Html.ActionLink("Agendar", "Agendar", "Evento", new {id = item.Id}, null) + <span> </span> + } + @if (item.PuedeModificar) + { + @Html.ActionLink("Modificar", "Modificar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedeConfirmar) + { + @Html.ActionLink("Confirmar", "Confirmar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedePublicar) + { + @Html.ActionLink("Publicar", "Publicar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedeCancelar) + { + @Html.ActionLink("Cancelar", "Cancelar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedeDescartar) + { + @Html.ActionLink("Descartar", "Descartar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedeReAgendar) + { + @Html.ActionLink("Re-Agendar", "ReAgendar", new { id = item.Id }) + <span> </span> + } + @if (item.PuedeReProponer) + { + @Html.ActionLink("Re-Proponer", "ReProponer", new { id = item.Id }) + <span> </span> + } + </td> + </tr> + } + </tbody> + </table> +</div> +<div class="buttons"> + @Html.ActionLink("Nuevo", "Nuevo") + @Html.ActionLink("Proponer", "Proponer") +</div>
--- a/Agendas/trunk/src/Agendas.Web/Views/Perfil/Index.cshtml Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Views/Perfil/Index.cshtml Sat Aug 06 03:34:45 2011 -0300 @@ -1,34 +1,38 @@ @model AltNetHispano.Agendas.Web.Models.PerfilIndexModel <h2>Perfil</h2> -<p> - Hola @Model.DisplayName, estas son tus cuentas registradas -</p> -<table> - <thead> - <tr> - <th>Proveedor</th> - <th>username</th> - <th>Acciones</th> - </tr> - </thead> - <tbody> - @foreach (var item in Model.Cuentas) - { - <tr> - <td>@item.IdentityProvider</td> - <td>@item.UserName</td> - <td> - @Html.ActionLink("Quitar", "Remove", new { identityProvider = item.IdentityProvider, userName = item.UserName }) - </td> - </tr> - } - </tbody> -</table> +<div id="content"> + <p> + Hola @Model.DisplayName, tu mail registrado es @Html.DisplayFor(m=>m.Email), tu blog @Html.DisplayFor(m=>m.Blog) y estas tus cuentas registradas + </p> + <table> + <thead> + <tr> + <th>Proveedor</th> + <th>username</th> + <th>Acciones</th> + </tr> + </thead> + <tbody> + @foreach (var item in Model.Cuentas) + { + <tr> + <td>@item.IdentityProvider</td> + <td>@item.UserName</td> + <td class="buttons"> + @Html.ActionLink("Quitar", "Remove", new { identityProvider = item.IdentityProvider, userName = item.UserName }) + </td> + </tr> + } + </tbody> + </table> +</div> -<p> -@Html.ActionLink("Asociar cuenta de Twitter", "AddTwitterAccount") -<!-- +<div class="buttons"> + @Html.ActionLink("Asociar cuenta de Twitter", "AddTwitterAccount") + <!-- + <br/> + @Html.ActionLink("Asociar cuenta de Google", "AddGoogleAccount") + --> + @Html.ActionLink("Modificar datos", "Modificar", "Persona", new {id=Model.Id}, null) +</div> <br/> -@Html.ActionLink("Asociar cuenta de Google", "AddGoogleAccount") ---> -<br/>
--- a/Agendas/trunk/src/Agendas.Web/Views/Persona/Index.cshtml Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Views/Persona/Index.cshtml Sat Aug 06 03:34:45 2011 -0300 @@ -3,29 +3,30 @@ <p> Las personas registradas en la aplicación son: </p> -<table> - <thead> - <tr> - <th>Nombre</th> - <th>Acciones</th> - </tr> - </thead> - <tbody> - @foreach (var item in Model.Items) - { - <tr> - <td>@item.Nombre</td> - <td> - @Html.ActionLink("Modificar", "Modificar", null, new { id = item.Id }, null) - <span> </span> - @Html.ActionLink("Quitar", "Quitar", null, new { id = item.Id }, null) - <span> </span> - </td> - </tr> - } - </tbody> -</table> - -<p> -@Html.ActionLink("Nueva", "Nueva") -</p> +<div id="content"> + <table> + <thead> + <tr> + <th>Nombre</th> + <th>Acciones</th> + </tr> + </thead> + <tbody> + @foreach (var item in Model.Items) + { + <tr> + <td>@item.Nombre</td> + <td class="buttons"> + @Html.ActionLink("Modificar", "Modificar", null, new { id = item.Id }, null) + <span> </span> + @Html.ActionLink("Quitar", "Quitar", null, new { id = item.Id }, null) + <span> </span> + </td> + </tr> + } + </tbody> + </table> +</div> +<div class="buttons"> + @Html.ActionLink("Nueva", "Nueva") +</div>
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/DefaultEditor.cshtml Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/DefaultEditor.cshtml Sat Aug 06 03:34:45 2011 -0300 @@ -12,11 +12,13 @@ <div> <fieldset> <legend>@Html.GetLegendForModel()</legend> - @Html.EditorForModel() - <p> + <div id="content"> + @Html.EditorForModel() + </div> + <div class="buttons"> <input type="submit" value="@LayoutResources.SaveButton" /> @Html.ActionLink(@LayoutResources.CancelButton, "Index") - </p> + </div> </fieldset> </div> } \ No newline at end of file
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml Sat Aug 06 02:51:07 2011 -0300 +++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml Sat Aug 06 03:34:45 2011 -0300 @@ -11,7 +11,11 @@ <script type="text/javascript"> $(document).ready(function () { - $(".errorbox").addClass("ui-state-error ui-corner-all"); + $(".buttons > :button").addClass("ui-button"); + $(".buttons > :submit").addClass("ui-button"); + $(".buttons > a").addClass("ui-button ui-state-default ui-corner-all"); + + $(".errorbox").addClass("ui-state-error ui-corner-all"); $(".warningbox").addClass("ui-state-highlight ui-corner-all"); $(".notificationbox").addClass("ui-corner-all"); }); @@ -43,7 +47,7 @@ @RenderBody() </div> <div id="footer"> - Contacto: <a href="mailto:contacto@althethispano.org" alt="contacto@althethispano.org">contacto@althethispano.org</a> - + Contacto: <a href="mailto:contacto@althethispano.org" alt="contacto@althethispano.org">contacto@althethispano.org</a> <strong>hosting by </strong> <a target="_blank" title="DiscountASP" href="http://www.discountasp.com/"> <img src="/Content/themes/altnethispano/images/logoDiscountASPNET.gif" alt="DiscountASP.NET" height="25" />