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

public/templates/account.tpl

@@ -43,7 +43,7 @@
 			        <span class="account-bio-label">age</span>
 			        <span>{age}</span>
 			        <br/>
-					
+					<hr/>
 					<span class="account-bio-label">member for</span>
 					<span>{joindate}</span>
 					<br/>
@@ -55,9 +55,11 @@
 					<span class="account-bio-label">posts</span>
 					<span id='postcount'>{postcount}</span>
 					<br/>
-					
+					<hr/>
 					<span class="account-bio-label">signature</span>
-					<span id='signature'>{signature}</span>
+					<div class="post-signature">
+						<span id='signature'>{signature}</span>
+					</div>
 				</div>
 			</div>
 		</div>

src/posts.js

@@ -89,7 +89,7 @@ marked.setOptions({
 					timeout: 2000
 				});
 
-				user.getUserFields(uid, ['username','reputation','picture'], function(data){
+				user.getUserFields(uid, ['username','reputation','picture','signature'], function(data){
 					
 					var timestamp = new Date().getTime();
 					
@@ -103,6 +103,7 @@ marked.setOptions({
 								'user_rep' : data.reputation || 0,
 								'post_rep' : 0,
 								'gravatar' : data.picture,
+								'signature' : marked(data.signature || ''),
 								'timestamp' : timestamp,
 								'relativeTime': utils.relativeTime(timestamp),
 								'fav_star_class' :'icon-star-empty',

src/routes/user.js

@@ -3,7 +3,8 @@
 var user = require('./../user.js'),
 	fs = require('fs'),
 	utils = require('./../utils.js'),
-	config = require('../../config.js');
+	config = require('../../config.js'),
+	marked = require('marked');
 
 
 (function(User) {
@@ -265,10 +266,15 @@ var user = require('./../user.js'),
 				});
 			} else {
 				getUserDataByUserName(req.params.username, callerUID, function(userData) {
+					
 					user.isFriend(callerUID, userData.theirid, function(isFriend) {
 						userData.isFriend = isFriend;
+						
+						userData.signature = marked(userData.signature || '');
+						
 						res.send(JSON.stringify(userData));
 					});
+					
 				});						
 			}
 		

src/topics.js

@@ -52,7 +52,7 @@ marked.setOptions({
 						'username' : user_data[uid].username || 'anonymous',
 						'user_rep' : user_data[uid].reputation || 0,
 						'gravatar' : user_data[uid].picture || 'http://www.gravatar.com/avatar/d41d8cd98f00b204e9800998ecf8427e',
-						'signature' : marked(utils.strip_tags(user_data[uid].signature || '')),
+						'signature' : marked(user_data[uid].signature || ''),
 						'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
 						'display_moderator_tools': (uid == current_user || privileges.editable) ? 'show' : 'none',
 						'edited-class': post_data.editor[i] !== null ? '' : 'none',

src/user.js

@@ -100,6 +100,9 @@ var config = require('../config.js'),
 					User.setUserField(uid, 'gravatarpicture', User.createGravatarURLFromEmail(data[key]));
 					RDB.set('email:' + data['email'] +':uid', uid);
 				}
+				else if(key === 'signature') {
+					data[key] = utils.strip_tags(data[key]);
+				}
 				
 				User.setUserField(uid, key, data[key]);
 			}