Bsitu has uploaded a new change for review.
https://gerrit.wikimedia.org/r/143530
Change subject: Add topic & post single revision view
......................................................................
Add topic & post single revision view
We used to have a page to show a full reivion view of topic & post, along
with replies, author count, comment replies etc. In the new frontend,
it doesn't seem easy to grab a specific revision for a topic. In addition,
revison is historical data, it's not possible to keep track of the replies,
author count etc for that pariticular revision. It would make more sense
to show just the revision text.
This fixes both topic & post revision view error, I think we should merge
this now and improve it later.
Bug: 67378
Change-Id: I928373284d02793964d99b6a111267c347220985
---
M handlebars/compiled/flow_block_topic_single_view.handlebars.php
M handlebars/flow_block_topic_single_view.handlebars
M includes/UrlGenerator.php
M modules/new/styles/layout.less
4 files changed, 42 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/30/143530/1
diff --git a/handlebars/compiled/flow_block_topic_single_view.handlebars.php
b/handlebars/compiled/flow_block_topic_single_view.handlebars.php
index 3fabb6c..d79f27b 100644
--- a/handlebars/compiled/flow_block_topic_single_view.handlebars.php
+++ b/handlebars/compiled/flow_block_topic_single_view.handlebars.php
@@ -15,15 +15,17 @@
'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-post',((is_array($in['revision']) &&
isset($in['revision']['human_timestamp'])) ? $in['revision']['human_timestamp']
: null),((is_array($in['revision']['rev_view_links']['board']) &&
isset($in['revision']['rev_view_links']['board']['title'])) ?
$in['revision']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['root']) &&
isset($in['revision']['root']['content'])) ? $in['revision']['root']['content']
: 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-post-first',((is_array($in['revision'])
&& isset($in['revision']['human_timestamp'])) ?
$in['revision']['human_timestamp'] :
null),((is_array($in['revision']['rev_view_links']['board']) &&
isset($in['revision']['rev_view_links']['board']['title'])) ?
$in['revision']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['root']) &&
isset($in['revision']['root']['content'])) ? $in['revision']['root']['content']
: 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'.((LCRun3::ifvar($cx, ((is_array($in['revision']) &&
isset($in['revision']['isTopicTitle'])) ? $in['revision']['isTopicTitle'] :
null))) ? ' class="flow-topics"' : '').'>
- '.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').'
+ 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-post',((is_array($in['revision']) &&
isset($in['revision']['human_timestamp'])) ? $in['revision']['human_timestamp']
: null),((is_array($in['revision']['rev_view_links']['board']) &&
isset($in['revision']['rev_view_links']['board']['title'])) ?
$in['revision']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['root']) &&
isset($in['revision']['root']['content'])) ? $in['revision']['root']['content']
: 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-post-first',((is_array($in['revision'])
&& isset($in['revision']['human_timestamp'])) ?
$in['revision']['human_timestamp'] :
null),((is_array($in['revision']['rev_view_links']['board']) &&
isset($in['revision']['rev_view_links']['board']['title'])) ?
$in['revision']['rev_view_links']['board']['title'] :
null),((is_array($in['revision']['root']) &&
isset($in['revision']['root']['content'])) ? $in['revision']['root']['content']
: 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>
diff --git a/handlebars/flow_block_topic_single_view.handlebars
b/handlebars/flow_block_topic_single_view.handlebars
index ba8cda7..4a19fba 100644
--- a/handlebars/flow_block_topic_single_view.handlebars
+++ b/handlebars/flow_block_topic_single_view.handlebars
@@ -1,12 +1,24 @@
-<div class="flow-revision-permalink-warning plainlinks">
- {{#if revision.previousRevisionId}}
- {{l10nParse "flow-revision-permalink-warning-post"
revision.human_timestamp revision.rev_view_links.board.title
revision.root.content revision.rev_view_links.hist.url
revision.rev_view_links.diff.url}}
- {{else}}
- {{l10nParse "flow-revision-permalink-warning-post-first"
revision.human_timestamp revision.rev_view_links.board.title
revision.root.content revision.rev_view_links.hist.url
revision.rev_view_links.diff.url}}
- {{/if}}
-</div>
-<div{{#if revision.isTopicTitle}} class="flow-topics"{{/if}}>
- {{escapeContent revision.contentFormat revision.content}}
+<div class="flow-board">
+ <div class="flow-revision-permalink-warning plainlinks">
+ {{#if revision.previousRevisionId}}
+ {{l10nParse "flow-revision-permalink-warning-post"
+ revision.human_timestamp
+ revision.rev_view_links.board.title
+ revision.root.content
revision.rev_view_links.hist.url
+ revision.rev_view_links.diff.url}}
+ {{else}}
+ {{l10nParse
+ "flow-revision-permalink-warning-post-first"
+ revision.human_timestamp
+ revision.rev_view_links.board.title
+ revision.root.content
+ 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>
diff --git a/includes/UrlGenerator.php b/includes/UrlGenerator.php
index 7123290..f69019a 100644
--- a/includes/UrlGenerator.php
+++ b/includes/UrlGenerator.php
@@ -128,6 +128,7 @@
array(
'workflow' => $workflowId->getAlphadecimal(),
'topic_revId' => $revId->getAlphadecimal(),
+ 'action' => 'single-view'
)
);
}
@@ -149,9 +150,8 @@
'workflow' => $workflowId->getAlphadecimal(),
'topic_postId' => $postId->getAlphadecimal(),
'topic_revId' => $revId->getAlphadecimal(),
- ),
- // necessary?
- '#flow-post-' . $postId->getAlphadecimal()
+ 'action' => 'single-view'
+ )
);
}
diff --git a/modules/new/styles/layout.less b/modules/new/styles/layout.less
index 9d2e4dc..02abdca 100644
--- a/modules/new/styles/layout.less
+++ b/modules/new/styles/layout.less
@@ -268,6 +268,13 @@
}
}
+// Revision view
+.flow-revision-content {
+ background: none repeat scroll 0 0 #EDEDED;
+ color: #777777 !important;
+ margin-top: 20px;
+ padding: 10px;
+}
// Comments
.flow-post {
--
To view, visit https://gerrit.wikimedia.org/r/143530
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I928373284d02793964d99b6a111267c347220985
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
