jenkins-bot has submitted this change and it was merged.
Change subject: "Edited timestamp" should link to diff
......................................................................
"Edited timestamp" should link to diff
Bug: 67607
Change-Id: Ia0047f654e9d1d7d819a3c7ffc366c22682aeb68
---
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_post_meta_actions.handlebars
4 files changed, 39 insertions(+), 11 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
index 4350f82..3bd174e 100644
--- a/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_post.handlebars.php
@@ -133,8 +133,15 @@
' : '').'
</span>
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['previousRevisionId'])) ? $in['previousRevisionId'] : null))) ? '
- <!--span class="wikiglyph wikiglyph-clock"></span-->
- '.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in)
&& isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),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').'"
+ class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'">
+ ' : '').'
+ '.LCRun3::ch($cx, 'uuidTimestamp',
Array(Array(((is_array($in) && isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),Array()), 'encq').'
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['diff-prev'])) ? $in['links']['diff-prev'] : null))) ? '
+ </a>
+ ' : '').'
•
' : '').'
'.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null),'time_ago'),Array()), 'encq').'
@@ -267,4 +274,4 @@
</div>
';
}
-?>
\ No newline at end of file
+?>
diff --git a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
index 09c9e74..5bac5c9 100644
--- a/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_moderate_topic.handlebars.php
@@ -135,8 +135,15 @@
' : '').'
</span>
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['previousRevisionId'])) ? $in['previousRevisionId'] : null))) ? '
- <!--span class="wikiglyph wikiglyph-clock"></span-->
- '.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in)
&& isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),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').'"
+ class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'">
+ ' : '').'
+ '.LCRun3::ch($cx, 'uuidTimestamp',
Array(Array(((is_array($in) && isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),Array()), 'encq').'
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['diff-prev'])) ? $in['links']['diff-prev'] : null))) ? '
+ </a>
+ ' : '').'
•
' : '').'
'.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null),'time_ago'),Array()), 'encq').'
@@ -269,4 +276,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 f13c1dc..3242d02 100644
--- a/handlebars/compiled/flow_post.handlebars.php
+++ b/handlebars/compiled/flow_post.handlebars.php
@@ -101,8 +101,15 @@
' : '').'
</span>
'.((LCRun3::ifvar($cx, ((is_array($in) &&
isset($in['previousRevisionId'])) ? $in['previousRevisionId'] : null))) ? '
- <!--span class="wikiglyph wikiglyph-clock"></span-->
- '.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in)
&& isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),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').'"
+ class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+
title="'.htmlentities(((is_array($in['links']['diff-prev']) &&
isset($in['links']['diff-prev']['title'])) ? $in['links']['diff-prev']['title']
: null), ENT_QUOTES, 'UTF-8').'">
+ ' : '').'
+ '.LCRun3::ch($cx, 'uuidTimestamp',
Array(Array(((is_array($in) && isset($in['revisionId'])) ? $in['revisionId'] :
null),'edited_ago'),Array()), 'encq').'
+ '.((LCRun3::ifvar($cx, ((is_array($in['links']) &&
isset($in['links']['diff-prev'])) ? $in['links']['diff-prev'] : null))) ? '
+ </a>
+ ' : '').'
•
' : '').'
'.LCRun3::ch($cx, 'uuidTimestamp', Array(Array(((is_array($in) &&
isset($in['postId'])) ? $in['postId'] : null),'time_ago'),Array()), 'encq').'
@@ -231,4 +238,4 @@
';}).'
';
}
-?>
\ No newline at end of file
+?>
diff --git a/handlebars/flow_post_meta_actions.handlebars
b/handlebars/flow_post_meta_actions.handlebars
index d256e11..09ec86f 100644
--- a/handlebars/flow_post_meta_actions.handlebars
+++ b/handlebars/flow_post_meta_actions.handlebars
@@ -33,8 +33,15 @@
{{/if}}
</span>
{{#if previousRevisionId}}
- <!--span class="wikiglyph wikiglyph-clock"></span-->
- {{uuidTimestamp revisionId "edited_ago"}}
+ {{#if links.diff-prev}}
+ <a href="{{links.diff-prev.url}}"
+ class="mw-ui-button mw-ui-progressive mw-ui-quiet
flow-ui-inline"
+ title="{{links.diff-prev.title}}">
+ {{/if}}
+ {{uuidTimestamp revisionId "edited_ago"}}
+ {{#if links.diff-prev}}
+ </a>
+ {{/if}}
•
{{/if}}
{{uuidTimestamp postId "time_ago"}}
--
To view, visit https://gerrit.wikimedia.org/r/146622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0047f654e9d1d7d819a3c7ffc366c22682aeb68
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[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
