Merge "RCFilters UI: Add tooltip to highlight menu"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Mar 2017 02:19:49 +0000 (02:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Mar 2017 02:19:49 +0000 (02:19 +0000)
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterItemWidget.js

index 098adb6..b7078dd 100644 (file)
        "rcfilters-filterlist-feedbacklink": "Provide feedback on the new (beta) filters",
        "rcfilters-highlightbutton-title": "Highlight results",
        "rcfilters-highlightmenu-title": "Select a color",
+       "rcfilters-highlightmenu-help": "Select a color to highlight this property",
        "rcfilters-filterlist-noresults": "No filters found",
        "rcfilters-filtergroup-registration": "User registration",
        "rcfilters-filter-registered-label": "Registered",
index 026157e..a3e2a8c 100644 (file)
        "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-highlightmenu-help": "Tooltip for the highlight menu for individual filters.",
        "rcfilters-filterlist-noresults": "Message showing no results found for searching a filter.",
        "rcfilters-filtergroup-registration": "Title for the filter group for editor registration type.",
        "rcfilters-filter-registered-label": "Label for the filter for showing edits made by logged-in users.\n{{Identical|Registered}}",
index 793fe06..5c6b262 100644 (file)
@@ -1845,6 +1845,7 @@ return [
                        'rcfilters-filter-logactions-description',
                        'rcfilters-highlightbutton-title',
                        'rcfilters-highlightmenu-title',
+                       'rcfilters-highlightmenu-help',
                        'recentchanges-noresult',
                ],
                'dependencies' => [
index 81b856d..4ea284b 100644 (file)
@@ -45,7 +45,8 @@
                        this.controller,
                        this.model,
                        {
-                               $overlay: config.$overlay || this.$element
+                               $overlay: config.$overlay || this.$element,
+                               title: mw.msg( 'rcfilters-highlightmenu-help' )
                        }
                );
                this.highlightButton.toggle( this.model.isHighlightEnabled() );