Merge branch 'master' into 'master'

Master See merge request !6

Merge branch 'master' into 'master'
Master See merge request !6
Nicolás Guarnieri
2 parents 74d50e5fd3 207a9f0c2d
Showing 3 changed files Show diff stats
src/js/controllerModal.js
src/js/service.js
src/views/foca-modal.html
@@ -8,9 +8,11 @@ angular.module(&#39;focaModal&#39;)
         'columnas',
         'query',
         'titulo',
+        'size',
         function($timeout, $filter, $scope, $uibModalInstance, focaModalService,
-            columnas, query, titulo) {
+            columnas, query, titulo, size) {
  
+            $scope.size = size;
             $scope.filters = '';
             $scope.columnas = columnas;
             $scope.titulo = titulo;
@@ -41,7 +41,8 @@ angular.module(&#39;focaModal&#39;)
                         resolve: {
                             columnas: function() { return columnas; },
                             query: function() { return query; },
-                            titulo: function() {return titulo;}
+                            titulo: function() { return titulo; },
+                            size: function() { return size; }
                         }
                     })
                         .result.then(
 <div class="modal-header py-1">
     <div class="row w-100">
-        <div class="col-lg-6">
+        <div ng-class="(size == 'md') ? 'col-lg-12' : 'col-lg-6'">
             <h5 class="modal-title my-1">{{titulo}}</h5>
         </div>
-        <div class="input-group col-lg-6 pr-0 my-2">
+        <div class="input-group pr-0 my-2" ng-class="(size == 'md') ? 'col-lg-12' : 'col-lg-6'">
             <input
                 ladda="searchLoading"
                 type="text"
...	...	@@ -8,9 +8,11 @@ angular.module('focaModal')
8	8	'columnas',
9	9	'query',
10	10	'titulo',
	11	+ 'size',
11	12	function($timeout, $filter, $scope, $uibModalInstance, focaModalService,
12		- columnas, query, titulo) {
	13	+ columnas, query, titulo, size) {
13	14
	15	+ $scope.size = size;
14	16	$scope.filters = '';
15	17	$scope.columnas = columnas;
16	18	$scope.titulo = titulo;
...	...	@@ -41,7 +41,8 @@ angular.module('focaModal')
41	41	resolve: {
42	42	columnas: function() { return columnas; },
43	43	query: function() { return query; },
44		- titulo: function() {return titulo;}
	44	+ titulo: function() { return titulo; },
	45	+ size: function() { return size; }
45	46	}
46	47	})
47	48	.result.then(
1	1	<div class="modal-header py-1">
2	2	<div class="row w-100">
3		- <div class="col-lg-6">
	3	+ <div ng-class="(size == 'md') ? 'col-lg-12' : 'col-lg-6'">
4	4	<h5 class="modal-title my-1">{{titulo}}</h5>
5	5	</div>
6		- <div class="input-group col-lg-6 pr-0 my-2">
	6	+ <div class="input-group pr-0 my-2" ng-class="(size == 'md') ? 'col-lg-12' : 'col-lg-6'">
7	7	<input
8	8	ladda="searchLoading"
9	9	type="text"