Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281274
Change subject: Show cursor:pointer on things that toggle expand/collapse of
resolved topics
......................................................................
Show cursor:pointer on things that toggle expand/collapse of resolved topics
Bug: T131658
Change-Id: I5c39de08b9b8cc818f2c7768b57eddce4a6b6762
---
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_content.partial.handlebars
M handlebars/flow_topic_titlebar_summary.partial.handlebars
M modules/styles/board/moderated.less
5 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/74/281274/1
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 4345984..dedab47 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -38,14 +38,14 @@
';},'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_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-click-interactive' : '').'"
+'.$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' :
'').'"
'.$sp.'
data-flow-topic-title="'.htmlentities((string)((isset($in['content']['content'])
&& is_array($in['content'])) ? $in['content']['content'] : null), ENT_QUOTES,
'UTF-8').'"
'.$sp.' data-flow-load-handler="topicTitle"
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '
data-flow-interactive-handler="collapserCollapsibleToggle"
'.$sp.'' : '').' >
'.$sp.' '.((LCRun3::ifvar($cx, ((isset($in['isLocked']) &&
is_array($in)) ? $in['isLocked'] : null))) ? '<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-check"></span> ' : '').''.LCRun3::ch($cx,
'escapeContent', array(array(((isset($in['content']['format']) &&
is_array($in['content'])) ? $in['content']['format'] :
null),((isset($in['content']['content']) && is_array($in['content'])) ?
$in['content']['content'] : null)),array()), 'encq').'</h2>
'.$sp.' <div class="flow-topic-meta">
-'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '<a class="expand-collapse-posts-link
flow-click-interactive"
+'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '<a class="expand-collapse-posts-link
flow-collapse-toggle flow-click-interactive"
'.$sp.' href="javascript:void(0);"
'.$sp.' title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-show-comments-title',((isset($in['reply_count']) &&
is_array($in)) ? $in['reply_count'] : null)),array()), 'encq').'"
'.$sp.' data-collapsed-title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-show-comments-title',((isset($in['reply_count']) &&
is_array($in)) ? $in['reply_count'] : null)),array()), 'encq').'"
@@ -65,7 +65,7 @@
'.$sp.' '.LCRun3::ch($cx, 'escapeContent',
array(array(((isset($in['moderateReason']['format']) &&
is_array($in['moderateReason'])) ? $in['moderateReason']['format'] :
null),((isset($in['moderateReason']['content']) &&
is_array($in['moderateReason'])) ? $in['moderateReason']['content'] :
null)),array()), 'encq').'
'.$sp.' </div>
'.$sp.'' : '').' <span class="flow-reply-count"><span
class="flow-reply-count-number">'.htmlentities((string)((isset($in['reply_count'])
&& is_array($in)) ? $in['reply_count'] : null), ENT_QUOTES,
'UTF-8').'</span></span>
-'.$sp.'</div>';},'flow_topic_titlebar_summary' => function ($cx, $in, $sp)
{return ''.$sp.'<div class="flow-topic-summary-container '.((LCRun3::ifvar($cx,
((isset($in['isLocked']) && is_array($in)) ? $in['isLocked'] : null))) ?
'flow-click-interactive' : '').'"
+'.$sp.'</div>';},'flow_topic_titlebar_summary' => function ($cx, $in, $sp)
{return ''.$sp.'<div class="flow-topic-summary-container '.((LCRun3::ifvar($cx,
((isset($in['isLocked']) && is_array($in)) ? $in['isLocked'] : null))) ?
'flow-collapse-toggle flow-click-interactive' : '').'"
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '
data-flow-interactive-handler="collapserCollapsibleToggle"
'.$sp.'' : '').' >
'.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), '
').''.((LCRun3::ifvar($cx, ((isset($in['revision']['content']['content']) &&
is_array($in['revision']['content'])) ? $in['revision']['content']['content'] :
null))) ? ' <div class="flow-topic-summary">
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index c70b5a4..b3891d9 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -83,14 +83,14 @@
'.$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>
';},'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-click-interactive' : '').'"
+'.$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' :
'').'"
'.$sp.'
data-flow-topic-title="'.htmlentities((string)((isset($in['content']['content'])
&& is_array($in['content'])) ? $in['content']['content'] : null), ENT_QUOTES,
'UTF-8').'"
'.$sp.' data-flow-load-handler="topicTitle"
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '
data-flow-interactive-handler="collapserCollapsibleToggle"
'.$sp.'' : '').' >
'.$sp.' '.((LCRun3::ifvar($cx, ((isset($in['isLocked']) &&
is_array($in)) ? $in['isLocked'] : null))) ? '<span class="mw-ui-icon
mw-ui-icon-before mw-ui-icon-check"></span> ' : '').''.LCRun3::ch($cx,
'escapeContent', array(array(((isset($in['content']['format']) &&
is_array($in['content'])) ? $in['content']['format'] :
null),((isset($in['content']['content']) && is_array($in['content'])) ?
$in['content']['content'] : null)),array()), 'encq').'</h2>
'.$sp.' <div class="flow-topic-meta">
-'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '<a class="expand-collapse-posts-link
flow-click-interactive"
+'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '<a class="expand-collapse-posts-link
flow-collapse-toggle flow-click-interactive"
'.$sp.' href="javascript:void(0);"
'.$sp.' title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-show-comments-title',((isset($in['reply_count']) &&
is_array($in)) ? $in['reply_count'] : null)),array()), 'encq').'"
'.$sp.' data-collapsed-title="'.LCRun3::ch($cx, 'l10n',
array(array('flow-show-comments-title',((isset($in['reply_count']) &&
is_array($in)) ? $in['reply_count'] : null)),array()), 'encq').'"
@@ -110,7 +110,7 @@
'.$sp.' '.LCRun3::ch($cx, 'escapeContent',
array(array(((isset($in['moderateReason']['format']) &&
is_array($in['moderateReason'])) ? $in['moderateReason']['format'] :
null),((isset($in['moderateReason']['content']) &&
is_array($in['moderateReason'])) ? $in['moderateReason']['content'] :
null)),array()), 'encq').'
'.$sp.' </div>
'.$sp.'' : '').' <span class="flow-reply-count"><span
class="flow-reply-count-number">'.htmlentities((string)((isset($in['reply_count'])
&& is_array($in)) ? $in['reply_count'] : null), ENT_QUOTES,
'UTF-8').'</span></span>
-'.$sp.'</div>';},'flow_topic_titlebar_summary' => function ($cx, $in, $sp)
{return ''.$sp.'<div class="flow-topic-summary-container '.((LCRun3::ifvar($cx,
((isset($in['isLocked']) && is_array($in)) ? $in['isLocked'] : null))) ?
'flow-click-interactive' : '').'"
+'.$sp.'</div>';},'flow_topic_titlebar_summary' => function ($cx, $in, $sp)
{return ''.$sp.'<div class="flow-topic-summary-container '.((LCRun3::ifvar($cx,
((isset($in['isLocked']) && is_array($in)) ? $in['isLocked'] : null))) ?
'flow-collapse-toggle flow-click-interactive' : '').'"
'.$sp.''.((LCRun3::ifvar($cx, ((isset($in['isLocked']) && is_array($in)) ?
$in['isLocked'] : null))) ? '
data-flow-interactive-handler="collapserCollapsibleToggle"
'.$sp.'' : '').' >
'.$sp.''.LCRun3::p($cx, 'flow_errors', array(array($in),array()), '
').''.((LCRun3::ifvar($cx, ((isset($in['revision']['content']['content']) &&
is_array($in['revision']['content'])) ? $in['revision']['content']['content'] :
null))) ? ' <div class="flow-topic-summary">
diff --git a/handlebars/flow_topic_titlebar_content.partial.handlebars
b/handlebars/flow_topic_titlebar_content.partial.handlebars
index f41f022..c196418 100644
--- a/handlebars/flow_topic_titlebar_content.partial.handlebars
+++ b/handlebars/flow_topic_titlebar_content.partial.handlebars
@@ -1,5 +1,5 @@
<div class="flow-topic-titlebar-container">
- <h2 class="flow-topic-title flow-load-interactive {{#if
isLocked}}flow-click-interactive{{/if}}"
+ <h2 class="flow-topic-title flow-load-interactive {{#if
isLocked}}flow-collapse-toggle flow-click-interactive{{/if}}"
data-flow-topic-title="{{content.content}}"
data-flow-load-handler="topicTitle"
{{#if isLocked}}
@@ -11,7 +11,7 @@
</h2>
<div class="flow-topic-meta">
{{#if isLocked~}}
- <a class="expand-collapse-posts-link flow-click-interactive"
+ <a class="expand-collapse-posts-link flow-collapse-toggle
flow-click-interactive"
href="javascript:void(0);"
title="{{l10n "flow-show-comments-title" reply_count}}"
data-collapsed-title="{{l10n "flow-show-comments-title"
reply_count}}"
diff --git a/handlebars/flow_topic_titlebar_summary.partial.handlebars
b/handlebars/flow_topic_titlebar_summary.partial.handlebars
index 6afb6e9..d8f0991 100644
--- a/handlebars/flow_topic_titlebar_summary.partial.handlebars
+++ b/handlebars/flow_topic_titlebar_summary.partial.handlebars
@@ -1,4 +1,4 @@
-<div class="flow-topic-summary-container {{#if
isLocked}}flow-click-interactive{{/if}}"
+<div class="flow-topic-summary-container {{#if isLocked}}flow-collapse-toggle
flow-click-interactive{{/if}}"
{{#if isLocked}}
data-flow-interactive-handler="collapserCollapsibleToggle"
{{/if}}
diff --git a/modules/styles/board/moderated.less
b/modules/styles/board/moderated.less
index 7fd8b61..4d95f91 100644
--- a/modules/styles/board/moderated.less
+++ b/modules/styles/board/moderated.less
@@ -20,4 +20,8 @@
.flow-element-collapsed .flow-post {
display: none;
}
+
+ .flow-collapse-toggle {
+ cursor: pointer;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/281274
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c39de08b9b8cc818f2c7768b57eddce4a6b6762
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
