Werdna has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/146511

Change subject: Add "There are no older topics" text.
......................................................................

Add "There are no older topics" text.

Change-Id: I965c9a10927e09fe728b51b17faaeb91f21cbef3
---
M handlebars/compiled/flow_block_topiclist.handlebars.php
M handlebars/flow_load_more.handlebars
M i18n/en.json
M i18n/qqq.json
M modules/new/styles/common.less
5 files changed, 17 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/11/146511/1

diff --git a/handlebars/compiled/flow_block_topiclist.handlebars.php 
b/handlebars/compiled/flow_block_topiclist.handlebars.php
index 9a9ea1c..a102f86 100644
--- a/handlebars/compiled/flow_block_topiclist.handlebars.php
+++ b/handlebars/compiled/flow_block_topiclist.handlebars.php
@@ -415,7 +415,11 @@
                   
title="'.htmlentities(((is_array($in['links']['pagination']['fwd']) && 
isset($in['links']['pagination']['fwd']['title'])) ? 
$in['links']['pagination']['fwd']['title'] : null), ENT_QUOTES, 'UTF-8').'"
                   class="flow-ui-button flow-ui-progressive 
flow-load-interactive /*flow-ui-quiet flow-ui-thin*/"><span class="wikiglyph 
wikiglyph-article"></span> '.LCRun3::ch($cx, 'l10n', 
Array(Array('flow-load-more'),Array()), 'encq').'</a>
        </div>
-' : '').'
+' : '
+       <div class="flow-no-more">
+               '.LCRun3::ch($cx, 'l10n', 
Array(Array('flow-no-more-fwd'),Array()), 'encq').'
+       </div>
+').'
 
 </div>
 ';
diff --git a/handlebars/flow_load_more.handlebars 
b/handlebars/flow_load_more.handlebars
index 5fa4759..3f31ff8 100644
--- a/handlebars/flow_load_more.handlebars
+++ b/handlebars/flow_load_more.handlebars
@@ -11,4 +11,8 @@
                   title="{{links.pagination.fwd.title}}"
                   class="flow-ui-button flow-ui-progressive 
flow-load-interactive /*flow-ui-quiet flow-ui-thin*/"><span class="wikiglyph 
wikiglyph-article"></span> {{l10n "flow-load-more"}}</a>
        </div>
+{{else}}
+       <div class="flow-no-more">
+               {{l10n "flow-no-more-fwd"}}
+       </div>
 {{/if}}
diff --git a/i18n/en.json b/i18n/en.json
index 56e75ba..2b4c1d0 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -318,6 +318,7 @@
     "flow-started-ago": "Started $1",
     "flow-edited-ago": "Edited $1",
     "flow-load-more": "Load More",
+    "flow-no-more-fwd" : "There are no older topics",
     "flow-add-topic": "Add Topic ",
     "flow-newest-topics": "Newest topics",
     "flow-recent-topics": "Recently active topics",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 736a191..f020d90 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -322,6 +322,7 @@
        "flow-started-ago": "Message displayed in the topic title bar to 
indicate how long ago the topic was created. Parameters:\n* $1 - Humanized time 
ago from CLDR. ex: 17 hours ago",
        "flow-edited-ago": "Message displayed below a post that has been edited 
indicating how long ago it was edited. Parameters:\n* $1 - Humanized time ago 
from CLDR. ex: 4 days ago",
        "flow-load-more": "Message displayed inside a button that fetches more 
topics and appends them to the bottom of the page",
+       "flow-no-more-fwd" : "Displayed instead of 'flow-load-more' when there 
are no more topics to show in the forward direction",
        "flow-add-topic": "Button text for submitting a new topic to the page",
        "flow-newest-topics": "Filter label text for \"Newest topics\"",
        "flow-recent-topics": "Filter label text for \"Recent active topics\"",
diff --git a/modules/new/styles/common.less b/modules/new/styles/common.less
index 547bf45..3d6ef63 100644
--- a/modules/new/styles/common.less
+++ b/modules/new/styles/common.less
@@ -53,6 +53,12 @@
        padding: 10px;
 }
 
+// "No more" link
+.flow-no-more {
+       font-size: .875em;
+       color: #777777;
+}
+
 // MEDIA QUERIES
 @media (max-width: 700px) and (min-device-width: 700px), (max-device-width: 
700px) {
        .flow-board-header,

-- 
To view, visit https://gerrit.wikimedia.org/r/146511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I965c9a10927e09fe728b51b17faaeb91f21cbef3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Werdna <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to