jenkins-bot has submitted this change and it was merged.
Change subject: Change close icon to lock/unlock
......................................................................
Change close icon to lock/unlock
Change-Id: I39eb4a1ee00f3aa47f034d7f5e28a3f398e72724
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar.handlebars
M handlebars/flow_topic_titlebar_content.handlebars
4 files changed, 11 insertions(+), 11 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 2db4aae..b3c2f8c 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -51,7 +51,7 @@
<h2 class="flow-topic-title" data-title="'.LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'encq').'">'.LCRun3::ch($cx,
'escapeContent', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'encq').'</h2>
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['isModerated'])) ?
$in['isModerated'] : null))) ? '
<div class="flow-moderated-topic-title flow-ui-text-truncated"><span
- class="wikiglyph '.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','lock'),Array()), $in, function($cx, $in)
{return 'wikiglyph-stop';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','hide'),Array()), $in, function($cx, $in)
{return 'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','delete'),Array()), $in, function($cx, $in)
{return 'wikiglyph-trash';}).'"></span>
+ class="wikiglyph '.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','lock'),Array()), $in, function($cx, $in)
{return 'wikiglyph-lock';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','hide'),Array()), $in, function($cx, $in)
{return 'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','delete'),Array()), $in, function($cx, $in)
{return 'wikiglyph-trash';}).'"></span>
'.LCRun3::ch($cx, 'l10n',
Array(Array('post_moderation_state',((is_array($in) &&
isset($in['moderateState'])) ? $in['moderateState'] : null),((is_array($in) &&
isset($in['replyToId'])) ? $in['replyToId'] :
null),((is_array($in['moderator']) && isset($in['moderator']['name'])) ?
$in['moderator']['name'] : null)),Array()), 'encq').'</div>
' : '').'
<div class="flow-topic-meta">
@@ -260,7 +260,7 @@
data-flow-id="'.htmlentities(((is_array($in) && isset($in['postId'])) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
href="'.htmlentities(((is_array($in['actions']['lock']) &&
isset($in['actions']['lock']['url'])) ? $in['actions']['lock']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['lock']) &&
isset($in['actions']['lock']['title'])) ? $in['actions']['lock']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-lock"></span>
'.LCRun3::ch($cx,
'l10n', Array(Array('flow-topic-action-lock-topic'),Array()), 'encq').'
</a>
</li>
@@ -274,7 +274,7 @@
data-flow-api-target="<
.flow-topic-titlebar .flow-topic-summary-container"
href="'.htmlentities(((is_array($in['actions']['unlock']) &&
isset($in['actions']['unlock']['url'])) ? $in['actions']['unlock']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['unlock']) &&
isset($in['actions']['unlock']['title'])) ? $in['actions']['unlock']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-unlock"></span>
'.LCRun3::ch($cx,
'l10n', Array(Array('flow-topic-action-unlock-topic'),Array()), 'encq').'
</a>
</li>
@@ -467,4 +467,4 @@
</div>
';
}
-?>
\ No newline at end of file
+?>
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 42fa5c0..e5f83cc 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -179,7 +179,7 @@
<h2 class="flow-topic-title" data-title="'.LCRun3::ch($cx,
'plaintextSnippet', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'encq').'">'.LCRun3::ch($cx,
'escapeContent', Array(Array(((is_array($in['content']) &&
isset($in['content']['format'])) ? $in['content']['format'] :
null),((is_array($in['content']) && isset($in['content']['content'])) ?
$in['content']['content'] : null)),Array()), 'encq').'</h2>
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['isModerated'])) ?
$in['isModerated'] : null))) ? '
<div class="flow-moderated-topic-title flow-ui-text-truncated"><span
- class="wikiglyph '.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','lock'),Array()), $in, function($cx, $in)
{return 'wikiglyph-stop';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','hide'),Array()), $in, function($cx, $in)
{return 'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','delete'),Array()), $in, function($cx, $in)
{return 'wikiglyph-trash';}).'"></span>
+ class="wikiglyph '.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','lock'),Array()), $in, function($cx, $in)
{return 'wikiglyph-lock';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','hide'),Array()), $in, function($cx, $in)
{return 'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifCond',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'===','delete'),Array()), $in, function($cx, $in)
{return 'wikiglyph-trash';}).'"></span>
'.LCRun3::ch($cx, 'l10n',
Array(Array('post_moderation_state',((is_array($in) &&
isset($in['moderateState'])) ? $in['moderateState'] : null),((is_array($in) &&
isset($in['replyToId'])) ? $in['replyToId'] :
null),((is_array($in['moderator']) && isset($in['moderator']['name'])) ?
$in['moderator']['name'] : null)),Array()), 'encq').'</div>
' : '').'
<div class="flow-topic-meta">
@@ -388,7 +388,7 @@
data-flow-id="'.htmlentities(((is_array($in) && isset($in['postId'])) ?
$in['postId'] : null), ENT_QUOTES, 'UTF-8').'"
href="'.htmlentities(((is_array($in['actions']['lock']) &&
isset($in['actions']['lock']['url'])) ? $in['actions']['lock']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['lock']) &&
isset($in['actions']['lock']['title'])) ? $in['actions']['lock']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-lock"></span>
'.LCRun3::ch($cx,
'l10n', Array(Array('flow-topic-action-lock-topic'),Array()), 'encq').'
</a>
</li>
@@ -402,7 +402,7 @@
data-flow-api-target="<
.flow-topic-titlebar .flow-topic-summary-container"
href="'.htmlentities(((is_array($in['actions']['unlock']) &&
isset($in['actions']['unlock']['url'])) ? $in['actions']['unlock']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['actions']['unlock']) &&
isset($in['actions']['unlock']['title'])) ? $in['actions']['unlock']['title'] :
null), ENT_QUOTES, 'UTF-8').'">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-unlock"></span>
'.LCRun3::ch($cx,
'l10n', Array(Array('flow-topic-action-unlock-topic'),Array()), 'encq').'
</a>
</li>
@@ -611,4 +611,4 @@
</div>
';
}
-?>
\ No newline at end of file
+?>
diff --git a/handlebars/flow_topic_titlebar.handlebars
b/handlebars/flow_topic_titlebar.handlebars
index dd386fa..ef2e639 100644
--- a/handlebars/flow_topic_titlebar.handlebars
+++ b/handlebars/flow_topic_titlebar.handlebars
@@ -144,7 +144,7 @@
data-flow-id="{{postId}}"
href="{{actions.lock.url}}"
title="{{actions.lock.title}}">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-lock"></span>
{{l10n
"flow-topic-action-lock-topic"}}
</a>
</li>
@@ -158,7 +158,7 @@
data-flow-api-target="<
.flow-topic-titlebar .flow-topic-summary-container"
href="{{actions.unlock.url}}"
title="{{actions.unlock.title}}">
- <span class="wikiglyph
wikiglyph-stop"></span>
+ <span class="wikiglyph
wikiglyph-unlock"></span>
{{l10n
"flow-topic-action-unlock-topic"}}
</a>
</li>
diff --git a/handlebars/flow_topic_titlebar_content.handlebars
b/handlebars/flow_topic_titlebar_content.handlebars
index ac93e7f..1e8cc55 100644
--- a/handlebars/flow_topic_titlebar_content.handlebars
+++ b/handlebars/flow_topic_titlebar_content.handlebars
@@ -1,7 +1,7 @@
<h2 class="flow-topic-title" data-title="{{plaintextSnippet content.format
content.content}}">{{escapeContent content.format content.content}}</h2>
{{#if isModerated}}
<div class="flow-moderated-topic-title flow-ui-text-truncated"><span
- class="wikiglyph {{#ifCond moderateState "==="
"lock"}}wikiglyph-stop{{/ifCond}}{{#ifCond moderateState "==="
"hide"}}wikiglyph-flag{{/ifCond}}{{#ifCond moderateState "==="
"delete"}}wikiglyph-trash{{/ifCond}}"></span>
+ class="wikiglyph {{#ifCond moderateState "==="
"lock"}}wikiglyph-lock{{/ifCond}}{{#ifCond moderateState "==="
"hide"}}wikiglyph-flag{{/ifCond}}{{#ifCond moderateState "==="
"delete"}}wikiglyph-trash{{/ifCond}}"></span>
{{l10n "post_moderation_state" moderateState replyToId
moderator.name~}}
</div>
{{/if}}
--
To view, visit https://gerrit.wikimedia.org/r/159480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39eb4a1ee00f3aa47f034d7f5e28a3f398e72724
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
