jenkins-bot has submitted this change and it was merged.
Change subject: Remove flow-author from topic titlebar to reduce titlebar height
......................................................................
Remove flow-author from topic titlebar to reduce titlebar height
Change-Id: Ib09becd59c8abda6ee28608c8a4645b23b94e087
---
M Resources.php
M handlebars/compiled/flow_block_topic.handlebars.php
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_topic_titlebar_content.handlebars
M i18n/en.json
M i18n/qqq.json
M includes/Formatter/TopicFormatter.php
M includes/Formatter/TopicListFormatter.php
M modules/new/styles/board/collapser.less
M modules/new/styles/board/moderated.less
M modules/new/styles/board/topic/meta.less
11 files changed, 0 insertions(+), 31 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Resources.php b/Resources.php
index 608e6e2..07dbf77 100644
--- a/Resources.php
+++ b/Resources.php
@@ -108,7 +108,6 @@
'flow-toggle-small-topics',
'flow-toggle-topics',
'flow-toggle-topics-posts',
- 'flow-topic-participants',
'flow-topic-action-hide-topic',
'flow-topic-action-close-topic',
'flow-topic-action-delete-topic',
diff --git a/handlebars/compiled/flow_block_topic.handlebars.php
b/handlebars/compiled/flow_block_topic.handlebars.php
index 5604d18..3fb3f16 100644
--- a/handlebars/compiled/flow_block_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic.handlebars.php
@@ -48,9 +48,6 @@
class="wikiglyph '.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'close'),Array()), $in, function($cx, $in) {return
'wikiglyph-stop';}).''.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'hide'),Array()), $in, function($cx, $in) {return
'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifEquals',
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>
' : '').'
-<span class="flow-author">
- '.LCRun3::ch($cx, 'l10n',
Array(Array('flow-topic-participants',((is_array($in) &&
isset($in['author_count'])) ? $in['author_count'] : null),((is_array($in) &&
isset($in['unnamed_author_count'])) ? $in['unnamed_author_count'] :
null),((is_array($in['creator']) && isset($in['creator']['name'])) ?
$in['creator']['name'] : null),((is_array($in) &&
isset($in['last_author_name'])) ? $in['last_author_name'] : null)),Array()),
'encq').'
-</span>
<div class="flow-topic-meta">
'.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
<a href="#flow-post-'.htmlentities(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null), ENT_QUOTES,
'UTF-8').'-form-content"
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 41e22db..10f20d2 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -171,9 +171,6 @@
class="wikiglyph '.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'close'),Array()), $in, function($cx, $in) {return
'wikiglyph-stop';}).''.LCRun3::hbch($cx, 'ifEquals',
Array(Array(((is_array($in) && isset($in['moderateState'])) ?
$in['moderateState'] : null),'hide'),Array()), $in, function($cx, $in) {return
'wikiglyph-flag';}).''.LCRun3::hbch($cx, 'ifEquals',
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>
' : '').'
-<span class="flow-author">
- '.LCRun3::ch($cx, 'l10n',
Array(Array('flow-topic-participants',((is_array($in) &&
isset($in['author_count'])) ? $in['author_count'] : null),((is_array($in) &&
isset($in['unnamed_author_count'])) ? $in['unnamed_author_count'] :
null),((is_array($in['creator']) && isset($in['creator']['name'])) ?
$in['creator']['name'] : null),((is_array($in) &&
isset($in['last_author_name'])) ? $in['last_author_name'] : null)),Array()),
'encq').'
-</span>
<div class="flow-topic-meta">
'.((LCRun3::ifvar($cx, ((is_array($in['actions']) &&
isset($in['actions']['reply'])) ? $in['actions']['reply'] : null))) ? '
<a href="#flow-post-'.htmlentities(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null), ENT_QUOTES,
'UTF-8').'-form-content"
diff --git a/handlebars/flow_topic_titlebar_content.handlebars
b/handlebars/flow_topic_titlebar_content.handlebars
index 27d2b50..378d8cf 100644
--- a/handlebars/flow_topic_titlebar_content.handlebars
+++ b/handlebars/flow_topic_titlebar_content.handlebars
@@ -5,9 +5,6 @@
{{l10n "post_moderation_state" moderateState replyToId
moderator.name~}}
</div>
{{/if}}
-<span class="flow-author">
- {{l10n "flow-topic-participants" author_count unnamed_author_count
creator.name last_author_name}}
-</span>
<div class="flow-topic-meta">
{{#if actions.reply}}
<a href="#flow-post-{{postId}}-form-content"
diff --git a/i18n/en.json b/i18n/en.json
index 887110f..5c3d0bc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -206,7 +206,6 @@
"flow-history-week": "Last week",
"flow-history-pages-topic": "Appears on [$1 \"$2\" board]",
"flow-history-pages-post": "Appears on [$1 $2]",
- "flow-topic-participants": "{{PLURAL:$1|$3 started this
topic|{{GENDER:$3|$3}}, {{GENDER:$4|$4}} and $2 {{PLURAL:$2|other|others}}|0=No
participation yet|2={{GENDER:$3|$3}} and {{GENDER:$4|$4}}}}",
"flow-topic-comments": "{{PLURAL:$1|$1 comment|$1
comments|0={{GENDER:$2|Be the first}} to comment!}}",
"flow-comment-restored": "Restored comment",
"flow-comment-deleted": "Deleted comment",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 30e03ef..4f074b8 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -210,7 +210,6 @@
"flow-history-week": "Used as <code><nowiki><h2></nowiki></code>
heading in the \"Topic history\" page to display all history of last
week.\n\nThis \"Last week\" is equal to \"Last 7 days\".\n{{Identical|Last
week}}",
"flow-history-pages-topic": "Used to describe what board the topic is
added to. Parameters:\n* $1 - the link to the page\n* $2 - the page title",
"flow-history-pages-post": "Used to describe what topic the post is
added to. Parameters:\n* $1 - the link to the topic\n* $2 - the topic title",
- "flow-topic-participants": "Message to display the amount of
participants in this topic (and potentially a couple of
names).\n\nParameters:\n* $1 - the total amount of participants in the
conversation, can be used for PLURAL\n* $2 - the total amount of participants
minus 3, can be used to generate a message like: X, Y, Z and $2 others ($3, $4
and $5 will be usernames)\n* $3 - username of the topic starter, can be used
for GENDER\n* $4 - username of the most recent participant who is not the
creator (if there is a second participant, otherwise not available), can be
used for GENDER",
"flow-topic-comments": "Message to display the amount of comments in
this topic. Shown as a link after the topic title and the line with the topic
authors. Clicking the link lets the current user write a new
comment.\n\nParameters:\n* $1 - the number of comments on this topic, can be
used for PLURAL\n* $2 - the name of the current user, can be used for
GENDER\nSee also:\n* {{msg-mw|Flow-topic-meta-minimal}}",
"flow-comment-restored": "Used as revision comment when the post has
been restored.\n\nSee also:\n* {{msg-mw|Flow-comment-deleted}}",
"flow-comment-deleted": "Used as revision comment when the post has
been deleted.\n\nSee also:\n* {{msg-mw|Flow-comment-restored}}",
diff --git a/includes/Formatter/TopicFormatter.php
b/includes/Formatter/TopicFormatter.php
index 5baddce..c8b2bc5 100644
--- a/includes/Formatter/TopicFormatter.php
+++ b/includes/Formatter/TopicFormatter.php
@@ -102,14 +102,8 @@
$workflow = isset( $workflows[$postAlphaId] ) ?
$workflows[$postAlphaId] : null;
- $authors = array_unique( $authors );
- $authorCount = count( $authors );
- $lastAuthor = end( $authors );
return array(
'reply_count' => $replies,
- 'unnamed_author_count' => $lastAuthor === $authors[0] ?
$authorCount - 1 : $authorCount - 2,
- 'last_author_name' => $lastAuthor,
- 'author_count' => $authorCount,
// ms timestamp
'last_updated' => $workflow ?
$workflow->getLastModifiedObj()->getTimestamp() * 1000 : null,
);
diff --git a/includes/Formatter/TopicListFormatter.php
b/includes/Formatter/TopicListFormatter.php
index f745197..a4bd99c 100644
--- a/includes/Formatter/TopicListFormatter.php
+++ b/includes/Formatter/TopicListFormatter.php
@@ -158,14 +158,8 @@
$workflow = isset( $workflows[$postAlphaId] ) ?
$workflows[$postAlphaId] : null;
- $authors = array_unique( $authors );
- $authorCount = count( $authors );
- $lastAuthor = end( $authors );
return array(
'reply_count' => $replies,
- 'unnamed_author_count' => $lastAuthor === $authors[0] ?
$authorCount - 1 : $authorCount - 2,
- 'last_author_name' => $lastAuthor,
- 'author_count' => $authorCount,
// ms timestamp
'last_updated' => $workflow ?
$workflow->getLastModifiedObj()->getTimestamp() * 1000 : null,
);
diff --git a/modules/new/styles/board/collapser.less
b/modules/new/styles/board/collapser.less
index 0a8fc62..a442f04 100644
--- a/modules/new/styles/board/collapser.less
+++ b/modules/new/styles/board/collapser.less
@@ -66,7 +66,6 @@
.flow-topic-titlebar {
padding: .5em @topicIndent;
- .flow-author,
.flow-topic-meta {
display: none;
}
diff --git a/modules/new/styles/board/moderated.less
b/modules/new/styles/board/moderated.less
index c14bde5..cde31bd 100644
--- a/modules/new/styles/board/moderated.less
+++ b/modules/new/styles/board/moderated.less
@@ -12,17 +12,12 @@
background-color: @colorWhite;
border: solid 1px @colorGrayLight;
}
-
- &.flow-element-collapsed .flow-author {
- display: none;
- }
}
// Hidden simply collapse partially
.flow-topic-moderatestate-hide {
&.flow-element-collapsed {
.flow-topic-title,
- .flow-author,
.flow-topic-meta {
display: none;
}
diff --git a/modules/new/styles/board/topic/meta.less
b/modules/new/styles/board/topic/meta.less
index 62e9a46..d3cd82b 100644
--- a/modules/new/styles/board/topic/meta.less
+++ b/modules/new/styles/board/topic/meta.less
@@ -5,6 +5,5 @@
// Topic metadata
.flow-topic-meta {
- padding: 0.33em 0 0 0;
color: @colorTextLight;
}
--
To view, visit https://gerrit.wikimedia.org/r/156728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib09becd59c8abda6ee28608c8a4645b23b94e087
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Spage <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
