Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-04 14:50:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-18 23:06:26 -05:00
parent f33256d628 b5496b5680
commit bbe1a00d34
5 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodebb
View File

@@ -59,7 +59,7 @@ case "$1" in
*)
echo "Welcome to NodeBB"
echo $"Usage: $0 {start|dev|watch|language}"
echo $"Usage: $0 {start|dev|watch|upgrade}"
echo ''
column -s ' ' -t <<< '
start Start NodeBB in production mode

9
public/templates/noscript/category.tpl
View File

@@ -18,4 +18,11 @@
</div>
</li>
<!-- END topics -->
</ul>
</ul>
<div class="text-center">
<ul class="pagination">
<!-- BEGIN pages -->
<li <!-- IF pages.active -->class="active"<!-- ENDIF pages.active -->><a href="?page={pages.page}">{pages.page}</a></li>
<!-- END pages -->
</ul>
</div>

9
public/templates/noscript/topic.tpl
View File

@@ -27,4 +27,11 @@
</div>
</li>
<!-- END posts -->
</ul>
</ul>
<div class="text-center">
<ul class="pagination">
<!-- BEGIN pages -->
<li <!-- IF pages.active -->class="active"<!-- ENDIF pages.active -->><a href="?page={pages.page}">{pages.page}</a></li>
<!-- END pages -->
</ul>
</div>

4
src/routes/api.js
View File

@@ -266,8 +266,8 @@ var path = require('path'),
return next(err);
}
var start = (page - 1) * settings.topicsPerPage;
var end = start + settings.topicsPerPage - 1;
var start = (page - 1) * settings.topicsPerPage,
end = start + settings.topicsPerPage - 1;
categoryTools.privileges(req.params.id, uid, function(err, privileges) {
if (!err && privileges.read) {

104
src/webserver.js
View File

@@ -524,7 +524,9 @@ module.exports.server = server;
});
app.get('/topic/:topic_id/:slug?', function (req, res, next) {
var tid = req.params.topic_id;
var tid = req.params.topic_id,
page = req.query.page || 1,
uid = req.user ? req.user.uid : 0;
async.waterfall([
function(next) {
@@ -541,14 +543,23 @@ module.exports.server = server;
});
},
function (next) {
topics.getTopicWithPosts(tid, ((req.user) ? req.user.uid : 0), 0, -1, true, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && parseInt(topicData.expose_tools, 10) === 0) {
return next(new Error('Topic deleted'), null);
}
user.getSettings(uid, function(err, settings) {
if (err) {
return next(err);
}
next(err, topicData);
var start = (page - 1) * settings.topicsPerPage,
end = start + settings.topicsPerPage - 1;
topics.getTopicWithPosts(tid, uid, start, end, true, function (err, topicData) {
if (topicData) {
if (parseInt(topicData.deleted, 10) === 1 && parseInt(topicData.expose_tools, 10) === 0) {
return next(new Error('Topic deleted'), null);
}
}
next(err, topicData);
});
});
},
function (topicData, next) {
@@ -644,7 +655,7 @@ module.exports.server = server;
}, function (err, header) {
next(err, {
header: header,
topics: topicData
posts: topicData
});
});
},
@@ -663,20 +674,33 @@ module.exports.server = server;
topic_url += '?' + queryString;
}
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/topic'].parse(data.topics) + '\n\t</noscript>' +
'\n\t' + app.create_route('topic/' + topic_url) + templates.footer
);
// Paginator for noscript
data.posts.pages = [];
for(var x=1;x<=data.posts.pageCount;x++) {
data.posts.pages.push({
page: x,
active: x === parseInt(page, 10)
});
}
translator.translate(templates['noscript/topic'].parse(data.posts), function(translatedHTML) {
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + translatedHTML + '\n\t</noscript>' +
'\n\t' + app.create_route('topic/' + topic_url) + templates.footer
);
});
});
});
app.get('/category/:category_id/:slug?', function (req, res, next) {
var cid = req.params.category_id;
var cid = req.params.category_id,
page = req.query.page || 1,
uid = req.user ? req.user.uid : 0;
async.waterfall([
function(next) {
CategoryTools.privileges(cid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
CategoryTools.privileges(cid, uid, function(err, privileges) {
if (!err) {
if (!privileges.read) {
next(new Error('not-enough-privileges'));
@@ -689,15 +713,24 @@ module.exports.server = server;
});
},
function (next) {
categories.getCategoryById(cid, 0, -1, 0, function (err, categoryData) {
if (categoryData) {
if (parseInt(categoryData.disabled, 10) === 1) {
return next(new Error('Category disabled'), null);
}
user.getSettings(uid, function(err, settings) {
if (err) {
return next(err);
}
next(err, categoryData);
var start = (page - 1) * settings.topicsPerPage,
end = start + settings.topicsPerPage - 1;
categories.getCategoryById(cid, start, end, 0, function (err, categoryData) {
if (categoryData) {
if (parseInt(categoryData.disabled, 10) === 1) {
return next(new Error('Category disabled'), null);
}
}
next(err, categoryData);
});
});
},
function (categoryData, next) {
@@ -736,7 +769,7 @@ module.exports.server = server;
}, function (err, header) {
next(err, {
header: header,
categories: categoryData
topics: categoryData
});
});
}
@@ -749,8 +782,8 @@ module.exports.server = server;
}
}
if(data.categories.link) {
return res.redirect(data.categories.link);
if(data.topics.link) {
return res.redirect(data.topics.link);
}
var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
@@ -759,11 +792,22 @@ module.exports.server = server;
category_url += '?' + queryString;
}
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + templates['noscript/category'].parse(data.categories) + '\n\t</noscript>' +
'\n\t' + app.create_route('category/' + category_url) + templates.footer
);
// Paginator for noscript
data.topics.pages = [];
for(var x=1;x<=data.topics.pageCount;x++) {
data.topics.pages.push({
page: x,
active: x === parseInt(page, 10)
});
}
translator.translate(templates['noscript/category'].parse(data.topics), function(translatedHTML) {
res.send(
data.header +
'\n\t<noscript>\n' + templates['noscript/header'] + translatedHTML + '\n\t</noscript>' +
'\n\t' + app.create_route('category/' + category_url) + templates.footer
);
});
});
});