From 20b7e16ed4aebb230339a16f35add4923f3a603b Mon Sep 17 00:00:00 2001 From: Kevan Ahlquist Date: Wed, 12 Nov 2014 11:04:04 -0600 Subject: [PATCH] Move footer to its own submodule. --- app/app.js | 2 +- app/components/footer/footerController.js | 7 +++++++ {partials => app/components/footer}/statusbar.html | 0 app/components/masthead/mastheadController.js | 4 ++-- app/controllers.js | 7 ------- index.html | 3 ++- 6 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 app/components/footer/footerController.js rename {partials => app/components/footer}/statusbar.html (100%) diff --git a/app/app.js b/app/app.js index 10d2ce8ca..79226b539 100644 --- a/app/app.js +++ b/app/app.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead']) +angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer']) .config(['$routeProvider', function ($routeProvider) { $routeProvider.when('/', {templateUrl: 'partials/dashboard.html', controller: 'DashboardController'}); $routeProvider.when('/containers/', {templateUrl: 'partials/containers.html', controller: 'ContainersController'}); diff --git a/app/components/footer/footerController.js b/app/components/footer/footerController.js new file mode 100644 index 000000000..fab5e4032 --- /dev/null +++ b/app/components/footer/footerController.js @@ -0,0 +1,7 @@ +angular.module('footer', []) +.controller('FooterController', ['$scope', 'Settings', function($scope, Settings) { + $scope.template = 'app/components/footer/statusbar.html'; + + $scope.uiVersion = Settings.uiVersion; + $scope.apiVersion = Settings.version; +}]); diff --git a/partials/statusbar.html b/app/components/footer/statusbar.html similarity index 100% rename from partials/statusbar.html rename to app/components/footer/statusbar.html diff --git a/app/components/masthead/mastheadController.js b/app/components/masthead/mastheadController.js index f160ae6bc..51fe0a2d7 100644 --- a/app/components/masthead/mastheadController.js +++ b/app/components/masthead/mastheadController.js @@ -1,4 +1,4 @@ angular.module('masthead', []) -.controller('MastheadController', function($scope) { +.controller('MastheadController', ['$scope', function($scope) { $scope.template = 'app/components/masthead/masthead.html'; -}); +}]); diff --git a/app/controllers.js b/app/controllers.js index 28a04a3d9..423f25d87 100644 --- a/app/controllers.js +++ b/app/controllers.js @@ -119,13 +119,6 @@ function getChart(id) { return new Chart(ctx); } -function StatusBarController($scope, Settings) { - $scope.template = 'partials/statusbar.html'; - - $scope.uiVersion = Settings.uiVersion; - $scope.apiVersion = Settings.version; -} - function SideBarController($scope, Container, Settings) { $scope.template = 'partials/sidebar.html'; $scope.containers = []; diff --git a/index.html b/index.html index 7b3cb17b5..135b33983 100644 --- a/index.html +++ b/index.html @@ -38,6 +38,7 @@ + @@ -56,7 +57,7 @@
-
+