jenkins-bot has submitted this change and it was merged.
Change subject: Header revision view
......................................................................
Header revision view
Change-Id: I81d81c26bbb4493f5487709ffe32c3506e43fb24
---
M handlebars/compiled/flow_block_header_single_view.handlebars.php
M handlebars/flow_block_header_single_view.handlebars
M includes/UrlGenerator.php
3 files changed, 30 insertions(+), 14 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_header_single_view.handlebars.php
b/handlebars/compiled/flow_block_header_single_view.handlebars.php
index c3a3eae..4319406 100644
--- a/handlebars/compiled/flow_block_header_single_view.handlebars.php
+++ b/handlebars/compiled/flow_block_header_single_view.handlebars.php
@@ -15,14 +15,18 @@
'sp_vars' => Array(),
);
- return '<div class="flow-revision-permalink-warning plainlinks">
- '.((LCRun3::ifvar($cx, ((is_array($in['revision']) &&
isset($in['revision']['previousRevisionId'])) ?
$in['revision']['previousRevisionId'] : null))) ? '
- '.LCRun3::ch($cx, 'l10nParse',
Array('flow-revision-permalink-warning-header',((is_array($in['revision']) &&
isset($in['revision']['human_timestamp'])) ? $in['revision']['human_timestamp']
: null),((is_array($in['revision']['rev_view_links']['hist']) &&
isset($in['revision']['rev_view_links']['hist']['url'])) ?
$in['revision']['rev_view_links']['hist']['url'] :
null),((is_array($in['revision']['rev_view_links']['diff']) &&
isset($in['revision']['rev_view_links']['diff']['url'])) ?
$in['revision']['rev_view_links']['diff']['url'] : null)), 'encq').'
- ' : '
- '.LCRun3::ch($cx, 'l10nParse',
Array('flow-revision-permalink-warning-header-first',((is_array($in['revision'])
&& isset($in['revision']['human_timestamp'])) ?
$in['revision']['human_timestamp'] :
null),((is_array($in['revision']['rev_view_links']['hist']) &&
isset($in['revision']['rev_view_links']['hist']['url'])) ?
$in['revision']['rev_view_links']['hist']['url'] :
null),((is_array($in['revision']['rev_view_links']['diff']) &&
isset($in['revision']['rev_view_links']['diff']['url'])) ?
$in['revision']['rev_view_links']['diff']['url'] : null)), 'encq').'
- ').'
+ return '<div class="flow-board">
+ <div class="flow-revision-permalink-warning plainlinks">
+ '.((LCRun3::ifvar($cx, ((is_array($in['revision']) &&
isset($in['revision']['previousRevisionId'])) ?
$in['revision']['previousRevisionId'] : null))) ? '
+ '.LCRun3::ch($cx, 'l10nParse',
Array('flow-revision-permalink-warning-header',((is_array($in['revision']) &&
isset($in['revision']['human_timestamp'])) ? $in['revision']['human_timestamp']
: null),((is_array($in['revision']['rev_view_links']['hist']) &&
isset($in['revision']['rev_view_links']['hist']['url'])) ?
$in['revision']['rev_view_links']['hist']['url'] :
null),((is_array($in['revision']['rev_view_links']['diff']) &&
isset($in['revision']['rev_view_links']['diff']['url'])) ?
$in['revision']['rev_view_links']['diff']['url'] : null)), 'encq').'
+ ' : '
+ '.LCRun3::ch($cx, 'l10nParse',
Array('flow-revision-permalink-warning-header-first',((is_array($in['revision'])
&& isset($in['revision']['human_timestamp'])) ?
$in['revision']['human_timestamp'] :
null),((is_array($in['revision']['rev_view_links']['hist']) &&
isset($in['revision']['rev_view_links']['hist']['url'])) ?
$in['revision']['rev_view_links']['hist']['url'] :
null),((is_array($in['revision']['rev_view_links']['diff']) &&
isset($in['revision']['rev_view_links']['diff']['url'])) ?
$in['revision']['rev_view_links']['diff']['url'] : null)), 'encq').'
+ ').'
+ </div>
+ <div class="flow-revision-content">
+ '.LCRun3::ch($cx, 'escapeContent',
Array(((is_array($in['revision']) && isset($in['revision']['contentFormat'])) ?
$in['revision']['contentFormat'] : null),((is_array($in['revision']) &&
isset($in['revision']['content'])) ? $in['revision']['content'] : null)),
'encq').'
+ </div>
</div>
-'.LCRun3::ch($cx, 'escapeContent', Array(((is_array($in['revision']) &&
isset($in['revision']['contentFormat'])) ? $in['revision']['contentFormat'] :
null),((is_array($in['revision']) && isset($in['revision']['content'])) ?
$in['revision']['content'] : null)), 'encq').'
';
}
?>
\ No newline at end of file
diff --git a/handlebars/flow_block_header_single_view.handlebars
b/handlebars/flow_block_header_single_view.handlebars
index 32b3425..5938c18 100644
--- a/handlebars/flow_block_header_single_view.handlebars
+++ b/handlebars/flow_block_header_single_view.handlebars
@@ -1,8 +1,19 @@
-<div class="flow-revision-permalink-warning plainlinks">
- {{#if revision.previousRevisionId}}
- {{l10nParse "flow-revision-permalink-warning-header"
revision.human_timestamp revision.rev_view_links.hist.url
revision.rev_view_links.diff.url}}
- {{else}}
- {{l10nParse "flow-revision-permalink-warning-header-first"
revision.human_timestamp revision.rev_view_links.hist.url
revision.rev_view_links.diff.url}}
- {{/if}}
+<div class="flow-board">
+ <div class="flow-revision-permalink-warning plainlinks">
+ {{#if revision.previousRevisionId}}
+ {{l10nParse "flow-revision-permalink-warning-header"
+ revision.human_timestamp
+ revision.rev_view_links.hist.url
+ revision.rev_view_links.diff.url}}
+ {{else}}
+ {{l10nParse
"flow-revision-permalink-warning-header-first"
+ revision.human_timestamp
+ revision.rev_view_links.hist.url
+ revision.rev_view_links.diff.url}}
+ {{/if}}
+ </div>
+
+ <div class="flow-revision-content">
+ {{escapeContent revision.contentFormat revision.content}}
+ </div>
</div>
-{{escapeContent revision.contentFormat revision.content}}
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index f69019a..cd92bab 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -109,6 +109,7 @@
array(
'workflow' => $workflowId->getAlphadecimal(),
'header_revId' => $revId->getAlphadecimal(),
+ 'action' => 'view-header'
)
);
}
--
To view, visit https://gerrit.wikimedia.org/r/143544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I81d81c26bbb4493f5487709ffe32c3506e43fb24
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson <[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
