Commit 98e03c5eda1b331d1ca0c9a4f82c9934561f77fd

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge branch 'develop' into 'master'

Develop

See merge request !33
src/views/modal-alert.html
1 <div class="modal-header"> 1 <div class="modal-header">
2 <h4>Atención</h4> 2 <h4>Atención</h4>
3 </div> 3 </div>
4 <div class="modal-body"> 4 <div class="modal-body">
5 <p ng-bind="textoModal" class="alertRemito"> 5 <p ng-bind="textoModal" class="alert">
6 6
7 </p> 7 </p>
8 </div> 8 </div>
9 <div class="modal-footer"> 9 <div class="modal-footer">
10 <button class="btn btn-primary" ng-click="aceptar()" foca-focus="true">Aceptar</button> 10 <button class="btn btn-primary" ng-click="aceptar()" foca-focus="true">Aceptar</button>
11 </div> 11 </div>
12 12
src/views/modal-confirm.html
1 <div class="modal-header"> 1 <div class="modal-header">
2 <h4>Confirmar</h4> 2 <h4>Confirmar</h4>
3 </div> 3 </div>
4 <div class="modal-body"> 4 <div class="modal-body">
5 <p ng-bind="textoModal"> 5 <p ng-bind="textoModal" class="alert">
6 6
7 </p> 7 </p>
8 </div> 8 </div>
9 <div class="modal-footer"> 9 <div class="modal-footer">
10 <button class="btn btn-danger" ng-click="aceptar()" foca-focus="true">Aceptar</button> 10 <button class="btn btn-danger" ng-click="aceptar()" foca-focus="true">Aceptar</button>
11 <button class="btn btn-default" ng-click="cancelar()">Cancelar</button> 11 <button class="btn btn-default" ng-click="cancelar()">Cancelar</button>
12 </div> 12 </div>
13 13