Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 18:59:41 +02:00
Code Issues Releases Activity

feat(ui): namespace access EE-3478 (#7398)

Browse source
This commit is contained in:
Dakota Walsh 2022-08-04 13:29:55 +12:00 • committed by GitHub
parent 305a949692
commit aa0f1221de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html
View file

@ -5,7 +5,7 @@
<div class="toolBar !flex-col gap-1"> <div class="toolBar !flex-col gap-1">
<div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full"> <div class="toolBar vertical-center !gap-x-5 !gap-y-1 flex-wrap !p-0 w-full">
<div class="toolBarTitle vertical-center"> <div class="toolBarTitle vertical-center">
<pr-icon icon="'box'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon> <pr-icon icon="'layers'" feather="true" class-name="'icon-nested-blue'" mode="'primary'"></pr-icon>
Namespaces Namespaces
</div> </div>
<div class="searchBar vertical-center"> <div class="searchBar vertical-center">

20
app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
View file

@ -3,9 +3,9 @@
title="'Namespace access management'" title="'Namespace access management'"
breadcrumbs="[ breadcrumbs="[
{ label:'Namespaces', link:'kubernetes.resourcePools' }, { label:'Namespaces', link:'kubernetes.resourcePools' },
{ {
label:ctrl.pool.Namespace.Name, label:ctrl.pool.Namespace.Name,
link: 'kubernetes.resourcePools.resourcePool', link: 'kubernetes.resourcePools.resourcePool',
linkParams:{id: ctrl.pool.Namespace.Name} linkParams:{id: ctrl.pool.Namespace.Name}
}, },
'Access management' 'Access management'
@ -20,12 +20,12 @@
<div class="row" ng-if="ctrl.pool"> <div class="row" ng-if="ctrl.pool">
<div class="col-sm-12"> <div class="col-sm-12">
<rd-widget> <rd-widget>
<rd-widget-header icon="fa-plug" title-text="Namespace"></rd-widget-header> <rd-widget-header icon="layers" feather-icon="true" title-text="Namespace"></rd-widget-header>
<rd-widget-body classes="no-padding"> <rd-widget-body>
<table class="table"> <table class="table">
<tbody> <tbody>
<tr> <tr>
<td>Name</td> <td class="!pl-0">Name</td>
<td> <td>
{{ ctrl.pool.Namespace.Name }} {{ ctrl.pool.Namespace.Name }}
</td> </td>
@ -40,7 +40,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<rd-widget ng-if="ctrl.availableUsersAndTeams"> <rd-widget ng-if="ctrl.availableUsersAndTeams">
<rd-widget-header icon="fa-user-lock" title-text="Create access"></rd-widget-header> <rd-widget-header icon="svg-userlock" title-text="Create access"></rd-widget-header>
<rd-widget-body> <rd-widget-body>
<form class="form-horizontal"> <form class="form-horizontal">
<div class="form-group"> <div class="form-group">
@ -48,7 +48,7 @@
<div class="col-sm-9 col-lg-4"> <div class="col-sm-9 col-lg-4">
<span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0"> <span class="small text-muted" ng-if="ctrl.availableUsersAndTeams.length === 0">
No user nor team access has been set on the environment. Head over to the No user nor team access has been set on the environment. Head over to the
<a ui-sref="portainer.endpoints.endpoint.access({id: ctrl.endpointId})">environment access view</a> to manage them. <a ui-sref="portainer.endpoints">Environments view</a> to manage them.
</span> </span>
<span <span
isteven-multi-select isteven-multi-select
@ -71,12 +71,12 @@
<div class="col-sm-12"> <div class="col-sm-12">
<button <button
type="submit" type="submit"
class="btn btn-primary btn-sm" class="btn btn-primary btn-sm !ml-0 vertical-center"
ng-disabled="(ctrl.availableUsersAndTeams | filter:{ticked:true}).length === 0 || ctrl.actionInProgress" ng-disabled="(ctrl.availableUsersAndTeams | filter:{ticked:true}).length === 0 || ctrl.actionInProgress"
ng-click="ctrl.authorizeAccess()" ng-click="ctrl.authorizeAccess()"
button-spinner="ctrl.actionInProgress" button-spinner="ctrl.actionInProgress"
> >
<span ng-hide="ctrl.state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Create access</span> <span class="vertical-center" ng-hide="ctrl.state.actionInProgress"><pr-icon icon="'plus'" feather="true" class="vertical-center"></pr-icon> Create access</span>
<span ng-show="ctrl.state.actionInProgress">Creating access...</span> <span ng-show="ctrl.state.actionInProgress">Creating access...</span>
</button> </button>
</div> </div>
@ -93,7 +93,7 @@
<access-datatable <access-datatable
ng-if="ctrl.authorizedUsersAndTeams" ng-if="ctrl.authorizedUsersAndTeams"
title-text="Access" title-text="Access"
title-icon="fa-user-lock" title-icon="svg-userlock"
table-key="kubernetes_resourcepool_access" table-key="kubernetes_resourcepool_access"
order-by="Name" order-by="Name"
dataset="ctrl.authorizedUsersAndTeams" dataset="ctrl.authorizedUsersAndTeams"