diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee index ccb31f6a..acc40593 100644 --- a/app/coffee/modules/backlog/sprints.coffee +++ b/app/coffee/modules/backlog/sprints.coffee @@ -169,7 +169,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> link = ($scope, $el, $attrs) -> # Event Handlers $el.on "click", "", (event) -> - $loading.start($el) + $loading.start($el.siblings('.load')) $rootscope.$broadcast("backlog:toggle-closed-sprints-visualization") $scope.$on "$destroy", -> @@ -177,8 +177,8 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> $scope.$on "sprints:loaded", (ctx, sprints) => closedSprints = _.filter(sprints, (sprint) -> sprint.closed) - $loading.finish($el) - + $loading.finish($el.siblings('.load')) + #TODO: i18n if closedSprints.length > 0 $el.text("Hide closed sprints") diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade index 73b8dacf..8beecd7b 100644 --- a/app/partials/views/modules/sprints.jade +++ b/app/partials/views/modules/sprints.jade @@ -12,11 +12,13 @@ section.sprints tg-check-permission="add_milestone") span.text + New sprint - section.sprint(ng-repeat="sprint in openSprints track by sprint.id" tg-backlog-sprint="sprint") + div.sprint.sprint-open(ng-repeat="sprint in openSprints track by sprint.id" tg-backlog-sprint="sprint") include sprint - div(class="filter-closed-sprints", ng-show="project.total_closed_milestones") - a(href="", tg-backlog-toggle-closed-sprints-visualization="ctrl.excludeClosedSprints") Show closed sprints + a.filter-closed-sprints(href="") + span.icon.icon-archive + span(tg-backlog-toggle-closed-sprints-visualization="ctrl.excludeClosedSprints") Show closed sprints + span.load - section.sprint(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint") + div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint") include sprint diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index 9d669cf3..e56b4e64 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -16,10 +16,19 @@ } } .filter-closed-sprints { - font-family: 'OpenSans-CondLight', Arial, Helvetica, sans-serif; - font-size: 1.2rem; - margin-bottom: 2rem; - margin-top: 2rem; + @extend %small; + display: block; + padding-bottom: 1rem; + text-align: center; + .icon-kanban { + margin-right: .3rem; + vertical-align: middle; + } + .load { + display: inline-block; + margin-left: .3rem; + vertical-align: middle; + } } .sprint-name { a {