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

Add filter warning in filters button

stable
Xavier Julián 2016-09-20 13:18:30 +02:00
parent f36b298e46
commit 8b8b1077ec
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/locales/taiga/locale-en.json
View File

@ -205,6 +205,7 @@
"TITLE_ACTION_SEARCH": "Search", "TITLE_ACTION_SEARCH": "Search",
"ACTION_SAVE_CUSTOM_FILTER": "save as custom filter", "ACTION_SAVE_CUSTOM_FILTER": "save as custom filter",
"PLACEHOLDER_FILTER_NAME": "Write the filter name and press enter", "PLACEHOLDER_FILTER_NAME": "Write the filter name and press enter",
"APPLIED_FILTERS_NUM": "filters applied",
"CATEGORIES": { "CATEGORIES": {
"TYPE": "Type", "TYPE": "Type",
"STATUS": "Status", "STATUS": "Status",

3
app/partials/kanban/kanban.jade
View File

@ -29,9 +29,10 @@ div.wrapper(tg-kanban, ng-controller="KanbanController as ctrl"
) )
button.button-filter.e2e-open-filter( button.button-filter.e2e-open-filter(
ng-class="{'button-filters-applied': !!ctrl.selectedFilters.length}"
ng-click="ctrl.openFilter = !ctrl.openFilter" ng-click="ctrl.openFilter = !ctrl.openFilter"
title="{{ctrl.selectedFilters.length}} {{'COMMON.FILTERS.APPLIED_FILTERS_NUM' | translate}}"
) )
span.filter-num(ng-if="ctrl.selectedFilters.length") {{ctrl.selectedFilters.length}}
tg-svg(svg-icon="icon-filters") tg-svg(svg-icon="icon-filters")
include ../includes/modules/kanban-table include ../includes/modules/kanban-table

2
app/partials/taskboard/taskboard.jade
View File

@ -29,9 +29,9 @@ div.wrapper(tg-taskboard, ng-controller="TaskboardController as ctrl",
on-zoom-change="ctrl.setZoom(zoomLevel, zoom)" on-zoom-change="ctrl.setZoom(zoomLevel, zoom)"
) )
button.button-filter.e2e-open-filter( button.button-filter.e2e-open-filter(
ng-class="{'button-filters-applied': !!ctrl.selectedFilters.length}"
ng-click="ctrl.openFilter = !ctrl.openFilter" ng-click="ctrl.openFilter = !ctrl.openFilter"
) )
span.filter-num(ng-if="ctrl.selectedFilters.length") {{ctrl.selectedFilters.length}}
tg-svg(svg-icon="icon-filters") tg-svg(svg-icon="icon-filters")
.taskboard-inner .taskboard-inner

12
app/styles/components/buttons.scss
View File

@ -161,8 +161,20 @@ a.button-gray {
background: $whitish; background: $whitish;
margin-left: 1rem; margin-left: 1rem;
padding: .4rem .5rem; padding: .4rem .5rem;
position: relative;
&:hover { &:hover {
background: $gray-light; background: $gray-light;
fill: $whitish; fill: $whitish;
} }
.filter-num {
@include font-size(small);
@include font-type(medium);
background: $red;
border-radius: 50%;
height: 1rem;
left: -.5rem;
position: absolute;
top: -.5rem;
width: 1rem;
}
} }