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

feat(k8s/sidebar): relocate setup entry as a sub-entry (#4192)

pull/4195/head
Anthony Lapenna 2020-08-11 12:39:01 +12:00 committed by GitHub
parent 6720c31aa9
commit a3925c3371
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html
View File

@ -15,7 +15,7 @@
</li> </li>
<li class="sidebar-list"> <li class="sidebar-list">
<a ui-sref="kubernetes.cluster({endpointId: $ctrl.endpointId})" ui-sref-active="active">Cluster <span class="menu-icon fa fa-server fa-fw"></span></a> <a ui-sref="kubernetes.cluster({endpointId: $ctrl.endpointId})" ui-sref-active="active">Cluster <span class="menu-icon fa fa-server fa-fw"></span></a>
</li> <div class="sidebar-sublist" ng-if="$ctrl.adminAccess && ($ctrl.currentState === 'kubernetes.cluster' || $ctrl.currentState === 'portainer.endpoints.endpoint.kubernetesConfig')">
<li class="sidebar-list" ng-if="$ctrl.adminAccess"> <a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpointId})">Setup</a>
<a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpointId})">Setup <span class="menu-icon fa fa-cog fa-fw"></span></a> </div>
</li> </li>

1
app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.js
View File

@ -3,5 +3,6 @@ angular.module('portainer.kubernetes').component('kubernetesSidebarContent', {
bindings: { bindings: {
adminAccess: '<', adminAccess: '<',
endpointId: '<', endpointId: '<',
currentState: '<',
}, },
}); });

3
app/portainer/views/sidebar/sidebar.html
View File

@ -17,6 +17,7 @@
ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider === 'KUBERNETES'" ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider === 'KUBERNETES'"
admin-access="isAdmin" admin-access="isAdmin"
endpoint-id="endpointId" endpoint-id="endpointId"
current-state="$state.current.name"
> >
</kubernetes-sidebar-content> </kubernetes-sidebar-content>
<azure-sidebar-content ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider === 'AZURE'" endpoint-id="endpointId"> </azure-sidebar-content> <azure-sidebar-content ng-if="applicationState.endpoint.mode && applicationState.endpoint.mode.provider === 'AZURE'" endpoint-id="endpointId"> </azure-sidebar-content>
@ -156,6 +157,7 @@
$state.current.name === 'portainer.endpoints.endpoint' || $state.current.name === 'portainer.endpoints.endpoint' ||
$state.current.name === 'portainer.endpoints.new' || $state.current.name === 'portainer.endpoints.new' ||
$state.current.name === 'portainer.endpoints.endpoint.access' || $state.current.name === 'portainer.endpoints.endpoint.access' ||
$state.current.name === 'portainer.endpoints.endpoint.kubernetesConfig' ||
$state.current.name === 'portainer.groups' || $state.current.name === 'portainer.groups' ||
$state.current.name === 'portainer.groups.group' || $state.current.name === 'portainer.groups.group' ||
$state.current.name === 'portainer.groups.group.access' || $state.current.name === 'portainer.groups.group.access' ||
@ -173,6 +175,7 @@
$state.current.name === 'portainer.endpoints.endpoint' || $state.current.name === 'portainer.endpoints.endpoint' ||
$state.current.name === 'portainer.endpoints.new' || $state.current.name === 'portainer.endpoints.new' ||
$state.current.name === 'portainer.endpoints.endpoint.access' || $state.current.name === 'portainer.endpoints.endpoint.access' ||
$state.current.name === 'portainer.endpoints.endpoint.kubernetesConfig' ||
$state.current.name === 'portainer.groups' || $state.current.name === 'portainer.groups' ||
$state.current.name === 'portainer.groups.group' || $state.current.name === 'portainer.groups.group' ||
$state.current.name === 'portainer.groups.group.access' || $state.current.name === 'portainer.groups.group.access' ||