From 2113da56fa1a6d0c7d4b68ec4fc6778be6d95dce Mon Sep 17 00:00:00 2001 From: Chaim Lando Date: Wed, 5 Sep 2018 10:13:33 +0300 Subject: [PATCH] feat(engine-details): replace engine view with host view --- app/docker/__module.js | 11 +++++------ .../dockerSidebarContent/dockerSidebarContent.html | 2 +- .../views/{engine/engine.html => host/host.html} | 2 +- app/docker/views/host/host.js | 4 ++++ .../engineController.js => host/hostController.js} | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) rename app/docker/views/{engine/engine.html => host/host.html} (97%) create mode 100644 app/docker/views/host/host.js rename app/docker/views/{engine/engineController.js => host/hostController.js} (86%) diff --git a/app/docker/__module.js b/app/docker/__module.js index ffd451fbd..e3f1cd3b6 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -129,13 +129,12 @@ angular.module('portainer.docker', ['portainer.app']) } }; - var engine = { - name: 'docker.engine', - url: '/engine', + var host = { + name: 'docker.host', + url: '/host', views: { 'content@': { - templateUrl: 'app/docker/views/engine/engine.html', - controller: 'EngineController' + component: 'hostView' } } }; @@ -428,7 +427,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(containerStats); $stateRegistryProvider.register(docker); $stateRegistryProvider.register(dashboard); - $stateRegistryProvider.register(engine); + $stateRegistryProvider.register(host); $stateRegistryProvider.register(events); $stateRegistryProvider.register(images); $stateRegistryProvider.register(image); diff --git a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html index 870c959ed..2e0eeb497 100644 --- a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html +++ b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html @@ -35,5 +35,5 @@ Swarm diff --git a/app/docker/views/engine/engine.html b/app/docker/views/host/host.html similarity index 97% rename from app/docker/views/engine/engine.html rename to app/docker/views/host/host.html index 73b1248b2..64eea8833 100644 --- a/app/docker/views/engine/engine.html +++ b/app/docker/views/host/host.html @@ -1,6 +1,6 @@ - + diff --git a/app/docker/views/host/host.js b/app/docker/views/host/host.js new file mode 100644 index 000000000..44c481189 --- /dev/null +++ b/app/docker/views/host/host.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('hostView', { + templateUrl: 'app/docker/views/host/host.html', + controller: 'HostController' +}); diff --git a/app/docker/views/engine/engineController.js b/app/docker/views/host/hostController.js similarity index 86% rename from app/docker/views/engine/engineController.js rename to app/docker/views/host/hostController.js index f106273a5..14b6405b4 100644 --- a/app/docker/views/engine/engineController.js +++ b/app/docker/views/host/hostController.js @@ -1,5 +1,5 @@ angular.module('portainer.docker') -.controller('EngineController', ['$q', '$scope', 'SystemService', 'Notifications', +.controller('HostController', ['$q', '$scope', 'SystemService', 'Notifications', function ($q, $scope, SystemService, Notifications) { function initView() {