taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug #709: Filters now have a breadcrum

stable
Jesús Espino 2014-08-27 11:51:21 +02:00
parent fe91223a09
commit ef88469ccc
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/modules/issues/list.coffee
View File

@ -481,14 +481,14 @@ IssuesFiltersDirective = ($log, $location, $rs) ->
showFilters = (title, type) -> showFilters = (title, type) ->
$el.find(".filters-cats").hide() $el.find(".filters-cats").hide()
$el.find(".filter-list").show() $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").html(title)
$el.find("h2 a.subfilter span.title").prop("data-type", type) $el.find("h2 a.subfilter span.title").prop("data-type", type)
showCategories = -> showCategories = ->
$el.find(".filters-cats").show() $el.find(".filters-cats").show()
$el.find(".filter-list").hide() $el.find(".filter-list").hide()
$el.find("h2 a.subfilter").addClass("hidden") $el.find("h2.breadcrumb").addClass("hidden")
initializeSelectedFilters = (filters) -> initializeSelectedFilters = (filters) ->
selectedFilters = [] selectedFilters = []
@ -577,7 +577,7 @@ IssuesFiltersDirective = ($log, $location, $rs) ->
renderFilters(_.reject(tags, "selected")) renderFilters(_.reject(tags, "selected"))
showFilters(target.attr("title"), target.data("type")) 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() event.preventDefault()
showCategories($el) showCategories($el)

8
app/partials/views/modules/issues-filters.jade
View File

@ -1,7 +1,7 @@
section.filters section.filters
div.filters-inner div.filters-inner
h1 h1
a.title(href="", title="back to categories") filters a.title filters
form form
fieldset fieldset
input(type="text", placeholder="Search by subject...", ng-model="filtersSubject") input(type="text", placeholder="Search by subject...", ng-model="filtersSubject")
@ -9,8 +9,10 @@ section.filters
div.filters-step-cat div.filters-step-cat
div.filters-applied div.filters-applied
a.hide.button.save-filters(href="", title="save", ng-class="{hide: filters.length}") save a.hide.button.save-filters(href="", title="save", ng-class="{hide: filters.length}") save
h2 h2.hidden.breadcrumb
a.hidden.subfilter(href="", title="cat-name") a.back(href="", title="back to categories") Filters
span.icon-arrow-right
a.subfilter(href="", title="cat-name")
span.title status span.title status
div.filters-cats div.filters-cats
ul ul

8
app/styles/modules/filters/filters.scss
View File

@ -74,6 +74,14 @@
color: $gray-light; color: $gray-light;
} }
} }
.breadcrumb {
.back {
@extend %xlarge;
}
.icon-arrow-right {
@extend %large;
}
}
} }
.filters-cats { .filters-cats {