Martin Macola / foca-login

Download as
Browse Code »

Commit 128d72e676cb6b85e91e450ff10f5c15e2def8fa

Authored by Martin Macola
1 parent 3245ee82c2
Exists in master

Merge conflicts

Showing 1 changed file with 6 additions and 29 deletions   Show diff stats
src/views/foca-login.html
Diff comments   View file @ 128d72e
1 <img src="img/logo.png" class="w-25 rounded mx-auto d-block"> 1 <div class="row mt-5 overflow-hidden">
2 <div class="login mt-5 p-3 border-0"> 2 <div class="col p-0">
3 <form name="login"> 3 <div class="row mt-5 justify-content-center">
4 4 <div class="col-auto p-0">
5 <div class="login-titulo"> 5 <img src="./img/logofoca.png" alt="Debo Logo">
6 <span>Ingreso de usuario</span> 6 </div>
7 </div> 7 </div>
8 8
9 <div class="row justify-content-center m-5"> 9 <div class="row justify-content-center m-5">
10 <div class="col col-sm-10 col-md-5 col-lg-4 bg-gray-gradient shadow rounded-2"> 10 <div class="col col-sm-10 col-md-5 col-lg-4 bg-gray-gradient shadow rounded-2">
11 <form name="login"> 11 <form name="login">
12 <div class="row my-2 justify-content-center"> 12 <div class="row my-2 justify-content-center">
13 <div class="col border-bottom border-white"> 13 <div class="col border-bottom border-white">
14 <p class="mb-2 text-center">Ingreso de usuario</p> 14 <p class="mb-2 text-center">Ingreso de usuario</p>
15 </div> 15 </div>
16 </div> 16 </div>
17 <div class="row mb-2"> 17 <div class="row mb-2">
18 <div class="col px-4"> 18 <div class="col px-4">
19 <p class="mb-0 text-center">Usuario</p> 19 <p class="mb-0 text-center">Usuario</p>
20 <input 20 <input
21 class="form-control form-control-sm" 21 class="form-control form-control-sm"
22 type="text" 22 type="text"
23 ng-model="usuario.idUsuario" 23 ng-model="usuario.idUsuario"
24 ng-focus="paso = 1" 24 ng-focus="paso = 1"
25 foca-focus="paso == 1" 25 foca-focus="paso == 1"
26 ng-keyup="$event.keyCode == 13 && irPaso(2)" 26 ng-keyup="$event.keyCode == 13 && irPaso(2)"
27 ladda="loginLoading" 27 ladda="loginLoading"
28 teclado-virtual 28 teclado-virtual
29 /> 29 />
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="row mb-3"> 32 <div class="row mb-3">
33 <div class="col px-4"> 33 <div class="col px-4">
34 <p class="mb-0 text-center">Contraseña</p> 34 <p class="mb-0 text-center">Contraseña</p>
35 <input 35 <input
36 class="form-control form-control-sm" 36 class="form-control form-control-sm"
37 id="password" 37 id="password"
38 type="password" 38 type="password"
39 ng-model="usuario.clave" 39 ng-model="usuario.clave"
40 foca-focus="paso == 2" 40 foca-focus="paso == 2"
41 ng-keyup="$event.keyCode == 13 && enviar()" 41 ng-keyup="$event.keyCode == 13 && enviar()"
42 ladda="loginLoading" 42 ladda="loginLoading"
43 teclado-virtual 43 teclado-virtual
44 /> 44 />
45 </div> 45 </div>
46 </div> 46 </div>
47 <div class="row mb-5"> 47 <div class="row mb-5">
48 <div class="col px-4"> 48 <div class="col px-4">
49 <button 49 <button
50 type="button" 50 type="button"
51 ng-click="enviar()" 51 ng-click="enviar()"
52 class="btn btn-primary btn-block" 52 class="btn btn-primary btn-block"
53 ladda="loginLoading"> 53 ladda="loginLoading">
54 Ingresar 54 Ingresar
55 </button> 55 </button>
56 </div> 56 </div>
57 </div> 57 </div>
58 </form> 58 </form>
59 </div> 59 </div>
60 </div> 60 </div>
61 <<<<<<< HEAD
62 <div class="login-campo">
63 <label>Contraseña</label>
64 <input
65 id = "password"
66 type = "password"
67 ng-model = "usuario.clave"
68 foca-focus = "paso == 2"
69 ng-keyup = "$event.keyCode == 13 && enviar()"
70 ladda = "loginLoading"
71 teclado-virtual
72 />
73 </div>
74 <button
75 type="button"
76 ng-click="enviar()"
77 class="login-button btn mt-3 btn-login"
78 ladda="loginLoading"
79 >Ingresar</button>
80 </form>
81 <img src="img/logo-foca.png" class="w-50 rounded mx-auto d-block">
82 =======
83 </div> 61 </div>
84 >>>>>>> ac450d6b074c59434f538a88b6166436bff55510
85 </div> 62 </div>
86 63