From 489122d29fd7dadfe100a067e66ae3b1b694ce35 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 3 Nov 2016 13:17:50 +0100 Subject: SONAR-8300 add labels --- .../js/apps/projects/components/FavoriteFilter.js | 11 +++++++---- .../js/apps/projects/components/FavoriteProjects.js | 7 ++++++- .../main/js/apps/projects/components/PageSidebar.js | 21 ++++++++++++--------- .../sonar-web/src/main/js/apps/projects/styles.css | 11 +++++++---- 4 files changed, 32 insertions(+), 18 deletions(-) diff --git a/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.js b/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.js index d13afa6e872..a2355a8ef4e 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.js +++ b/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.js @@ -27,10 +27,13 @@ export default class FavoriteFilter extends React.Component { } return ( -
- All - Favorite -
+
+ Quick Filters: +
+ All + Favorite +
+
); } } diff --git a/server/sonar-web/src/main/js/apps/projects/components/FavoriteProjects.js b/server/sonar-web/src/main/js/apps/projects/components/FavoriteProjects.js index 8e82cefd4c5..2e1410d8e0c 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/FavoriteProjects.js +++ b/server/sonar-web/src/main/js/apps/projects/components/FavoriteProjects.js @@ -61,7 +61,12 @@ export default class FavoriteProjects extends React.Component { diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js index a5cd4c4b31f..1b4baa2f1c7 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js +++ b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.js @@ -26,7 +26,6 @@ import QualityGateFilter from '../filters/QualityGateFilter'; import ReliabilityFilter from '../filters/ReliabilityFilter'; import SecurityFilter from '../filters/SecurityFilter'; import MaintainabilityFilter from '../filters/MaintainabilityFilter'; -import { translate } from '../../../helpers/l10n'; export default class PageSidebar extends React.Component { static propTypes = { @@ -39,6 +38,18 @@ export default class PageSidebar extends React.Component { return (
+
+ {isFiltered && ( +
+ + Clear All Filters + +
+ )} + +

Filters

+
+ @@ -46,14 +57,6 @@ export default class PageSidebar extends React.Component { - - {isFiltered && ( -
- - {translate('reset_verb')} - -
- )}
); } diff --git a/server/sonar-web/src/main/js/apps/projects/styles.css b/server/sonar-web/src/main/js/apps/projects/styles.css index 38a02765bc2..7ee75b33a94 100644 --- a/server/sonar-web/src/main/js/apps/projects/styles.css +++ b/server/sonar-web/src/main/js/apps/projects/styles.css @@ -90,11 +90,14 @@ transition: none; } +.projects-facets-header { + margin-bottom: 10px; + padding: 10px 0; + border-bottom: 1px solid #e6e6e6; +} + .projects-facets-reset { - margin-top: 20px; - padding: 10px; - border-top: 1px solid #e6e6e6; - text-align: center; + float: right; } .projects-facets-reset .button { -- cgit v1.2.3