@@ -62,7 +62,7 @@
- {username} >
+ {username}
edit
+
-
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 8016c10742..d49af806b8 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -14,6 +14,21 @@
There are no topics in this category.
Why don't you try posting one?
+
+
+
+Why don't you try posting one?
+
-
@@ -47,18 +62,9 @@
-
-
+
Recent Replies
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index 45d973e898..3e38ca006c 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -3,7 +3,7 @@
- {username} >
+ {username}
followers
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index 38b84c45d4..b14bf94904 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -5,7 +5,7 @@
- {username} >
+ {username}
following
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 896c009e74..f960144fdf 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -2,12 +2,7 @@
{title}
-
-
-
-
-
-
+ {meta_tags}
diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index 082d5b7fa5..3a8c22d9a3 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -14,7 +14,7 @@
diff --git a/public/templates/outgoing.tpl b/public/templates/outgoing.tpl
index c4c6a065ae..cd27b3a682 100644
--- a/public/templates/outgoing.tpl
+++ b/public/templates/outgoing.tpl
@@ -5,7 +5,7 @@
\ No newline at end of file
diff --git a/src/categories.js b/src/categories.js
index b6abb329cd..ea4b4ec01d 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -13,7 +13,8 @@ var RDB = require('./redis.js'),
if (err) return callback(err);
var category_name = categoryData.name,
- category_slug = categoryData.slug;
+ category_slug = categoryData.slug,
+ category_description = categoryData.description;
function getTopicIds(next) {
Categories.getTopicIds(category_id, next);
@@ -28,8 +29,9 @@ var RDB = require('./redis.js'),
var categoryData = {
'category_name' : category_name,
+ 'category_description': category_description,
'show_sidebar' : 'show',
- 'show_topic_button': 'show',
+ 'show_topic_button': 'inline-block',
'no_topics_message': 'hidden',
'topic_row_size': 'span9',
'category_id': category_id,
@@ -174,7 +176,10 @@ var RDB = require('./redis.js'),
function loadTopic(tid, callback) {
topics.getTopicData(tid, function(topicData) {
-
+ if(!topicData) {
+ return callback(null);
+ }
+
getTopicInfo(topicData, function(topicInfo) {
topicData['pin-icon'] = topicData.pinned === '1' ? 'icon-pushpin' : 'none';
diff --git a/src/meta.js b/src/meta.js
index c0e868569b..130edb312e 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -61,6 +61,8 @@ var utils = require('./../public/src/utils.js'),
fs.readFile(themeConfPath, function(err, conf) {
conf = JSON.parse(conf);
conf.src = global.nconf.get('url') + 'themes/' + themeDir + '/' + conf.src;
+ if (conf.screenshot) conf.screenshot = global.nconf.get('url') + 'themes/' + themeDir + '/' + conf.screenshot;
+ else conf.screenshot = global.nconf.get('url') + 'images/themes/default.png';
themeArr.push(conf);
next();
});
diff --git a/src/posts.js b/src/posts.js
index ef6ef41028..c0f22cba9d 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -184,6 +184,10 @@ var RDB = require('./redis.js'),
}
Posts.reply = function(socket, tid, uid, content, images) {
+ if(content) {
+ content = content.trim();
+ }
+
if (uid < 1) {
socket.emit('event:alert', {
title: 'Reply Unsuccessful',
diff --git a/src/topics.js b/src/topics.js
index f83a64bf26..3f3c48b43e 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -338,6 +338,11 @@ marked.setOptions({
if (!category_id)
throw new Error('Attempted to post without a category_id');
+ if(content)
+ content = content.trim();
+ if(title)
+ title = title.trim();
+
if (uid === 0) {
socket.emit('event:alert', {
title: 'Thank you for posting',
diff --git a/src/webserver.js b/src/webserver.js
index 911a9a154e..c2555b1400 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -26,12 +26,20 @@ var express = require('express'),
(function(app) {
var templates = null;
- app.build_header = function(res) {
+ app.build_header = function(res, metaTags) {
+ var defaultMetaTags = [
+ { name: 'viewport', content: 'width=device-width, initial-scale=1.0' },
+ { name: 'content-type', content: 'text/html; charset=UTF-8' },
+ { name: 'apple-mobile-web-app-capable', content: 'yes' }
+ ],
+ metaString = utils.buildMetaTags(defaultMetaTags.concat(metaTags || []));
+
return templates['header'].parse({
cssSrc: global.config['theme:src'] || global.nconf.get('relative_path') + '/vendor/bootstrap/css/bootstrap.min.css',
title: global.config['title'] || 'NodeBB',
csrf:res.locals.csrf_token,
- relative_path: global.nconf.get('relative_path')
+ relative_path: global.nconf.get('relative_path'),
+ meta_tags: metaString
});
};
@@ -154,7 +162,6 @@ var express = require('express'),
app.get('/', function(req, res) {
-
categories.getAllCategories(function(returnData) {
res.send(
app.build_header(res) +
@@ -211,9 +218,12 @@ var express = require('express'),
var category_url = cid + (req.params.slug ? '/' + req.params.slug : '');
categories.getCategoryById(cid, 0, function(err, returnData) {
if(err) return res.redirect('404');
-
+
res.send(
- app.build_header(res) +
+ app.build_header(res, [
+ { name: 'title', content: returnData.category_name },
+ { name: 'description', content: returnData.category_description }
+ ]) +
'\n\t' +
'\n\t' +
templates['footer']
@@ -413,6 +423,19 @@ var express = require('express'),
}
});
break;
+ case 'outgoing' :
+ var url = req.url.split('?');
+
+ if (url[1]) {
+ res.json({
+ url: url[1],
+ home: global.nconf.get('url')
+ });
+ } else {
+ res.status(404);
+ res.redirect(global.nconf.get('relative_path') + '/404');
+ }
+ break;
default :
res.json(404, { error: 'unrecognized API endpoint' });
break;
diff --git a/src/websockets.js b/src/websockets.js
index 5d2c51abd9..0bb2ff4c0e 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -281,35 +281,37 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
socket.on('api:user.follow', function(data) {
-
- user.follow(uid, data.uid, function(success) {
- if(success) {
- user.getUserField(data.uid, 'username', function(username) {
- socket.emit('event:alert', {
- title: 'Following',
- message: 'You are now following ' + username + '!',
- type: 'success',
- timeout: 2000
- });
- });
- }
- });
+ if(uid) {
+ user.follow(uid, data.uid, function(success) {
+ if(success) {
+ user.getUserField(data.uid, 'username', function(username) {
+ socket.emit('event:alert', {
+ title: 'Following',
+ message: 'You are now following ' + username + '!',
+ type: 'success',
+ timeout: 2000
+ });
+ });
+ }
+ });
+ }
});
socket.on('api:user.unfollow', function(data) {
-
- user.unfollow(uid, data.uid, function(success) {
- if(success) {
- user.getUserField(data.uid, 'username', function(username) {
- socket.emit('event:alert', {
- title: 'Unfollowed',
- message: 'You are no longer following ' + username + '!',
- type: 'success',
- timeout: 2000
- });
- });
- }
- });
+ if(uid) {
+ user.unfollow(uid, data.uid, function(success) {
+ if(success) {
+ user.getUserField(data.uid, 'username', function(username) {
+ socket.emit('event:alert', {
+ title: 'Unfollowed',
+ message: 'You are no longer following ' + username + '!',
+ type: 'success',
+ timeout: 2000
+ });
+ });
+ }
+ });
+ }
});
socket.on('api:topics.post', function(data) {
- 
+
{categories.posts.username}: {categories.posts.content}
- - + Continue to {url} + Return to NodeBB