From 67e54362c79977825ba8769f677c611bd05aa276 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Wed, 4 Feb 2015 14:43:27 +0100 Subject: [PATCH] fix closed sprints click zone --- app/coffee/modules/backlog/sprints.coffee | 11 +++++++---- app/partials/includes/modules/sprints.jade | 4 ++-- app/styles/modules/backlog/sprints.scss | 9 +++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee index 2ea737a4..4c32e641 100644 --- a/app/coffee/modules/backlog/sprints.coffee +++ b/app/coffee/modules/backlog/sprints.coffee @@ -139,7 +139,8 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> link = ($scope, $el, $attrs) -> # Event Handlers - $el.on "click", "", (event) -> + $el.on "click", (event) -> + event.preventDefault() excludeClosedSprints = not excludeClosedSprints $loading.start($el.parent().siblings('.loading-spinner')) @@ -152,13 +153,15 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> $el.off() $scope.$on "closed-sprints:reloaded", (ctx, sprints) => - $loading.finish($el.parent().siblings('.loading-spinner')) + $loading.finish($el.siblings('.loading-spinner')) #TODO: i18n if sprints.length > 0 - $el.text("Hide closed sprints") + text = "Hide closed sprints" else - $el.text("Show closed sprints") + text = "Show closed sprints" + + $el.find(".text").text(text) return {link: link} diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade index d3100acf..836b3b34 100644 --- a/app/partials/includes/modules/sprints.jade +++ b/app/partials/includes/modules/sprints.jade @@ -15,9 +15,9 @@ section.sprints div.sprint.sprint-open(ng-repeat="sprint in openSprints track by sprint.id", tg-backlog-sprint="sprint", tg-sprint-sortable) include sprint - a.filter-closed-sprints(href="", ng-show="totalClosedMilestones") + a.filter-closed-sprints(tg-backlog-toggle-closed-sprints-visualization, href="", ng-show="totalClosedMilestones") span.icon.icon-archive - span(tg-backlog-toggle-closed-sprints-visualization) Show closed sprints + span.text Show closed sprints div.loading-spinner div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable) diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index 05545d50..759b6a1d 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -17,12 +17,13 @@ } .filter-closed-sprints { @extend %small; - display: block; + align-content: center; + display: flex; + justify-content: center; padding-bottom: 1rem; - text-align: center; - .icon-kanban { + vertical-align: middle; + .icon-archive { margin-right: .3rem; - vertical-align: middle; } } .loading-spinner {