VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395674 )
Change subject: Remove unique, inconsistent treatment of menu items
......................................................................
Remove unique, inconsistent treatment of menu items
Special treatment of overflow, flagged menu items of solely
two items is not only inconsistent with icon menus elsewhere,
it also adds to payload on every page with added OOUI icon packs
in RL. We are removing the treatment here and also provide a
follow-up patch in core.
Bug: T110051
Change-Id: I644ab66e8ca17d614247cda730fb16c72e8d1349
---
M handlebars/flow_moderation_actions_list.partial.handlebars
1 file changed, 22 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/74/395674/1
diff --git a/handlebars/flow_moderation_actions_list.partial.handlebars
b/handlebars/flow_moderation_actions_list.partial.handlebars
index 19f905d..b5098e1 100644
--- a/handlebars/flow_moderation_actions_list.partial.handlebars
+++ b/handlebars/flow_moderation_actions_list.partial.handlebars
@@ -4,9 +4,9 @@
{{~#if actions.edit~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-edit-title-link"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-edit-title-link"
href="{{actions.edit.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-edit
mw-ui-icon-edit-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-edit"></span> {{/if~}}
{{~l10n (concat
"flow-topic-action-edit-title")~}}
</a>
{{~noop~}}
@@ -37,9 +37,9 @@
{{~#if actions.summarize~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-summarize-topic-link"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-summarize-topic-link"
href="{{actions.summarize.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-stripeToC
mw-ui-icon-stripeToC-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-stripeToC"></span> {{/if~}}
{{~#if
summary.revision.content.content~}}
{{~l10n (concat
"flow-topic-action-resummarize-topic")~}}
{{else~}}
@@ -57,11 +57,11 @@
{{~#if actions.lock~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-topicmenu-lock"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-topicmenu-lock"
data-role="lock"
data-flow-id="{{postId}}"
href="{{actions.lock.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-check
mw-ui-icon-check-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-check"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-lock-topic")~}}
</a>
{{~noop~}}
@@ -70,11 +70,11 @@
{{~#if actions.unlock~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-topicmenu-lock"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-topicmenu-lock"
data-role="unlock"
data-flow-id="{{postId}}"
href="{{actions.unlock.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-ongoingConversation
mw-ui-icon-ongoingConversation-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-ongoingConversation"></span>
{{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-unlock-topic")~}}
</a>
{{~noop~}}
@@ -85,11 +85,11 @@
{{~#if actions.lock~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-topicmenu-lock"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-topicmenu-lock"
data-flow-id="{{postId}}"
data-role="lock"
href="{{actions.lock.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-check
mw-ui-icon-check-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-check"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-lock-topic")~}}
</a>
{{~noop~}}
@@ -98,11 +98,11 @@
{{~#if actions.unlock~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-topicmenu-lock"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-topicmenu-lock"
data-flow-id="{{postId}}"
data-role="unlock"
href="{{actions.unlock.url}}">
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-ongoingConversation
mw-ui-icon-ongoingConversation-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-ongoingConversation"></span>
{{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-unlock-topic")~}}
</a>
{{~noop~}}
@@ -114,10 +114,10 @@
{{!-- Post only --}}
{{~#if actions.edit~}}
<li>
- <a class="{{moderationMwUiClass}}
mw-ui-progressive mw-ui-quiet mw-ui-hovericon flow-ui-edit-post-link"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet
flow-ui-edit-post-link"
href="{{actions.edit.url}}"
>
- {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-edit
mw-ui-icon-edit-progressive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span
class="mw-ui-icon mw-ui-icon-before mw-ui-icon-edit"></span> {{/if~}}
{{~l10n "flow-post-action-edit-post"~}}
</a>
</li>
@@ -182,12 +182,12 @@
{{~#if actions.delete~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}} mw-ui-destructive
mw-ui-quiet mw-ui-hovericon"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet"
href="{{actions.delete.url}}"
data-flow-interactive-handler="moderationDialog"
data-flow-template="flow_moderate_{{moderationTemplate}}.partial"
data-role="delete">
- {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash mw-ui-icon-trash-destructive-hover"></span>
{{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-delete-" moderationTemplate)~}}
</a>
{{~noop~}}
@@ -196,12 +196,12 @@
{{~#if actions.undelete~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}} mw-ui-destructive
mw-ui-quiet mw-ui-hovericon"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet"
href="{{actions.undelete.url}}"
data-flow-interactive-handler="moderationDialog"
data-flow-template="flow_moderate_{{moderationTemplate}}.partial"
data-role="undelete">
- {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash mw-ui-icon-trash-destructive-hover"></span>
{{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-undelete-" moderationTemplate)~}}
</a>
{{~noop~}}
@@ -210,12 +210,12 @@
{{~#if actions.suppress~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}} mw-ui-destructive
mw-ui-quiet mw-ui-hovericon"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet"
href="{{actions.suppress.url}}"
data-flow-interactive-handler="moderationDialog"
data-flow-template="flow_moderate_{{moderationTemplate}}.partial"
data-role="suppress">
- {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-block mw-ui-icon-block-destructive-hover"></span>
{{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-block"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-suppress-" moderationTemplate)~}}
</a>
{{~noop~}}
@@ -224,12 +224,12 @@
{{~#if actions.unsuppress~}}
<li>
{{~noop~}}
- <a class="{{moderationMwUiClass}} mw-ui-destructive
mw-ui-quiet mw-ui-hovericon"
+ <a class="{{moderationMwUiClass}} mw-ui-quiet"
href="{{actions.unsuppress.url}}"
data-flow-interactive-handler="moderationDialog"
data-flow-template="flow_moderate_{{moderationTemplate}}.partial"
data-role="unsuppress">
- {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-block mw-ui-icon-block-destructive-hover"></span>
{{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-block"></span> {{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-unsuppress-" moderationTemplate)~}}
</a>
{{~noop~}}
--
To view, visit https://gerrit.wikimedia.org/r/395674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I644ab66e8ca17d614247cda730fb16c72e8d1349
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
