From 1b3d3b00faddc0ed984194cc582a0a554ef2ea5e Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 30 Jul 2014 14:12:47 +0200 Subject: [PATCH] show main menu in the project detail --- app/coffee/modules/nav.coffee | 1 - app/coffee/modules/project.coffee | 5 ++--- app/partials/project.jade | 14 ++++++-------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index e2113073..68fcd585 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -145,7 +145,6 @@ ProjectMenuDirective = ($log, $compile, $auth, $rootscope, $tgAuth, $location) - renderMenuEntries = ($el, targetScope) -> container = $el.find(".menu-container") sectionName = targetScope.section - dom = $compile(menuEntriesTemplate({user: $auth.getUser()}))(targetScope) dom.find("a.active").removeClass("active") dom.find("#nav-#{sectionName} > a").addClass("active") diff --git a/app/coffee/modules/project.coffee b/app/coffee/modules/project.coffee index c8a6e669..5cb57231 100644 --- a/app/coffee/modules/project.coffee +++ b/app/coffee/modules/project.coffee @@ -21,7 +21,6 @@ class ProjectController extends taiga.Controller @.$inject = ["$scope", "$tgResources", "$tgRepo", "$routeParams", "$q"] constructor: (@scope, @rs, @repo, @params, @q) -> - @scope.hideMenu = true @.loadInitialData() loadInitialData: -> @@ -39,12 +38,12 @@ class ProjectController extends taiga.Controller loadProject: -> return @rs.projects.get(@scope.projectId).then (project) => - @.project = project + @scope.project = project return project loadProjectStats: -> return @rs.projects.stats(@scope.projectId).then (stats) => - @.stats = stats + @scope.stats = stats return stats diff --git a/app/partials/project.jade b/app/partials/project.jade index 0afc6480..13f6cd08 100644 --- a/app/partials/project.jade +++ b/app/partials/project.jade @@ -10,24 +10,22 @@ block content ul.home-project-info-list li - span.info-num(tg-bo-html="ctrl.stats.total_points") + span.info-num(tg-bo-html="stats.total_points") span.info-text projects points li - span.info-num(tg-bo-html="ctrl.stats.defined_points") + span.info-num(tg-bo-html="stats.defined_points") span.info-text defined points li - span.info-num(tg-bo-html="ctrl.stats.assigned_points") + span.info-num(tg-bo-html="stats.assigned_points") span.info-text assigned points li - span.info-num(tg-bo-html="ctrl.stats.closed_points") + span.info-num(tg-bo-html="stats.closed_points") span.info-text closed points - p.description(tg-bo-html="ctrl.project.description") + p.description(tg-bo-html="project.description") .home-project-bottom ul - li(ng-repeat="member in ctrl.project.active_memberships") + li(ng-repeat="member in project.active_memberships") img(src="{{member.photo}}") - - a.button.button-blackish(href="", tg-nav="project-backlog:project=ctrl.project.slug") GO TO PROJECT