From 4ffb57b249d4cb5c5cf2b88a2a5196ce8d0df2b4 Mon Sep 17 00:00:00 2001
From: Eike Cochu <eike@cochu.com>
Date: Wed, 17 Feb 2016 20:50:35 +0100
Subject: [PATCH] fixed active menu links for subroutes, added root controller
---
vipra-ui/app/index.html | 8 ++++----
vipra-ui/app/js/controllers.js | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/vipra-ui/app/index.html b/vipra-ui/app/index.html
index 215b50a1..8c4471f6 100644
--- a/vipra-ui/app/index.html
+++ b/vipra-ui/app/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en" ng-app="vipra.app">
+<html lang="en" ng-app="vipra.app" ng-controller="RootController">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -51,9 +51,9 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="vipra-navbar-collapse-1">
<ul class="nav navbar-nav">
- <li ui-sref-active="active"><a ui-sref="articles.index">Articles</a></li>
- <li ui-sref-active="active"><a ui-sref="topics.index">Topics</a></li>
- <li ui-sref-active="active"><a ui-sref="words.index">Words</a></li>
+ <li ng-class="{active:$state.includes('articles')}"><a ui-sref="articles.index">Articles</a></li>
+ <li ng-class="{active:$state.includes('topics')}"><a ui-sref="topics.index">Topics</a></li>
+ <li ng-class="{active:$state.includes('words')}"><a ui-sref="words.index">Words</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
diff --git a/vipra-ui/app/js/controllers.js b/vipra-ui/app/js/controllers.js
index f8a5cd6b..cdbd83dd 100644
--- a/vipra-ui/app/js/controllers.js
+++ b/vipra-ui/app/js/controllers.js
@@ -14,6 +14,10 @@
pageSize = 100,
paginationPadding = 4;
+ app.controller('RootController', ['$scope', '$state', function($scope, $state) {
+ $scope.$state = $state;
+ }]);
+
/**
* Index controller
*/
--
GitLab