Commit 1528f4661a4a8519e5de90cc040a51ea1ce26ac1

Authored by Nicolás Guarnieri
Exists in master

Merge branch 'master' into 'master'

buscador en header, paginado en footer, cambio icons

See merge request !1
... ... @@ -8,7 +8,7 @@
8 8 "gulp-pre-commit": "gulp pre-commit",
9 9 "compile": "gulp uglify",
10 10 "postinstall": "npm run compile && gulp clean-post-install",
11   - "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+https://debo.suite.repo/modulos-npm/foca-directivas.git"
  11 + "install-dev": "npm install -D angular font-awesome pump jquery bootstrap ui-bootstrap4 jshint gulp gulp-uglify gulp-concat gulp-htmlmin gulp-rename gulp-uglify gulp-jshint gulp-replace gulp-connect gulp-clean gulp-angular-templatecache git+ssh://git@git.focasoftware.com:npm/foca-directivas.git"
12 12 },
13 13 "pre-commit": [
14 14 "gulp-pre-commit"
... ... @@ -22,7 +22,7 @@
22 22 "devDependencies": {
23 23 "angular": "^1.7.5",
24 24 "bootstrap": "^4.1.3",
25   - "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas.git",
  25 + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git",
26 26 "font-awesome": "^4.7.0",
27 27 "gulp": "^3.9.1",
28 28 "gulp-angular-templatecache": "^2.2.2",
src/views/modal-moneda.html
1 1 <div class="modal-header py-1">
2   - <h5 class="modal-title">Busqueda de Moneda</h5>
  2 + <div class="row w-100">
  3 + <div class="col-lg-6">
  4 + <h5 class="modal-title my-1">Busqueda de Moneda</h5>
  5 + </div>
  6 + <div class="input-group col-lg-6 pr-0 my-2">
  7 + <input
  8 + type="text"
  9 + class="form-control form-control-sm"
  10 + placeholder="Busqueda"
  11 + ng-model="filters"
  12 + ng-change="search()"
  13 + ng-keydown="busquedaDown($event.keyCode)"
  14 + ng-keypress="busquedaPress($event.keyCode)"
  15 + foca-focus="selectedMoneda == -1"
  16 + ng-focus="selectedMoneda = -1"
  17 + >
  18 + <div class="input-group-append">
  19 + <button
  20 + ladda="searchLoading"
  21 + class="btn btn-outline-secondary"
  22 + type="button">
  23 + <i class="fa fa-search" aria-hidden="true"></i>
  24 + </button>
  25 + </div>
  26 + </div>
  27 + </div>
  28 +
3 29 </div>
4 30 <div class="modal-body" id="modal-body">
5   - <div class="input-group">
6   - <input
7   - type="text"
8   - class="form-control form-control-sm"
9   - placeholder="Busqueda"
10   - ng-model="filters"
11   - ng-change="search()"
12   - ng-keydown="busquedaDown($event.keyCode)"
13   - ng-keypress="busquedaPress($event.keyCode)"
14   - foca-focus="selectedMoneda == -1"
15   - ng-focus="selectedMoneda = -1"
16   - >
  31 + <div>
17 32 <table class="table table-striped table-sm">
18 33 <thead>
19 34 <tr>
... ... @@ -41,13 +56,17 @@
41 56 foca-focus="selectedMoneda == {{key}}"
42 57 ng-keydown="itemProducto($event.keyCode)"
43 58 >
44   - <i class="fa fa-arrow-right" aria-hidden="true"></i>
  59 + <i class="fa fa-circle-thin" aria-hidden="true"></i>
45 60 </button>
46 61 </td>
47 62 </tr>
48 63 </tbody>
49 64 </table>
50   - <nav>
  65 +
  66 + </div>
  67 +</div>
  68 +<div class="modal-footer py-1">
  69 + <nav class="mr-auto">
51 70 <ul class="pagination pagination-sm justify-content-end mb-0">
52 71 <li class="page-item" ng-class="{'disabled': currentPage == 1}">
53 72 <a class="page-link" href="javascript:void();" ng-click="selectPage(currentPage - 1)">
... ... @@ -75,8 +94,5 @@
75 94 </li>
76 95 </ul>
77 96 </nav>
78   - </div>
79   -</div>
80   -<div class="modal-footer py-1">
81 97 <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button>
82 98 </div>