Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

feat(ux): always display search bar in datatables (#2034)

Browse source
This commit is contained in:
Anthony Lapenna 2018-07-11 16:18:44 +02:00 • committed by GitHub
parent b6792461a4
commit cdf79c731b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 66 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html
View file

@ -5,13 +5,8 @@
<div class="toolBarTitle">
<i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
</div>
<div class="settings">
<span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
<i class="fa fa-search" aria-hidden="true"></i> Search
</span>
</div>
</div>
<div class="searchBar" ng-if="$ctrl.state.displayTextFilter">
<div class="searchBar">
<i class="fa fa-search searchIcon" aria-hidden="true"></i>
<input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus>
</div>

3
app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.js
View file

@ -7,7 +7,6 @@ angular.module('extension.storidge').component('storidgeClusterEventsDatatable',
dataset: '<',
tableKey: '@',
orderBy: '@',
reverseOrder: '<',
showTextFilter: '<'
reverseOrder: '<'
}
});

7
app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
View file

@ -5,13 +5,8 @@
<div class="toolBarTitle">
<i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
</div>
<div class="settings">
<span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
<i class="fa fa-search" aria-hidden="true"></i> Search
</span>
</div>
</div>
<div class="searchBar" ng-if="$ctrl.state.displayTextFilter">
<div class="searchBar">
<i class="fa fa-search searchIcon" aria-hidden="true"></i>
<input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus>
</div>

3
app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js
View file

@ -7,7 +7,6 @@ angular.module('extension.storidge').component('storidgeNodesDatatable', {
dataset: '<',
tableKey: '@',
orderBy: '@',
reverseOrder: '<',
showTextFilter: '<'
reverseOrder: '<'
}
});

7
app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html
View file

@ -5,11 +5,6 @@
<div class="toolBarTitle">
<i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }}
</div>
<div class="settings">
<span class="setting" ng-class="{ 'setting-active': $ctrl.state.displayTextFilter }" ng-click="$ctrl.updateDisplayTextFilter()" ng-if="$ctrl.showTextFilter">
<i class="fa fa-search" aria-hidden="true"></i> Search
</span>
</div>
</div>
<div class="actionBar">
<button type="button" class="btn btn-sm btn-danger"
@ -17,7 +12,7 @@
<i class="fa fa-trash-alt space-right" aria-hidden="true"></i>Remove
</button>
</div>
<div class="searchBar" ng-if="$ctrl.state.displayTextFilter">
<div class="searchBar">
<i class="fa fa-search searchIcon" aria-hidden="true"></i>
<input type="text" class="searchInput" ng-model="$ctrl.state.textFilter" placeholder="Search..." auto-focus>
</div>

1
app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js
View file

@ -8,7 +8,6 @@ angular.module('extension.storidge').component('storidgeProfilesDatatable', {
tableKey: '@',
orderBy: '@',
reverseOrder: '<',
showTextFilter: '<',
removeAction: '<'
}
});

2
app/extensions/storidge/views/cluster/cluster.html
View file

@ -57,7 +57,7 @@
<storidge-nodes-datatable
title-text="Storage nodes" title-icon="fa-object-group"
dataset="clusterNodes" table-key="storidge_nodes"
order-by="Name" show-text-filter="true"
order-by="Name"
></storidge-nodes-datatable>
</div>
</div>

2
app/extensions/storidge/views/monitor/monitor.html
View file

@ -116,7 +116,7 @@
<storidge-cluster-events-datatable
title-text="Cluster events" title-icon="fa-history"
dataset="events" table-key="storidge_cluster_events"
order-by="Time" show-text-filter="true" reverse-order="true"
order-by="Time" reverse-order="true"
></storidge-cluster-events-datatable>
</div>
</div>

2
app/extensions/storidge/views/profiles/profiles.html
View file

@ -51,7 +51,7 @@
<storidge-profiles-datatable
title-text="Profiles" title-icon="fa-sticky-note"
dataset="profiles" table-key="storidge_profiles"
order-by="Name" show-text-filter="true"
order-by="Name"
remove-action="removeAction"
></storidge-profiles-datatable>
</div>