Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/159480
Change subject: Change close icon to lock/unlock ...................................................................... Change close icon to lock/unlock According[1] to May, this should be the correct unlock icon. I can't see it on my local machine, though, and it still seems to be listed on the "Icon requests" page[2] Make sure the icon is showing when merging this! 1: https://trello.com/c/oSuO1E3T/574-h-4-change-text-from-close-and-open-lock-and-unlock-1 2: https://www.mediawiki.org/wiki/Design/WikiFont#Icon_requests 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 M modules/new/styles/icons.less 5 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/80/159480/1 diff --git a/handlebars/compiled/flow_block_topic.handlebars.php b/handlebars/compiled/flow_block_topic.handlebars.php index 78a5e1c..c383f58 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> diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php b/handlebars/compiled/flow_block_topiclist.handlebars.php index c8745ba..35ec089 100644 --- a/handlebars/compiled/flow_block_topiclist.handlebars.php +++ b/handlebars/compiled/flow_block_topiclist.handlebars.php @@ -177,7 +177,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"> @@ -386,7 +386,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> @@ -400,7 +400,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> 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 956aad9..96bb9a0 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}} diff --git a/modules/new/styles/icons.less b/modules/new/styles/icons.less index d3f36bb..7fe5d82 100644 --- a/modules/new/styles/icons.less +++ b/modules/new/styles/icons.less @@ -186,7 +186,9 @@ .wikiglyph-lock:before { content: "\e508"; } - +.wikiglyph-unlock:before { + content: "\e509"; +} /* USER e600-602 */ -- To view, visit https://gerrit.wikimedia.org/r/159480 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39eb4a1ee00f3aa47f034d7f5e28a3f398e72724 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
