github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(roles): fixed search box in the Roles page. (#7448) 

* feat(roles): fixed search box in the Roles page.

* feat(roles): fixed icon position
pull/7454/head
fhanportainer 2022-08-09 19:22:10 +12:00 committed by GitHub
parent e5b27d7a57
commit 83a17de1c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.css Normal file
View File

@ -0,0 +1,15 @@
.datatable.access-viewer-datatable .toolBar {
font-size: inherit;
}
.datatable.access-viewer-datatable .toolBar .small {
font-weight: normal;
}
.datatable.access-viewer-datatable .toolBar.pl-0 {
padding-left: 0;
}
.datatable.access-viewer-datatable .toolBar.pr-0 {
padding-right: 0;
}

33
app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
View File

@ -1,14 +1,25 @@
<div class="datatable"> <div class="datatable access-viewer-datatable">
<div class="searchBar"> <div class="toolBar vertical-center pl-0 pr-0">
<pr-icon icon="'search'" class="vertical-center" feather="true"></pr-icon> <div class="toolBarTitle vertical-center">
<input <div>
type="text" <div class="form-section-title mb-1">Access</div>
class="searchInput ml-1" <div class="vertical-center">
ng-model="$ctrl.state.textFilter" <pr-icon icon="'info'" mode="'primary'" feather="true" size="'sm'" class="vertical-center"></pr-icon>
ng-change="$ctrl.onTextFilterChange()" <span class="small text-muted"> Effective role for each environment will be displayed for the selected user </span>
placeholder="Search..." </div>
ng-model-options="{ debounce: 300 }" </div>
/> </div>
<div class="searchBar vertical-center">
<pr-icon icon="'search'" class="vertical-center" feather="true"></pr-icon>
<input
type="text"
class="searchInput ml-1"
ng-model="$ctrl.state.textFilter"
ng-change="$ctrl.onTextFilterChange()"
placeholder="Search..."
ng-model-options="{ debounce: 300 }"
/>
</div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover nowrap-cells"> <table class="table table-hover nowrap-cells">

2
app/portainer/rbac/components/access-viewer/access-viewer-datatable/index.js
View File

@ -1,3 +1,5 @@
import './access-viewer-datatable.css';
export const accessViewerDatatable = { export const accessViewerDatatable = {
templateUrl: './access-viewer-datatable.html', templateUrl: './access-viewer-datatable.html',
controller: 'GenericDatatableController', controller: 'GenericDatatableController',

8
app/portainer/rbac/components/access-viewer/access-viewer.html
View File

@ -22,14 +22,6 @@
</ui-select> </ui-select>
</div> </div>
</div> </div>
<div class="col-sm-12 form-section-title"> Access </div>
<div>
<div class="small text-muted vertical-center" style="margin-bottom: 15px">
<pr-icon icon="'info'" mode="'primary'" feather="true" size="'sm'" class="vertical-center"></pr-icon>
Effective role for each environment will be displayed for the selected user
</div>
</div>
<access-viewer-datatable table-key="access_viewer" dataset="$ctrl.userRoles" order-by="EndpointName" is-admin="$ctrl.isAdmin"> </access-viewer-datatable> <access-viewer-datatable table-key="access_viewer" dataset="$ctrl.userRoles" order-by="EndpointName" is-admin="$ctrl.isAdmin"> </access-viewer-datatable>
</form> </form>
</rd-widget-body> </rd-widget-body>

26
app/portainer/rbac/components/roles-datatable/roles-datatable.html
View File

@ -1,22 +1,22 @@
<div class="datatable"> <div class="datatable">
<rd-widget> <rd-widget>
<rd-widget-body classes="no-padding"> <rd-widget-body classes="no-padding">
<div class="toolBar"> <div class="toolBar vertical-center">
<div class="toolBarTitle vertical-center"> <div class="toolBarTitle vertical-center">
<pr-icon icon="$ctrl.titleIcon" feather="true" class="vertical-center" class-name="'icon-white icon-primary icon-nested-blue'"></pr-icon>{{ $ctrl.titleText }} <pr-icon icon="$ctrl.titleIcon" feather="true" class="vertical-center" class-name="'icon-white icon-primary icon-nested-blue'"></pr-icon>{{ $ctrl.titleText }}
</div> </div>
</div> <div class="searchBar vertical-center">
<div class="searchBar"> <pr-icon icon="'search'" class="vertical-center" feather="true"></pr-icon>
<pr-icon icon="'search'" class="vertical-center" feather="true"></pr-icon> <input
<input type="text"
type="text" class="searchInput ml-1"
class="searchInput ml-1" ng-model="$ctrl.state.textFilter"
ng-model="$ctrl.state.textFilter" ng-change="$ctrl.onTextFilterChange()"
ng-change="$ctrl.onTextFilterChange()" placeholder="Search..."
placeholder="Search..." auto-focus
auto-focus ng-model-options="{ debounce: 300 }"
ng-model-options="{ debounce: 300 }" />
/> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover nowrap-cells"> <table class="table table-hover nowrap-cells">