From 30e0b285d175936447c36ff048a3afc3fcdce91a Mon Sep 17 00:00:00 2001 From: petarpetkovic Date: Wed, 1 Nov 2017 11:00:04 +0100 Subject: [PATCH] RCFilters: Spell out Tags and Namespaces labels - Provide Tags and Namespaces menus with labels where the icons now are, in order to increase discoverability. Bug: T178539 Change-Id: I2101898d10043ef45d7636f6676d8f1f51b9db58 --- languages/i18n/en.json | 1 - languages/i18n/qqq.json | 1 - resources/Resources.php | 2 +- ...w.rcfilters.ui.FilterTagMultiselectWidget.less | 15 ++------------- .../mw.rcfilters.ui.FilterTagMultiselectWidget.js | 9 ++------- 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 8015c3d1a2..234b78d77c 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1463,7 +1463,6 @@ "rcfilters-tag-prefix-tags": "#$1", "rcfilters-exclude-button-off": "Exclude selected", "rcfilters-exclude-button-on": "Excluding selected", - "rcfilters-view-advanced-filters-label": "Advanced filters", "rcfilters-view-tags": "Tagged edits", "rcfilters-view-namespaces-tooltip": "Filter results by namespace", "rcfilters-view-tags-tooltip": "Filter results using edit tags", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 5f72b75635..9e7bfca612 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1657,7 +1657,6 @@ "rcfilters-tag-prefix-tags": "Prefix for the edit tags in [[Special:RecentChanges]]. Edit tags use a hash (#) as prefix. Please keep this format.\n\nParameters:\n* $1 - Tag display name.", "rcfilters-exclude-button-off": "Title for the button that excludes selected namespaces, when it is not yet active.", "rcfilters-exclude-button-on": "Title for the button that excludes selected namespaces, when it is active.", - "rcfilters-view-advanced-filters-label": "Label for the view switch that changes between advanced filters in [[Special:RecentChanges]]", "rcfilters-view-tags": "Title for the tags view in [[Special:RecentChanges]]\n{{Identical|Tag}}", "rcfilters-view-namespaces-tooltip": "Tooltip for the button that loads the namespace view in [[Special:RecentChanges]]", "rcfilters-view-tags-tooltip": "Tooltip for the button that loads the tags view in [[Special:RecentChanges]]", diff --git a/resources/Resources.php b/resources/Resources.php index eb33ff7e85..df0c24968b 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1874,7 +1874,6 @@ return [ 'rcfilters-tag-prefix-tags', 'rcfilters-exclude-button-off', 'rcfilters-exclude-button-on', - 'rcfilters-view-advanced-filters-label', 'rcfilters-view-tags', 'rcfilters-view-namespaces-tooltip', 'rcfilters-view-tags-tooltip', @@ -1888,6 +1887,7 @@ return [ 'rcfilters-other-review-tools', 'blanknamespace', 'namespaces', + 'tags-title', 'invert', 'recentchanges-noresult', 'recentchanges-timeout', diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less index fafa69701f..148e37b2d8 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less @@ -65,27 +65,16 @@ &-widget.oo-ui-widget { border: 1px solid @colorGray10; border-left-width: 0; - border-top-left-radius: 0; - border-top-right-radius: 0; - border-bottom-left-radius: 0; + border-radius: 0 0 @borderRadius 0; display: block; text-align: right; height: 2.5em; .box-sizing( border-box ); - .oo-ui-buttonElement-frameless.oo-ui-iconElement:first-child { + .oo-ui-buttonOptionWidget:first-child { margin-left: 0; } - - .oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child { - margin-left: 0; - - .oo-ui-labelElement-label { - color: @colorGray5; - font-weight: bold; - } - } } } } diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js index 404cb981a4..a2ce20eaf9 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js @@ -148,23 +148,18 @@ this.viewsSelectWidget = new OO.ui.ButtonSelectWidget( { classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget' ], items: [ - new OO.ui.ButtonOptionWidget( { - framed: false, - data: '', - disabled: true, - classes: [ 'mw-rcfilters-ui-filterTagMultiselectWidget-views-select-widget-label' ], - label: mw.msg( 'rcfilters-view-advanced-filters-label' ) - } ), new OO.ui.ButtonOptionWidget( { framed: false, data: 'namespaces', icon: 'article', + label: mw.msg( 'namespaces' ), title: mw.msg( 'rcfilters-view-namespaces-tooltip' ) } ), new OO.ui.ButtonOptionWidget( { framed: false, data: 'tags', icon: 'tag', + label: mw.msg( 'tags-title' ), title: mw.msg( 'rcfilters-view-tags-tooltip' ) } ) ] -- 2.20.1