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

Merge branch 'master' of github.com:designcreateplay/NodeBB

Browse Source
v1.18.x
Julian Lam 11 years ago
parent 39d9dd76dc f282dcd677
commit cc236c1f72
13 changed files with 391 additions and 361 deletions
Show Stats Download Patch File Download Diff File

4
public/src/forum/account.js
Unescape Escape View File

@ -68,10 +68,6 @@ define(['forum/accountheader'], function(header) {
app.openChat(username, theirid); app.openChat(username, theirid);
}); });
$('.user-recent-posts .topic-row').on('click', function() {
ajaxify.go($(this).attr('topic-url'));
});
socket.on('user.isOnline', Account.handleUserOnline); socket.on('user.isOnline', Account.handleUserOnline);
socket.emit('user.isOnline', theirid, Account.handleUserOnline); socket.emit('user.isOnline', theirid, Account.handleUserOnline);

2
public/src/forum/category.js
Unescape Escape View File

@ -155,8 +155,8 @@ define(['composer'], function(composer) {
replies += '<li data-pid="'+ posts[i].pid +'">' + replies += '<li data-pid="'+ posts[i].pid +'">' +
'<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" class="img-rounded user-img" src="' + posts[i].picture + '"/></a>' + '<a href="' + RELATIVE_PATH + '/user/' + posts[i].userslug + '"><img title="' + posts[i].username + '" class="img-rounded user-img" src="' + posts[i].picture + '"/></a>' +
'<strong><span>'+ posts[i].username + '</span></strong>' +
'<a href="' + RELATIVE_PATH + '/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' + '<a href="' + RELATIVE_PATH + '/topic/' + posts[i].topicSlug + '#' + posts[i].pid + '">' +
'<strong><span>'+ posts[i].username + '</span></strong>' +
'<p>' + posts[i].content + '</p>' + '<p>' + posts[i].content + '</p>' +
'</a>' + '</a>' +
'<span class="timeago pull-right" title="' + posts[i].relativeTime + '"></span>' + '<span class="timeago pull-right" title="' + posts[i].relativeTime + '"></span>' +

6
public/src/forum/topic.js
Unescape Escape View File

@ -522,8 +522,10 @@ define(['composer'], function(composer) {
$('#post-container').on('click', '.chat', function(e) { $('#post-container').on('click', '.chat', function(e) {
var username = $(this).parents('li.row').attr('data-username'); var post = $(this).parents('li.post-row'),
var touid = $(this).parents('li.row').attr('data-uid'); username = post.attr('data-username'),
touid = post.attr('data-uid');
app.openChat(username, touid); app.openChat(username, touid);
$(this).parents('.btn-group').find('.dropdown-toggle').click(); $(this).parents('.btn-group').find('.dropdown-toggle').click();
return false; return false;

26
public/templates/account.tpl
Unescape Escape View File

@ -108,12 +108,28 @@
</div> </div>
<div class="col-md-6 user-recent-posts"> <div class="col-md-6 user-recent-posts">
<!-- BEGIN posts --> <div class="topic-row panel panel-default clearfix">
<div class="topic-row img-thumbnail clearfix" topic-url="topic/{posts.tid}/#{posts.pid}"> <div class="panel-heading">
<span>{posts.content}</span> <h3 class="panel-title">Recent Posts</h3>
<span class="pull-right timeago" title="{posts.relativeTime}"></span> </div>
<div class="panel-body">
<!-- BEGIN posts -->
<div class="clearfix">
<p>{posts.content}</p>
<span class="pull-right">
<a href="../../topic/{posts.tid}/#{posts.pid}">posted</a>
in
<a href="../../category/{posts.categorySlug}">
<i class="fa {posts.categoryIcon}"></i> {posts.categoryName}
</a>
<span class="timeago" title="{posts.relativeTime}"></span>
</span>
</div>
<hr/>
<!-- END posts -->
</div>
</div> </div>
<!-- END posts -->
</div> </div>
</div> </div>

94
public/templates/category.tpl
Unescape Escape View File

@ -30,54 +30,56 @@
<meta itemprop="itemListOrder" content="descending"> <meta itemprop="itemListOrder" content="descending">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class}" itemprop="itemListElement"> <li class="category-item {topics.deleted-class}" itemprop="itemListElement">
<div class="row">
<div class="col-md-12 topic-row"> <div class="col-md-12 panel panel-default topic-row">
<div>
<a href="../../topic/{topics.slug}" itemprop="url">
<h3> <h3>
<meta itemprop="name" content="{topics.title}"> <a href="../../topic/{topics.slug}" itemprop="url">
<meta itemprop="name" content="{topics.title}">
<span class="topic-title">
<strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> <span class="topic-title">
{topics.title} <strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong>
</span> {topics.title}
</h3> </span>
</a>
</h3>
<small>
<span class="topic-stats">
[[category:posts]]
<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
</span>
|
<span class="topic-stats">
[[category:views]]
<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</span>
|
<span>
<a href="../../user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a> </a>
<small> [[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span>
<span class="topic-stats"> </span>
[[category:posts]]
<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong> <span class="pull-right hidden-xs">
</span> <!-- IF topics.unreplied -->
| [[category:no_replies]]
<span class="topic-stats"> <!-- ELSE -->
[[category:views]] <a href="../../user/{topics.teaser_userslug}">
<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong> <img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</span> </a>
| <a href="../../topic/{topics.slug}#{topics.teaser_pid}">
<span> [[category:replied]]
<a href="../../user/{topics.userslug}"> </a>
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/> <span class="timeago" title="{topics.teaser_timestamp}"></span>
</a> <!-- ENDIF topics.unreplied -->
[[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span> </span>
</span> </small>
<span class="pull-right hidden-xs">
<!-- IF topics.unreplied -->
[[category:no_replies]]
<!-- ELSE -->
<a href="../../user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a>
<a href="../../topic/{topics.slug}#{topics.teaser_pid}">
[[category:replied]]
</a>
<span class="timeago" title="{topics.teaser_timestamp}"></span>
<!-- ENDIF topics.unreplied -->
</span>
</small>
</div>
</div>
</div> </div>
</li> </li>
<!-- END topics --> <!-- END topics -->
</ul> </ul>

37
public/templates/favourites.tpl
Unescape Escape View File

@ -13,28 +13,29 @@
<div class="row"> <div class="row">
<div class="col-md-12 user-favourite-posts"> <div class="col-md-12 user-favourite-posts">
<!-- BEGIN posts --> <!-- BEGIN posts -->
<div class="topic-row img-thumbnail clearfix"> <div class="topic-row panel panel-default clearfix">
<a href="../../user/{posts.userslug}"> <div class="panel-body">
<img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}"> <a href="../../user/{posts.userslug}">
</a> <img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}">
</a>
<a href="../../user/{posts.userslug}"> <a href="../../user/{posts.userslug}">
<strong><span>{posts.username}</span></strong> <strong><span>{posts.username}</span></strong>
</a> </a>
<p>{posts.content}</p> <p>{posts.content}</p>
<div> <div>
<span class="pull-right"> <span class="pull-right">
<a href="../../topic/{posts.tid}/#{posts.pid}">posted</a> <a href="../../topic/{posts.tid}/#{posts.pid}">posted</a>
in in
<a href="../../category/{posts.categorySlug}"> <a href="../../category/{posts.categorySlug}">
<i class="fa {posts.categoryIcon}"></i> {posts.categoryName} <i class="fa {posts.categoryIcon}"></i> {posts.categoryName}
</a> </a>
<span class="timeago" title="{posts.relativeTime}"></span> <span class="timeago" title="{posts.relativeTime}"></span>
</span> </span>
</div>
</div> </div>
</div> </div>
<br/>
<!-- END posts --> <!-- END posts -->
</div> </div>
</div> </div>

25
public/templates/home.tpl
Unescape Escape View File

@ -1,22 +1,31 @@
<div class="motd{motd_class}"> <div class="panel motd{motd_class}">
{motd} {motd}
</div> </div>
<div class="row home" itemscope itemtype="http://www.schema.org/ItemList"> <div class="row home" itemscope itemtype="http://www.schema.org/ItemList">
<!-- BEGIN categories --> <!-- BEGIN categories -->
<div class="{categories.class}"> <div class="{categories.class}">
<meta itemprop="name" content="{categories.name}">
<h4>
<!-- IF !categories.link -->
<span class="badge {categories.badgeclass}">{categories.topic_count} </span>
<!-- ENDIF !categories.link -->
<!-- IF categories.link -->
<a href="{categories.link}" itemprop="url" target="_blank">
<!-- ELSE -->
<a href="{relative_path}/category/{categories.slug}" itemprop="url">
<!-- ENDIF categories.link -->
{categories.name}
</a>
</h4>
<!-- IF categories.link --> <!-- IF categories.link -->
<a href="{categories.link}" itemprop="url" target="_blank"> <a href="{categories.link}" itemprop="url" target="_blank">
<!-- ELSE --> <!-- ELSE -->
<a href="{relative_path}/category/{categories.slug}" itemprop="url"> <a href="{relative_path}/category/{categories.slug}" itemprop="url">
<!-- ENDIF categories.link --> <!-- ENDIF categories.link -->
<meta itemprop="name" content="{categories.name}">
<h4>
<!-- IF !categories.link -->
<span class="badge {categories.badgeclass}">{categories.topic_count} </span>
<!-- ENDIF !categories.link -->
{categories.name}
</h4>
<div class="icon" style="background: {categories.background}; color: {categories.color};"> <div class="icon" style="background: {categories.background}; color: {categories.color};">
<div id="category-{categories.cid}" class="category-slider-{categories.post_count}"> <div id="category-{categories.cid}" class="category-slider-{categories.post_count}">
<div class="category-box"><i class="fa {categories.icon} fa-4x"></i></div> <div class="category-box"><i class="fa {categories.icon} fa-4x"></i></div>

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

@ -24,50 +24,57 @@
<ul id="topics-container"> <ul id="topics-container">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">
<div class="row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
<div class="col-md-12 col-xs-12 topic-row img-thumbnail">
<h3>
<a href="{relative_path}/topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3> <span class="topic-title">
</a> <strong>
<small> <i class="fa {topics.pin-icon}"></i>
<span class="topic-stats"> <i class="fa {topics.lock-icon}"></i>
posts </strong>
<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong> {topics.title}
</span>
|
<span class="topic-stats">
views
<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</span>
|
<span>
<a href="{relative_path}/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a>
posted in
<a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span>
</span>
</span> </span>
</a>
</h3>
<span class="pull-right hidden-xs"> <small>
<!-- IF topics.unreplied --> <span class="topic-stats">
No one has replied posts
<!-- ELSE --> <strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
<a href="{relative_path}/user/{topics.teaser_userslug}"> </span>
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> |
</a> <span class="topic-stats">
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}"> views
replied <strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</a> </span>
<span class="timeago" title="{topics.teaser_timestamp}"></span> |
<!-- ENDIF topics.unreplied --> <span>
<a href="{relative_path}/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a>
posted in
<a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</small> </span>
</div>
<span class="pull-right hidden-xs">
<!-- IF topics.unreplied -->
No one has replied
<!-- ELSE -->
<a href="{relative_path}/user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a>
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}">
replied
</a>
<span class="timeago" title="{topics.teaser_timestamp}"></span>
<!-- ENDIF topics.unreplied -->
</span>
</small>
</div> </div>
</li> </li>
<!-- END topics --> <!-- END topics -->

167
public/templates/topic.tpl
Unescape Escape View File

@ -23,7 +23,7 @@
<ul id="post-container" class="posts" data-tid="{topic_id}"> <ul id="post-container" class="posts" data-tid="{topic_id}">
<!-- BEGIN posts --> <!-- BEGIN posts -->
<li class="row post-row infiniteloaded" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-userslug="{posts.userslug}" data-index="{posts.index}" data-deleted="{posts.deleted}" itemscope itemtype="http://schema.org/Comment"> <li class="post-row infiniteloaded" data-pid="{posts.pid}" data-uid="{posts.uid}" data-username="{posts.username}" data-userslug="{posts.userslug}" data-index="{posts.index}" data-deleted="{posts.deleted}" itemscope itemtype="http://schema.org/Comment">
<a id="post_anchor_{posts.pid}" name="{posts.pid}"></a> <a id="post_anchor_{posts.pid}" name="{posts.pid}"></a>
<meta itemprop="datePublished" content="{posts.relativeTime}"> <meta itemprop="datePublished" content="{posts.relativeTime}">
@ -36,107 +36,106 @@
<span class="label label-danger">[[topic:banned]]</span> <span class="label label-danger">[[topic:banned]]</span>
<!-- ENDIF posts.user_banned --> <!-- ENDIF posts.user_banned -->
</a> </a>
</div> </div>
<div class="col-md-11"> <div class="col-md-11 panel panel-default post-block">
<div class="post-block">
<a class="main-post avatar" href="{relative_path}/user/{posts.userslug}">
<img itemprop="image" src="{posts.picture}" align="left" class="img-thumbnail" width=150 height=150 />
</a>
<h3 class="main-post">
<p id="topic_title_{posts.pid}" class="topic-title" itemprop="name">{topic_name}</p>
</h3>
<div class="topic-buttons"> <a class="main-post avatar" href="{relative_path}/user/{posts.userslug}">
<img itemprop="image" src="{posts.picture}" align="left" class="img-thumbnail" width=150 height=150 />
</a>
<h3 class="main-post">
<p id="topic_title_{posts.pid}" class="topic-title" itemprop="name">{topic_name}</p>
</h3>
<div class="btn-group"> <div class="topic-buttons">
<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
<img class="visible-xs visible-sm pull-left" src="{posts.picture}" width=18 height=18 />
<span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">&nbsp; {posts.username}&nbsp;</span>
<span class="caret"></span>
</button>
<ul class="dropdown-menu"> <div class="btn-group">
<li><a href="{relative_path}/user/{posts.userslug}"><i class="fa fa-user"></i> [[topic:profile]]</a></li> <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
<li><a href="#" class="chat"><i class="fa fa-comment"></i> [[topic:chat]]</a></li> <img class="visible-xs visible-sm pull-left" src="{posts.picture}" width=18 height=18 />
</ul> <span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">&nbsp; {posts.username}&nbsp;</span>
</div> <span class="caret"></span>
</button>
<div class="btn-group"> <ul class="dropdown-menu">
<!-- IF @first --> <li><a href="{relative_path}/user/{posts.userslug}"><i class="fa fa-user"></i> [[topic:profile]]</a></li>
<button class="btn btn-sm btn-default follow" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button> <li><a href="#" class="chat"><i class="fa fa-comment"></i> [[topic:chat]]</a></li>
<!-- ENDIF @first --> </ul>
<button data-favourited="{posts.favourited}" class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button"> </div>
<span class="favourite-text">[[topic:favourite]]</span>
<span class="post_rep_{posts.pid}">{posts.reputation} </span>
<!-- IF posts.favourited -->
<i class="fa fa-star"></i>
<!-- ELSE -->
<i class="fa fa-star-o"></i>
<!-- ENDIF posts.favourited -->
</button>
</div>
<div class="btn-group">
<button class="btn btn-sm btn-default quote" type="button" title="[[topic:quote]]"><i class="fa fa-quote-left"></i></button>
<button class="btn btn-sm btn-primary btn post_reply" type="button">[[topic:reply]] <i class="fa fa-reply"></i></button>
</div>
<div class="pull-right"> <div class="btn-group">
<div class="btn-group post-tools"> <!-- IF @first -->
<div class="dropdown share-dropdown"> <button class="btn btn-sm btn-default follow" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button>
<button title="[[topic:share]]"class="btn btn-sm btn-default share" data-toggle="dropdown" href="#"><i class="fa fa-share-square-o"></i></button> <!-- ENDIF @first -->
<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel"> <button data-favourited="{posts.favourited}" class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
<!-- IF !disableSocialButtons --> <span class="favourite-text">[[topic:favourite]]</span>
<li class="btn btn-sm btn-default facebook-share" type="button" title=""><i class="fa fa-facebook"></i></li> <span class="post_rep_{posts.pid}">{posts.reputation} </span>
<li class="btn btn-sm btn-default twitter-share" type="button" title=""><i class="fa fa-twitter"></i></li> <!-- IF posts.favourited -->
<li class="btn btn-sm btn-default google-share" type="button" title=""><i class="fa fa-google-plus"></i></li> <i class="fa fa-star"></i>
<!-- ENDIF !disableSocialButtons --> <!-- ELSE -->
<li> <i class="fa fa-star-o"></i>
<input type="text" id="post_{posts.pid}_link" value="" class="form-control pull-right post-link" style=""></input> <!-- ENDIF posts.favourited -->
<li> </button>
</ul> </div>
</div> <div class="btn-group">
<button class="btn btn-sm btn-default quote" type="button" title="[[topic:quote]]"><i class="fa fa-quote-left"></i></button>
<button class="btn btn-sm btn-primary btn post_reply" type="button">[[topic:reply]] <i class="fa fa-reply"></i></button>
</div>
<div class="pull-right">
<div class="btn-group post-tools">
<div class="dropdown share-dropdown">
<button title="[[topic:share]]"class="btn btn-sm btn-default share" data-toggle="dropdown" href="#"><i class="fa fa-share-square-o"></i></button>
<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel">
<!-- IF !disableSocialButtons -->
<li class="btn btn-sm btn-default facebook-share" type="button" title=""><i class="fa fa-facebook"></i></li>
<li class="btn btn-sm btn-default twitter-share" type="button" title=""><i class="fa fa-twitter"></i></li>
<li class="btn btn-sm btn-default google-share" type="button" title=""><i class="fa fa-google-plus"></i></li>
<!-- ENDIF !disableSocialButtons -->
<li>
<input type="text" id="post_{posts.pid}_link" value="" class="form-control pull-right post-link" style=""></input>
<li>
</ul>
</div> </div>
</div>
<!-- IF posts.display_moderator_tools --> <!-- IF posts.display_moderator_tools -->
<div class="btn-group post-tools"> <div class="btn-group post-tools">
<div class="dropdown"> <div class="dropdown">
<button title="[[topic:tools]]" class="btn btn-sm btn-default" data-toggle="dropdown" href="#"><i class="fa fa-gear"></i></button> <button title="[[topic:tools]]" class="btn btn-sm btn-default" data-toggle="dropdown" href="#"><i class="fa fa-gear"></i></button>
<ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel"> <ul class="dropdown-menu text-center pull-right" role="menu" aria-labelledby="dLabel">
<button class="btn btn-sm btn-default edit" type="button" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button> <button class="btn btn-sm btn-default edit" type="button" title="[[topic:edit]]"><i class="fa fa-pencil"></i></button>
<button class="btn btn-sm btn-default delete" type="button" title="[[topic:delete]]"><i class="fa fa-trash-o"></i></button> <button class="btn btn-sm btn-default delete" type="button" title="[[topic:delete]]"><i class="fa fa-trash-o"></i></button>
<button class="btn btn-sm btn-default move {posts.display_move_tools}" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button> <button class="btn btn-sm btn-default move {posts.display_move_tools}" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
</ul> </ul>
</div>
</div> </div>
<!-- ENDIF posts.display_moderator_tools -->
</div> </div>
<!-- ENDIF posts.display_moderator_tools -->
</div> </div>
</div>
<div id="content_{posts.pid}" class="post-content" itemprop="text">{posts.content}</div> <div id="content_{posts.pid}" class="post-content" itemprop="text">{posts.content}</div>
<!-- IF posts.signature --> <!-- IF posts.signature -->
<div class="post-signature">{posts.signature}</div> <div class="post-signature">{posts.signature}</div>
<!-- ENDIF posts.signature --> <!-- ENDIF posts.signature -->
<div class="post-info"> <div class="post-info">
<span class="pull-left"> <span class="pull-left">
[[topic:reputation]]: <i class='fa fa-star'></i> <span class='formatted-number post_rep_{posts.uid}'>{posts.user_rep}</span>&nbsp;|&nbsp;[[topic:posts]]: <i class='fa fa-pencil'></i> <span class='formatted-number user_postcount_{posts.uid}'>{posts.user_postcount}</span> [[topic:reputation]]: <i class='fa fa-star'></i> <span class='formatted-number post_rep_{posts.uid}'>{posts.user_rep}</span>&nbsp;|&nbsp;[[topic:posts]]: <i class='fa fa-pencil'></i> <span class='formatted-number user_postcount_{posts.uid}'>{posts.user_postcount}</span>
{posts.additional_profile_info} {posts.additional_profile_info}
</span> </span>
<span class="pull-right"> <span class="pull-right">
[[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span> [[category:posted]] <span class="relativeTimeAgo timeago" title="{posts.relativeTime}"></span>
<!-- IF posts.editor --> <!-- IF posts.editor -->
<span>| [[category:last_edited_by]] <strong><a href="{relative_path}/user/{posts.editorslug}">{posts.editorname}</a></strong></span> <span>| [[category:last_edited_by]] <strong><a href="{relative_path}/user/{posts.editorslug}">{posts.editorname}</a></strong></span>
<span class="timeago" title="{posts.relativeEditTime}"></span> <span class="timeago" title="{posts.relativeEditTime}"></span>
<!-- ENDIF posts.editor --> <!-- ENDIF posts.editor -->
</span> </span>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div>
</div> </div>
</div> </div>
<div style="clear:both;"></div>
</li> </li>
<!-- IF @first --> <!-- IF @first -->

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

@ -19,49 +19,57 @@
<ul id="topics-container" data-next-start="{nextStart}"> <ul id="topics-container" data-next-start="{nextStart}">
<!-- BEGIN topics --> <!-- BEGIN topics -->
<li class="category-item {topics.deleted-class}"> <li class="category-item {topics.deleted-class}">
<div class="row"> <div class="col-md-12 col-xs-12 panel panel-default topic-row">
<div class="col-md-12 topic-row">
<h3>
<a href="{relative_path}/topic/{topics.slug}"> <a href="{relative_path}/topic/{topics.slug}">
<h3><span class="topic-title"><strong><i class="fa {topics.pin-icon}"></i> <i class="fa {topics.lock-icon}"></i></strong> {topics.title}</span></h3> <span class="topic-title">
</a> <strong>
<small> <i class="fa {topics.pin-icon}"></i>
<span class="topic-stats"> <i class="fa {topics.lock-icon}"></i>
posts </strong>
<strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong> {topics.title}
</span>
|
<span class="topic-stats">
views
<strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</span>
|
<span>
<a href="{relative_path}/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a>
posted in
<a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span>
</span>
</span> </span>
</a>
</h3>
<span class="pull-right hidden-xs"> <small>
<!-- IF topics.unreplied --> <span class="topic-stats">
No one has replied posts
<!-- ELSE --> <strong class="human-readable-number" title="{topics.postcount}">{topics.postcount}</strong>
<a href="{relative_path}/user/{topics.teaser_userslug}"> </span>
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/> |
</a> <span class="topic-stats">
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}"> views
replied <strong class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</strong>
</a> </span>
<span class="timeago" title="{topics.teaser_timestamp}"></span> |
<!-- ENDIF topics.unreplied --> <span>
<a href="{relative_path}/user/{topics.userslug}">
<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
</a>
posted in
<a href="{relative_path}/category/{topics.categorySlug}">
<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
</a>
<span class="timeago" title="{topics.relativeTime}"></span>
</span> </span>
</small> </span>
</div>
<span class="pull-right hidden-xs">
<!-- IF topics.unreplied -->
No one has replied
<!-- ELSE -->
<a href="{relative_path}/user/{topics.teaser_userslug}">
<img class="teaser-pic" src="{topics.teaser_userpicture}" title="{topics.teaser_username}"/>
</a>
<a href="{relative_path}/topic/{topics.slug}#{topics.teaser_pid}">
replied
</a>
<span class="timeago" title="{topics.teaser_timestamp}"></span>
<!-- ENDIF topics.unreplied -->
</span>
</small>
</div> </div>
</li> </li>
<!-- END topics --> <!-- END topics -->

132
src/posts.js
Unescape Escape View File

@ -126,6 +126,60 @@ var db = require('./database'),
}); });
}; };
Posts.getPostsByPids = function(pids, callback) {
var keys = [];
for(var x=0, numPids=pids.length; x<numPids; ++x) {
keys.push('post:' + pids[x]);
}
db.getObjects(keys, function(err, data) {
if(err) {
return callback(err);
}
async.map(data, function(postData, next) {
if(!postData) {
return next(null);
}
postData.relativeTime = utils.toISOString(postData.timestamp);
postData.relativeEditTime = parseInt(postData.edited, 10) !== 0 ? utils.toISOString(postData.edited) : '';
postTools.parse(postData.content, function(err, content) {
if(err) {
return next(err);
}
postData.content = content;
next(null, postData);
});
}, callback);
});
};
Posts.getPostsByUid = function(callerUid, uid, start, end, callback) {
user.getPostIds(uid, start, end, function(err, pids) {
if(err) {
return callback(err);
}
async.filter(pids, function(pid, next) {
postTools.privileges(pid, callerUid, function(err, privileges) {
next(privileges.read);
});
}, function(pids) {
if (!(pids && pids.length)) {
return callback(null, []);
}
Posts.getPostSummaryByPids(pids, false, callback);
});
});
}
Posts.addUserInfoToPost = function(post, callback) { Posts.addUserInfoToPost = function(post, callback) {
user.getUserFields(post.uid, ['username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned'], function(err, userData) { user.getUserFields(post.uid, ['username', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned'], function(err, userData) {
if (err) { if (err) {
@ -310,39 +364,6 @@ var db = require('./database'),
db.setObject('post:' + pid, data, callback); db.setObject('post:' + pid, data, callback);
}; };
Posts.getPostsByPids = function(pids, callback) {
var keys = [];
for(var x=0, numPids=pids.length; x<numPids; x++) {
keys.push('post:' + pids[x]);
}
db.getObjects(keys, function(err, data) {
if(err) {
return callback(err);
}
async.map(data, function(postData, next) {
if(!postData) {
return next(null);
}
postData.relativeTime = utils.toISOString(postData.timestamp);
postData.relativeEditTime = parseInt(postData.edited, 10) !== 0 ? utils.toISOString(postData.edited) : '';
postTools.parse(postData.content, function(err, content) {
if(err) {
return next(err);
}
postData.content = content;
next(null, postData);
});
}, callback);
});
}
Posts.getCidByPid = function(pid, callback) { Posts.getCidByPid = function(pid, callback) {
Posts.getPostField(pid, 'tid', function(err, tid) { Posts.getPostField(pid, 'tid', function(err, tid) {
if(err) { if(err) {
@ -418,40 +439,6 @@ var db = require('./database'),
}); });
} }
Posts.getPostsByUid = function(uid, start, end, callback) {
user.getPostIds(uid, start, end, function(err, pids) {
if(err) {
return callback(err);
}
async.filter(pids, function(pid, next) {
postTools.privileges(pid, 0, function(err, privileges) {
next(privileges.read);
});
}, function(pids) {
if (pids && pids.length) {
plugins.fireHook('filter:post.getTopic', pids, function(err, posts) {
if(err) {
return callback(err);
}
if (posts && posts.length) {
Posts.getPostsByPids(pids, function(err, posts) {
plugins.fireHook('action:post.gotTopic', posts);
callback(null, posts);
});
} else {
callback(null, []);
}
});
} else {
callback(null, []);
}
});
});
}
Posts.reIndexPids = function(pids, callback) { Posts.reIndexPids = function(pids, callback) {
function reIndex(pid, callback) { function reIndex(pid, callback) {
@ -478,16 +465,11 @@ var db = require('./database'),
Posts.getFavourites = function(uid, callback) { Posts.getFavourites = function(uid, callback) {
db.getSortedSetRevRange('uid:' + uid + ':favourites', 0, -1, function(err, pids) { db.getSortedSetRevRange('uid:' + uid + ':favourites', 0, -1, function(err, pids) {
if (err) if (err) {
return callback(err, null); return callback(err, null);
}
Posts.getPostSummaryByPids(pids, false, function(err, posts) { Posts.getPostSummaryByPids(pids, false, callback);
if (err)
return callback(err, null);
callback(null, posts);
});
}); });
} }

35
src/routes/api.js
Unescape Escape View File

@ -68,39 +68,44 @@ var path = require('path'),
async.each(data.categories, iterator, function (err) { async.each(data.categories, iterator, function (err) {
// Assemble the MOTD // Assemble the MOTD
var motdString; var motdString,
assemble = function() {
data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none';
data.motd_class += (meta.config.motd && meta.config.motd.length > 0 ? '' : ' default');
data.motd_class += meta.config.motd_class ? ' ' + meta.config.motd_class : '';
data.motd = require('marked')(motdString);
res.json(data);
};
if (!meta.config.motd) { if (!meta.config.motd) {
// Construct default MOTD // Construct default MOTD
translator.mget(['global:motd.welcome', 'global:motd.get', 'global:motd.fork', 'global:motd.like', 'global:motd.follow'], function(err, strings) { translator.translate('\n\n# NodeBB \n<small><span>v' + pkg.version + '</span></small>\n\n[[global:motd.welcome]]\
motdString = '\n\n# NodeBB \n<small><span>v' + pkg.version + '</span></small>\n\n' + strings[0] + <div class="btn-group">\
'<div class="btn-group">\
<a target="_blank" href="https://www.nodebb.org" class="btn btn-default btn-lg">\ <a target="_blank" href="https://www.nodebb.org" class="btn btn-default btn-lg">\
<i class="fa fa-comment"></i>\ <i class="fa fa-comment"></i>\
<span class="hidden-mobile">&nbsp;' + strings[1] + '</span>\ <span class="hidden-mobile">&nbsp;[[global:motd.get]]</span>\
</a>\ </a>\
<a target="_blank" href="https://github.com/designcreateplay/NodeBB" class="btn btn-default btn-lg hidden-mobile">\ <a target="_blank" href="https://github.com/designcreateplay/NodeBB" class="btn btn-default btn-lg hidden-mobile">\
<i class="fa fa-github"></i>\ <i class="fa fa-github"></i>\
<span class="hidden-mobile">&nbsp;' + strings[2] + '</span>\ <span class="hidden-mobile">&nbsp;[[global:motd.fork]]</span>\
</a>\ </a>\
<a target="_blank" href="https://facebook.com/NodeBB" class="btn btn-default btn-lg">\ <a target="_blank" href="https://facebook.com/NodeBB" class="btn btn-default btn-lg">\
<i class="fa fa-facebook"></i>\ <i class="fa fa-facebook"></i>\
<span class="hidden-mobile">&nbsp;' + strings[3] + '</span>\ <span class="hidden-mobile">&nbsp;[[global:motd.like]]</span>\
</a>\ </a>\
<a target="_blank" href="https://twitter.com/NodeBB" class="btn btn-default btn-lg">\ <a target="_blank" href="https://twitter.com/NodeBB" class="btn btn-default btn-lg">\
<i class="fa fa-twitter"></i>\ <i class="fa fa-twitter"></i>\
<span class="hidden-mobile">&nbsp;' + strings[4] + '</span>\ <span class="hidden-mobile">&nbsp;[[global:motd.follow]]</span>\
</a>\ </a>\
</div>'; </div>\
', function(motd) {
motdString = motd;
assemble();
}); });
} else { } else {
motdString = meta.config.motd; motdString = meta.config.motd;
assemble();
} }
data.motd_class = (parseInt(meta.config.show_motd, 10) === 1 || meta.config.show_motd === undefined) ? '' : ' none';
data.motd_class += (meta.config.motd && meta.config.motd.length > 0 ? '' : ' default');
data.motd_class += meta.config.motd_class ? ' ' + meta.config.motd_class : '';
data.motd = require('marked')(motdString);
res.json(data);
}); });
}); });
}); });

53
src/routes/user.js
Unescape Escape View File

@ -407,38 +407,41 @@ var fs = require('fs'),
var callerUID = req.user ? req.user.uid : '0'; var callerUID = req.user ? req.user.uid : '0';
getUserDataByUserSlug(req.params.userslug, callerUID, function (userData) { getUserDataByUserSlug(req.params.userslug, callerUID, function (userData) {
if (userData) { if(!userData) {
user.isFollowing(callerUID, userData.theirid, function (isFollowing) { return res.json(404, {
posts.getPostsByUid(userData.theirid, 0, 9, function (err, posts) { error: 'User not found!'
});
}
if(err) { user.isFollowing(callerUID, userData.theirid, function (isFollowing) {
return next(err);
}
userData.posts = posts.filter(function (p) { posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, posts) {
return p && parseInt(p.deleted, 10) !== 1;
});
userData.isFollowing = isFollowing; if(err) {
return next(err);
}
if (!userData.profileviews) { userData.posts = posts.filter(function (p) {
userData.profileviews = 1; return p && parseInt(p.deleted, 10) !== 1;
} });
if (parseInt(callerUID, 10) !== parseInt(userData.uid, 10)) {
user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
}
postTools.parse(userData.signature, function (err, signature) { userData.isFollowing = isFollowing;
userData.signature = signature;
res.json(userData); if (!userData.profileviews) {
}); userData.profileviews = 1;
}
if (parseInt(callerUID, 10) !== parseInt(userData.uid, 10)) {
user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
}
postTools.parse(userData.signature, function (err, signature) {
userData.signature = signature;
res.json(userData);
}); });
}); });
} else { });
res.json(404, {
error: 'User not found!'
});
}
}); });
}); });

Write Preview
Loading…
Cancel
Save