Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/155825
Change subject: Hygiene: Remove templates for flow_topic_navigation
......................................................................
Hygiene: Remove templates for flow_topic_navigation
It just serves to confuse people reading your code. This template doesn't
render anywhere and is full of @todo notes.
It's very bad practice having unused code lying around the place.
Change-Id: I794a921fee616c5589440737b7f1682dce8e1329
---
M Resources.php
M handlebars/Makefile
M handlebars/flow_block_topiclist.handlebars
D handlebars/flow_topic_navigation.handlebars
M modules/new/flow-handlebars.js
5 files changed, 0 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/25/155825/1
diff --git a/Resources.php b/Resources.php
index 1eeefe9..09319b9 100644
--- a/Resources.php
+++ b/Resources.php
@@ -67,7 +67,6 @@
"flow_topic_titlebar.handlebars",
"flow_topic_titlebar_close.handlebars",
"flow_topic_titlebar_watch.handlebars",
- "flow_topic_navigation.handlebars",
"flow_topic_titlebar_content.handlebars",
"flow_topic_titlebar_summary.handlebars",
"flow_topiclist_loop.handlebars",
diff --git a/handlebars/Makefile b/handlebars/Makefile
index f63e5aa..bfbf9d9 100644
--- a/handlebars/Makefile
+++ b/handlebars/Makefile
@@ -95,7 +95,6 @@
compiled/flow_block_topiclist.handlebars.php: \
flow_block_topiclist.handlebars \
flow_board_navigation.handlebars \
- flow_topic_navigation.handlebars \
flow_newtopic_form.handlebars \
flow_anon_warning.handlebars \
flow_tooltip.handlebars \
diff --git a/handlebars/flow_block_topiclist.handlebars
b/handlebars/flow_block_topiclist.handlebars
index e4c8c8d..d5493c4 100644
--- a/handlebars/flow_block_topiclist.handlebars
+++ b/handlebars/flow_block_topiclist.handlebars
@@ -1,8 +1,6 @@
{{> flow_board_navigation}}
<div class="flow-board">
- {{> flow_topic_navigation}}
-
{{! new-topic form should only be displayed when run with JS, otherwise
link to designated page }}
<div class="flow-newtopic-container">
<div class="flow-nojs">
diff --git a/handlebars/flow_topic_navigation.handlebars
b/handlebars/flow_topic_navigation.handlebars
deleted file mode 100644
index f828081..0000000
--- a/handlebars/flow_topic_navigation.handlebars
+++ /dev/null
@@ -1,34 +0,0 @@
-<ul class="flow-topic-navigation flow-list" style="display:none;">
- {{!-- @todo reimplement this after Sprint B --}}{{!--
- <li class="flow-topic-navigation-heading"><h5>{{l10n "Topics_n"
this}}</h5></li>
- {{#each roots}}
- {{#eachPost @root this}}
- <li class="flow-topic-navigator-wrap">
- <a href="#flow-topic-{{postId}}"
class="flow-topic-navigator">
- {{math @index "+" "1"}}.
{{escapeContent content.format content.content}}
- <span class="flow-topic-navigator-meta">
- {{#if last_updated}}
- {{timestamp
last_updated "active_ago"}}
- {{else}}
- {{uuidTimestamp postId
"started_ago"}}
- {{/if}}
- </span>
- </a>
- </li>
- {{/eachPost}}
- {{/each}}
- <li class="flow-topic-navigation-footer">
- {{l10n "topic_count_sidebar" this}}
- {{#if links.pagination.fwd}}
- <a href="{{links.pagination.fwd.url}}"
title="{{links.pagination.fwd.title}}" class="mw-ui-button mw-ui-progressive
mw-ui-quiet"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
- {{else}}
- {{if links.pagination.rev}}
- <a href="{{links.pagination.rev.url}}"
title="{{links.pagination.rev.title}}" class="mw-ui-button mw-ui-progressive
mw-ui-quiet"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
- {{else}}
- <!-- @todo make disabled class do something? -->
- <a class="mw-ui-button mw-ui-progressive
mw-ui-quiet disabled"><span class="wikiglyph wikiglyph-article"></span> {{l10n
"flow-load-more"}}</a>
- {{/if}}
- {{/if}}
- </li>
- --}}
-</ul>
diff --git a/modules/new/flow-handlebars.js b/modules/new/flow-handlebars.js
index 7553c18..7107d23 100644
--- a/modules/new/flow-handlebars.js
+++ b/modules/new/flow-handlebars.js
@@ -165,9 +165,6 @@
var parameters = Array.prototype.slice.call( arguments, 1 ),
strings = ( {
"Reply": "Reply", // TODO: pass in and parse
$author['gender']
- "Topics_n": function ( count, options ) {
- return "Topics (" + count + ")";
- },
// @todo - use real i18n message keys instead
of cancatenation
"started_with_participants": function (
context, options ) {
--
To view, visit https://gerrit.wikimedia.org/r/155825
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I794a921fee616c5589440737b7f1682dce8e1329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
