From 6f6e3d23a5407a79ba1bc03fe5c788a05aa39062 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Wed, 8 May 2013 11:46:22 -0400
Subject: [PATCH] Added static url prefix to partials and images.

---
 lib/ui/static/js/app.js        | 53 ++++++++++++++++++----------------
 lib/ui/templates/ui/index.html |  4 +--
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/lib/ui/static/js/app.js b/lib/ui/static/js/app.js
index eba7c9ac0a..65fa82674b 100644
--- a/lib/ui/static/js/app.js
+++ b/lib/ui/static/js/app.js
@@ -4,6 +4,9 @@
  * Our main application mdoule. Declare application routes and perform initialization chores.
  *
  */
+ 
+var urlPrefix = '/static/';
+ 
 angular.module('ansible', [
     'RestServices',
     'AuthService',
@@ -39,75 +42,75 @@ angular.module('ansible', [
      ])
     .config(['$routeProvider', function($routeProvider) {
         $routeProvider.
-            when('/inventories', { templateUrl: 'partials/inventories.html',
+            when('/inventories', { templateUrl: urlPrefix + 'partials/inventories.html',
                                    controller: InventoriesList }).
 
-            when('/inventories/add', { templateUrl: 'partials/inventories.html',
+            when('/inventories/add', { templateUrl: urlPrefix + 'partials/inventories.html',
                                        controller: InventoriesAdd }).
 
-            when('/inventories/:id', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:id', { templateUrl: urlPrefix + 'partials/inventories.html',
                                        controller: InventoriesEdit }).
 
-            when('/inventories/:id/hosts', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:id/hosts', { templateUrl: urlPrefix + 'partials/inventories.html',
                                              controller: HostsList }).
 
-            when('/inventories/:id/hosts/add', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:id/hosts/add', { templateUrl: urlPrefix + 'partials/inventories.html',
                                                  controller: HostsAdd }).
 
-            when('/inventories/:inventory_id/hosts/:id', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:inventory_id/hosts/:id', { templateUrl: urlPrefix + 'partials/inventories.html',
                                                            controller: HostsEdit }).
 
-            when('/inventories/:id/groups', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:id/groups', { templateUrl: urlPrefix + 'partials/inventories.html',
                                               controller: GroupsList }).
 
-            when('/inventories/:id/groups/add', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:id/groups/add', { templateUrl: urlPrefix + 'partials/inventories.html',
                                                   controller: GroupsAdd }).
 
-            when('/inventories/:inventory_id/groups/:id', { templateUrl: 'partials/inventories.html',
+            when('/inventories/:inventory_id/groups/:id', { templateUrl: urlPrefix + 'partials/inventories.html',
                                                              controller: GroupsEdit }).
 
-            when('/organizations', { templateUrl: 'partials/organizations.html',
+            when('/organizations', { templateUrl: urlPrefix + 'partials/organizations.html',
                                      controller: OrganizationsList }).
 
-            when('/organizations/add', { templateUrl: 'partials/organizations.html',
+            when('/organizations/add', { templateUrl: urlPrefix + 'partials/organizations.html',
                                          controller: OrganizationsAdd }).
 
-            when('/organizations/:id', { templateUrl: 'partials/organizations.html',
+            when('/organizations/:id', { templateUrl: urlPrefix + 'partials/organizations.html',
                                          controller: OrganizationsEdit }).
 
-            when('/organizations/:id/admins', { templateUrl: 'partials/organizations.html',
+            when('/organizations/:id/admins', { templateUrl: urlPrefix + 'partials/organizations.html',
                                                 controller: AdminsList }).
 
-            when('/organizations/:id/users', { templateUrl: 'partials/users.html',
+            when('/organizations/:id/users', { templateUrl: urlPrefix + 'partials/users.html',
                                                controller: UsersList }).
 
-            when('/organizations/:id/users/add', { templateUrl: 'partials/users.html',
+            when('/organizations/:id/users/add', { templateUrl: urlPrefix + 'partials/users.html',
                                                    controller: UsersAdd }).
 
-            when('/organizations/:organization_id/users/:id', { templateUrl: 'partials/users.html',
+            when('/organizations/:organization_id/users/:id', { templateUrl: urlPrefix + 'partials/users.html',
                                                                 controller: UsersEdit }).
 
-            when('/teams', { templateUrl: 'partials/teams.html',
+            when('/teams', { templateUrl: urlPrefix + 'partials/teams.html',
                              controller: TeamsList }).
 
-            when('/teams/add', { templateUrl: 'partials/teams.html',
+            when('/teams/add', { templateUrl: urlPrefix + 'partials/teams.html',
                                  controller: TeamsAdd }).
 
-            when('/teams/:id', { templateUrl: 'partials/teams.html',
+            when('/teams/:id', { templateUrl: urlPrefix + 'partials/teams.html',
                                  controller: TeamsEdit }).
             
-            when('/users', { templateUrl: 'partials/users.html',
+            when('/users', { templateUrl: urlPrefix + 'partials/users.html',
                              controller: UsersList }).
 
-            when('/users/add', { templateUrl: 'partials/users.html',
+            when('/users/add', { templateUrl: urlPrefix + 'partials/users.html',
                                  controller: UsersAdd }).
 
-            when('/users/:id', { templateUrl: 'partials/users.html',
+            when('/users/:id', { templateUrl: urlPrefix + 'partials/users.html',
                                  controller: UsersEdit }).
 
-            when('/login', { templateUrl: 'partials/login-dialog.html', controller: Authenticate }). 
+            when('/login', { templateUrl: urlPrefix + 'partials/login-dialog.html', controller: Authenticate }). 
 
-            when('/logout', { templateUrl: 'partials/login-dialog.html', controller: Authenticate }).
+            when('/logout', { templateUrl: urlPrefix + 'partials/login-dialog.html', controller: Authenticate }).
             
             otherwise({redirectTo: '/'});
     }])
@@ -119,7 +122,7 @@ angular.module('ansible', [
         $rootScope.$on("$routeChangeStart", function(event, next, current) {
             // Evaluate the token on each navigation request. Redirect to login page when not valid
             if (Authorization.isTokenValid() == false) {
-               if ( next.templateUrl != 'partials/login.html' ) {
+               if ( next.templateUrl != (urlPrefix + 'partials/login.html') ) {
                   $location.path('/login');
                }
             }
diff --git a/lib/ui/templates/ui/index.html b/lib/ui/templates/ui/index.html
index 784233ec0f..4e04206f03 100644
--- a/lib/ui/templates/ui/index.html
+++ b/lib/ui/templates/ui/index.html
@@ -62,7 +62,7 @@
     <div class="navbar navbar-inverse navbar-fixed-top">
        <div class="navbar-inner">
          <div class="container">
-           <a class="brand" href="#/"><img class="logo" src="img/ansibleworks-logo.png" /></a>
+           <a class="brand" href="#/"><img class="logo" src="{{ STATIC_URL }}img/ansibleworks-logo.png" /></a>
            <ul class="nav pull-right">
              <li ng-show="current_user.username != null && current_user.username != undefined">
               <a href="" ng-bind="'Hello! ' + current_user.username"></a></li>
@@ -155,7 +155,7 @@
         <a href="mailto://info@ansibleworks.com"><i class="icon-envelope"></i></a>
       </div>
       <div class="logo pull-right">
-        <a href="http://www.ansibleworks.com" target="_blank"><img src="img/ansible-logo-bw-invert.png" /></a>
+        <a href="http://www.ansibleworks.com" target="_blank"><img src="{{ STATIC_URL }}img/ansible-logo-bw-invert.png" /></a>
         <div class="tag-line">Radically simple IT orchestration.</div>
       </div>
     </div>