From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 2 Aug 2017 00:44:44 +0000 (+0000)
Subject: Merge "RCFilters: Add 'advanced filters' label to the view selection"
X-Git-Tag: 1.31.0-rc.0~2503
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=4838f88d844056d475967a96d592f1271cc987bf;hp=a7eddfad5b8f6af709bfa84075035beba149357e

Merge "RCFilters: Add 'advanced filters' label to the view selection"
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index d9bbf9a675..039d617790 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1451,6 +1451,7 @@
 	"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 89f6f414ba..6afc62637b 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1641,6 +1641,7 @@
 	"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 not yet 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 45a90d1654..478f1ea9bb 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1877,6 +1877,7 @@ 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',
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 a5cf744064..076636cc85 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -70,6 +70,9 @@
 					margin-left: 0;
 				}
 
+				.oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child {
+					margin-left: 0;
+				}
 			}
 		}
 	}
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 530429e7fd..3aa716111c 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -140,6 +140,13 @@
 		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',