From eb3fc22626230be89a0a5b6f516cd5d6771ca1d2 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.be>
Date: Fri, 27 Jun 2014 11:34:09 +0200
Subject: [PATCH] Other fixes on navegation.

---
 app/coffee/modules/base.coffee        | 16 ++++++++++++----
 app/coffee/modules/issues/list.coffee |  1 -
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/coffee/modules/base.coffee b/app/coffee/modules/base.coffee
index 44eb43fa..26806ac3 100644
--- a/app/coffee/modules/base.coffee
+++ b/app/coffee/modules/base.coffee
@@ -48,7 +48,6 @@ class MainTaigaController extends taiga.Controller
 ## Global Page Directive
 #############################################################################
 
-
 MainTaigaDirective = ($log, $compile, $rootscope) ->
     template = _.template("""
     <h1 class="logo"><a href="" title="Home"><img src="/images/logo.png" alt="Taiga"/></a></h1>
@@ -113,6 +112,8 @@ MainTaigaDirective = ($log, $compile, $rootscope) ->
         menuDom.empty()
         menuDom.append(dom)
 
+        $el.find("nav.menu").removeClass("hidden")
+
         sectionName = targetScope.section
         menuDom.find("a.active").removeClass("active")
         menuDom.find("[data-name=#{sectionName}] > a").addClass("active")
@@ -131,11 +132,18 @@ MainTaigaDirective = ($log, $compile, $rootscope) ->
             $el.toggleClass("closed-project-nav")
             $el.toggleClass("open-project-nav")
 
-    link = ($scope, $el, $attrs, $ctrl) ->
-        $scope.$on "$viewContentLoaded", (ctx) ->
-            renderMainMenu($el, ctx.targetScope.$$childHead)
+    linkMenuNav = ($scope, $el, $attrs, $ctrl) ->
+        $el.find("nav.menu").addClass("hidden")
 
+        $scope.$on "$viewContentLoaded", (ctx) ->
+            if ctx.targetScope.$$childHead is null
+                $log.error "No scope found for render menu."
+            else
+                renderMainMenu($el, ctx.targetScope.$$childHead)
+
+    link = ($scope, $el, $attrs, $ctrl) ->
         linkProjecsNav($scope, $el, $attrs, $ctrl)
+        linkMenuNav($scope, $el, $attrs, $ctrl)
 
     return {
         controller: MainTaigaController
diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee
index 5bac3b4e..386f7259 100644
--- a/app/coffee/modules/issues/list.coffee
+++ b/app/coffee/modules/issues/list.coffee
@@ -216,7 +216,6 @@ IssuesDirective = ($log, $location) ->
                 $ctrl.selectFilter("page", pagenum)
                 $ctrl.loadIssues()
 
-
     #########################
     ## Issues Filters
     #########################