RCFilters: Spell out Tags and Namespaces labels

- Provide Tags and Namespaces menus with labels where the icons now are,
in order to increase discoverability.

Bug: T178539
Change-Id: I2101898d10043ef45d7636f6676d8f1f51b9db58

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8015c3d..234b78d 100644 (file)
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1463,7 +1463,6 @@
        "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 5f72b75..9e7bfca 100644 (file)
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1657,7 +1657,6 @@
        "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 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 eb33ff7..df0c249 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1874,7 +1874,6 @@ 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',
@@ -1888,6 +1887,7 @@ return [
                        'rcfilters-other-review-tools',
                        'blanknamespace',
                        'namespaces',
+                       'tags-title',
                        'invert',
                        'recentchanges-noresult',
                        'recentchanges-timeout',

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 fafa697..148e37b 100644 (file)
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterTagMultiselectWidget.less
@@ -65,27 +65,16 @@
                        &-widget.oo-ui-widget {
                                border: 1px solid @colorGray10;
                                border-left-width: 0;
-                               border-top-left-radius: 0;
-                               border-top-right-radius: 0;
-                               border-bottom-left-radius: 0;
+                               border-radius: 0 0 @borderRadius 0;
 
                                display: block;
                                text-align: right;
                                height: 2.5em;
                                .box-sizing( border-box );
 
-                               .oo-ui-buttonElement-frameless.oo-ui-iconElement:first-child {
+                               .oo-ui-buttonOptionWidget:first-child {
                                        margin-left: 0;
                                }
-
-                               .oo-ui-labelElement.oo-ui-optionWidget.oo-ui-buttonElement:first-child {
-                                       margin-left: 0;
-
-                                       .oo-ui-labelElement-label {
-                                               color: @colorGray5;
-                                               font-weight: bold;
-                                       }
-                               }
                        }
                }
        }

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 404cb98..a2ce20e 100644 (file)
--- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FilterTagMultiselectWidget.js
@@ -148,23 +148,18 @@
                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',
                                        icon: 'article',
+                                       label: mw.msg( 'namespaces' ),
                                        title: mw.msg( 'rcfilters-view-namespaces-tooltip' )
                                } ),
                                new OO.ui.ButtonOptionWidget( {
                                        framed: false,
                                        data: 'tags',
                                        icon: 'tag',
+                                       label: mw.msg( 'tags-title' ),
                                        title: mw.msg( 'rcfilters-view-tags-tooltip' )
                                } )
                        ]