hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

template changes to recent and unread

Browse Source
v1.18.x
Baris Usakli 12 years ago
parent 6b4520e526
commit 1ec6726459
4 changed files with 96 additions and 86 deletions
Show Stats Download Patch File Download Diff File

80
public/templates/recent.tpl
Unescape Escape View File

@ -24,49 +24,51 @@
<div class="{topic_row_size}"> <div class="{topic_row_size}">
<ul id="topics-container"> <ul id="topics-container">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <li class="category-item {topics.deleted-class}">
<li class="category-item {topics.deleted-class}"> <div class="row">
<div class="row"> <div class="col-md-12 col-xs-12 topic-row img-thumbnail">
<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
<a href="../../topic/{topics.slug}"> <a href="../../topic/{topics.slug}">
<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3> <h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
</a> </a>
<small> <small>
<span class="topic-stats"> <span class="topic-stats">
<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts <span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
</span> </span>
<span class="topic-stats"> <span class="topic-stats">
<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views <span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
</span> </span>
|
<span> posted in
<a href="../../category/{topics.categorySlug}">
<i class="{topics.categoryIcon}"></i> {topics.categoryName}
</a>
</span>
<span class="pull-right hidden-xs"> <span class="pull-right hidden-xs">
<a href="/user/{topics.userslug}"> <a href="/user/{topics.userslug}">
<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/> <img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
<a href="../../topic/{topics.slug}"> <a href="../../topic/{topics.slug}">
<span> <span>
posted <span class="timeago" title="{topics.relativeTime}"></span> posted <span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</a> </a>
| |
<a href="/user/{topics.teaser_userslug}"> <a href="/user/{topics.teaser_userslug}">
<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="../../topic/{topics.slug}#{topics.teaser_pid}">
<span> <span>
replied <span class="timeago" title="{topics.teaser_timestamp}"></span> replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
</span> </span>
</a> </a>
</span> </span>
</small> </small>
</div>
</div> </div>
</li> </div>
</a> </li>
<!-- END topics --> <!-- END topics -->
</ul> </ul>
</div> </div>

78
public/templates/unread.tpl
Unescape Escape View File

@ -19,46 +19,50 @@
<div class="{topic_row_size}"> <div class="{topic_row_size}">
<ul id="topics-container" data-next-start="{nextStart}"> <ul id="topics-container" data-next-start="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<a href="../../topic/{topics.slug}" id="tid-{topics.tid}"> <li class="category-item {topics.deleted-class}">
<li class="category-item {topics.deleted-class}"> <div class="row">
<div class="row"> <div class="col-md-12 topic-row">
<div class="col-md-12 topic-row"> <a href="../../topic/{topics.slug}">
<a href="../../topic/{topics.slug}"> <h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3>
<h3><span class="topic-title"><strong><i class="{topics.pin-icon}"></i> <i class="{topics.lock-icon}"></i></strong> {topics.title}</span></h3> </a>
</a> <small>
<small> <span class="topic-stats">
<span class="topic-stats"> <span class="badge {topics.badgeclass}">{topics.postcount}</span> posts
<span class="badge {topics.badgeclass}">{topics.postcount}</span> posts </span>
</span> <span class="topic-stats">
<span class="topic-stats"> <span class="badge {topics.badgeclass}">{topics.viewcount}</span> views
<span class="badge {topics.badgeclass}">{topics.viewcount}</span> views </span>
</span> |
<span> posted in
<a href="../../category/{topics.categorySlug}">
<i class="{topics.categoryIcon}"></i> {topics.categoryName}
</a>
</span>
<span class="pull-right hidden-xs"> <span class="pull-right hidden-xs">
<a href="/user/{topics.userslug}"> <a href="/user/{topics.userslug}">
<img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/> <img class="img-rounded teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
<a href="../../topic/{topics.slug}"> <a href="../../topic/{topics.slug}">
<span> <span>
posted <span class="timeago" title="{topics.relativeTime}"></span> posted <span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</a> </a>
| |
<a href="/user/{topics.teaser_userslug}"> <a href="/user/{topics.teaser_userslug}">
<img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> <img class="img-rounded teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a> </a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}"> <a href="../../topic/{topics.slug}#{topics.teaser_pid}">
<span> <span>
replied <span class="timeago" title="{topics.teaser_timestamp}"></span> replied <span class="timeago" title="{topics.teaser_timestamp}"></span>
</span> </span>
</a> </a>
</span> </span>
</small> </small>
</div>
</div> </div>
</li> </div>
</a> </li>
<!-- END topics --> <!-- END topics -->
</ul> </ul>
<button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button> <button id="load-more-btn" class="btn btn-primary hide">[[unread:load_more]]</button>

8
src/categories.js
Unescape Escape View File

@ -310,13 +310,7 @@ var RDB = require('./redis.js'),
}; };
Categories.getCategoryFields = function(cid, fields, callback) { Categories.getCategoryFields = function(cid, fields, callback) {
RDB.hmgetObject('category:' + cid, fields, function(err, data) { RDB.hmgetObject('category:' + cid, fields, callback);
if (err === null) {
callback(data);
} else {
winston.err(err);
}
});
}; };
Categories.setCategoryField = function(cid, field, value) { Categories.setCategoryField = function(cid, field, value) {

16
src/topics.js
Unescape Escape View File

@ -306,7 +306,14 @@ var RDB = require('./redis.js'),
}); });
} }
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges], function(err, results) { function getCategoryInfo(next) {
categories.getCategoryFields(topicData.cid, ['name', 'slug', 'icon'], function(err, categoryData) {
console.log(categoryData);
next(err, categoryData);
});
}
async.parallel([getUserInfo, hasReadTopic, getTeaserInfo, getPrivileges, getCategoryInfo], function(err, results) {
callback({ callback({
username: results[0].username, username: results[0].username,
userslug: results[0].userslug, userslug: results[0].userslug,
@ -314,7 +321,8 @@ var RDB = require('./redis.js'),
userbanned: results[0].banned, userbanned: results[0].banned,
hasread: results[1], hasread: results[1],
teaserInfo: results[2], teaserInfo: results[2],
privileges: results[3] privileges: results[3],
categoryData: results[4]
}); });
}); });
} }
@ -339,13 +347,15 @@ var RDB = require('./redis.js'),
topicData.username = topicInfo.username; topicData.username = topicInfo.username;
topicData.userslug = topicInfo.userslug; topicData.userslug = topicInfo.userslug;
topicData.picture = topicInfo.picture; topicData.picture = topicInfo.picture;
topicData.categoryIcon = topicInfo.categoryData.icon;
topicData.categoryName = topicInfo.categoryData.name;
topicData.categorySlug = topicInfo.categoryData.slug;
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 || '',
topicData.teaser_username = topicInfo.teaserInfo.username || ''; topicData.teaser_username = topicInfo.teaserInfo.username || '';
topicData.teaser_userslug = topicInfo.teaserInfo.userslug || ''; topicData.teaser_userslug = topicInfo.teaserInfo.userslug || '';
topicData.teaser_userpicture = topicInfo.teaserInfo.picture || require('gravatar').url('', {}, https = nconf.get('https')); topicData.teaser_userpicture = topicInfo.teaserInfo.picture || require('gravatar').url('', {}, https = nconf.get('https'));
topicData.teaser_pid = topicInfo.teaserInfo.pid; topicData.teaser_pid = topicInfo.teaserInfo.pid;
topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : ''; topicData.teaser_timestamp = topicInfo.teaserInfo.timestamp ? (new Date(parseInt(topicInfo.teaserInfo.timestamp, 10)).toISOString()) : '';
if (isTopicVisible(topicData, topicInfo)) if (isTopicVisible(topicData, topicInfo))

Write Preview
Loading…
Cancel
Save