show.rhtml in parlement-0.6

- old
+ new
@@ -1,69 +1,63 @@
 <div class="sidebar">
 	<h3 class="boxTitle">Electoral list</h3>
 	<div class="box">
 		All voters:
-		<span class="result" style="float: none">
+		<span class="result selected" style="float: none">
 			<%= Choice.count :select => 'person_id', :distinct => true %>
 		</span>
 	</div>
 
 	<h3 class="boxTitle">Identity</h3>
 	<div class="box">
 		<div id="author_<%= @elt.id %>">
-			<%= render :partial => 'account/show',
-					:locals => { :divId => 'author_'+@elt.id } %>
+			<%= render :partial => 'account/show', :locals => { :divId => 'author_'+@elt.id } %>
 		</div>
 	</div>
 
-	<% if @elt.children.count > 0 %>
-		<h3 class="boxTitle">Titres</h3>
-	<% end %>
+	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Highest posts</h3><% end %>
+	<div class="box listByVote">
+		<%= render :partial => '/elt/listByVote' %>
+	</div>
 
-	<div class="box">
-		<ul>
-			<% for elt in @elt.children.reverse[0...PAGE_ELT_LENGTH] %>
-				<li class="boxLine" title="<%= elt.created_on.strftime('%d/%m') %>">
-					<span class="result"><%= sprintf("%+d", elt.result) %></span>
-					<%= link_to elt.subject, :id => elt %>
-				</li>
-			<% end %>
-		</ul>
-
-		<%= link_to image_tag("/images/webfeed.gif"),
-				:action => 'rss', :id => @elt %>
+	<% if @elt.elts_count > 0 %><h3 class="boxTitle">Latest posts</h3><% end %>
+	<div class="box listByDate">
+		<%= render :partial => '/elt/listByDate' %>
 	</div>
 
 	<h3 class="boxTitle">Subscribe</h3>
 	<div class="box">
 		<div id="subscription">
 			<%= 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')) %>
+				:update => 'subscription',
+				:url => { :controller => 'subscriber', :action => 'subscribe', :id => @elt },
+				:loaded => visual_effect(:BlindDown, 'subscription')) %>
 		</div>
 
 		<div class="boxLine">
 			<% @elt.subscribers.each do |i| %>
 				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
 			<% end %>
 		</div>
-		<div class="boxLineR"><%= @elt.subscribers.size %> subscriber(s)</div>
+
+		<div class="boxLineR">
+			<% @elt.parent.all_recipients.each do |i| %>
+				<%= link_to(i.name, :controller => 'person', :action => 'show', :id => i) %>
+			<% end %>
+		</div>
 	</div>
 </div>
 
 <% @flash.each do |key, value| %>
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
 
-<% if @elt.parent and @elt.parent.subject != '' %>
-	<h3 class="parent">
-		<%= link_to(textilize_without_paragraph(@elt.parent.subject),
-				:id => @elt.parent) %>
-	</h3>
-<% end %>
+<h3 class="parent">
+	<%= link_to textilize_without_paragraph(@elt.parent.subject), :id => @elt.parent \
+			if @elt.parent %>
+</h3>
 
-<ul>
+<ul class="top">
 	<%= render :partial => 'elt', :layout => 'top',
 			:locals => { :elt => @elt, :eltTop => true } %>
 </ul>
 