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

public/templates/category.tpl

@@ -11,7 +11,7 @@
 </div>
 <div class="category row">
 
-	<div class="span9">
+	<div class="{topic_row_size}">
 		<ul id="topics-container">
 		<!-- BEGIN topics -->
 		<a href="../../topic/{topics.slug}"><li class="category-item {topics.deleted-class}">
@@ -43,7 +43,7 @@
 		<!-- END topics -->
 		</ul>
 	</div>
-	<div class="span3">
+	<div class="span3 {show_category_features}">
 		<div class="sidebar-block img-polaroid">
 			<div class="block-header">
 				Recent Replies
@@ -77,7 +77,7 @@
 
 
 <hr />
-<button id="new_post" class="btn btn-primary btn-large {show_topic_button}">New Topic</button>
+<button id="new_post" class="btn btn-primary btn-large {show_category_features}">New Topic</button>
 
 
 <script type="text/javascript">

src/categories.js

@@ -27,7 +27,8 @@ var	RDB = require('./redis.js'),
 
 					var categoryData = {
 							'category_name' : category_name,
-							'show_topic_button' : 'show',
+							'show_category_features' : 'show',
+							'topic_row_size': 'span9',
 							'category_id': category_id,
 							'active_users': active_users,
 							'topics' : []
@@ -69,7 +70,8 @@ var	RDB = require('./redis.js'),
 		RDB.zrange('topics:recent', 0, -1, function(err, tids) {
 			var latestTopics = {
 				'category_name' : 'Recent',
-				'show_topic_button' : 'hidden',
+				'show_category_features' : 'hidden',
+				'topic_row_size': 'span12',
 				'category_id': false,
 				'topics' : []
 			};