add sidebar

mobiwolf · Mar 3, 2012 · 2706532 · 2706532
1 parent 828cd49
commit 2706532
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 43 deletions.
diff --git a/controllers/topic.js b/controllers/topic.js
@@ -54,9 +54,10 @@ exports.index = function(req, res, next) {
 
 	get_full_topic(topic_id, function(err, message, topic, tags, author, replies) {
 		if (err) return ep.emit('error', err);
-		// if (message) {
-		// 	return res.render('notify/notify', { error: message });
-		// }
+		if (message) {
+			ep.unbind();
+			return res.render('notify/notify', { error: message });
+		}
 
 		at_ctrl.link_at_who(topic.content, function(err, content) {
 			if (err) return ep.emit('error', err);

diff --git a/views/message/index.html b/views/message/index.html
@@ -1,12 +1,4 @@
-<div id='sidebar'>
-	<div class='panel'>
-		<% if (locals.current_user) { %>
-		<div class='inner'>
-			<%- partial('user/card', { object: current_user, as: 'user' }) %>
-		</div>
-		<% } %>
-	</div>
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/notify/notify.html b/views/notify/notify.html
@@ -1,5 +1,4 @@
-<div id='sidebar'>
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/collect_tags.html b/views/user/collect_tags.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/collect_topics.html b/views/user/collect_topics.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/followers.html b/views/user/followers.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/followings.html b/views/user/followings.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/replies.html b/views/user/replies.html
@@ -1,5 +1,4 @@
-<div id='sidebar'>
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/setting.html b/views/user/setting.html
@@ -1,10 +1,4 @@
-<div id='sidebar'>
-	<div class='panel'>
-		<div class='inner'>
-			<%- partial('user/card',{object:current_user,as:'user'}) %>
-		</div>
-	</div>
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/stars.html b/views/user/stars.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/top100.html b/views/user/top100.html
@@ -1,6 +1,4 @@
-<div id='sidebar'>
-
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>

diff --git a/views/user/topics.html b/views/user/topics.html
@@ -1,5 +1,4 @@
-<div id='sidebar'>
-</div>
+<%- partial('sidebar') %>
 
 <div id='content'>
 	<div class='panel'>