From d695657711d52f423985c906c2c73b91c3476a65 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 20 Sep 2017 08:23:36 +0200 Subject: [PATCH] feat(sidebar): rename Docker to Engine (#1212) --- app/app.js | 10 +++++----- .../{docker/docker.html => engine/engine.html} | 2 +- .../dockerController.js => engine/engineController.js} | 10 +++++----- app/components/sidebar/sidebar.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) rename app/components/{docker/docker.html => engine/engine.html} (98%) rename app/components/{docker/dockerController.js => engine/engineController.js} (79%) diff --git a/app/app.js b/app/app.js index a71659b44..16cb0bc9d 100644 --- a/app/app.js +++ b/app/app.js @@ -32,7 +32,7 @@ angular.module('portainer', [ 'createSecret', 'createService', 'createVolume', - 'docker', + 'engine', 'endpoint', 'endpointAccess', 'endpoints', @@ -350,12 +350,12 @@ angular.module('portainer', [ } } }) - .state('docker', { - url: '/docker/', + .state('engine', { + url: '/engine/', views: { 'content@': { - templateUrl: 'app/components/docker/docker.html', - controller: 'DockerController' + templateUrl: 'app/components/engine/engine.html', + controller: 'EngineController' }, 'sidebar@': { templateUrl: 'app/components/sidebar/sidebar.html', diff --git a/app/components/docker/docker.html b/app/components/engine/engine.html similarity index 98% rename from app/components/docker/docker.html rename to app/components/engine/engine.html index 67aa6db5b..e81f1cdbf 100644 --- a/app/components/docker/docker.html +++ b/app/components/engine/engine.html @@ -1,6 +1,6 @@ - + diff --git a/app/components/docker/dockerController.js b/app/components/engine/engineController.js similarity index 79% rename from app/components/docker/dockerController.js rename to app/components/engine/engineController.js index 4e3a160dc..9d7c04163 100644 --- a/app/components/docker/dockerController.js +++ b/app/components/engine/engineController.js @@ -1,9 +1,7 @@ -angular.module('docker', []) -.controller('DockerController', ['$q', '$scope', 'SystemService', 'Notifications', +angular.module('engine', []) +.controller('EngineController', ['$q', '$scope', 'SystemService', 'Notifications', function ($q, $scope, SystemService, Notifications) { - $scope.info = {}; - $scope.version = {}; - + function initView() { $('#loadingViewSpinner').show(); $q.all({ @@ -15,6 +13,8 @@ function ($q, $scope, SystemService, Notifications) { $scope.info = data.info; }) .catch(function error(err) { + $scope.info = {}; + $scope.version = {}; Notifications.error('Failure', err, 'Unable to retrieve engine details'); }) .finally(function final() { diff --git a/app/components/sidebar/sidebar.html b/app/components/sidebar/sidebar.html index 79117e697..aa61d2ce5 100644 --- a/app/components/sidebar/sidebar.html +++ b/app/components/sidebar/sidebar.html @@ -50,7 +50,7 @@ Swarm