External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added static url prefix to partials and images.

Browse Source
This commit is contained in:
Chris Church
2013-05-08 11:46:22 -04:00
parent eff2e65c9a
commit 6f6e3d23a5
2 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
lib/ui/static/js/app.js
View File

@@ -4,6 +4,9 @@
* Our main application mdoule. Declare application routes and perform initialization chores. * Our main application mdoule. Declare application routes and perform initialization chores.
* *
*/ */
var urlPrefix = '/static/';
angular.module('ansible', [ angular.module('ansible', [
'RestServices', 'RestServices',
'AuthService', 'AuthService',
@@ -39,75 +42,75 @@ angular.module('ansible', [
]) ])
.config(['$routeProvider', function($routeProvider) { .config(['$routeProvider', function($routeProvider) {
$routeProvider. $routeProvider.
when('/inventories', { templateUrl: 'partials/inventories.html', when('/inventories', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: InventoriesList }). controller: InventoriesList }).
when('/inventories/add', { templateUrl: 'partials/inventories.html', when('/inventories/add', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: InventoriesAdd }). controller: InventoriesAdd }).
when('/inventories/:id', { templateUrl: 'partials/inventories.html', when('/inventories/:id', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: InventoriesEdit }). controller: InventoriesEdit }).
when('/inventories/:id/hosts', { templateUrl: 'partials/inventories.html', when('/inventories/:id/hosts', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: HostsList }). controller: HostsList }).
when('/inventories/:id/hosts/add', { templateUrl: 'partials/inventories.html', when('/inventories/:id/hosts/add', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: HostsAdd }). 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 }). controller: HostsEdit }).
when('/inventories/:id/groups', { templateUrl: 'partials/inventories.html', when('/inventories/:id/groups', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: GroupsList }). controller: GroupsList }).
when('/inventories/:id/groups/add', { templateUrl: 'partials/inventories.html', when('/inventories/:id/groups/add', { templateUrl: urlPrefix + 'partials/inventories.html',
controller: GroupsAdd }). 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 }). controller: GroupsEdit }).
when('/organizations', { templateUrl: 'partials/organizations.html', when('/organizations', { templateUrl: urlPrefix + 'partials/organizations.html',
controller: OrganizationsList }). controller: OrganizationsList }).
when('/organizations/add', { templateUrl: 'partials/organizations.html', when('/organizations/add', { templateUrl: urlPrefix + 'partials/organizations.html',
controller: OrganizationsAdd }). controller: OrganizationsAdd }).
when('/organizations/:id', { templateUrl: 'partials/organizations.html', when('/organizations/:id', { templateUrl: urlPrefix + 'partials/organizations.html',
controller: OrganizationsEdit }). controller: OrganizationsEdit }).
when('/organizations/:id/admins', { templateUrl: 'partials/organizations.html', when('/organizations/:id/admins', { templateUrl: urlPrefix + 'partials/organizations.html',
controller: AdminsList }). controller: AdminsList }).
when('/organizations/:id/users', { templateUrl: 'partials/users.html', when('/organizations/:id/users', { templateUrl: urlPrefix + 'partials/users.html',
controller: UsersList }). controller: UsersList }).
when('/organizations/:id/users/add', { templateUrl: 'partials/users.html', when('/organizations/:id/users/add', { templateUrl: urlPrefix + 'partials/users.html',
controller: UsersAdd }). 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 }). controller: UsersEdit }).
when('/teams', { templateUrl: 'partials/teams.html', when('/teams', { templateUrl: urlPrefix + 'partials/teams.html',
controller: TeamsList }). controller: TeamsList }).
when('/teams/add', { templateUrl: 'partials/teams.html', when('/teams/add', { templateUrl: urlPrefix + 'partials/teams.html',
controller: TeamsAdd }). controller: TeamsAdd }).
when('/teams/:id', { templateUrl: 'partials/teams.html', when('/teams/:id', { templateUrl: urlPrefix + 'partials/teams.html',
controller: TeamsEdit }). controller: TeamsEdit }).
when('/users', { templateUrl: 'partials/users.html', when('/users', { templateUrl: urlPrefix + 'partials/users.html',
controller: UsersList }). controller: UsersList }).
when('/users/add', { templateUrl: 'partials/users.html', when('/users/add', { templateUrl: urlPrefix + 'partials/users.html',
controller: UsersAdd }). controller: UsersAdd }).
when('/users/:id', { templateUrl: 'partials/users.html', when('/users/:id', { templateUrl: urlPrefix + 'partials/users.html',
controller: UsersEdit }). 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: '/'}); otherwise({redirectTo: '/'});
}]) }])
@@ -119,7 +122,7 @@ angular.module('ansible', [
$rootScope.$on("$routeChangeStart", function(event, next, current) { $rootScope.$on("$routeChangeStart", function(event, next, current) {
// Evaluate the token on each navigation request. Redirect to login page when not valid // Evaluate the token on each navigation request. Redirect to login page when not valid
if (Authorization.isTokenValid() == false) { if (Authorization.isTokenValid() == false) {
if ( next.templateUrl != 'partials/login.html' ) { if ( next.templateUrl != (urlPrefix + 'partials/login.html') ) {
$location.path('/login'); $location.path('/login');
} }
} }

4
lib/ui/templates/ui/index.html
View File

@@ -62,7 +62,7 @@
<div class="navbar navbar-inverse navbar-fixed-top"> <div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <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"> <ul class="nav pull-right">
<li ng-show="current_user.username != null && current_user.username != undefined"> <li ng-show="current_user.username != null && current_user.username != undefined">
<a href="" ng-bind="'Hello! ' + current_user.username"></a></li> <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> <a href="mailto://info@ansibleworks.com"><i class="icon-envelope"></i></a>
</div> </div>
<div class="logo pull-right"> <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 class="tag-line">Radically simple IT orchestration.</div>
</div> </div>
</div> </div>