merge

client/production/src/index/index.html

@@ -4,7 +4,7 @@
     <vn-vertical pad-medium>
         <vn-horizontal vn-one margin-large-bottom class="locator-header">
             <vn-title vn-one><span translate>Finder</span></vn-title>
-            <form vn-two vn-horizontal class="filterPanel" ng-submit="$ctrl.searchTickets()">
+            <!--<form vn-two vn-horizontal class="filterPanel" ng-submit="$ctrl.searchTickets()">
                 <vn-textfield vn-one label="Filtro" model="$ctrl.filter.q"></vn-textfield>
                 <vn-icon 
                     vn-none 
@@ -14,7 +14,16 @@
                     ng-click="$ctrl.moreFilters($event)">
                 </vn-icon>
                 <vn-button vn-none pad-small-top label="Filtrar" ng-click="$ctrl.searchTickets()"></vn-button>
-            </form>
+            </form>-->
+            <vn-two>
+                <vn-searchbar vn-auto
+                    index="$ctrl"
+                    on-search="$ctrl.searchTickets($ctrl.filter)"
+                    advanced="true"
+                    search="$ctrl.filter.q"
+                    popover="vn-production-filter-panel">
+                </vn-searchbar>
+            </vn-two>
             <vn-one vn-horizontal>
                 <vn-one></vn-one>
                     <vn-autocomplete vn-two

client/salix/src/components/searchbar/searchbar.html

@@ -8,6 +8,7 @@
         icon="keyboard_arrow_down"
         style="cursor: pointer;">
     </vn-icon>
-    <vn-icon-button icon="search"></vn-icon-button>
+    <vn-button ng-if="$ctrl.label" vn-none label="{{$ctrl.label}}"></vn-button>
+    <vn-icon-button ng-if="!$ctrl.label" icon="search"></vn-icon-button>
 </vn-horizontal>
 </form>

client/salix/src/components/searchbar/searchbar.js

@@ -42,7 +42,8 @@ ngModule.component('vnSearchbar', {
         search: '=',
         onSearch: '&',
         advanced: '=',
-        popover: '@'
+        popover: '@',
+        label: '@?'
     },
     controller: Controller
 });