SG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166727
Change subject: Remove topic group collapser
......................................................................
Remove topic group collapser
Change-Id: I0ec83cd37115e6771331c2e45ba2e2f802fa9c65
---
M Resources.php
M handlebars/Makefile
M handlebars/compiled/flow_block_topiclist.handlebars.php
D handlebars/compiled/flow_board_collapsers_subcomponent.handlebars.php
D handlebars/flow_board_collapsers_subcomponent.handlebars
M handlebars/flow_board_navigation.handlebars
M modules/new/styles/board/collapser.less
7 files changed, 1 insertion(+), 112 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/27/166727/1
diff --git a/Resources.php b/Resources.php
index 1ed844c..8ea48d3 100644
--- a/Resources.php
+++ b/Resources.php
@@ -39,7 +39,6 @@
"flow_block_topicsummary_diff_view.handlebars",
"flow_block_topicsummary_edit.handlebars",
"flow_block_topicsummary_single_view.handlebars",
- "flow_board_collapsers_subcomponent.handlebars",
"flow_board_navigation.handlebars",
"flow_component.handlebars",
"flow_edit_post.handlebars",
diff --git a/handlebars/Makefile b/handlebars/Makefile
index f92bf1c..5dde464 100644
--- a/handlebars/Makefile
+++ b/handlebars/Makefile
@@ -31,7 +31,6 @@
compiled/flow_block_header_edit.handlebars.php \
compiled/flow_block_header_single_view.handlebars.php \
compiled/flow_block_header_diff_view.handlebars.php \
- compiled/flow_board_collapsers_subcomponent.handlebars.php \
compiled/flow_block_topiclist.handlebars.php \
compiled/flow_block_topiclist_newtopic.handlebars.php \
compiled/flow_block_topic.handlebars.php \
@@ -90,10 +89,6 @@
compiled/flow_block_topicsummary_diff_view.handlebars.php: \
flow_block_topicsummary_diff_view.handlebars
$(COMPILE) flow_block_topicsummary_diff_view
-
-compiled/flow_board_collapsers_subcomponent.handlebars.php: \
- flow_board_collapsers_subcomponent.handlebars
- $(COMPILE) flow_board_collapsers_subcomponent
compiled/flow_block_topiclist.handlebars.php: \
flow_block_topiclist.handlebars \
diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 57efb41..bb1beb0 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -37,13 +37,6 @@
</div>
'.'
<div class="flow-board-navigation-inner">
- '.LCRun3::hbch($cx, 'progressiveEnhancement',
Array(Array(),Array()), $in, function($cx, $in) {return '
- <a href="#topics/full"
data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-compact flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-compact
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-topics-posts'),Array()), 'encq').'"></span></a>
-<a href="#topics/compact" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-topics flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-toc
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-small-topics'),Array()), 'encq').'"></span></a>
-<a href="#topics/topics" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-full flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-expanded
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-topics'),Array()), 'encq').'"></span></a>
-
- ';}).'
-
'.'
<a href="javascript:void(0);"
class="flow-board-navigator-active
flow-board-navigator-first flow-ui-tooltip-target"
diff --git
a/handlebars/compiled/flow_board_collapsers_subcomponent.handlebars.php
b/handlebars/compiled/flow_board_collapsers_subcomponent.handlebars.php
deleted file mode 100644
index 7f28d97..0000000
--- a/handlebars/compiled/flow_board_collapsers_subcomponent.handlebars.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php return function ($in, $debugopt = 1) {
- $cx = Array(
- 'flags' => Array(
- 'jstrue' => false,
- 'jsobj' => false,
- 'spvar' => true,
- 'prop' => false,
- 'method' => false,
- 'mustlok' => false,
- 'debug' => $debugopt,
- ),
- 'helpers' => Array( 'l10n' => 'Flow\TemplateHelper::l10n',
-),
- 'blockhelpers' => Array(),
- 'hbhelpers' => Array(),
- 'scopes' => Array($in),
- 'sp_vars' => Array(),
-
- );
- return '<a href="#topics/full"
data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-compact flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-compact
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-topics-posts'),Array()), 'encq').'"></span></a>
-<a href="#topics/compact" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-topics flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-toc
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-small-topics'),Array()), 'encq').'"></span></a>
-<a href="#topics/topics" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-full flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-expanded
flow-ui-tooltip-target" title="'.LCRun3::ch($cx, 'l10n',
Array(Array('flow-toggle-topics'),Array()), 'encq').'"></span></a>
-';
-}
-?>
\ No newline at end of file
diff --git a/handlebars/flow_board_collapsers_subcomponent.handlebars
b/handlebars/flow_board_collapsers_subcomponent.handlebars
deleted file mode 100644
index 25dbc22..0000000
--- a/handlebars/flow_board_collapsers_subcomponent.handlebars
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="#topics/full" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-compact flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-compact
flow-ui-tooltip-target" title="{{l10n "flow-toggle-topics-posts"}}"></span></a>
-<a href="#topics/compact" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-topics flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-toc
flow-ui-tooltip-target" title="{{l10n "flow-toggle-small-topics"}}"></span></a>
-<a href="#topics/topics" data-flow-interactive-handler="collapserGroupToggle"
class="flow-board-collapser-full flow-board-navigator-right
flow-board-navigator-cap"><span class="wikiglyph wikiglyph-stripe-expanded
flow-ui-tooltip-target" title="{{l10n "flow-toggle-topics"}}"></span></a>
diff --git a/handlebars/flow_board_navigation.handlebars
b/handlebars/flow_board_navigation.handlebars
index 80645e8..c84f93e 100644
--- a/handlebars/flow_board_navigation.handlebars
+++ b/handlebars/flow_board_navigation.handlebars
@@ -5,10 +5,6 @@
</div>
{{!-- <a href="{{links.search.url}}" title="{{links.search.title}}"
class="flow-board-navigator-last"><span class="wikiglyph
wikiglyph-magnifying-glass flow-ui-tooltip-target" title="Search"></span></a>
--}}
<div class="flow-board-navigation-inner">
- {{#progressiveEnhancement}}
- {{> flow_board_collapsers_subcomponent}}
- {{/progressiveEnhancement}}
-
{{!-- Click for sorting options, not sure what this url should
be --}}
<a href="javascript:void(0);"
class="flow-board-navigator-active
flow-board-navigator-first flow-ui-tooltip-target"
diff --git a/modules/new/styles/board/collapser.less
b/modules/new/styles/board/collapser.less
index a02cdbd..a9a0674 100644
--- a/modules/new/styles/board/collapser.less
+++ b/modules/new/styles/board/collapser.less
@@ -46,70 +46,4 @@
display: none;
}
}
-}
-
-// In compact mode, posts are hidden by default, and the topic titlebar is
minimized
-.flow-board-collapsed-compact {
- .flow-board-navigation {
- a.flow-board-collapser-compact {
- display: inline-block;
- }
- a.flow-board-collapser-full {
- display: none;
- }
- }
-
- .flow-topic {
- padding-bottom: 0;
-
- h2.flow-topic-title,
- .flow-moderated-topic-title {
- margin-bottom: 0 !important; // Needs additional
specificity to override `div#content h2`
- }
-
- .flow-topic-titlebar {
- padding: .5em @topicIndent;
-
- .flow-topic-meta {
- display: none;
- }
- }
-
- .flow-reply-count {
- display: block;
- }
- }
-
- .flow-topic-expanded {
- .flow-topic-title {
- overflow: visible;
- white-space: normal;
- }
- }
-
- .flow-topic-summary,
- .flow-post,
- .flow-reply-form {
- display: none;
-
- &.flow-preview {
- display: block;
- }
- }
-}
-// In topics mode, posts are hidden by default; only the topic titlebar is
visible
-.flow-board-collapsed-topics {
- .flow-board-navigation {
- a.flow-board-collapser-topics {
- display: inline-block;
- }
- a.flow-board-collapser-full {
- display: none;
- }
- }
-
- .flow-post,
- .flow-reply-form {
- display: none;
- }
-}
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/166727
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ec83cd37115e6771331c2e45ba2e2f802fa9c65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: SG <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
