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

fix(UI) Update docker container inspect,log,stats,console,attach pages EE-3492 (#7307)

Browse source 
* EE-3492 update docker container inspect,log,stats,console,attach pages

* EE-3492 bug fixing

* EE-3492 replace chart bar icon

* EE-3492 bug fix

* Update resourcePoolsDatatable.html

* Update resourcePoolsDatatable.html
This commit is contained in:
Rex Wang 2022-07-25 11:03:22 +08:00 • committed by GitHub
parent 7ee8dac832
commit 3356d1abe2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 99 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/portainer/access-control/AccessControlPanel/AccessControlPanel.tsx
View file

@ -1,6 +1,7 @@
import { useReducer } from 'react';
import { useUser } from '@/portainer/hooks/useUser';
import { Icon } from '@/react/components/Icon';
import { r2a } from '@/react-tools/react2angular';
import { TeamMembership, Role } from '@/portainer/teams/types';
import { useUserMembership } from '@/portainer/users/queries';
@ -57,7 +58,7 @@ export function AccessControlPanel({
<div className="row">
<div>
<Button color="link" onClick={toggleEditMode}>
<i className="fa fa-edit space-right" aria-hidden="true" />
<Icon icon="edit" className="space-right" feather />
Change ownership
</Button>
</div>

2
app/portainer/components/datatables/groups-datatable/groupsDatatable.html
View file

@ -62,7 +62,7 @@
<a ui-sref="portainer.groups.group({id: item.Id})">{{ item.Name }}</a>
</td>
<td>
<a ui-sref="portainer.groups.group.access({id: item.Id})"> <i class="fa fa-users" aria-hidden="true"></i> Manage access </a>
<a ui-sref="portainer.groups.group.access({id: item.Id})"> <pr-icon icon="'users'" feather="true"></pr-icon> Manage access </a>
</td>
</tr>
<tr ng-if="!$ctrl.dataset">

8
app/portainer/components/datatables/registries-datatable/registriesDatatable.html
View file

@ -13,10 +13,10 @@
class="searchInput"
ng-model="$ctrl.state.textFilter"
ng-change="$ctrl.onTextFilterChange()"
placeholder="Search..."
placeholder="Search for a registry..."
auto-focus
ng-model-options="{ debounce: 300 }"
data-cy="volume-searchInput"
data-cy="registry-searchInput"
/>
</div>
<div class="actionBar !gap-3" ng-if="$ctrl.isAdmin">
@ -89,9 +89,9 @@
{{ item.URL }}
</td>
<td>
<a ng-if="$ctrl.canManageAccess(item)" ng-click="$ctrl.redirectToManageAccess(item)"> <i class="fa fa-users" aria-hidden="true"></i> Manage access </a>
<a ng-if="$ctrl.canManageAccess(item)" ng-click="$ctrl.redirectToManageAccess(item)"> <pr-icon icon="'users'" feather="true"></pr-icon> Manage access </a>
<be-feature-indicator feature="$ctrl.limitedFeature" ng-if="$ctrl.canBrowse(item)">
<span class="text-muted space-left" style="padding-right: 5px"> <i class="fa fa-search" aria-hidden="true"></i> Browse</span>
<span class="text-muted space-left" style="padding-right: 5px"> <pr-icon icon="'search'" feather="true"></pr-icon> Browse </span>
</be-feature-indicator>
<span ng-if="!$ctrl.canBrowse(item) && !$ctrl.canManageAccess(item)"> - </span>

4
app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html
View file

@ -34,10 +34,10 @@
>{{ item.TeamName ? 'Team' : 'User' }} <code ng-if="item.TeamName">{{ item.TeamName }}</code> access defined on {{ item.AccessLocation }}
<code ng-if="item.GroupName">{{ item.GroupName }}</code>
<a ng-if="!item.GroupName && $ctrl.isAdmin" ui-sref="portainer.endpoints.endpoint.access({id: item.EndpointId})"
><i style="margin-left: 5px" class="fa fa-users" aria-hidden="true"></i> Manage access
><pr-icon icon="'users'" feather="true"></pr-icon> Manage access
</a>
<a ng-if="item.GroupName && $ctrl.isAdmin" ui-sref="portainer.groups.group.access({id: item.GroupId})"
><i style="margin-left: 5px" class="fa fa-users" aria-hidden="true"></i> Manage access
><pr-icon icon="'users'" feather="true"></pr-icon> Manage access
</a>
</td>
</tr>