Fixes #18

QutEcoacoustics · Dec 6, 2013 · 7480469 · 7480469
1 parent 149ca86
commit 7480469
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/app/navigation/navigation.tpl.html b/src/app/navigation/navigation.tpl.html
@@ -1,6 +1,6 @@
 <ul class="breadcrumb">
     <li ng-repeat="breadcrumb in breadcrumbs.getAll()" ng-class="{ active: $last }">
-        <a ng-if="!$last" ng-href="{{breadcrumb.path}}">{{breadcrumb.title}}</a>
+        <a ng-if="!$last" target="{{breadcrumb.target}}" ng-href="{{breadcrumb.path}}">{{breadcrumb.title}}</a>
         <span ng-if="$last">{{breadcrumb.title}}</span>
     </li>
 </ul>

diff --git a/src/components/services/services.js b/src/components/services/services.js
@@ -223,7 +223,7 @@
     }]);
 
     // breadcrumbs - from https://github.com/angular-app/angular-app/blob/master/client/src/common/services/breadcrumbs.js
-    bawss.factory('breadcrumbs', ['$rootScope', '$location', '$route', '$routeParams', function ($rootScope, $location, $route, $routeParams) {
+    bawss.factory('breadcrumbs', ['$rootScope', '$location', '$route', '$routeParams',  'conf.paths', function ($rootScope, $location, $route, $routeParams, paths) {
 
         var breadcrumbs = [];
         var breadcrumbsService = {};
@@ -304,7 +304,7 @@
             }
 
             // add home as first item in result array
-            result.unshift({name: 'Home', path: '/', title: 'Home'});
+            result.unshift({name: 'Home', path: paths.api.root, title: 'Home', target: "_self"});
 
             breadcrumbs = result;
         });

diff --git a/src/index.html b/src/index.html
@@ -29,12 +29,12 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" ng-href="{{paths.api.links.homeAbsolute}}">Bioacoustics Workbench</a>
+            <a class="navbar-brand" ng-href="{{paths.api.links.homeAbsolute}}" target="_self">Bioacoustics Workbench</a>
         </div>
 
         <div class="collapse navbar-collapse">
             <ul class="nav navbar-nav">
-                <li ng-class="{ active: $location.path().indexOf('/projects') != -1}"><a ng-href="{{paths.api.links.projectsAbsolute}}">Projects</a></li>
+                <li ng-class="{ active: $location.path().indexOf('/projects') != -1}"><a ng-href="{{paths.api.links.projectsAbsolute}}"  target="_self">Projects</a></li>
                 <li ng-class="{ active: $location.path().indexOf('/listen') != -1}"><a href="/listen/">Listen</a></li>
                 <li ng-class="{ active: $location.path().indexOf('/bird') != -1}"><a href="/birdWalks">Bird Walks</a></li>