Actualización interfaces modulo 4

jafuentest · Apr 21, 2015 · 777ac19 · 777ac19
1 parent d78535e
commit 777ac19
Show file tree

Hide file tree

Showing 92 changed files with 1,907 additions and 9,717 deletions.
diff --git a/GUI/Master/menuLateral.xml b/GUI/Master/menuLateral.xml
@@ -23,12 +23,12 @@
 	</opcion>
 
 	<!-- Opciones del menú lateral del Módulo 4-->
-  <opcion nombre="Perfil Proyecto" link="~/GUI/Modulo4/PerfilProyecto.aspx">
-    <modulo id="4"></modulo>
-  </opcion>
 	<opcion nombre="Lista de Proyectos" link="~/GUI/Modulo1/Default.aspx">
 		<modulo id="4"></modulo>
 	</opcion>
+	<opcion nombre="Perfil Proyecto" link="~/GUI/Modulo4/PerfilProyecto.aspx">
+		<modulo id="4"></modulo>
+	</opcion>
 	<opcion nombre="Crear Proyecto" link="~/GUI/Modulo4/CrearProyecto.aspx">
 		<modulo id="4"></modulo>
 	</opcion>

diff --git a/GUI/Modulo1/Default.aspx.cs b/GUI/Modulo1/Default.aspx.cs
@@ -114,6 +114,13 @@ protected void Page_Load(object sender, EventArgs e)
                  alert_requerimiento.InnerHtml = "<div><button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>Proyecto eliminado exitosamente</div>";
 
              }
+             if (success.Equals("2"))
+             {
+                 alert_requerimiento.Attributes["class"] = "alert alert-success alert-dismissible";
+                 alert_requerimiento.Attributes["role"] = "alert";
+                 alert_requerimiento.InnerHtml = "<div><button type=\"button\" class=\"close\" data-dismiss=\"alert\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>Proyecto creado exitosamente</div>";
+
+             }
          }
 
 

diff --git a/GUI/Modulo4/CrearProyecto.aspx b/GUI/Modulo4/CrearProyecto.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" MasterPageFile="~/GUI/Master/MasterPage.master"  AutoEventWireup="true" CodeFile="CrearProyecto.aspx.cs" Inherits="GUI_Modulo4_CrearProyecto" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
-    <link href="bootstrap-switch-master/docs/css/highlight.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/dist/css/bootstrap3/bootstrap-switch.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/docs/css/main.css" rel="stylesheet">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+	<link href="bootstrap-toggle-master/css/bootstrap-toggle.css" rel="stylesheet">
     <style>
         textarea {
             resize: none;
@@ -54,15 +53,14 @@
                        <input type="text" id="Precio" placeholder="Precio" class="form-control" name="precio"/>
                 </div>
 
-                <div id="div_activo" class="col-sm-3 col-md-3 col-lg-3 col-md-offset-3">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <input id="switch-disabled" type="checkbox" checked data-on-text="Activo" data-on-color="success" data-off-text="Inactivo" disabled>
+                <div id="div_activo" class="col-sm-3 col-md-3 col-lg-3">
+                    <input disabled checked data-toggle="toggle" data-size="normal" type="checkbox" data-on="Activo" data-off="Inactivo" data-onstyle="success" data-offstyle="warning" data-width="100">
                 </div>
 	        </div>
             <br>
             <div class="form-group">
 		        <div class="col-sm-1 col-md-1 col-lg-1">
-				    <button class="btn btn-primary" onclick="return checkform()">Crear</button>
+				    <a id="btn-crear" type="button" class="btn btn-primary" onclick="return checkform()" href="../Modulo1/Default.aspx?success=2">Crear</a>
 			    </div>
                 <div class="col-sm-1 col-md-1 col-lg-1">
 				    <button class="btn btn-default" onclick="goBack()">Cancelar</button>
@@ -71,9 +69,20 @@
         </form>
     </div>
     <script src="js/Validacion.js"></script>
-    <script src="bootstrap-switch-master/docs/js/highlight.js"></script>
-    <script src="bootstrap-switch-master/dist/js/bootstrap-switch.js"></script>
-    <script src="bootstrap-switch-master/docs/js/main.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
+	<script src="bootstrap-toggle-master/doc/script.js"></script>
+	<script src="bootstrap-toggle-master/js/bootstrap-toggle.js"></script>
+	<script>
+	    (function (i, s, o, g, r, a, m) {
+	        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+	            (i[r].q = i[r].q || []).push(arguments)
+	        }, i[r].l = 1 * new Date(); a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+	    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+	    ga('create', 'UA-55669452-1', 'auto');
+	    ga('send', 'pageview');
+	</script>
+
     <script language="javascript">
          function fillCodigoTextField() {
              var codigoTextField = document.getElementById("Codigo");

diff --git a/GUI/Modulo4/ListaProyectos.aspx b/GUI/Modulo4/ListaProyectos.aspx
@@ -1,9 +1,8 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/GUI/Master/MasterPage.master" AutoEventWireup="true" CodeFile="ListaProyectos.aspx.cs" Inherits="GUI_Modulo4_ListaProyectos" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
-    <link href="bootstrap-switch-master/docs/css/highlight.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/dist/css/bootstrap3/bootstrap-switch.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/docs/css/main.css" rel="stylesheet">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+	<link href="bootstrap-toggle-master/css/bootstrap-toggle.css" rel="stylesheet">
     <style>
         .bootstrapBlue {
             color: #337ab7;
@@ -43,7 +42,7 @@
                 <div class="jumbotron">
                     <h2 class="sameLine"><a href="PerfilProyecto.aspx">Totem1</a></h2> <h5 class="sameLine">COD: </h5> <h5 id="codigoProyecto" class="sameLine" runat="server">T01</h5>
                     <p class="desc">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent quis pulvinar nisi, in dapibus leo. Aliquam ac gravida sem. Curabitur a aliquet tellus. Curabitur dui felis, luctus quis venenatis non, congue non nunc. Nam quis ipsum in dui egestas rutrum vel quis elit. Proin cursus lectus eget sem interdum tristique. Aliquam convallis elementum metus, eu hendrerit est aliquam vitae. Morbi suscipit sagittis venenatis. Etiam vehicula cursus convallis. Integer ultrices consequat dolor, hendrerit consectetur magna blandit eget. Curabitur nec vestibulum justo, lobortis mattis ipsum. Nullam enim est, placerat efficitur risus a, congue porttitor diam. Proin eget tortor dolor.</p>
-                    <input id="switch-disabled" type="checkbox" data-size="mini" data-on-text="Activo" data-on-color="success" data-off-text="Inactivo" data-off-color="warning" checked disabled>
+                    <input disabled checked data-toggle="toggle" data-size="small" type="checkbox" data-on="Activo" data-off="Inactivo" data-onstyle="success" data-offstyle="warning" data-width="100">
                     <br><br>
                     <p class="sameLine">Cliente: </p><p id="nombreCliente" class="sameLine bootstrapBlue">Carlo Magurno</p>
                     <br>
@@ -53,7 +52,7 @@
                 <div class="jumbotron">
                     <h2 class="sameLine"><a href="#">Totem02</a></h2> <h5 class="sameLine">COD: </h5> <h5 id="H1" class="sameLine" runat="server">T02</h5>
                     <p class="desc">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent quis pulvinar nisi, in dapibus leo. Aliquam ac gravida sem. Curabitur a aliquet tellus. Curabitur dui felis, luctus quis venenatis non, congue non nunc. Nam quis ipsum in dui egestas rutrum vel quis elit. Proin cursus lectus eget sem interdum tristique. Aliquam convallis elementum metus, eu hendrerit est aliquam vitae. Morbi suscipit sagittis venenatis. Etiam vehicula cursus convallis. Integer ultrices consequat dolor, hendrerit consectetur magna blandit eget. Curabitur nec vestibulum justo, lobortis mattis ipsum. Nullam enim est, placerat efficitur risus a, congue porttitor diam. Proin eget tortor dolor.</p>
-                    <input id="switch-disabled1" type="checkbox" data-size="mini" data-on-text="Activo" data-on-color="success" data-off-text="Inactivo" data-off-color="warning" unchecked disabled>
+                    <input disabled unchecked data-toggle="toggle" data-size="small" type="checkbox" data-on="Activo" data-off="Inactivo" data-onstyle="success" data-offstyle="warning" data-width="100">
                     <br><br>
                     <p class="sameLine">Cliente: </p><p id="nombreCliente" class="sameLine bootstrapBlue">Carlo Magurno</p>
                     <br>
@@ -63,7 +62,7 @@
                 <div class="jumbotron">
                     <h2 class="sameLine"><a href="#">Totem03</a></h2> <h5 class="sameLine">COD: </h5> <h5 id="H2" class="sameLine" runat="server">T03</h5>
                     <p class="desc">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent quis pulvinar nisi, in dapibus leo. Aliquam ac gravida sem. Curabitur a aliquet tellus. Curabitur dui felis, luctus quis venenatis non, congue non nunc. Nam quis ipsum in dui egestas rutrum vel quis elit. Proin cursus lectus eget sem interdum tristique. Aliquam convallis elementum metus, eu hendrerit est aliquam vitae. Morbi suscipit sagittis venenatis. Etiam vehicula cursus convallis. Integer ultrices consequat dolor, hendrerit consectetur magna blandit eget. Curabitur nec vestibulum justo, lobortis mattis ipsum. Nullam enim est, placerat efficitur risus a, congue porttitor diam. Proin eget tortor dolor.</p>
-                    <input id="switch-disabled2" type="checkbox" data-size="mini" data-on-text="Activo" data-on-color="success" data-off-text="Inactivo" data-off-color="warning" unchecked disabled>
+                    <input disabled unchecked data-toggle="toggle" data-size="small" type="checkbox" data-on="Activo" data-off="Inactivo" data-onstyle="success" data-offstyle="warning" data-width="100">
                     <br><br>
                     <p class="sameLine">Cliente: </p><p id="nombreCliente" class="sameLine bootstrapBlue">Carlo Magurno</p>
                     <br>
@@ -74,10 +73,18 @@
 
     </div>
 
-    <script src="bootstrap-switch-master/docs/js/jquery.min.js"></script>
-    <script src="bootstrap-switch-master/docs/js/bootstrap.min.js"></script>
-    <script src="bootstrap-switch-master/docs/js/highlight.js"></script>
-    <script src="bootstrap-switch-master/dist/js/bootstrap-switch.js"></script>
-    <script src="bootstrap-switch-master/docs/js/main.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
+	<script src="bootstrap-toggle-master/doc/script.js"></script>
+	<script src="bootstrap-toggle-master/js/bootstrap-toggle.js"></script>
+	<script>
+	    (function (i, s, o, g, r, a, m) {
+	        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+	            (i[r].q = i[r].q || []).push(arguments)
+	        }, i[r].l = 1 * new Date(); a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+	    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+	    ga('create', 'UA-55669452-1', 'auto');
+	    ga('send', 'pageview');
+	</script>
 
 </asp:Content>
diff --git a/GUI/Modulo4/ModificarProyecto.aspx b/GUI/Modulo4/ModificarProyecto.aspx
@@ -1,9 +1,8 @@
 <%@ Page Language="C#" MasterPageFile="~/GUI/Master/MasterPage.master" AutoEventWireup="true" CodeFile="ModificarProyecto.aspx.cs" Inherits="GUI_Modulo4_ModificarProyecto" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
-    <link href="bootstrap-switch-master/docs/css/highlight.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/dist/css/bootstrap3/bootstrap-switch.css" rel="stylesheet">
-    <link href="bootstrap-switch-master/docs/css/main.css" rel="stylesheet">
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
+	<link href="bootstrap-toggle-master/css/bootstrap-toggle.css" rel="stylesheet">
     <style>
         textarea {
             resize: none;
@@ -19,13 +18,6 @@
     <form id="register_form" class="form-horizontal" action="#">
         <div class="form-group">
 
-            <!--<div id="div_alerta" class="col-sm-12 col-md-12 col-lg-12">
-                <div class="alert alert-success alert-dismissible" role="alert">
-                  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                  Se ha modificado el proyecto con exito.
-                </div>
-            </div>-->
-
             <div id="div_nombre" class="col-sm-8 col-md-8 col-lg-8">
 				<input type="text" placeholder="Nombre" class="form-control" value="Twitter" name="nombre"/>
 			</div>
@@ -57,27 +49,38 @@
                        <input type="text" id="Precio" placeholder="Precio" value="200000000" class="form-control" name="precio"/>
                 </div>
 
-                <div id="div_activo" class="col-sm-3 col-md-3 col-lg-3 col-md-offset-3">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <input id="switch-disabled" type="checkbox" checked data-on-text="Activo" data-on-color="success" data-off-text="Inactivo" data-off-color="warning">
+                <div id="div_activo" class="col-sm-3 col-md-3 col-lg-3">
+                    <input checked data-toggle="toggle" data-size="normal" type="checkbox" data-on="Activo" data-off="Inactivo" data-onstyle="success" data-offstyle="warning" data-width="100">
                 </div>
 	        </div>
             <br>
             <div class="form-group">
 		        <div class="col-sm-1 col-md-1 col-lg-1">
-				    <a id="btn-modificar" type="button" class="btn btn-primary" href="PerfilProyecto.aspx?success=4">Modificar</a>
+				    <a id="btn-modificar" type="button" class="btn btn-primary" href="PerfilProyecto.aspx?success=0">Modificar</a>
 			    </div>
                 <div class="col-sm-3 col-md-3 col-lg-3">
                     &nbsp;&nbsp;&nbsp;&nbsp;
 				    <a id="btn-eliminar" type="button" class="btn btn-default" href="PerfilProyecto.aspx">Cancelar</a>
 			    </div>
 	        </div>
-    </form>
-        </div>
+        </form>
+    </div>
+
     <script src="js/Validacion.js"></script>
-    <script src="bootstrap-switch-master/docs/js/highlight.js"></script>
-    <script src="bootstrap-switch-master/dist/js/bootstrap-switch.js"></script>
-    <script src="bootstrap-switch-master/docs/js/main.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.3/highlight.min.js"></script>
+	<script src="bootstrap-toggle-master/doc/script.js"></script>
+	<script src="bootstrap-toggle-master/js/bootstrap-toggle.js"></script>
+	<script>
+	    (function (i, s, o, g, r, a, m) {
+	        i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+	            (i[r].q = i[r].q || []).push(arguments)
+	        }, i[r].l = 1 * new Date(); a = s.createElement(o),
+            m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m)
+	    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+	    ga('create', 'UA-55669452-1', 'auto');
+	    ga('send', 'pageview');
+	</script>
+
     <script type="text/javascript">
         $("#dpmoneda li a").click(function () {