show.rhtml in parlement-0.14

- old
+ new

@@ -1,48 +1,49 @@
 <% voters = Choice.count :select => 'person_id', :distinct => true %>
 
-<%= periodically_call_remote(:update => 'spinner', :url => { :action => 'updateView', :id => @elt })%>
-<span id="spinner">
-  <!--
-  <%= image_tag "/images/live_tree_loading_spinner.gif" %>
-  -->
-</span>
+<div id="sidebar" class="sb">
+  <script type="text/javascript">if (displayBorder) { border.render('sidebar'); }</script>
+	<%= render :partial => '/layouts/title' %>
 
-<div class="sidebar">
+  <%= periodically_call_remote(:update => 'spinner', :url => { :action => 'updateView', :id => @elt })%>
+  <span id="spinner"></span>
+
   <div class="box identity" id="identity">
     <%= render :partial => 'account/show', :locals => { :elt => @elt.parent } %>
   </div>
 
 	<div class="box" id="filter">
-    <h3 class="boxTitle"><%= _('Filter') %></h3>
-    <form id="filterForm" name="filterForm">
-			<a onclick="return decrementFilter()" href="#" accesskey="<">&lt;</a>
-			<select id="filter" name="filter"
-        onchange="setFilter(this.options[this.selectedIndex].value, '<%= @elt.id %>')">
-				<%= options_for_select [["", -voters]] %>
-				<%= options_for_select (0..(voters)), 0 %>
-			</select>
-			<a onclick="return incrementFilter()" href="#" accesskey=">">&gt;</a>
-			<%= submit_tag 'Ok' %>
+		<h3 class="boxTitle"><%= _('Filter') %></h3>
+		<form id="filterForm" action="">
+      <p>
+        <a onclick="return decrementFilter()" href="#" accesskey="-">&#x2012;</a>
+        <select name="filter"
+          onchange="setFilter(this.options[this.selectedIndex].value, '<%= @elt.id %>')">
+          <%= options_for_select [["", -voters]] %>
+          <%= options_for_select (0..(voters)), 0 %>
+        </select>
+        <a onclick="return incrementFilter()" href="#" accesskey="+">+</a>
+        <%= submit_tag 'Ok' %>
+      </p>
 		</form>
-		<script>setFilterFromCookie();</script>
+		<script type="text/javascript">setFilterFromCookie();</script>
 	</div>
 
   <div class="box" id="listVisitors">
-    <%= render :partial => '/elt/listVisitors' %>
+    <%= render :partial => '/elt/list/visitors' %>
   </div>
 
   <div class="box" id="listSubscribers">
-    <%= render :partial => '/subscriber/list' %>
+    <%= render :partial => '/elt/list/subscribers' %>
   </div>
 
   <div class="box" id="listByVote">
-    <%= render :partial => '/elt/listByVote' %>
+    <%= render :partial => '/elt/list/byVote' %>
   </div>
 
   <div class="box" id="listByDate">
-    <%= render :partial => '/elt/listByDate' %>
+    <%= render :partial => '/elt/list/byDate' %>
   </div>
 
   <div class="box">
     <h3 class="boxTitle"><%= _('Links') %></h3>
     <h4><%= _('Personal') %></h4>
@@ -61,12 +62,10 @@
         benj&#8217;s</a></div>
 
     <h4><%= _('Democracy') %></h4>
     <div class="boxLine"><a href="http://worldblu.com">
         World BLU</a></div>
-    <div class="boxLine"><a href="http://groups.google.com/group/top-politics">
-        top politics</a></div>
     <div class="boxLine"><a href="http://www.tdge.org">
         world Parliament Experiment</a></div>
     <div class="boxLine"><a href="http://groups.google.com/group/worldcit">
         The Community of World Citizens</a></div>
     <div class="boxLine"><a href="http://world-wide.democracy.net">
@@ -74,14 +73,16 @@
   </div>
 
 	<div class="box">
     <h3 class="boxTitle"><%= _('Search') %></h3>
 		<form action="http://google.com/search">
-			<input type="hidden" name="q"
-				value="site:<%= ActionMailer::Base.smtp_settings[:domain] %>"/>
-			<input type="text" name="q"/>
-			<%= submit_tag 'OK' %>
+      <div>
+        <input type="hidden" name="q"
+          value="site:<%= ActionMailer::Base.smtp_settings[:domain] %>" />
+        <input type="text" name="q" />
+        <%= submit_tag 'OK' %>
+      </div>
 		</form>
 	</div>
 
   <!--
   <table width="100%" bgcolor="#FFFFFF" style="font-size: smaller">
@@ -89,11 +90,11 @@
       <td align="center">
         <img src="http://www.acthum.net/directdemocracy/images/dd-sml.gif">
       </td>
       <td colspan="3">
         <b><font size="3">DIRECT DEMOCRACY</font></b>
-        <br/>
+        <br />
         <font size="4">Web Ring</font>
       </td>
     </tr>
     <tr>
       <td align="center">
@@ -136,11 +137,11 @@
 <% flash.each do |key, value| %>
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
 
 <h3 class="parent">
-	<%= link_to textilize_without_paragraph(@elt.parent.subject), :id => @elt.parent \
-			if @elt.parent %>
+  <%= link_to @elt.parent.subject, :id => @elt.parent \
+    if @elt.parent and @elt.parent_id != 'ROOT' %>
 </h3>
 
 <ul class="top">
 	<%= render :partial => 'elt', :layout => 'top',
 			:locals => { :elt => @elt, :eltTop => true } %>