Mercurial > altnet-hispano

changeset 176:c58d26b15759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author nelopauselli
date Mon, 08 Aug 2011 10:13:46 -0300
parents b7621309524f (current diff) 3c70b0d8bd69 (diff)
children 784d81e32366
files
diffstat 4 files changed, 36 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/Agendas/trunk/src/Agendas.Web/Controllers/AccountController.cs	Mon Aug 08 10:13:26 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Controllers/AccountController.cs	Mon Aug 08 10:13:46 2011 -0300
@@ -44,6 +44,18 @@
 			{
 				var username = OAuthTwitter.GetResponseContent(response, "screen_name");
 				var nombre = OAuthTwitter.GetResponseContent(response, "name");
+				//TOD: Esto es temporal.
+				nombre = nombre.Replace('\u00e1', 'á');
+				nombre = nombre.Replace('\u00e9', 'é');
+				nombre = nombre.Replace('\u00ed', 'í');
+				nombre = nombre.Replace('\u00fa', 'ú');
+				nombre = nombre.Replace('\u00c1', 'Á');
+				nombre = nombre.Replace('\u00c9', 'É');
+				nombre = nombre.Replace('\u00cd', 'Í');
+				nombre = nombre.Replace('\u00d3', 'Ó');
+				nombre = nombre.Replace('\u00da', 'Ú');
+				nombre = nombre.Replace('\u00f1', 'ñ');
+				nombre = nombre.Replace('\u00d1', 'Ñ');
 
 				var personaService = AgendaFactory.GetPersonaService();
 				personaService.CreateIfNotExist(IdentityProviderEnum.Twitter, username, nombre);
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml	Mon Aug 08 10:13:26 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/Index.cshtml	Mon Aug 08 10:13:46 2011 -0300
@@ -23,7 +23,7 @@
 					<td class="buttons">
 						@if (item.PuedeAgendar)
 						{
-							@Html.ActionLink("Agendar", "Agendar", "Evento", new {id = item.Id}, null)
+							@Html.ActionLink("Agendar", "Agendar", "Evento", new { id = item.Id }, null)
 							<span>&nbsp;</span>
 						}
 						@if (item.PuedeModificar)
@@ -33,7 +33,7 @@
 						}
 						@if (item.PuedeConfirmar)
 						{
-							@Html.ActionLink("Confirmar", "Confirmar", new { id = item.Id })
+							@Html.ActionLink("Confirmar", "Confirmar", new { id = item.Id }, new { @class = "ui-button-confirm" })
 							<span>&nbsp;</span>
 						}
 						@if (item.PuedePublicar)
@@ -43,12 +43,12 @@
 						}
 						@if (item.PuedeCancelar)
 						{
-							@Html.ActionLink("Cancelar", "Cancelar", new { id = item.Id })
+							@Html.ActionLink("Cancelar", "Cancelar", new { id = item.Id }, new { @class = "ui-button-confirm"})
 							<span>&nbsp;</span>
 						}
 						@if (item.PuedeDescartar)
 						{
-							@Html.ActionLink("Descartar", "Descartar", new { id = item.Id })
+							@Html.ActionLink("Descartar", "Descartar", new { id = item.Id }, new { @class = "ui-button-confirm"})
 							<span>&nbsp;</span>
 						}
 						@if (item.PuedeReAgendar)
--- a/Agendas/trunk/src/Agendas.Web/Views/Historico/Index.cshtml	Mon Aug 08 10:13:26 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Historico/Index.cshtml	Mon Aug 08 10:13:46 2011 -0300
@@ -15,7 +15,7 @@
         </tr>
     </thead>
     <tbody>
-        @foreach (var item in Model.Items)
+        @foreach (var item in Model.Items.OrderByDescending(i => i.Numero))
         {
         <tr>
             <td>@item.Numero</td>
--- a/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Mon Aug 08 10:13:26 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/_Layout.cshtml	Mon Aug 08 10:13:46 2011 -0300
@@ -1,24 +1,29 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Gestión de VANs</title>
-    <link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
-    <link href="@Url.Content("~/Content/AltNetHispanoVans.css")" rel="stylesheet" type="text/css" />
-    <link href="@Url.Content("~/Content/themes/base/jquery-ui.css")" rel="stylesheet" type="text/css" />
+	<title>Gestión de VANs</title>
+	<link href="@Url.Content("~/Content/Site.css")" rel="stylesheet" type="text/css" />
+	<link href="@Url.Content("~/Content/AltNetHispanoVans.css")" rel="stylesheet" type="text/css" />
+	<link href="@Url.Content("~/Content/themes/base/jquery-ui.css")" rel="stylesheet" type="text/css" />
 
-    <script src="@Url.Content("~/Scripts/jquery-1.4.4.min.js")" type="text/javascript"></script>
+	<script src="@Url.Content("~/Scripts/jquery-1.4.4.min.js")" type="text/javascript"></script>
 	<script src="@Url.Content("~/Scripts/jquery-ui.js")" type="text/javascript"></script>
 
-    <script type="text/javascript">
-    	$(document).ready(function () {
-    		$(".buttons > :button").addClass("ui-button");
-    		$(".buttons > :submit").addClass("ui-button");
-    		$(".buttons > a").addClass("ui-button ui-state-default ui-corner-all");
-			
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$(".buttons > :button").addClass("ui-button");
+			$(".buttons > :submit").addClass("ui-button");
+			$(".buttons > a").addClass("ui-button ui-state-default ui-corner-all");
+			$(".buttons > a.ui-button-confirm").click(function (event) {
+				var rsp = confirm("Esta seguro que desea " + $(this).text() + "?");
+				if (!rsp)
+					event.preventDefault();
+			});
+
 			$(".errorbox").addClass("ui-state-error ui-corner-all");
-    		$(".warningbox").addClass("ui-state-highlight ui-corner-all");
-    		$(".notificationbox").addClass("ui-corner-all");
-    	});
+			$(".warningbox").addClass("ui-state-highlight ui-corner-all");
+			$(".notificationbox").addClass("ui-corner-all");
+		});
 	</script>
 </head>