jenkins-bot has submitted this change and it was merged.
Change subject: Add "flow-board" wrapper to diff view pages
......................................................................
Add "flow-board" wrapper to diff view pages
Change-Id: I45226de4c42069967e42b40e9152ca7c506ca5d8
---
M handlebars/compiled/flow_block_header_diff_view.handlebars.php
M handlebars/compiled/flow_block_topic_diff_view.handlebars.php
M handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
M handlebars/flow_block_header_diff_view.handlebars
M handlebars/flow_block_topic_diff_view.handlebars
M handlebars/flow_block_topicsummary_diff_view.handlebars
6 files changed, 75 insertions(+), 30 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/handlebars/compiled/flow_block_header_diff_view.handlebars.php
b/handlebars/compiled/flow_block_header_diff_view.handlebars.php
index 9626e7e..e7d8858 100644
--- a/handlebars/compiled/flow_block_header_diff_view.handlebars.php
+++ b/handlebars/compiled/flow_block_header_diff_view.handlebars.php
@@ -15,11 +15,13 @@
'sp_vars' => Array(),
);
- return '<div class="flow-compare-revisions-header plainlinks">
- '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-header',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
-</div>
-<div class="flow-compare-revisions">
- '.LCRun3::ch($cx, 'diffRevision', Array(((is_array($in['revision']) &&
isset($in['revision']['diff_content'])) ? $in['revision']['diff_content'] :
null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ return '<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-header',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
+ </div>
+ <div class="flow-compare-revisions">
+ '.LCRun3::ch($cx, 'diffRevision',
Array(((is_array($in['revision']) && isset($in['revision']['diff_content'])) ?
$in['revision']['diff_content'] : null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ </div>
</div>
';
}
diff --git a/handlebars/compiled/flow_block_topic_diff_view.handlebars.php
b/handlebars/compiled/flow_block_topic_diff_view.handlebars.php
index f1ea7de..5f861dd 100644
--- a/handlebars/compiled/flow_block_topic_diff_view.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_diff_view.handlebars.php
@@ -15,11 +15,13 @@
'sp_vars' => Array(),
);
- return '<div class="flow-compare-revisions-header plainlinks">
- '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-post',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['root']) &&
isset($in['revision']['new']['root']['content'])) ?
$in['revision']['new']['root']['content'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['root']) &&
isset($in['revision']['new']['rev_view_links']['root']['url'])) ?
$in['revision']['new']['rev_view_links']['root']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
-</div>
-<div class="flow-compare-revisions">
- '.LCRun3::ch($cx, 'diffRevision', Array(((is_array($in['revision']) &&
isset($in['revision']['diff_content'])) ? $in['revision']['diff_content'] :
null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ return '<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-post',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['root']) &&
isset($in['revision']['new']['root']['content'])) ?
$in['revision']['new']['root']['content'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['root']) &&
isset($in['revision']['new']['rev_view_links']['root']['url'])) ?
$in['revision']['new']['rev_view_links']['root']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
+ </div>
+ <div class="flow-compare-revisions">
+ '.LCRun3::ch($cx, 'diffRevision',
Array(((is_array($in['revision']) && isset($in['revision']['diff_content'])) ?
$in['revision']['diff_content'] : null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ </div>
</div>
';
}
diff --git
a/handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
b/handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
index 89e26a9..51280ba 100644
--- a/handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
+++ b/handlebars/compiled/flow_block_topicsummary_diff_view.handlebars.php
@@ -15,11 +15,13 @@
'sp_vars' => Array(),
);
- return '<div class="flow-compare-revisions-header plainlinks">
- '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-postsummary',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['root']) &&
isset($in['revision']['new']['root']['content'])) ?
$in['revision']['new']['root']['content'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['root']) &&
isset($in['revision']['new']['rev_view_links']['root']['url'])) ?
$in['revision']['new']['rev_view_links']['root']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
-</div>
-<div class="flow-compare-revisions">
- '.LCRun3::ch($cx, 'diffRevision', Array(((is_array($in['revision']) &&
isset($in['revision']['diff_content'])) ? $in['revision']['diff_content'] :
null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ return '<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ '.LCRun3::ch($cx, 'l10nParse',
Array('flow-compare-revisions-header-postsummary',((is_array($in['revision']['new']['rev_view_links']['board'])
&& isset($in['revision']['new']['rev_view_links']['board']['title'])) ?
$in['revision']['new']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['new']['root']) &&
isset($in['revision']['new']['root']['content'])) ?
$in['revision']['new']['root']['content'] :
null),((is_array($in['revision']['new']['rev_view_links']['board']) &&
isset($in['revision']['new']['rev_view_links']['board']['url'])) ?
$in['revision']['new']['rev_view_links']['board']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['root']) &&
isset($in['revision']['new']['rev_view_links']['root']['url'])) ?
$in['revision']['new']['rev_view_links']['root']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['hist']) &&
isset($in['revision']['new']['rev_view_links']['hist']['url'])) ?
$in['revision']['new']['rev_view_links']['hist']['url'] : null)), 'encq').'
+ </div>
+ <div class="flow-compare-revisions">
+ '.LCRun3::ch($cx, 'diffRevision',
Array(((is_array($in['revision']) && isset($in['revision']['diff_content'])) ?
$in['revision']['diff_content'] : null),((is_array($in['revision']['old']) &&
isset($in['revision']['old']['human_timestamp'])) ?
$in['revision']['old']['human_timestamp'] :
null),((is_array($in['revision']['new']) &&
isset($in['revision']['new']['human_timestamp'])) ?
$in['revision']['new']['human_timestamp'] :
null),((is_array($in['revision']['old']['author']) &&
isset($in['revision']['old']['author']['name'])) ?
$in['revision']['old']['author']['name'] :
null),((is_array($in['revision']['new']['author']) &&
isset($in['revision']['new']['author']['name'])) ?
$in['revision']['new']['author']['name'] :
null),((is_array($in['revision']['old']['rev_view_links']['single-view']) &&
isset($in['revision']['old']['rev_view_links']['single-view']['url'])) ?
$in['revision']['old']['rev_view_links']['single-view']['url'] :
null),((is_array($in['revision']['new']['rev_view_links']['single-view']) &&
isset($in['revision']['new']['rev_view_links']['single-view']['url'])) ?
$in['revision']['new']['rev_view_links']['single-view']['url'] : null)),
'encq').'
+ </div>
</div>';
}
?>
\ No newline at end of file
diff --git a/handlebars/flow_block_header_diff_view.handlebars
b/handlebars/flow_block_header_diff_view.handlebars
index d7dbc1e..a1ed0c4 100644
--- a/handlebars/flow_block_header_diff_view.handlebars
+++ b/handlebars/flow_block_header_diff_view.handlebars
@@ -1,6 +1,18 @@
-<div class="flow-compare-revisions-header plainlinks">
- {{l10nParse "flow-compare-revisions-header-header"
revision.new.rev_view_links.board.title revision.new.author.name
revision.new.rev_view_links.board.url revision.new.rev_view_links.hist.url }}
-</div>
-<div class="flow-compare-revisions">
- {{diffRevision revision.diff_content revision.old.human_timestamp
revision.new.human_timestamp revision.old.author.name revision.new.author.name
revision.old.rev_view_links.single-view.url
revision.new.rev_view_links.single-view.url }}
+<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ {{l10nParse "flow-compare-revisions-header-header"
+ revision.new.rev_view_links.board.title
+ revision.new.author.name
+ revision.new.rev_view_links.board.url
+ revision.new.rev_view_links.hist.url }}
+ </div>
+ <div class="flow-compare-revisions">
+ {{diffRevision revision.diff_content
+ revision.old.human_timestamp
+ revision.new.human_timestamp
+ revision.old.author.name
+ revision.new.author.name
+ revision.old.rev_view_links.single-view.url
+ revision.new.rev_view_links.single-view.url }}
+ </div>
</div>
diff --git a/handlebars/flow_block_topic_diff_view.handlebars
b/handlebars/flow_block_topic_diff_view.handlebars
index 1f4f635..fda0d32 100644
--- a/handlebars/flow_block_topic_diff_view.handlebars
+++ b/handlebars/flow_block_topic_diff_view.handlebars
@@ -1,6 +1,20 @@
-<div class="flow-compare-revisions-header plainlinks">
- {{l10nParse "flow-compare-revisions-header-post"
revision.new.rev_view_links.board.title revision.new.root.content
revision.new.author.name revision.new.rev_view_links.board.url
revision.new.rev_view_links.root.url revision.new.rev_view_links.hist.url }}
-</div>
-<div class="flow-compare-revisions">
- {{diffRevision revision.diff_content revision.old.human_timestamp
revision.new.human_timestamp revision.old.author.name revision.new.author.name
revision.old.rev_view_links.single-view.url
revision.new.rev_view_links.single-view.url }}
+<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ {{l10nParse "flow-compare-revisions-header-post"
+ revision.new.rev_view_links.board.title
+ revision.new.root.content
+ revision.new.author.name
+ revision.new.rev_view_links.board.url
+ revision.new.rev_view_links.root.url
+ revision.new.rev_view_links.hist.url }}
+ </div>
+ <div class="flow-compare-revisions">
+ {{diffRevision revision.diff_content
+ revision.old.human_timestamp
+ revision.new.human_timestamp
+ revision.old.author.name
+ revision.new.author.name
+ revision.old.rev_view_links.single-view.url
+ revision.new.rev_view_links.single-view.url }}
+ </div>
</div>
diff --git a/handlebars/flow_block_topicsummary_diff_view.handlebars
b/handlebars/flow_block_topicsummary_diff_view.handlebars
index f81f68f..4e9fcbc 100644
--- a/handlebars/flow_block_topicsummary_diff_view.handlebars
+++ b/handlebars/flow_block_topicsummary_diff_view.handlebars
@@ -1,6 +1,19 @@
-<div class="flow-compare-revisions-header plainlinks">
- {{l10nParse "flow-compare-revisions-header-postsummary"
revision.new.rev_view_links.board.title revision.new.root.content
revision.new.rev_view_links.board.url revision.new.rev_view_links.root.url
revision.new.rev_view_links.hist.url }}
-</div>
-<div class="flow-compare-revisions">
- {{diffRevision revision.diff_content revision.old.human_timestamp
revision.new.human_timestamp revision.old.author.name revision.new.author.name
revision.old.rev_view_links.single-view.url
revision.new.rev_view_links.single-view.url }}
+<div class="flow-board">
+ <div class="flow-compare-revisions-header plainlinks">
+ {{l10nParse "flow-compare-revisions-header-postsummary"
+ revision.new.rev_view_links.board.title
+ revision.new.root.content
+ revision.new.rev_view_links.board.url
+ revision.new.rev_view_links.root.url
+ revision.new.rev_view_links.hist.url }}
+ </div>
+ <div class="flow-compare-revisions">
+ {{diffRevision revision.diff_content
+ revision.old.human_timestamp
+ revision.new.human_timestamp
+ revision.old.author.name
+ revision.new.author.name
+ revision.old.rev_view_links.single-view.url
+ revision.new.rev_view_links.single-view.url }}
+ </div>
</div>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/143546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I45226de4c42069967e42b40e9152ca7c506ca5d8
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
