show.rhtml in parlement-0.10

- old
+ new

@@ -1,13 +1,9 @@
 <% voters = Choice.count :select => 'person_id', :distinct => true %>
 <div class="sidebar">
 	<h3 class="boxTitle">Identity</h3>
-	<div class="box" id="identity">
-		<div id="author_<%= @elt.id %>">
-			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
-		</div>
-	</div>
+	<div class="box" id="identity"><%= render :partial => 'account/show' %></div>
 
 	<h3 class="boxTitle">Filter</h3>
 	<div class="box">
 		<div>All voters: <span class="result"><%= voters %></span></div>
 		<form id="filterForm" name="filterForm">
@@ -21,40 +17,17 @@
 			<%= submit_tag 'Ok' %>
 		</form>
 		<script>setFilterFromCookie();</script>
 	</div>
 
-	<h3 class="boxTitle">Highest posts</h3>
-	<div class="box listByVote">
-		<%= render :partial => '/elt/listByVote' %>
-	</div>
-
-	<h3 class="boxTitle">Latest posts</h3>
-	<div class="box listByDate">
-		<%= render :partial => '/elt/listByDate' %>
-	</div>
-
 	<h3 class="boxTitle">Subscribers</h3>
-	<div class="box">
-		<div id="subscription" <%= "style='display: none'" unless session[:person] %> >
-			<%= link_to_remote(((@session[:person] and @elt.subscribers.include?(@session[:person])) ? 'Unsubscribe!' : 'Subscribe!'),
-				:update => 'subscription',
-				:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
-				:loaded => visual_effect(:BlindDown, 'subscription')) %>
-		</div>
+	<div class="box"><%= render :partial => '/subscriber/list' %></div>
 
-		<div class="boxLine">
-			<% @elt.subscribers.each do |i| %>
-				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
-			<% end %>
-		</div>
+	<h3 class="boxTitle">Highest posts</h3>
+	<div class="box listByVote"><%= render :partial => '/elt/listByVote' %></div>
 
-		<div class="boxLineR">
-			<% @elt.parent.all_recipients.each do |i| %>
-				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
-			<% end %>
-		</div>
-	</div>
+	<h3 class="boxTitle">Latest posts</h3>
+	<div class="box listByDate"><%= render :partial => '/elt/listByDate' %></div>
 
 	<h3 class="boxTitle">Search</h3>
 	<div class="box">
 		<form action="http://google.com/search">
 			<input type="hidden" name="q"