Commit 5a7851ca0d19a08fee2db0a9f6b4679518bf9767
1 parent
f1caad73db
Exists in
master
and in
1 other branch
correciones en identacion
Showing
2 changed files
with
48 additions
and
53 deletions
Show diff stats
src/js/controller.js
... | ... | @@ -20,7 +20,6 @@ angular.module('focaBotoneraPrincipal') |
20 | 20 | |
21 | 21 | $scope.rutas = $localStorage.rutas? JSON.parse($localStorage.rutas) : []; |
22 | 22 | |
23 | - | |
24 | 23 | $scope.irA = function (accion) { |
25 | 24 | $location.path(accion); |
26 | 25 | }; |
... | ... | @@ -34,11 +33,5 @@ angular.module('focaBotoneraPrincipal') |
34 | 33 | focaModalService.info('Su terminal es: ' + key); |
35 | 34 | }; |
36 | 35 | |
37 | - init(); | |
38 | - | |
39 | - function init() { | |
40 | - | |
41 | - console.log($localStorage); | |
42 | - } | |
43 | 36 | } |
44 | 37 | ]); |
src/views/foca-botonera-principal.html
1 | 1 | <div class="botonera-principal"> |
2 | - <div class="d-flex"> | |
3 | - | |
4 | - <!-- <div class="dropdown"> | |
5 | - <button class="btn btn-secondary dropdown-toggle" | |
6 | - type="button" | |
7 | - id="dropdownMenuButton" | |
8 | - data-toggle="dropdown" | |
9 | - aria-haspopup="true" | |
10 | - aria-expanded="false"> | |
11 | - Dropdown button | |
12 | - </button> | |
13 | - <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> | |
14 | - <a class="dropdown-item" href="#">Action</a> | |
15 | - <a class="dropdown-item" href="#">Another action</a> | |
16 | - <a class="dropdown-item" href="#">Something else here</a> | |
17 | - </div> --> | |
18 | - | |
19 | - | |
20 | - | |
21 | - <div ng-if="rutas.length > 0" class="ml-auto dropdown"> | |
22 | - <button class="m-0 btn-tareas-pausadas dropdown-toggle" | |
23 | - type="button" | |
24 | - id="dropdownMenuButton" | |
25 | - data-toggle="dropdown" | |
26 | - aria-haspopup="true" | |
2 | + <div class="d-flex"> | |
3 | + <div ng-if="rutas.length > 0" class="ml-auto dropdown"> | |
4 | + <button | |
5 | + class="m-0 btn-tareas-pausadas dropdown-toggle" | |
6 | + type="button" | |
7 | + id="dropdownMenuButton" | |
8 | + data-toggle="dropdown" | |
9 | + aria-haspopup="true" | |
27 | 10 | aria-expanded="false" |
28 | - > | |
29 | - Tareas Pausadas | |
30 | - </button> | |
31 | - <div class="dropdown-tareas-pausadas dropdown-menu" aria-labelledby="dropdownMenuButton"> | |
32 | - <a | |
33 | - ng-click="irA(ruta)" | |
34 | - ng-repeat="ruta in rutas track by $index" | |
35 | - class="items-dropdown dropdown-item m-1"> | |
36 | - Volver a: {{ruta}} | |
37 | - </a> | |
38 | - </div> | |
11 | + > | |
12 | + Tareas Pausadas | |
13 | + </button> | |
14 | + <div class="dropdown-tareas-pausadas dropdown-menu" aria-labelledby="dropdownMenuButton"> | |
15 | + <a | |
16 | + ng-click="irA(ruta)" | |
17 | + ng-repeat="ruta in rutas track by $index" | |
18 | + class="items-dropdown dropdown-item m-1"> | |
19 | + Volver a: {{ruta}} | |
20 | + </a> | |
39 | 21 | </div> |
40 | 22 | </div> |
23 | + </div> | |
41 | 24 | <div class="row mt-3 justify-content-center"> |
42 | 25 | <div class="col-auto p-0"> |
43 | 26 | <img src="./img/logoMapa.png" /> |
... | ... | @@ -49,11 +32,17 @@ |
49 | 32 | <slides> |
50 | 33 | <slide ng-repeat="(keyPagina, pagina) in paginas"> |
51 | 34 | <menu class="botonera-principal-menu"> |
52 | - <menuitem ng-class="boton.clase" ng-repeat="(keyBoton, boton) in pagina" | |
53 | - ng-show="boton.accion != '/venta-hoja-ruta/lista'"> | |
54 | - <button foca-focus="keyPagina === 0 && keyBoton === 0" ng-click="irA(boton.accion)"> | |
55 | - <span ng-bind="boton.texto"></span> | |
56 | - </button> | |
35 | + <menuitem | |
36 | + ng-class="boton.clase" | |
37 | + ng-repeat="(keyBoton, boton) in pagina" | |
38 | + ng-show="boton.accion != '/venta-hoja-ruta/lista'" | |
39 | + > | |
40 | + <button | |
41 | + foca-focus="keyPagina === 0 && keyBoton === 0" | |
42 | + ng-click="irA(boton.accion)" | |
43 | + > | |
44 | + <span ng-bind="boton.texto"></span> | |
45 | + </button> | |
57 | 46 | </menuitem> |
58 | 47 | </menu> |
59 | 48 | </slide> |
... | ... | @@ -63,10 +52,17 @@ |
63 | 52 | <pagination></pagination> |
64 | 53 | </swiper> |
65 | 54 | <div class="d-none d-sm-block"> |
66 | - <a class="btn btn-outline-dark mt-5 btn-lg" href="javascript:void()" ng-click="showTerminal()"> | |
55 | + <a | |
56 | + class="btn btn-outline-dark mt-5 btn-lg" | |
57 | + href="javascript:void()" | |
58 | + ng-click="showTerminal()" | |
59 | + > | |
67 | 60 | <i class="fa fa-info-circle" aria-hidden="true"></i> |
68 | 61 | </a> |
69 | - <a class="btn btn-outline-dark mt-5 btn-lg" href="javascript:void()" ng-click="logout()"> | |
62 | + <a | |
63 | + class="btn btn-outline-dark mt-5 btn-lg" | |
64 | + href="javascript:void()" | |
65 | + ng-click="logout()"> | |
70 | 66 | <i class="fa fa-power-off" aria-hidden="true"></i> |
71 | 67 | </a> |
72 | 68 | </div> |
... | ... | @@ -74,12 +70,18 @@ |
74 | 70 | </div> |
75 | 71 | <div class="row d-md-none fixed-bottom"> |
76 | 72 | <div class="w-100 d-flex px-3 acciones-mobile"> |
77 | - <a class="btn btn-outline-dark btn-lg mr-2" href="javascript:void()" ng-click="showTerminal()"> | |
73 | + <a | |
74 | + class="btn btn-outline-dark btn-lg mr-2" | |
75 | + href="javascript:void()" | |
76 | + ng-click="showTerminal()"> | |
78 | 77 | <i class="fa fa-info-circle" aria-hidden="true"></i> |
79 | 78 | </a> |
80 | - <a class="btn btn-outline-dark btn-lg" href="javascript:void()" ng-click="logout()"> | |
79 | + <a | |
80 | + class="btn btn-outline-dark btn-lg" | |
81 | + href="javascript:void()" | |
82 | + ng-click="logout()"> | |
81 | 83 | <i class="fa fa-power-off" aria-hidden="true"></i> |
82 | 84 | </a> |
83 | 85 | </div> |
84 | 86 | </div> |
85 | -</div> | |
86 | 87 | \ No newline at end of file |
88 | +</div> |