From 1a11d7bb3a4aa72a261ecbf7c62c0208f9e0d198 Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosby.michael@gmail.com>
Date: Mon, 10 Jun 2013 15:10:43 -0900
Subject: [PATCH] Add api version

---
 js/app.js              |  3 ++-
 js/controllers.js      |  2 ++
 js/services.js         | 26 ++++++++++++++------------
 partials/settings.html |  9 +++++----
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/js/app.js b/js/app.js
index f0d03aa45..dd4a786e8 100644
--- a/js/app.js
+++ b/js/app.js
@@ -11,4 +11,5 @@ angular.module('dockerui', ['dockerui.services', 'dockerui.filters'])
         $routeProvider.otherwise({redirectTo: '/'});
     }])
     // 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_ENDPOINT', 'http://192.168.1.9:4243\:4243')
+    .constant('DOCKER_API_VERSION', '/v1.1');
diff --git a/js/controllers.js b/js/controllers.js
index 362d097b0..06a57e5a1 100644
--- a/js/controllers.js
+++ b/js/controllers.js
@@ -42,6 +42,8 @@ function SettingsController($scope, Auth, System, Docker, Settings) {
     $scope.auth = {};
     $scope.info = {};
     $scope.docker = {};
+    $scope.endpoint = Settings.endpoint;
+    $scope.apiVersion = Settings.version;
 
     $('#response').hide();
     $scope.alertClass = 'block';
diff --git a/js/services.js b/js/services.js
index 27b0bfa5e..3b44cfdb4 100644
--- a/js/services.js
+++ b/js/services.js
@@ -1,10 +1,10 @@
 'use strict';
 
 angular.module('dockerui.services', ['ngResource'])
-    .factory('Container', function($resource, DOCKER_ENDPOINT) {
+    .factory('Container', function($resource, Settings) {
         // Resource for interacting with the docker containers
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#containers
-        return $resource(DOCKER_ENDPOINT + '/containers/:id/:action', {}, {
+        return $resource(Settings.url + '/containers/:id/:action', {}, {
             query: {method: 'GET', params:{ all: 0, action: 'json'}, isArray: true},
             get :{method: 'GET', params: { action:'json'}},
             start: {method: 'POST', params: {id: '@id', action: 'start'}},
@@ -16,10 +16,10 @@ angular.module('dockerui.services', ['ngResource'])
             remove :{method: 'DELETE', params: {id: '@id', v:0}}
         });
     })
-    .factory('Image', function($resource, DOCKER_ENDPOINT) {
+    .factory('Image', function($resource, Settings) {
         // Resource for docker images
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#images
-        return $resource(DOCKER_ENDPOINT + '/images/:id/:action', {}, {
+        return $resource(Settings.url + '/images/:id/:action', {}, {
             query: {method: 'GET', params:{ all: 0, action: 'json'}, isArray: true},
             get :{method: 'GET', params: { action:'json'}},
             search :{method: 'GET', params: { action:'search'}},
@@ -31,31 +31,33 @@ angular.module('dockerui.services', ['ngResource'])
             delete :{id: '@id', method: 'DELETE'}
         });
     })
-    .factory('Docker', function($resource, DOCKER_ENDPOINT) {
+    .factory('Docker', function($resource, Settings) {
         // Information for docker
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#display-system-wide-information
-        return $resource(DOCKER_ENDPOINT + '/version', {}, {
+        return $resource(Settings.url + '/version', {}, {
             get: {method: 'GET'}
         });
     })
-    .factory('Auth', function($resource, DOCKER_ENDPOINT) {
+    .factory('Auth', function($resource, Settings) {
         // Auto Information for docker
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#set-auth-configuration
-        return $resource(DOCKER_ENDPOINT + '/auth', {}, {
+        return $resource(Settings.url + '/auth', {}, {
             get: {method: 'GET'},
             update: {method: 'POST'}
         });
     })
-    .factory('System', function($resource, DOCKER_ENDPOINT) {
+    .factory('System', function($resource, Settings) {
         // System for docker
         // http://docs.docker.io/en/latest/api/docker_remote_api.html#display-system-wide-information
-        return $resource(DOCKER_ENDPOINT + '/info', {}, {
+        return $resource(Settings.url + '/info', {}, {
             get: {method: 'GET'}
         });
     })
-    .factory('Settings', function(DOCKER_ENDPOINT) {
+    .factory('Settings', function(DOCKER_ENDPOINT, DOCKER_API_VERSION) {
         return {
             displayAll: false,
-            endpoint: DOCKER_ENDPOINT 
+            endpoint: DOCKER_ENDPOINT,
+            version: DOCKER_API_VERSION,
+            url: DOCKER_ENDPOINT + DOCKER_API_VERSION
         };    
     });
diff --git a/partials/settings.html b/partials/settings.html
index a1121db7e..122ee5855 100644
--- a/partials/settings.html
+++ b/partials/settings.html
@@ -6,10 +6,11 @@
     <h3>Docker Information</h3>
     <div>
         <p class="lead">
-            <strong>Endpoint</strong>{{ endpoint }}<br />
-            <strong>Version</strong>{{ docker.Version }}<br />
-            <strong>GitCommit</strong>{{ docker.GitCommit }}<br />
-            <strong>GoVersion</strong>{{ docker.GoVersion }}<br />
+            <strong>Endpoint: </strong>{{ endpoint }}<br />
+            <strong>Api Version: </strong>{{ apiVersion }}<br />
+            <strong>Version: </strong>{{ docker.Version }}<br />
+            <strong>Git Commit: </strong>{{ docker.GitCommit }}<br />
+            <strong>Go Version: </strong>{{ docker.GoVersion }}<br />
         </p>
     </div>