From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Fri, 24 Feb 2017 22:58:59 +0000 (-0800)
Subject: RCFilters UI: Add popup footer with feedback link
X-Git-Tag: 1.31.0-rc.0~3944^2
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=8061012c0b521f5b7512b233e85a1b8c62f5bd28;p=lhc%2Fweb%2Fwiklou.git

RCFilters UI: Add popup footer with feedback link

Bug: T150959
Change-Id: Id10c39222a3d3d65d4ab1d006123f93b9972288f
Depends-On: Ie947ebe5d43da25e10119a34a736762b3fff5659
---

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index abee4a9528..098adb62f4 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1378,6 +1378,7 @@
 	"rcfilters-invalid-filter": "Invalid filter",
 	"rcfilters-empty-filter": "No active filters. All contributions are shown.",
 	"rcfilters-filterlist-title": "Filters",
+	"rcfilters-filterlist-feedbacklink": "Provide feedback on the new (beta) filters",
 	"rcfilters-highlightbutton-title": "Highlight results",
 	"rcfilters-highlightmenu-title": "Select a color",
 	"rcfilters-filterlist-noresults": "No filters found",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 7665f80ff8..ea280abf5a 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1564,6 +1564,7 @@
 	"rcfilters-invalid-filter": "A label for an invalid filter.",
 	"rcfilters-empty-filter": "Placeholder for the filter list when no filters were chosen.",
 	"rcfilters-filterlist-title": "Title for the filters list.\n{{Identical|Filter}}",
+	"rcfilters-filterlist-feedbacklink": "Caption for the link to the feedback page about the filters beta feature.",
 	"rcfilters-highlightbutton-title": "Title for the highlight button used to toggle the highlight feature on and off.",
 	"rcfilters-highlightmenu-title": "Title for the highlight menu used to select the highlight color for an individual filter.",
 	"rcfilters-filterlist-noresults": "Message showing no results found for searching a filter.",
diff --git a/resources/Resources.php b/resources/Resources.php
index d6cb43f7b4..2a6562dee3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1805,6 +1805,7 @@ return [
 			'rcfilters-invalid-filter',
 			'rcfilters-empty-filter',
 			'rcfilters-filterlist-title',
+			'rcfilters-filterlist-feedbacklink',
 			'rcfilters-filterlist-noresults',
 			'rcfilters-filtergroup-registration',
 			'rcfilters-filter-registered-label',
@@ -1851,6 +1852,7 @@ return [
 			'mediawiki.rcfilters.filters.dm',
 			'oojs-ui.styles.icons-moderation',
 			'oojs-ui.styles.icons-editing-core',
+			'oojs-ui.styles.icons-interactions',
 		],
 	],
 	'mediawiki.special' => [
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
index da6fa466b5..7b4e39fad6 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -12,6 +12,12 @@
 		.oo-ui-popupWidget-body {
 			max-height: 70vh;
 		}
+
+		.oo-ui-popupWidget-footer {
+			background-color: #f8f9fa;
+			text-align: right;
+			padding: 0.5em;
+		}
 	}
 
 	&-search {
diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
index bb213fd5ec..5b73bdc53c 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
@@ -13,6 +13,7 @@
 	 * @cfg {jQuery} [$overlay] A jQuery object serving as overlay for popups
 	 */
 	mw.rcfilters.ui.FilterWrapperWidget = function MwRcfiltersUiFilterWrapperWidget( controller, model, config ) {
+		var $footer = $( '<div>' );
 		config = config || {};
 
 		// Parent
@@ -33,6 +34,16 @@
 			}
 		);
 
+		$footer.append(
+			new OO.ui.ButtonWidget( {
+				framed: false,
+				icon: 'feedback',
+				flags: [ 'progressive' ],
+				label: mw.msg( 'rcfilters-filterlist-feedbacklink' ),
+				href: 'https://www.mediawiki.org/wiki/Help_talk:Edit_Review_Improvements/RC_filters'
+			} ).$element
+		);
+
 		this.textInput = new OO.ui.TextInputWidget( {
 			classes: [ 'mw-rcfilters-ui-filterWrapperWidget-search' ],
 			icon: 'search',
@@ -43,6 +54,7 @@
 			$overlay: this.$overlay,
 			popup: {
 				$content: this.filterPopup.$element,
+				$footer: $footer,
 				classes: [ 'mw-rcfilters-ui-filterWrapperWidget-popup' ],
 				width: 650
 			}