From 6ab37bde09c512f3615cf172a656f826c093d340 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 23 Jul 2013 13:17:54 -0400
Subject: [PATCH] closes #105

---
 public/templates/category.tpl | 26 ++++++++++++++++----------
 src/categories.js             |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

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 @@
 	<strong>There are no topics in this category.</strong><br />
 	Why don't you try posting one?
 </div>
+
+<div>
+
+	<button id="new_post" class="btn btn-primary btn-large {show_topic_button}">New Topic</button>
+
+	<div class="inline-block pull-right">
+		<a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign icon-2x"></i></a>&nbsp;
+		<a href="#" id="facebook-share"><i class="icon-facebook-sign icon-2x"></i></a>&nbsp;
+		<a href="#" id="twitter-intent"><i class="icon-twitter-sign icon-2x"></i></a>&nbsp;
+		<a href="#" id="google-share"><i class="icon-google-plus-sign icon-2x"></i></a>&nbsp;
+	</div>
+</div>
+
+<hr class="{show_sidebar}" />
+
 <div class="category row">
 	<div class="{topic_row_size}">
 		<ul id="topics-container">
@@ -47,18 +62,9 @@
 		</li></a>
 		<!-- END topics -->
 		</ul>
-		<hr class="{show_sidebar}" />
-		<button id="new_post" class="btn btn-primary btn-large {show_topic_button}">New Topic</button>
 	</div>
 	<div class="span3 {show_sidebar} category-sidebar mobile-sidebar">
-		<div class="sidebar-block img-polaroid">
-			<div class="block-header">
-				<a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign icon-2x"></i></a>&nbsp;
-				<a href="#" id="facebook-share"><i class="icon-facebook-sign icon-2x"></i></a>&nbsp;
-				<a href="#" id="twitter-intent"><i class="icon-twitter-sign icon-2x"></i></a>&nbsp;
-				<a href="#" id="google-share"><i class="icon-google-plus-sign icon-2x"></i></a>&nbsp;
-			</div>
-		</div>
+
 		<div class="sidebar-block img-polaroid">
 			<div class="block-header">
 				Recent Replies
diff --git a/src/categories.js b/src/categories.js
index b6abb329cd..b9bc05a252 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -29,7 +29,7 @@ var	RDB = require('./redis.js'),
 				var categoryData = {
 					'category_name' : category_name,
 					'show_sidebar' : 'show',
-					'show_topic_button': 'show',
+					'show_topic_button': 'inline-block',
 					'no_topics_message': 'hidden',
 					'topic_row_size': 'span9',
 					'category_id': category_id,