Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-11 16:35:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #464

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-10-29 14:16:03 -04:00
parent 842cd17979
commit 89540172b2
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/src/forum/admin/topics.js
View File

@@ -59,6 +59,7 @@ define(function() {
topicsListEl.innerHTML += html; topicsListEl.innerHTML += html;
btnEl.innerHTML = 'Load More Topics'; btnEl.innerHTML = 'Load More Topics';
$('span.timeago').timeago();
} else { } else {
// Exhausted all topics // Exhausted all topics
btnEl.className += ' disabled'; btnEl.className += ' disabled';

2
public/templates/admin/topics.tpl
View File

@@ -11,7 +11,7 @@
</div> </div>
<a target="_blank" href="{relative_path}/topic/{topics.slug}">{topics.title}</a> <a target="_blank" href="{relative_path}/topic/{topics.slug}">{topics.title}</a>
<ul> <ul>
<li><i class="icon-time"></i> Posted {topics.relativeTime} ago by {topics.username}</li> <li><i class="icon-time"></i> Posted <span class="timeago" title="{topics.relativeTime}"></span> by {topics.username}</li>
<li><i class="icon-comments"></i> {topics.postcount} post(s)</li> <li><i class="icon-comments"></i> {topics.postcount} post(s)</li>
</ul> </ul>
<div class="clear"></div> <div class="clear"></div>

9
src/topics.js
View File

@@ -22,8 +22,12 @@ var RDB = require('./redis.js'),
Topics.getTopicData = function(tid, callback) { Topics.getTopicData = function(tid, callback) {
RDB.hgetall('topic:' + tid, function(err, data) { RDB.hgetall('topic:' + tid, function(err, data) {
if (err === null) { if (err === null) {
if(data) if(data) {
data.title = validator.sanitize(data.title).escape(); data.title = validator.sanitize(data.title).escape();
if(data.timestamp) {
data.relativeTime = new Date(parseInt(data.timestamp, 10)).toISOString();
}
}
callback(data); callback(data);
} else { } else {
@@ -327,8 +331,6 @@ var RDB = require('./redis.js'),
topicData['lock-icon'] = topicData.locked === '1' ? 'icon-lock' : 'none'; topicData['lock-icon'] = topicData.locked === '1' ? 'icon-lock' : 'none';
topicData['deleted-class'] = topicData.deleted === '1' ? 'deleted' : ''; topicData['deleted-class'] = topicData.deleted === '1' ? 'deleted' : '';
topicData.relativeTime = new Date(parseInt(topicData.timestamp, 10)).toISOString();
topicData.username = topicInfo.username; topicData.username = topicInfo.username;
topicData.badgeclass = (topicInfo.hasread && current_user != 0) ? '' : 'badge-important'; topicData.badgeclass = (topicInfo.hasread && current_user != 0) ? '' : 'badge-important';
topicData.teaser_text = topicInfo.teaserInfo.text || '', topicData.teaser_text = topicInfo.teaserInfo.text || '',
@@ -455,7 +457,6 @@ var RDB = require('./redis.js'),
hasRead = results[1], hasRead = results[1],
teaser = results[2]; teaser = results[2];
topicData.relativeTime = new Date(parseInt(topicData.timestamp,10)).toISOString();
topicData.badgeclass = hasRead ? '' : 'badge-important'; topicData.badgeclass = hasRead ? '' : 'badge-important';
topicData.teaser_text = teaser.text || ''; topicData.teaser_text = teaser.text || '';
topicData.teaser_username = teaser.username || ''; topicData.teaser_username = teaser.username || '';