From 0237acc8859a59df1ede96247dcb4e9a1d06f944 Mon Sep 17 00:00:00 2001 From: petarpetkovic Date: Fri, 6 Oct 2017 14:47:46 +0200 Subject: [PATCH] Change Tagged edits help icon - Change the link that help icon leads to. - Reduce the size of help icon. Bug: T176661 Change-Id: Ifc3b3e9efce00ea601795bd67a2de17c4be3cf6f --- languages/i18n/en.json | 2 +- languages/i18n/qqq.json | 2 +- resources/Resources.php | 1 + .../mw.rcfilters.ui.FilterMenuHeaderWidget.less | 14 ++++++++++++++ .../ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js | 2 +- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index 282b906f31..93e5603dbf 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1467,7 +1467,7 @@ "rcfilters-view-namespaces-tooltip": "Filter results by namespace", "rcfilters-view-tags-tooltip": "Filter results using edit tags", "rcfilters-view-return-to-default-tooltip": "Return to main filter menu", - "rcfilters-view-tags-help-icon-tooltip": "Learn more about Tagged Edits", + "rcfilters-view-tags-help-icon-tooltip": "Learn more about Tagged edits", "rcfilters-liveupdates-button": "Live updates", "rcfilters-liveupdates-button-title-on": "Turn off live updates", "rcfilters-liveupdates-button-title-off": "Display new changes as they happen", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index 4d6cf93a4c..bb40e25433 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -1660,7 +1660,7 @@ "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]]", "rcfilters-view-return-to-default-tooltip": "Tooltip for the button that returns to the default filter view in [[Special:RecentChanges]]", - "rcfilters-view-tags-help-icon-tooltip": "Tooltip for the help button that leads user to [[mw:Special:MyLanguage/Help:New_filters_for_edit_review/Advanced_filters#tags|Help page]] for Tagged Edits", + "rcfilters-view-tags-help-icon-tooltip": "Tooltip for the help button that leads user to Special:Tags page", "rcfilters-liveupdates-button": "Label for the button to enable or disable live updates on [[Special:RecentChanges]]", "rcfilters-liveupdates-button-title-on": "Title for the button to enable or disable live updates on [[Special:RecentChanges]] when the feature is ON.", "rcfilters-liveupdates-button-title-off": "Title for the button to enable or disable live updates on [[Special:RecentChanges]] when the feature is OFF.", diff --git a/resources/Resources.php b/resources/Resources.php index 6d59d5ce6d..4df8194f0e 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1922,6 +1922,7 @@ return [ 'jquery.makeCollapsible', 'mediawiki.language', 'mediawiki.user', + 'mediawiki.util', 'mediawiki.rcfilters.filters.dm', 'oojs-ui.styles.icons-content', 'oojs-ui.styles.icons-moderation', diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less index 83fe189e49..f9b32a2f16 100644 --- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less +++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterMenuHeaderWidget.less @@ -13,6 +13,20 @@ position: absolute; top: 50%; .transform( translateY( -50% ) ); + + // HACK: Following overrides help icon size and centers it + &.oo-ui-widget.oo-ui-widget-enabled > .oo-ui-buttonElement-button { + box-sizing: content-box; + padding: 0; + + .oo-ui-icon-help { + min-width: initial; + min-height: initial; + width: 1.4em; + height: 1.4em; + margin-top: 0.2375em; + } + } } &-header { diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js index 1a0c5ff51c..5b5062c051 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterMenuHeaderWidget.js @@ -41,7 +41,7 @@ framed: false, title: mw.msg( 'rcfilters-view-tags-help-icon-tooltip' ), classes: [ 'mw-rcfilters-ui-filterMenuHeaderWidget-helpIcon' ], - href: 'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:New_filters_for_edit_review/Advanced_filters#tags', + href: mw.util.getUrl( 'Special:Tags' ), target: '_blank' } ); this.helpIcon.toggle( this.model.getCurrentView() === 'tags' ); -- 2.20.1