[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add popup footer with feedback link
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339793 )
Change subject: RCFilters UI: Add popup footer with feedback link
..
RCFilters UI: Add popup footer with feedback link
Bug: T150959
Change-Id: Id10c39222a3d3d65d4ab1d006123f93b9972288f
Depends-On: Ie947ebe5d43da25e10119a34a736762b3fff5659
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
5 files changed, 22 insertions(+), 0 deletions(-)
Approvals:
Sbisson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index abee4a9..098adb6 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 7665f80..ea280ab 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 d6cb43f..2a6562d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1805,6 +1805,7 @@
'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 @@
'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 da6fa46..7b4e39f 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 bb213fd..5b73bdc 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 = $( '' );
config = config || {};
// Parent
@@ -33,6 +34,16 @@
}
);
+ $footer.append(
+ new OO.ui.ButtonWidget( {
+ framed: false,
+ icon: 'feedback',
+ flags: [ 'progressive' ],
+
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters UI: Add popup footer with feedback link
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339793 )
Change subject: RCFilters UI: Add popup footer with feedback link
..
RCFilters UI: Add popup footer with feedback link
Bug: T150959
Change-Id: Id10c39222a3d3d65d4ab1d006123f93b9972288f
Depends-On: Ie947ebe5d43da25e10119a34a736762b3fff5659
---
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
M
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterWrapperWidget.js
5 files changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/339793/1
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index abee4a9..098adb6 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 7665f80..ea280ab 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 d6cb43f..2a6562d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1805,6 +1805,7 @@
'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 @@
'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 bdc94b3..eb484d5 100644
---
a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
+++
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less
@@ -8,6 +8,12 @@
// on the inline style of the popup
margin-top: 2.4em !important;
max-width: 650px;
+
+ .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 d46bd4b..db333c9 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 = $( '' );
config = config || {};
// Parent
@@ -33,6 +34,16 @@
}
);
+ $footer.append(
+ new OO.ui.ButtonWidget( {
+ framed: false,
+ icon: 'feedback',
+ flags: [
