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 748055ac52 c122492470
commit 77cacda0fa
7 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File

7
public/language/en_GB/global.json
Unescape Escape View File

@ -51,5 +51,10 @@
"alert.follow": "You are now following %1!",
"posts": "Posts",
"views": "Views"
"views": "Views",
"posted": "posted",
"in": "in",
"recentposts": "Recent Posts"
}

1
public/language/en_GB/topic.json
Unescape Escape View File

@ -41,7 +41,6 @@
"favourites.not_logged_in.message": "Please log in in order to favourite this post",
"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
"posted_by": "posted by",
"loading_more_posts": "Loading More Posts",
"move_topic": "Move Topic",
"move_post": "Move Post",

3
public/language/en_GB/user.json
Unescape Escape View File

@ -12,6 +12,7 @@
"profile_views": "Profile views",
"reputation": "Reputation",
"posts": "Posts",
"favourites":"Favourites",
"followers": "Followers",
"following": "Following",
"signature": "Signature",
@ -30,7 +31,7 @@
"upload_a_picture": "Upload a picture",
"image_spec": "You may only upload PNG, JPG, or GIF files under 256kb.",
"settings": "settings",
"settings": "Settings",
"show_email": "Show My Email",
"has_no_follower": "This user doesn't have any followers :(",

21
public/src/forum/accountheader.js
Unescape Escape View File

@ -28,15 +28,18 @@ define(function() {
AccountHeader.createMenu = function() {
var userslug = $('.account-username-box').attr('data-userslug');
var links = $('<div class="account-sub-links inline-block pull-right">\
<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">settings</a></span>\
<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">favourites</a></span>\
<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">followers</a></span>\
<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">following</a></span>\
<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">edit</a></span>\
</div>');
$('.account-username-box').append(links);
var html = '<div class="account-sub-links inline-block pull-right">\
<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">[[user:settings]]</a></span>\
<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">[[user:favourites]]</a></span>\
<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">[[user:followers]]</a></span>\
<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">[[user:following]]</a></span>\
<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">[[user:edit]]</a></span>\
</div>'
translator.translate(html, function(translatedHtml) {
$('.account-username-box').append(translatedHtml);
});
}
return AccountHeader;

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

@ -110,7 +110,7 @@
<div class="col-md-6 user-recent-posts">
<div class="topic-row panel panel-default clearfix">
<div class="panel-heading">
<h3 class="panel-title">Recent Posts</h3>
<h3 class="panel-title">[[global:recentposts]]</h3>
</div>
<div class="panel-body">
<!-- BEGIN posts -->
@ -118,8 +118,8 @@
<p>{posts.content}</p>
<small>
<span class="pull-right">
<a href="../../topic/{posts.tid}/#{posts.pid}">posted</a>
in
<a href="../../topic/{posts.tid}/#{posts.pid}">[[global:posted]]</a>
[[global:in]]
<a href="../../category/{posts.categorySlug}">
<i class="fa {posts.categoryIcon}"></i> {posts.categoryName}
</a>

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

@ -111,8 +111,9 @@
<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 move {posts.display_move_tools}" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
<!-- IF posts.display_move_tools -->
<button class="btn btn-sm btn-default move" type="button" title="[[topic:move]]"><i class="fa fa-arrows"></i></button>
<!-- ENDIF posts.display_move_tools -->
</ul>
</div>
</div>

2
src/topics.js
Unescape Escape View File

@ -381,7 +381,7 @@ var async = require('async'),
var pid = postData[i].pid;
postData[i].favourited = fav_data[pid];
postData[i].display_moderator_tools = (current_user != 0) && privileges[pid].editable;
postData[i].display_move_tools = privileges[pid].move ? '' : 'hidden';
postData[i].display_move_tools = privileges[pid].move;
if(parseInt(postData[i].deleted, 10) === 1 && !privileges[pid].view_deleted) {
postData[i].content = 'This post is deleted!';
}

Write Preview
Loading…
Cancel
Save