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

public/css/footer.less

@@ -1,4 +1,6 @@
 .footer-stats {
+	display: none;
+
 	.stats-card {
 		text-align: center;
 

public/src/templates.js

@@ -89,8 +89,6 @@
 			jQuery.when(jQuery.getJSON(RELATIVE_PATH + '/templates/config.json'), jQuery.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function(config_data, templates_data) {
 				config = config_data[0];
 				available_templates = templates_data[0];
-				console.log(config, available_templates);
-
 				templates.ready();
 			});
 		}

public/templates/category.tpl

@@ -3,7 +3,7 @@
 		<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
 	</li>
 	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<span itemprop="title">{category_name}</span>
+		<span itemprop="title">{category_name} <a target="_blank" href="../{category_id}.rss"><i class="icon-rss-sign"></i></a></span>
 	</li>
 	<div id="category_active_users"></div>
 </ol>
@@ -12,7 +12,6 @@
 	<button id="new_post" class="btn btn-primary btn-lg {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;

public/templates/footer.tpl

@@ -41,7 +41,7 @@
 	<div id="alert_window"></div>
 
 
-	<div class="container footer-stats">
+	<div id="footer" class="container footer-stats">
 		<div class="row">
 			<div class="col-md-3 col-xs-6">
 				<div class="stats-card well">
@@ -64,9 +64,9 @@
 				</div>
 			</div>
 		</div>
-	</div>
 
 		<footer class="footer">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.org">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></footer>
+	</div>
 
 	<script>
 		$.getScript(RELATIVE_PATH + '/src/forum/footer.js');

public/templates/topic.tpl

@@ -6,7 +6,7 @@
 		<a href="/category/{category_slug}" itemprop="url"><span itemprop="title">{category_name}</span></a>
 	</li>
 	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
-		<span itemprop="title">{topic_name}</span>
+		<span itemprop="title">{topic_name} <a target="_blank" href="../{topic_id}.rss"><i class="icon-rss-sign"></i></a></span>
 	</li>
 	<div id="thread_active_users" class="hidden-xs"></div>
 </ol>
@@ -21,7 +21,9 @@
 						<a class="main-avatar" href="/users/{main_posts.userslug}">
 							<img src="{main_posts.picture}" align="left" class="img-thumbnail" width=150 height=150 /><br />
 						</a>
-						<h3><p id="topic_title_{main_posts.pid}" class="topic-title">{topic_name}</p></h3>
+						<h3>
+							<p id="topic_title_{main_posts.pid}" class="topic-title">{topic_name}</p>
+						</h3>
 
 						<div class="topic-buttons" >
 							<div class="btn-group">