Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/356512 )
Change subject: Use "trash" icon instead of deprecated and removed "remove" icon
......................................................................
Use "trash" icon instead of deprecated and removed "remove" icon
Bug: T166742
Change-Id: I79250860db7f3922685c2ec7baeb8198c467fe1c
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_moderation_actions_list.partial.handlebars
M handlebars/flow_topic_moderation_flag.partial.handlebars
6 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/12/356512/1
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index f5ff83f..da21c04 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -65,11 +65,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['undelete']['url']) &&
is_array($in['actions']['undelete'])) ? $in['actions']['undelete']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['suppress']['url']) &&
is_array($in['actions']['suppress'])) ? $in['actions']['suppress']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index d275721..1b972e3 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -35,7 +35,7 @@
'.$sp.'';}).' </ul>
'.$sp.' </div>
'.$sp.'' : '').'</div>
-';},'flow_topic_moderation_flag' => function ($cx, $in, $sp) {return
''.$sp.'<span class="mw-ui-icon mw-ui-icon-before'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','lock'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-check';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','hide'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-flag';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','delete'),array()), $in, false,
function($cx, $in)use($sp){return ' mw-ui-icon-remove';}).'"></span>
+';},'flow_topic_moderation_flag' => function ($cx, $in, $sp) {return
''.$sp.'<span class="mw-ui-icon mw-ui-icon-before'.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','lock'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-check';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','hide'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-flag';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','delete'),array()), $in, false,
function($cx, $in)use($sp){return ' mw-ui-icon-trash';}).'"></span>
';},'flow_post_moderation_state' => function ($cx, $in, $sp) {return
''.$sp.'<span class="plainlinks">'.((LCRun3::ifvar($cx,
((isset($in['replyToId']) && is_array($in)) ? $in['replyToId'] : null))) ?
''.LCRun3::ch($cx, 'l10nParse', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'-post-content'),array()),
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ?
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url'])
&& is_array($in['links']['topic-history'])) ?
$in['links']['topic-history']['url'] : null)),array()), 'encq').'' :
''.LCRun3::ch($cx, 'l10nParse', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'-title-content'),array()),
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ?
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url'])
&& is_array($in['links']['topic-history'])) ?
$in['links']['topic-history']['url'] : null)),array()), 'encq').'').'</span>
';},'flow_topic_titlebar_content' => function ($cx, $in, $sp) {return
''.$sp.'<div class="flow-topic-titlebar-container">
'.$sp.' <h2 class="flow-topic-title flow-load-interactive
'.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? 'flow-collapse-toggle flow-click-interactive' :
'').'"
@@ -126,11 +126,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['undelete']['url']) &&
is_array($in['actions']['undelete'])) ? $in['actions']['undelete']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['suppress']['url']) &&
is_array($in['actions']['suppress'])) ? $in['actions']['suppress']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 7ef5313..55aa847 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -80,7 +80,7 @@
'.$sp.''.LCRun3::p($cx, 'flow_form_cancel_button', array(array($in),array()),
' ').' <small
class="flow-terms-of-use plainlinks">'.LCRun3::ch($cx, 'l10nParse',
array(array('flow-terms-of-use-new-topic'),array()), 'encq').'</small>
'.$sp.' </div>
'.$sp.' </form>
-'.$sp.'' : '').'';},'flow_topic_moderation_flag' => function ($cx, $in, $sp)
{return ''.$sp.'<span class="mw-ui-icon mw-ui-icon-before'.LCRun3::hbch($cx,
'ifCond', array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','lock'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-check';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','hide'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-flag';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','delete'),array()), $in, false,
function($cx, $in)use($sp){return ' mw-ui-icon-remove';}).'"></span>
+'.$sp.'' : '').'';},'flow_topic_moderation_flag' => function ($cx, $in, $sp)
{return ''.$sp.'<span class="mw-ui-icon mw-ui-icon-before'.LCRun3::hbch($cx,
'ifCond', array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','lock'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-check';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','hide'),array()), $in, false, function($cx,
$in)use($sp){return ' mw-ui-icon-flag';}).''.LCRun3::hbch($cx, 'ifCond',
array(array(((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'===','delete'),array()), $in, false,
function($cx, $in)use($sp){return ' mw-ui-icon-trash';}).'"></span>
';},'flow_post_moderation_state' => function ($cx, $in, $sp) {return
''.$sp.'<span class="plainlinks">'.((LCRun3::ifvar($cx,
((isset($in['replyToId']) && is_array($in)) ? $in['replyToId'] : null))) ?
''.LCRun3::ch($cx, 'l10nParse', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'-post-content'),array()),
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ?
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url'])
&& is_array($in['links']['topic-history'])) ?
$in['links']['topic-history']['url'] : null)),array()), 'encq').'' :
''.LCRun3::ch($cx, 'l10nParse', array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderateState']) && is_array($in)) ?
$in['moderateState'] : null),'-title-content'),array()),
'raw'),((isset($in['moderator']['name']) && is_array($in['moderator'])) ?
$in['moderator']['name'] : null),((isset($in['links']['topic-history']['url'])
&& is_array($in['links']['topic-history'])) ?
$in['links']['topic-history']['url'] : null)),array()), 'encq').'').'</span>
';},'flow_topic_titlebar_content' => function ($cx, $in, $sp) {return
''.$sp.'<div class="flow-topic-titlebar-container">
'.$sp.' <h2 class="flow-topic-title flow-load-interactive
'.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? 'flow-collapse-toggle flow-click-interactive' :
'').'"
@@ -171,11 +171,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['undelete']['url']) &&
is_array($in['actions']['undelete'])) ? $in['actions']['undelete']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['suppress']['url']) &&
is_array($in['actions']['suppress'])) ? $in['actions']['suppress']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index a1323e7..7ace593 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -113,11 +113,11 @@
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['delete']['url']) &&
is_array($in['actions']['delete'])) ? $in['actions']['delete']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="delete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-delete-',((isset($in['moderationTemplate']) && is_array($in)) ?
$in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['undelete']) && is_array($in['actions'])) ?
$in['actions']['undelete'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['undelete']['url']) &&
is_array($in['actions']['undelete'])) ? $in['actions']['undelete']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
-'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-remove
mw-ui-icon-remove-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
+'.$sp.' data-role="undelete">'.((LCRun3::ifvar($cx,
((isset($in['moderationIcons']) && is_array($in)) ? $in['moderationIcons'] :
null))) ? '<span class="mw-ui-icon mw-ui-icon-before mw-ui-icon-trash
mw-ui-icon-trash-destructive-hover"></span> ' : '').''.LCRun3::ch($cx, 'l10n',
array(array(LCRun3::ch($cx, 'concat',
array(array('flow-',((isset($in['moderationType']) && is_array($in)) ?
$in['moderationType'] :
null),'-action-undelete-',((isset($in['moderationTemplate']) && is_array($in))
? $in['moderationTemplate'] : null)),array()), 'raw')),array()),
'encq').'</a>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'</li>' : '').''.((LCRun3::ifvar($cx,
((isset($in['actions']['suppress']) && is_array($in['actions'])) ?
$in['actions']['suppress'] : null))) ?
'<li>'.htmlentities((string)((isset($in['noop']) && is_array($in)) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<a
class="'.htmlentities((string)((isset($in['moderationMwUiClass']) &&
is_array($in)) ? $in['moderationMwUiClass'] : null), ENT_QUOTES, 'UTF-8').'
mw-ui-destructive mw-ui-quiet mw-ui-hovericon"
'.$sp.'
href="'.htmlentities((string)((isset($in['actions']['suppress']['url']) &&
is_array($in['actions']['suppress'])) ? $in['actions']['suppress']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
'.$sp.'
data-flow-interactive-handler="moderationDialog"
'.$sp.'
data-flow-template="flow_moderate_'.htmlentities((string)((isset($in['moderationTemplate'])
&& is_array($in)) ? $in['moderationTemplate'] : null), ENT_QUOTES,
'UTF-8').'.partial"
diff --git a/handlebars/flow_moderation_actions_list.partial.handlebars
b/handlebars/flow_moderation_actions_list.partial.handlebars
index 766d5a6..19f905d 100644
--- a/handlebars/flow_moderation_actions_list.partial.handlebars
+++ b/handlebars/flow_moderation_actions_list.partial.handlebars
@@ -187,7 +187,7 @@
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-remove
mw-ui-icon-remove-destructive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash mw-ui-icon-trash-destructive-hover"></span>
{{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-delete-" moderationTemplate)~}}
</a>
{{~noop~}}
@@ -201,7 +201,7 @@
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-remove
mw-ui-icon-remove-destructive-hover"></span> {{/if~}}
+ {{~#if moderationIcons}}<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-trash mw-ui-icon-trash-destructive-hover"></span>
{{/if~}}
{{~l10n (concat "flow-" moderationType
"-action-undelete-" moderationTemplate)~}}
</a>
{{~noop~}}
diff --git a/handlebars/flow_topic_moderation_flag.partial.handlebars
b/handlebars/flow_topic_moderation_flag.partial.handlebars
index 8446fde..122ff6b 100644
--- a/handlebars/flow_topic_moderation_flag.partial.handlebars
+++ b/handlebars/flow_topic_moderation_flag.partial.handlebars
@@ -1,4 +1,4 @@
<span class="mw-ui-icon mw-ui-icon-before
{{~#ifCond moderateState "===" "lock"}} mw-ui-icon-check{{/ifCond~}}
{{~#ifCond moderateState "===" "hide"}} mw-ui-icon-flag{{/ifCond~}}
- {{~#ifCond moderateState "===" "delete"}}
mw-ui-icon-remove{{/ifCond~}}"></span>
+ {{~#ifCond moderateState "===" "delete"}}
mw-ui-icon-trash{{/ifCond~}}"></span>
--
To view, visit https://gerrit.wikimedia.org/r/356512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79250860db7f3922685c2ec7baeb8198c467fe1c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <r...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
