From ab2da5058e68e9e567edb3b5eb0a5ff32083e609 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 17 Nov 2015 11:57:31 -0800
Subject: [PATCH] fixing issue with nav bar routing

projects, inventories, and job templates would not route to correct location
---
 .../src/main-menu/main-menu.partial.html      |  6 +++---
 awx/ui/templates/ui/index.html                | 20 -------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index 6969e8951d..42efa82ce9 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -79,7 +79,7 @@
     <!-- Non-mobile menu items -->
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         id="main_menu_projects_link"
-        href="/#/projects"
+        href="/#/projects/"
         ng-class="{'is-currentRoute' : isCurrentRoute('projects'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             PROJECTS
@@ -87,7 +87,7 @@
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         id="main_menu_inventories_link"
-        href="/#/inventories"
+        href="/#/inventories/"
         ng-class="{'is-currentRoute' : isCurrentRoute('inventories'), 'is-loggedOut' : !$root.current_user.username}">
         <span class="MainMenu-itemText">
             INVENTORIES
@@ -95,7 +95,7 @@
     </a>
     <a class="MainMenu-item MainMenu-item--notMobile MainMenu-item--left"
         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}">
         <span class="MainMenu-itemText">
             JOB TEMPLATES
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index ec9c4e8272..a67ae1cedc 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -224,26 +224,6 @@
   <div class="overlay"></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>
 <tower-footer></tower-footer>
   <script>