Fixed flex layout on Ruleset tabs

This commit is contained in:
Juanjo Jiménez 2018-06-25 09:18:32 +02:00 committed by Javier Castro
parent 858670807a
commit 11d19d1dc9
2 changed files with 30 additions and 34 deletions

View File

@ -1,31 +1,27 @@
<div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding"> <div ng-show="!loading && !viewingDetail" flex layout="column" class="md-padding">
<div id="content" layout="row" layout-align="start start"> <div id="content" layout="row" layout-align="start start">
<input flex="60" placeholder="Filter decoders..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid wz-margin-top-4 height-36" <input flex placeholder="Filter decoders..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid wz-margin-top-4 height-36"
aria-invalid="false" wz-enter="search(custom_search)"> aria-invalid="false" wz-enter="search(custom_search)">
<button type="submit" aria-label="Search" class="kuiLocalSearchButton height-36 wz-margin-top-4 wz-margin-right-16" ng-click="search(custom_search)"> <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-36 wz-margin-top-4 wz-margin-right-16" ng-click="search(custom_search)">
<span class="fa fa-search" aria-hidden="true"></span> <span class="fa fa-search" aria-hidden="true"></span>
</button> </button>
<div flex="15" layout="column" class="height-40 wz-select-input wz-margin-right-8"> <div layout="column" class="height-40 wz-select-input wz-margin-right-8">
<select flex class="kuiSelect wz-border-none cursor-pointer" ng-model="typeFilter" ng-change="onlyParents(typeFilter)" aria-label="Filter by type" ng-init="'All decoders'"> <select flex class="kuiSelect wz-border-none cursor-pointer" ng-model="typeFilter" ng-change="onlyParents(typeFilter)" aria-label="Filter by type" ng-init="'All decoders'">
<option value="all">All decoders</option> <option value="all">All decoders</option>
<option value="parents">Parent decoders</option> <option value="parents">Parent decoders</option>
</select> </select>
</div> </div>
<div flex layout="column"> <md-button ng-class="(globalRulesetTab == 'rules') ? 'active' : ''" ng-click="setRulesTab('rules')"
<md-button flex ng-class="(globalRulesetTab == 'rules') ? 'active' : ''" ng-click="setRulesTab('rules')" class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset rules button">
class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset rules button"> <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i> Rules
<i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i> Rules </md-button>
</md-button> <md-button ng-class="(globalRulesetTab == 'decoders') ? 'active' : ''" ng-click="setRulesTab('decoders')"
</div> class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset decoders button">
<div flex layout="column"> <i class="fa fa-fw fa-search" aria-hidden="true"></i> Decoders
<md-button flex ng-class="(globalRulesetTab == 'decoders') ? 'active' : ''" ng-click="setRulesTab('decoders')" </md-button>
class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset decoders button">
<i class="fa fa-fw fa-search" aria-hidden="true"></i> Decoders
</md-button>
</div>
</div> </div>
<md-chips readonly="true" ng-show="appliedFilters.length || implicitFilterFromDetail"> <md-chips readonly="true" ng-show="appliedFilters.length || implicitFilterFromDetail">
@ -44,16 +40,16 @@
<div layout="row"> <div layout="row">
<wazuh-table ng-if="implicitFilterFromDetail" <wazuh-table ng-if="implicitFilterFromDetail"
implicit-filter="implicitFilterFromDetail" implicit-filter="implicitFilterFromDetail"
flex flex
path="'/decoders'" path="'/decoders'"
keys="['name',{value:'details.program_name',size:2},{value:'details.order',size:2},'file']" keys="['name',{value:'details.program_name',size:2},{value:'details.order',size:2},'file']"
allow-click="true" allow-click="true"
rows-per-page="18"> rows-per-page="18">
</wazuh-table> </wazuh-table>
<wazuh-table ng-if="!implicitFilterFromDetail" <wazuh-table ng-if="!implicitFilterFromDetail"
flex flex
path="'/decoders'" path="'/decoders'"
keys="['name',{value:'details.program_name',size:2,nosortable:true},{value:'details.order',size:2,nosortable:true},'file']" keys="['name',{value:'details.program_name',size:2,nosortable:true},{value:'details.order',size:2,nosortable:true},'file']"
allow-click="true" allow-click="true"
rows-per-page="18"> rows-per-page="18">
</wazuh-table> </wazuh-table>

View File

@ -1,17 +1,17 @@
<div ng-if="!loading && !viewingDetail" flex layout="column" class="md-padding"> <div ng-if="!loading && !viewingDetail" flex layout="column" class="md-padding">
<div id="content" layout="row"> <div id="content" layout="row">
<input flex="80" placeholder="Filter rules..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid wz-margin-top-4 height-36"
<input flex placeholder="Filter rules..." ng-model="custom_search" type="text" class="kuiLocalSearchInput ng-empty ng-pristine ng-scope ng-touched ng-valid wz-margin-top-4 height-36"
aria-invalid="false" wz-enter="search(custom_search)"> aria-invalid="false" wz-enter="search(custom_search)">
<button type="submit" aria-label="Search" class="kuiLocalSearchButton height-36 wz-margin-top-4" ng-click="search(custom_search)"> <button type="submit" aria-label="Search" class="kuiLocalSearchButton height-36 wz-margin-top-4" ng-click="search(custom_search)">
<span class="fa fa-search" aria-hidden="true"></span> <span class="fa fa-search" aria-hidden="true"></span>
</button> </button>
<md-button ng-class="(globalRulesetTab == 'rules') ? 'active' : ''"
<md-button flex ng-class="(globalRulesetTab == 'rules') ? 'active' : ''"
ng-click="setRulesTab('rules')" class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset rules button"> ng-click="setRulesTab('rules')" class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset rules button">
<i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i> Rules <i class="fa fa-fw fa-file-text-o" aria-hidden="true"></i> Rules
</md-button> </md-button>
<md-button flex ng-class="(globalRulesetTab == 'decoders') ? 'active' : ''" <md-button ng-class="(globalRulesetTab == 'decoders') ? 'active' : ''"
ng-click="setRulesTab('decoders')" class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset decoders button"> ng-click="setRulesTab('decoders')" class="wz-button md-raised md-primary manager-ruleset-btn" aria-label="Ruleset decoders button">
<i class="fa fa-fw fa-search" aria-hidden="true"></i> Decoders <i class="fa fa-fw fa-search" aria-hidden="true"></i> Decoders
</md-button> </md-button>
@ -53,16 +53,16 @@
<div layout="row"> <div layout="row">
<wazuh-table ng-if="implicitFilterFromDetail" <wazuh-table ng-if="implicitFilterFromDetail"
implicit-filter="implicitFilterFromDetail" implicit-filter="implicitFilterFromDetail"
flex flex
path="'/rules'" path="'/rules'"
keys="['id',{value:'file',size:2},{value:'description',size:2},{value:'groups',nosortable:true,size:2},{value:'pci',nosortable:true,size:2},{value:'gdpr',nosortable:true},'level']" keys="['id',{value:'file',size:2},{value:'description',size:2},{value:'groups',nosortable:true,size:2},{value:'pci',nosortable:true,size:2},{value:'gdpr',nosortable:true},'level']"
allow-click="true" allow-click="true"
rows-per-page="18"> rows-per-page="18">
</wazuh-table> </wazuh-table>
<wazuh-table ng-if="!implicitFilterFromDetail" <wazuh-table ng-if="!implicitFilterFromDetail"
flex flex
path="'/rules'" path="'/rules'"
keys="['id',{value:'file',size:2},{value:'description',size:2},{value:'groups',nosortable:true,size:2},{value:'pci',nosortable:true,size:2},{value:'gdpr',nosortable:true},'level']" keys="['id',{value:'file',size:2},{value:'description',size:2},{value:'groups',nosortable:true,size:2},{value:'pci',nosortable:true,size:2},{value:'gdpr',nosortable:true},'level']"
allow-click="true" allow-click="true"
rows-per-page="18"> rows-per-page="18">
</wazuh-table> </wazuh-table>