Commit e55433b54df0fc50cab36d831dcac1414eee1cb0

Authored by Pablo Marco del Pont
Exists in master

Merge branch 'master' into 'master'

Master

See merge request modulos-npm/foca-busqueda-cliente!1
... ... @@ -0,0 +1,48 @@
  1 +<html ng-app="focaBusquedaCliente">
  2 +
  3 +<head>
  4 + <meta charset="UTF-8" />
  5 + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
  6 +
  7 + <!--CSS-->
  8 + <link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
  9 + <link href="node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
  10 +
  11 + <!--VENDOR JS-->
  12 + <script src="node_modules/jquery/dist/jquery.min.js"></script>
  13 + <script src="node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
  14 + <script src="node_modules/angular/angular.min.js"></script>
  15 + <script src="node_modules/ui-bootstrap4/dist/ui-bootstrap-tpls.js"></script>
  16 +
  17 + <!-- BUILD -->
  18 + <script src="src/js/app.js"></script>
  19 + <script src="src/js/controller.js"></script>
  20 + <script src="src/js/service.js"></script>
  21 +
  22 + <!-- /BUILD -->
  23 +
  24 + <!-- CONFIG PARA DEVELOP -->
  25 + <script type="text/javascript">
  26 + angular.module('focaBusquedaCliente')
  27 + .controller('controller', ['$uibModal', function ($uibModal) {
  28 + var modalInstance = $uibModal.open(
  29 + {
  30 + ariaLabelledBy: 'Busqueda de Petroleras',
  31 + templateUrl: 'src/views/foca-busqueda-cliente-modal',
  32 + controller: 'focaBusquedaClienteModalController',
  33 + size: 'lg'
  34 + }
  35 + );
  36 + }]);
  37 + </script>
  38 +</head>
  39 +
  40 +<body ng-controller="controller">
  41 + <style>
  42 + .p-5 {
  43 + padding: 5px !important;
  44 + }
  45 + </style>
  46 +</body>
  47 +
  48 +</html>
0 49 \ No newline at end of file
1 1 {
2   - "name": "foca-abm-sectores",
  2 + "name": "foca-busqueda-cliente",
3 3 "version": "1.0.0",
4   - "description": "ABM de sectores",
  4 + "description": "Búsqueda de clientes",
5 5 "main": "dist/foca-abm-sectores.js",
6 6 "scripts": {
7 7 "test": "echo \"Error: no test specified\" && exit 1",
8 8 "compile": "gulp uglify && gulp html",
9   - "pre-commit": [
10   - "gulp-pre-commit"
11   - ],
12 9 "postinstall": "npm run compile && rm -R src && rm index.html && rm .jshintrc && rm gulpfile.js"
13 10 },
14 11 "repository": {
15 12 "type": "git",
16   - "url": "https://192.168.0.11/modulos-npm/foca-abm-sectores.git"
  13 + "url": "https://192.168.0.11/modulos-npm/foca-busqueda-cliente.git"
17 14 },
18 15 "author": "Foca Software",
19 16 "license": "ISC",
... ... @@ -41,7 +38,7 @@
41 38 "angular-ui-bootstrap": "2.5.6",
42 39 "bootstrap": "4.1.3",
43 40 "font-awesome": "4.7.0",
44   - "gulp": "3.9.1",
  41 + "gulp": "^3.9.1",
45 42 "gulp-angular-templatecache": "2.2.1",
46 43 "gulp-concat": "2.6.1",
47 44 "gulp-htmlmin": "5.0.1",
src/views/foca-busqueda-cliente-modal.html
... ... @@ -23,13 +23,13 @@
23 23 >
24 24 <i ng-show="cargandoClientes" class="fas fa-sync"></i>
25 25 <div ng-show="sinResultados">
26   - <i class="fas fa-minus"></i> No se encontraron resultados.
  26 + <i class="fa fa-minus"></i> No se encontraron resultados.
27 27 </div>
28 28 </div>
29 29 </div>
30 30 </form>
31 31 </div>
32 32 <div class="modal-footer">
33   - <button ng-click="aceptar()">Aceptar</button>
34   - <button ng-click="cancelar()">Cancelar</button>
  33 + <button class="btn" ng-click="aceptar()">Aceptar</button>
  34 + <button class="btn" ng-click="cancelar()">Cancelar</button>
35 35 </div>