From ef88469ccc467fa67f046b678816b69d2205e712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 27 Aug 2014 11:51:21 +0200 Subject: [PATCH] Bug #709: Filters now have a breadcrum --- app/coffee/modules/issues/list.coffee | 6 +++--- app/partials/views/modules/issues-filters.jade | 8 +++++--- app/styles/modules/filters/filters.scss | 8 ++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index a732d925..1ec230e6 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -481,14 +481,14 @@ IssuesFiltersDirective = ($log, $location, $rs) -> showFilters = (title, type) -> $el.find(".filters-cats").hide() $el.find(".filter-list").show() - $el.find("h2 a.subfilter").removeClass("hidden") + $el.find("h2.breadcrumb").removeClass("hidden") $el.find("h2 a.subfilter span.title").html(title) $el.find("h2 a.subfilter span.title").prop("data-type", type) showCategories = -> $el.find(".filters-cats").show() $el.find(".filter-list").hide() - $el.find("h2 a.subfilter").addClass("hidden") + $el.find("h2.breadcrumb").addClass("hidden") initializeSelectedFilters = (filters) -> selectedFilters = [] @@ -577,7 +577,7 @@ IssuesFiltersDirective = ($log, $location, $rs) -> renderFilters(_.reject(tags, "selected")) showFilters(target.attr("title"), target.data("type")) - $el.on "click", ".filters-inner > h1 > a.title", (event) -> + $el.on "click", ".filters-inner > .filters-step-cat > .breadcrumb > .back", (event) -> event.preventDefault() showCategories($el) diff --git a/app/partials/views/modules/issues-filters.jade b/app/partials/views/modules/issues-filters.jade index 93a50028..9731321a 100644 --- a/app/partials/views/modules/issues-filters.jade +++ b/app/partials/views/modules/issues-filters.jade @@ -1,7 +1,7 @@ section.filters div.filters-inner h1 - a.title(href="", title="back to categories") filters + a.title filters form fieldset input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") @@ -9,8 +9,10 @@ section.filters div.filters-step-cat div.filters-applied a.hide.button.save-filters(href="", title="save", ng-class="{hide: filters.length}") save - h2 - a.hidden.subfilter(href="", title="cat-name") + h2.hidden.breadcrumb + a.back(href="", title="back to categories") Filters + span.icon-arrow-right + a.subfilter(href="", title="cat-name") span.title status div.filters-cats ul diff --git a/app/styles/modules/filters/filters.scss b/app/styles/modules/filters/filters.scss index 7d98a6f6..25240cbf 100644 --- a/app/styles/modules/filters/filters.scss +++ b/app/styles/modules/filters/filters.scss @@ -74,6 +74,14 @@ color: $gray-light; } } + .breadcrumb { + .back { + @extend %xlarge; + } + .icon-arrow-right { + @extend %large; + } + } } .filters-cats {