EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/161361
Change subject: Hygiene: Share pipelist decoration between history and author
links
......................................................................
Hygiene: Share pipelist decoration between history and author links
Change-Id: I505ff3f3038fc028bf580df5d45b2032b1fe5181
---
M handlebars/compiled/flow_block_board-history.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
M handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
M handlebars/compiled/flow_post.handlebars.php
M handlebars/flow_block_board-history.handlebars
M handlebars/flow_block_topic_history.handlebars
M handlebars/flow_post_author.handlebars
M modules/new/styles/board/topic/post.less
M modules/new/styles/common.less
9 files changed, 84 insertions(+), 70 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/61/161361/1
diff --git a/handlebars/compiled/flow_block_board-history.handlebars.php
b/handlebars/compiled/flow_block_board-history.handlebars.php
index 01fff40..9681811 100644
--- a/handlebars/compiled/flow_block_board-history.handlebars.php
+++ b/handlebars/compiled/flow_block_board-history.handlebars.php
@@ -24,14 +24,14 @@
<ul>
'.LCRun3::sec($cx, ((is_array($in) && isset($in['revisions']))
? $in['revisions'] : null), $in, true, function($cx, $in) {return '
<li>
- ('.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['diff-cur'])) ?
$in['links']['diff-cur'] : null))) ? '<a
href="'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['url'])) ? $in['links']['diff-cur']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES,
'UTF-8').'">'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES, 'UTF-8').'</a>' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('cur'),Array()), 'encq').'
- ').'
- '.LCRun3::ch($cx, 'l10n',
Array(Array('pipe-separator'),Array()), 'encq').'
- '.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['diff-prev'])) ?
$in['links']['diff-prev'] : null))) ? '
- <a
href="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES,
'UTF-8').'">'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'</a>' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('last'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['topic'])) ?
$in['links']['topic'] : null))) ? '
- '.LCRun3::ch($cx, 'l10n',
Array(Array('pipe-separator'),Array()), 'encq').'
- <a
href="'.htmlentities(((is_array($in['links']['topic']) &&
isset($in['links']['topic']['url'])) ? $in['links']['topic']['url'] : null),
ENT_QUOTES, 'UTF-8').'" title="'.htmlentities(((is_array($in['links']['topic'])
&& isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.htmlentities(((is_array($in['links']['topic'])
&& isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').'</a>' : '').')
+ <span
class="flow-pipelist">'.htmlentities(((is_array($in) && isset($in['noop'])) ?
$in['noop'] : null), ENT_QUOTES, 'UTF-8').'<span>'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['diff-cur'])) ?
$in['links']['diff-cur'] : null))) ? '<a
href="'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['url'])) ? $in['links']['diff-cur']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES,
'UTF-8').'">'.htmlentities(((is_array($in['links']['diff-cur']) &&
isset($in['links']['diff-cur']['title'])) ? $in['links']['diff-cur']['title'] :
null), ENT_QUOTES, 'UTF-8').'</a>' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('cur'),Array()), 'encq').'
+ ').'
+ </span>
+ <span>
+ '.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['diff-prev'])) ?
$in['links']['diff-prev'] : null))) ? '
+ <a
href="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['url'])) ? $in['links']['diff-prev']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES,
'UTF-8').'">'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'</a>' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('last'),Array()), 'encq').'
+
').'</span>'.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['topic'])) ? $in['links']['topic'] : null))) ? '
+ <span><a
href="'.htmlentities(((is_array($in['links']['topic']) &&
isset($in['links']['topic']['url'])) ? $in['links']['topic']['url'] : null),
ENT_QUOTES, 'UTF-8').'" title="'.htmlentities(((is_array($in['links']['topic'])
&& isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.htmlentities(((is_array($in['links']['topic'])
&& isset($in['links']['topic']['title'])) ? $in['links']['topic']['title'] :
null), ENT_QUOTES, 'UTF-8').'</a></span>' : '').'</span>
'.LCRun3::ch($cx, 'historyTimestamp',
Array(Array($in),Array()), 'encq').'
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 23cd539..63f4ccb 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -50,11 +50,16 @@
<input type="hidden" name="wpEditToken"
value="'.htmlentities(((is_array($cx['scopes'][0]) &&
isset($cx['scopes'][0]['editToken'])) ? $cx['scopes'][0]['editToken'] : null),
ENT_QUOTES, 'UTF-8').'" />
<textarea name="topic_reason"
+ required
+ data-flow-expandable="true"
+ class="mw-ui-input"
+ data-role="content"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array(LCRun3::ch($cx, 'concat',
Array(Array('flow-moderation-placeholder-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-post'),Array()),
'raw')),Array()), 'encq').'">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['reason'])) ?
$cx['scopes'][0]['submitted']['reason'] : null))) ?
''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['reason'])) ?
$cx['scopes'][0]['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'' :
'').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button data-flow-interactive-handler="apiRequest"
data-flow-api-handler="moderatePost"
- class="mw-ui-button
mw-ui-constructive">'.LCRun3::ch($cx, 'l10n', Array(Array(LCRun3::ch($cx,
'concat',
Array(Array('flow-moderation-confirm-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-post'),Array()),
'raw')),Array()), 'encq').'</button>
+ class="mw-ui-button mw-ui-constructive"
+ data-role="submit">'.LCRun3::ch($cx, 'l10n',
Array(Array(LCRun3::ch($cx, 'concat',
Array(Array('flow-moderation-confirm-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-post'),Array()),
'raw')),Array()), 'encq').'</button>
<a data-flow-interactive-handler="cancelForm"
class="mw-ui-button mw-ui-destructive mw-ui-quiet"
href="'.htmlentities(((is_array($in['links']['topic']) &&
isset($in['links']['topic']['url'])) ? $in['links']['topic']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
@@ -166,7 +171,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
@@ -359,7 +364,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 19553cc..ddb0356 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -51,16 +51,15 @@
<input type="hidden" name="wpEditToken"
value="'.htmlentities(((is_array($cx['scopes'][0]) &&
isset($cx['scopes'][0]['editToken'])) ? $cx['scopes'][0]['editToken'] : null),
ENT_QUOTES, 'UTF-8').'" />
<textarea name="topic_reason"
required
- data-flow-preview-template="flow_post"
data-flow-expandable="true"
class="mw-ui-input"
- type="text"
data-role="content"
placeholder="'.LCRun3::ch($cx, 'l10n',
Array(Array(LCRun3::ch($cx, 'concat',
Array(Array('flow-moderation-placeholder-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-topic'),Array()),
'raw')),Array()), 'encq').'">'.((LCRun3::ifvar($cx,
((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['reason'])) ?
$cx['scopes'][0]['submitted']['reason'] : null))) ?
''.htmlentities(((is_array($cx['scopes'][0]['submitted']) &&
isset($cx['scopes'][0]['submitted']['reason'])) ?
$cx['scopes'][0]['submitted']['reason'] : null), ENT_QUOTES, 'UTF-8').'' :
'').'</textarea>
<div class="flow-form-actions flow-form-collapsible">
<button class="mw-ui-button mw-ui-constructive"
- data-flow-interactive-handler="apiRequest"
-
data-flow-api-handler="moderateTopic">'.LCRun3::ch($cx, 'l10n',
Array(Array(LCRun3::ch($cx, 'concat',
Array(Array('flow-moderation-confirm-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-topic'),Array()),
'raw')),Array()), 'encq').'</button>
+ data-flow-interactive-handler="apiRequest"
+ data-flow-api-handler="moderateTopic"
+ data-role="submit">'.LCRun3::ch($cx, 'l10n',
Array(Array(LCRun3::ch($cx, 'concat',
Array(Array('flow-moderation-confirm-',((is_array($cx['scopes'][0]['submitted'])
&& isset($cx['scopes'][0]['submitted']['moderationState'])) ?
$cx['scopes'][0]['submitted']['moderationState'] : null),'-topic'),Array()),
'raw')),Array()), 'encq').'</button>
<a class="mw-ui-button mw-ui-quiet mw-ui-destructive"
href="'.htmlentities(((is_array($in['links']['topic']) &&
isset($in['links']['topic']['url'])) ? $in['links']['topic']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-cancel'),Array()), 'encq').'"
@@ -172,7 +171,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
@@ -365,7 +364,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
@@ -626,4 +625,4 @@
</div>
';
}
-?>
+?>
\ No newline at end of file
diff --git a/handlebars/compiled/flow_post.handlebars.php
b/handlebars/compiled/flow_post.handlebars.php
index 971b006..388cae5 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -133,7 +133,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
@@ -326,7 +326,7 @@
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['userpage']) &&
isset($in['links']['userpage']['exists'])) ? $in['links']['userpage']['exists']
: null))) ? 'new ' : '').'mw-userlink">
' : '').'
'.((LCRun3::ifvar($cx, ((is_array($in) && isset($in['name'])) ?
$in['name'] : null))) ? ''.htmlentities(((is_array($in) && isset($in['name']))
? $in['name'] : null), ENT_QUOTES, 'UTF-8').'' : ''.LCRun3::ch($cx, 'l10n',
Array(Array('flow-anonymous'),Array()), 'encq').'
- ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
+ ').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['userpage'])) ? $in['links']['userpage'] : null))) ? '</a>'
: '').'<span class="mw-usertoollinks flow-pipelist">'.((LCRun3::ifvar($cx,
((is_array($in['links']) && isset($in['links']['talk'])) ? $in['links']['talk']
: null))) ? '<span><a href="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['url'])) ? $in['links']['talk']['url'] : null),
ENT_QUOTES, 'UTF-8').'"
class="'.((!LCRun3::ifvar($cx,
((is_array($in['links']['talk']) && isset($in['links']['talk']['exists'])) ?
$in['links']['talk']['exists'] : null))) ? 'new ' : '').'"
title="'.htmlentities(((is_array($in['links']['talk']) &&
isset($in['links']['talk']['title'])) ? $in['links']['talk']['title'] : null),
ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('talkpagelinktext'),Array()), 'encq').'</a></span>' :
'').''.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['contribs'])) ? $in['links']['contribs'] : null))) ? '<span>
<a
href="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['url'])) ? $in['links']['contribs']['url'] :
null), ENT_QUOTES, 'UTF-8').'"
title="'.htmlentities(((is_array($in['links']['contribs']) &&
isset($in['links']['contribs']['title'])) ? $in['links']['contribs']['title'] :
null), ENT_QUOTES, 'UTF-8').'">'.LCRun3::ch($cx, 'l10n',
Array(Array('contribslink'),Array()), 'encq').'</a>
diff --git a/handlebars/flow_block_board-history.handlebars
b/handlebars/flow_block_board-history.handlebars
index 5cda4a9..c65f8c4 100644
--- a/handlebars/flow_block_board-history.handlebars
+++ b/handlebars/flow_block_board-history.handlebars
@@ -2,29 +2,32 @@
<ul>
{{#each revisions}}
<li>
- (
- {{~#if links.diff-cur~}}
- <a
href="{{links.diff-cur.url}}" title="{{links.diff-cur.title}}">
-
{{~links.diff-cur.title~}}
- </a>
- {{~else~}}
- {{l10n "cur"}}
- {{/if}}
- {{l10n "pipe-separator"}}
- {{#if links.diff-prev}}
- <a
href="{{links.diff-prev.url}}" title="{{links.diff-prev.title}}">
-
{{~links.diff-prev.title~}}
- </a>
- {{~else~}}
- {{l10n "last"}}
- {{~/if~}}
+ <span class="flow-pipelist">
+ {{~noop~}}
+ <span>
+ {{~#if links.diff-cur~}}
+ <a
href="{{links.diff-cur.url}}" title="{{links.diff-cur.title}}">
+
{{~links.diff-cur.title~}}
+ </a>
+ {{~else~}}
+ {{l10n "cur"}}
+ {{/if}}
+ </span>
+ <span>
+ {{#if links.diff-prev}}
+ <a
href="{{links.diff-prev.url}}" title="{{links.diff-prev.title}}">
+
{{~links.diff-prev.title~}}
+ </a>
+ {{~else~}}
+ {{l10n "last"}}
+ {{~/if~}}
+ </span>
{{~#if links.topic}}
- {{l10n "pipe-separator"}}
- <a href="{{links.topic.url}}"
title="{{links.topic.title}}">
+ <span><a
href="{{links.topic.url}}" title="{{links.topic.title}}">
{{~links.topic.title~}}
- </a>
+ </a></span>
{{~/if~}}
- )
+ </span>
{{historyTimestamp this}}
diff --git a/handlebars/flow_block_topic_history.handlebars
b/handlebars/flow_block_topic_history.handlebars
index b30d8d4..ca725e2 100644
--- a/handlebars/flow_block_topic_history.handlebars
+++ b/handlebars/flow_block_topic_history.handlebars
@@ -3,29 +3,32 @@
<ul>
{{#each revisions}}
<li>
- (
- {{~#if links.diff-cur~}}
- <a
href="{{links.diff-cur.url}}" title="{{links.diff-cur.title}}">
-
{{~links.diff-cur.title~}}
- </a>
- {{~else~}}
- {{l10n "cur"}}
- {{/if}}
- {{l10n "pipe-separator"}}
- {{#if links.diff-prev}}
- <a
href="{{links.diff-prev.url}}" title="{{links.diff-prev.title}}">
-
{{~links.diff-prev.title~}}
- </a>
- {{~else~}}
- {{l10n "last"}}
- {{~/if~}}
+ <span class="flow-pipelist">
+ {{~noop~}}
+ <span>
+ {{~#if links.diff-cur~}}
+ <a
href="{{links.diff-cur.url}}" title="{{links.diff-cur.title}}">
+
{{~links.diff-cur.title~}}
+ </a>
+ {{~else~}}
+ {{l10n "cur"}}
+ {{/if}}
+ </span>
+ <span>
+ {{#if links.diff-prev}}
+ <a
href="{{links.diff-prev.url}}" title="{{links.diff-prev.title}}">
+
{{~links.diff-prev.title~}}
+ </a>
+ {{~else~}}
+ {{l10n "last"}}
+ {{~/if~}}
+ </span>
{{~#if links.topic}}
- {{l10n
"pipe-separator"}}
- <a
href="{{links.topic.url}}" title="{{links.topic.title}}">
+ <span><a
href="{{links.topic.url}}" title="{{links.topic.title}}">
{{~links.topic.title~}}
- </a>
+ </a></span>
{{~/if~}}
- )
+ </span>
{{historyTimestamp this}}
diff --git a/handlebars/flow_post_author.handlebars
b/handlebars/flow_post_author.handlebars
index db96f21..e6c48cf 100644
--- a/handlebars/flow_post_author.handlebars
+++ b/handlebars/flow_post_author.handlebars
@@ -12,7 +12,7 @@
{{~/if~}}
{{~#if links.userpage~}}</a>{{~/if~}}
- <span class="mw-usertoollinks">
+ <span class="mw-usertoollinks flow-pipelist">
{{~#if links.talk~}}
<span><a href="{{links.talk.url}}"
class="{{#unless links.talk.exists}}new
{{/unless}}"
diff --git a/modules/new/styles/board/topic/post.less
b/modules/new/styles/board/topic/post.less
index 7501204..de76abe 100644
--- a/modules/new/styles/board/topic/post.less
+++ b/modules/new/styles/board/topic/post.less
@@ -107,15 +107,6 @@
.mw-usertoollinks {
opacity: 0;
.transition( opacity .25s linear );
- &:not(:empty):before {
- content: ' ( ';
- }
- span ~ span:before {
- content: ' | ';
- }
- &:not(:empty):after {
- content: ' ) ';
- }
}
&:hover .mw-usertoollinks {
opacity: 1;
diff --git a/modules/new/styles/common.less b/modules/new/styles/common.less
index 9b302d3..c9533f2 100644
--- a/modules/new/styles/common.less
+++ b/modules/new/styles/common.less
@@ -57,6 +57,19 @@
font-size: .875em;
}
+// Decorate as a pipelist, ex: ( foo | bar | baz )
+.flow-pipelist {
+ &:not(:empty):before {
+ content: ' (';
+ }
+ span ~ span:before {
+ content: ' | ';
+ }
+ &:not(:empty):after {
+ content: ') ';
+ }
+}
+
@media all and (min-width: @wgFlowDeviceWidthTablet) {
.flow-topic-meta {
font-size: 1em;
--
To view, visit https://gerrit.wikimedia.org/r/161361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I505ff3f3038fc028bf580df5d45b2032b1fe5181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
