From 20f67f9f4a822b713b7d02ca1ed487c1b4ef8e86 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 14 Jun 2013 15:20:22 -0900 Subject: [PATCH] Add bottom status bar with version information --- css/app.css | 4 ++++ index.html | 12 ++++-------- js/app.js | 3 ++- js/controllers.js | 9 ++++++++- js/services.js | 5 +++-- partials/statusbar.html | 3 +++ 6 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 partials/statusbar.html diff --git a/css/app.css b/css/app.css index af14914a9..a70a0982e 100644 --- a/css/app.css +++ b/css/app.css @@ -92,3 +92,7 @@ .container-bottom { height: 50px; } + + .footer { + max-height:6px; + } diff --git a/index.html b/index.html index 1c0f4b445..e8da9503b 100644 --- a/index.html +++ b/index.html @@ -28,16 +28,12 @@
+
-
-
- -
-
-
-

Created by: crosbymichael

-
+
+
+
diff --git a/js/app.js b/js/app.js index 3d58e29f6..386179a67 100644 --- a/js/app.js +++ b/js/app.js @@ -12,4 +12,5 @@ angular.module('dockerui', ['dockerui.services', 'dockerui.filters']) }]) // This is your docker url that the api will use to make requests .constant('DOCKER_ENDPOINT', 'http://192.168.1.9:4243\:4243') - .constant('DOCKER_API_VERSION', '/v1.1'); + .constant('UI_VERSION', 'v0.1') + .constant('DOCKER_API_VERSION', 'v1.1'); diff --git a/js/controllers.js b/js/controllers.js index b391b748e..580b7ebb5 100644 --- a/js/controllers.js +++ b/js/controllers.js @@ -37,6 +37,13 @@ function DashboardController($scope, Container) { } +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 = []; @@ -65,7 +72,7 @@ function SettingsController($scope, Auth, System, Docker, Settings) { Auth.update( {username: $scope.auth.username, email: $scope.auth.email, password: $scope.auth.password}, function(d) { console.log(d); - setSuccessfulResponse($scope, 'Auto information updated.', '#response'); + setSuccessfulResponse($scope, 'Auth information updated.', '#response'); }, function(e) { console.log(e); setFailedResponse($scope, e.data, '#response'); diff --git a/js/services.js b/js/services.js index 3b44cfdb4..f42e2a332 100644 --- a/js/services.js +++ b/js/services.js @@ -53,11 +53,12 @@ angular.module('dockerui.services', ['ngResource']) get: {method: 'GET'} }); }) - .factory('Settings', function(DOCKER_ENDPOINT, DOCKER_API_VERSION) { + .factory('Settings', function(DOCKER_ENDPOINT, DOCKER_API_VERSION, UI_VERSION) { return { displayAll: false, endpoint: DOCKER_ENDPOINT, version: DOCKER_API_VERSION, - url: DOCKER_ENDPOINT + DOCKER_API_VERSION + url: DOCKER_ENDPOINT + '/' + DOCKER_API_VERSION, + uiVersion: UI_VERSION }; }); diff --git a/partials/statusbar.html b/partials/statusbar.html new file mode 100644 index 000000000..d4abfe6ff --- /dev/null +++ b/partials/statusbar.html @@ -0,0 +1,3 @@ +
+

Docker API Version: {{ apiVersion }} UI Version: {{ uiVersion }} Created by: crosbymichael

+