External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

fixing issue with nav bar routing

Browse Source 
projects, inventories, and job templates would not route to correct location
This commit is contained in:
Jared Tabor
2015-11-17 11:57:31 -08:00
parent 31ea58cc6e
commit ab2da5058e
2 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/main-menu/main-menu.partial.html
View File

@@ -79,7 +79,7 @@
<!-- Non-mobile menu items --> <!-- Non-mobile menu items -->
<a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left" <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
id="main_menu_projects_link" id="main_menu_projects_link"
href="/#/projects" href="/#/projects/"
ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}"> ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}">
<span class="MainMenu-itemText"> <span class="MainMenu-itemText">
PROJECTS PROJECTS
@@ -87,7 +87,7 @@
</a> </a>
<a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left" <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
id="main_menu_inventories_link" id="main_menu_inventories_link"
href="/#/inventories" href="/#/inventories/"
ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}"> ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}">
<span class="MainMenu-itemText"> <span class="MainMenu-itemText">
INVENTORIES INVENTORIES
@@ -95,7 +95,7 @@
</a> </a>
<a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left" <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
id="main_menu_job_templates_link" id="main_menu_job_templates_link"
href="/#/job_templates" href="/#/job_templates/"
ng-class="{'is-currentRoute' : isCurrentRoute('job_templates'), 'is-loggedOut' : !$root.current_user.username}"> ng-class="{'is-currentRoute' : isCurrentRoute('job_templates'), 'is-loggedOut' : !$root.current_user.username}">
<span class="MainMenu-itemText"> <span class="MainMenu-itemText">
JOB TEMPLATES JOB TEMPLATES

20
awx/ui/templates/ui/index.html
View File

@@ -224,26 +224,6 @@
<div class="overlay"></div> <div class="overlay"></div>
<div class="spinny"><i class="fa fa-cog fa-spin fa-2x"></i> <p>working...</p></div> <div class="spinny"><i class="fa fa-cog fa-spin fa-2x"></i> <p>working...</p></div>
<!--
<div class="navbar navbar-inverse site-footer fade-in">
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 text-left help">
<a href="https://ansibleworks.zendesk.com/anonymous_requests/new"
target="_blank"><i class="fa fa-question-circle"></i> Contact Support</a>
</div>
<div class="col-sm-6 text-center copyright">
<a href="http://www.ansible.com">Ansible Tower <span ng-bind="version"></span><br />Copyright &copy; 2014 Ansible, Inc. All rights reserved.</a>
</div>
<div class="col-sm-3">
<div class="logo">
<a href="http://www.ansible.com" target="_blank"><img src="{{ STATIC_URL }}img/tower_console_bug.png" /></a>
</div>
</div>
</div>
</div>
</div>
-->
<div class="site-footer"></div> <div class="site-footer"></div>
<tower-footer></tower-footer> <tower-footer></tower-footer>
<script> <script>