From bdcd9ef4b105de25612a90fcb5c6ad1c6a7ed16b Mon Sep 17 00:00:00 2001
From: kleper <kleper@kleper.net>
Date: Fri, 5 Apr 2019 08:31:56 -0500
Subject: [PATCH] =?UTF-8?q?Correcci=C3=B3n=20de=20errores,=20con=20esto=20?=
 =?UTF-8?q?ya=20queda=20una=20versi=C3=B3n=20funcional=20de=20la=20nueva?=
 =?UTF-8?q?=20implementaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 portalcautivo2/index.html | 63 ++++++++++-----------------------------
 1 file changed, 16 insertions(+), 47 deletions(-)
diff --git a/portalcautivo2/index.html b/portalcautivo2/index.html
index cd7d80c..dc89772 100644
--- a/portalcautivo2/index.html
+++ b/portalcautivo2/index.html
@@ -19,6 +19,8 @@
 
         <!-- static zone info -->
         <script src="js/zone.js"></script>
+        <script src="js/jquery-1.11.2.min.js"></script>
+        <!-- <script src="js/captiveportal-jquery.min.js"></script> -->
 
         <script>
             function getURLparams()
@@ -156,49 +158,6 @@
         </script>
     </head>
     <body>
-<!--
-        <header class="page-head">
-            <nav class="navbar navbar-default" >
-                <div class="container-fluid">
-                    <div class="navbar-header">
-                        <a class="navbar-brand" href="#">
-                            <img class="brand-logo" src="images/captiveportal-logoNR.png" height="30" width="150">
-                        </a>
-                    </div>
-                </div>
-            </nav>
-        </header>
-
-        <main class="page-content col-sm-6 col-sm-push-3">
--->
-          <!-- User option 1: login needed with name and password -->
-<!--
-          <div id="login_password" class="hidden">
-              <form class="form-signin">
-                  <h2 class="form-signin-heading">Please sign in</h2>
-                  <label for="inputUsername" class="sr-only">Username</label>
-                  <input type="text" id="inputUsername" class="form-control" placeholder="Username" required autofocus autocomplete="none" autocapitalize="none" autocorrect="off">
-                  <label for="inputPassword" class="sr-only">Password</label>
-                  <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
-                  <button class="btn btn-primary btn-block" id="signin" type="button">Sign in</button>
-              </form>
-          </div>
-      -->
-          <!-- User option 2: login needed, without username, password -->
-          <!--
-          <div id="login_none" class="hidden">
-            <form class="form-signin">
-                <button class="btn btn-primary btn-block" id="signin_anon" type="button">Sign in</button>
-            </form>
-          </div>
-          <!-- User option 3: Already logged in, show logout button -->
-        <!--
-          <div id="logout_frm" class="hidden">
-            <form class="form-signin">
-                <button class="btn btn-primary btn-block" id="logoff" type="button">Logout</button>
-            </form>
-          </div>
-          <!-- Message dialog -->
 
 
         <div class="container register">
@@ -224,14 +183,24 @@
                   <div class="row register-form">
                     <div class="col-md-12">
 
+                      <div id="login_password" class="hidden">
                           <form class="form-signin">
-                              <!--<h2 class="form-signin-heading">Please sign in</h2>-->
+                              <!-- <h2 class="form-signin-heading">Please sign in</h2> -->
                               <label for="inputUsername" class="sr-only">Usuario</label>
-                              <input type="text" id="inputUsername" class="form-control" placeholder="Username" required autofocus autocomplete="none" autocapitalize="none" autocorrect="off">
+                              <input type="text" id="inputUsername" class="form-control" placeholder="Usuario" required autofocus autocomplete="none" autocapitalize="none" autocorrect="off">
                               <label for="inputPassword" class="sr-only">Contraseña</label>
-                              <input type="password" id="inputPassword" class="form-control" placeholder="Password" required>
+                              <input type="password" id="inputPassword" class="form-control" placeholder="Contraseña" required>
                               <button class="btn btn-primary btn-block" id="signin" type="button">Ingresar</button>
                           </form>
+                      </div>
+
+                      <!-- User option 3: Already logged in, show logout button -->
+         <div id="logout_frm" class="hidden">
+           <form class="form-signin">
+               <button class="btn btn-primary btn-block" id="logoff" type="button">Salir</button>
+           </form>
+         </div>
+
 
 
                     </div>
@@ -262,7 +231,7 @@
         </div>
 
         <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-        <script src="js/captiveportal-jquery.min.js"></script>
+
         <!-- Include all compiled plugins (below), or include individual files as needed -->
         <script src="js/captiveportal-bootstrap.min.js"></script>
     </body>
