# HG changeset patch
# User Nelo@Guinea.neluz.int
# Date 1312338325 10800
# Node ID c03c4920228062b32102b6b3cd4fb7ccff5cccb9
# Parent  19bab30521da728478711b5b44de932a7f69e14e# Parent  c99636fbdc5fdcf3d5012ee0eed074cf7db2f010
Merge

diff -r c99636fbdc5f -r c03c49202280 Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj
--- a/Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj	Tue Aug 02 23:05:50 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Agendas.Web.csproj	Tue Aug 02 23:25:25 2011 -0300
@@ -218,6 +218,9 @@
   <ItemGroup>
     <Content Include="Views\Shared\EditorTemplates\Ponente.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Shared\EditorTemplates\DateTime.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. 
diff -r c99636fbdc5f -r c03c49202280 Agendas/trunk/src/Agendas.Web/Views/Evento/Agendar.cshtml
--- a/Agendas/trunk/src/Agendas.Web/Views/Evento/Agendar.cshtml	Tue Aug 02 23:05:50 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Evento/Agendar.cshtml	Tue Aug 02 23:25:25 2011 -0300
@@ -7,12 +7,6 @@
 <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>
 
-<script type="text/javascript">
-	$(document).ready(function () {
-		$("#Fecha").datepicker({ dateFormat: 'dd-mm-yy' });
-	});
-</script>
-
 @using (Html.BeginForm())
 {
     @Html.ValidationSummary(true, "Los datos ingresados no son validos, por favor verifíquelos")
diff -r c99636fbdc5f -r c03c49202280 Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml
--- a/Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml	Tue Aug 02 23:05:50 2011 -0300
+++ b/Agendas/trunk/src/Agendas.Web/Views/Home/About.cshtml	Tue Aug 02 23:25:25 2011 -0300
@@ -1,10 +1,9 @@
-<h2>About Us</h2>
+<h2>Acerca de nosotros</h2>
+<p>Desarrollado por colaboradores de la comunidad</p>
+<ul>
+    <li>Alejandro Labra</li>
+    <li>Jorge Rowies</li>
+    <li>Juan José Montes de Oca</li>
+    <li>Nelo Pauselli</li>
+</ul>
 
-<p>
-     Desarrollado por colaboradores de la comunidad
-     <ul>
-        <li>Juan José Montes de Oca</li>
-        <li>Nelo Pauselli</li>
-        <li>¿quién mas?</li>
-     </ul>
-</p>
diff -r c99636fbdc5f -r c03c49202280 Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/DateTime.cshtml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Agendas/trunk/src/Agendas.Web/Views/Shared/EditorTemplates/DateTime.cshtml	Tue Aug 02 23:25:25 2011 -0300
@@ -0,0 +1,7 @@
+@model DateTime?
+<script type="text/javascript">
+    $(document).ready(function () {
+        $("#@ViewData.TemplateInfo.GetFullHtmlFieldId(string.Empty)").datepicker({ dateFormat: 'dd-mm-yy' });
+    });
+</script>
+@Html.TextBox(string.Empty, (Model.HasValue ? Model.Value.ToShortDateString() : string.Empty))