parlement 0.13 → 0.14

data/app/views/elt/_choice.rhtml

@@ -1,35 +1,35 @@
 <%
-choice = Choice.find_by_elt_id_and_person_id elt.id, (session[:person] ? session[:person].id : nil)
-result = elt.result
+	choice = Choice.find_by_elt_id_and_person_id elt.id, session[:person].id if session[:person]
+	result = elt.result
 %>
 
-<label class="con <%= choice and choice.value == -1 ? "selected" : "" %>"
-	title="-1" for="choice_<%= elt.id %>_con">
-	<%= image_tag 'vote_minus.png' %>
-	<%= radio_button_tag "choice[value]", "-1",
-		(choice and choice.value == -1),
-		:id => "choice_#{elt.id}_con",
-		:onclick => "this.form.commit.click()" %>
-</label>
+<%= link_to_remote(
+	image_tag('vote_minus.png',
+		:class => "con" + ((choice and choice.value == -1) ? ' selected' : '')),
+	{ :update => 'eltChoice_'+elt.id.to_s,
+		:url => { :action => 'vote', :id => elt, 'choice[value]' => '-1' },
+		:before => visual_effect(:DropOut, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }),
+		:loaded => visual_effect(:Grow, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }) },
+	{ :href => url_for(:controller => 'elt', :action => 'vote', 'choice[value]' => '-1') }) %>
 
 <%= link_to_remote("%+d" % result,
 	{ :update => 'result_'+elt.id,
 		:position => :top,
 		:url => { :action => 'choices', :id => elt } },
-	{ :class => 'result', :id => "result_#{ elt.id}",
+	{ :class => 'result' + ((choice and choice.value != 0) ? ' selected' : ''),
+		:id => "result_#{ elt.id}",
 		:href => url_for(:controller => 'elt', :action => 'choices', :id => elt) }) %>
-<script>setKnob($('elt_<%= elt.id %>'), <%= result %>);</script>
 
-<label class="pro <%= choice and choice.value == 1 ? "selected" : "" %>"
-	title="+1" for="choice_<%= elt.id %>_pro">
-	<%= image_tag 'vote_plus.png' %>
-	<%= radio_button_tag "choice[value]", "+1",
-		(choice and choice.value == +1),
-		:id => "choice_#{elt.id}_pro",
-		:onclick => "this.form.commit.click()" %>
-</label>
+<%= link_to_remote(
+  image_tag('vote_plus.png',
+		:class => "pro" + ((choice and choice.value == 1) ? ' selected' : '')),
+  { :update => 'eltChoice_'+elt.id.to_s,
+    :url => { :action => 'vote', :id => elt, 'choice[value]' => '+1' },
+    :before => visual_effect(:DropOut, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }),
+    :loaded => visual_effect(:Grow, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }) },
+  { :href => url_for(:controller => 'elt', :action => 'vote', 'choice[value]' => '1') }) %>
 
-<%= submit_tag 'Vote!' %>
+<script type="text/javascript">setKnob($('elt_<%= elt.id %>'), 0<%= result %>);</script>
 
 <span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
 	<%= link_to_remote(image_tag('write.png'),
@@ -37,6 +37,6 @@ result = elt.result
 			:url => { :controller => 'elt', :action => 'new', :id => elt },
 			:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
 				visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s) },
-		{ :href => url_for(:controller => 'elt', :action => 'new', :id => @elt)}) %>
+		{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt.id)}) %>
 </span>
 

data/app/views/elt/_elt.rhtml

@@ -1,79 +1,89 @@
-<li id="elt_<%= elt.id %>" class="elt <%= 'titled' if displayTitle? elt %>">
-	<script>setKnobs($('elt_<%= elt.id %>'));</script>
-
-	<!-- The form is here to make sure a text browser can see it all on one line -->
-	<% form_remote_tag(
-		:update => 'eltChoice_'+elt.id.to_s,
-		:url => { :action => 'vote', :id => elt },
-		:before => visual_effect(:DropOut, 'eltChoice_'+elt.id.to_s, { :queue => 'end' }),
-		:loaded => visual_effect(:Grow, 'eltChoice_'+elt.id.to_s, { :queue => 'end' })) do
-
-		cache :action => 'show', :id => elt.id do %>
-			<% if displayTitle? elt and elt.created_on %>
-				<span class="created_on"><%= elt.created_on.strftime('%d/%m/%y %H:%M') %></span>
-			<% end %>
-
-			<% if elt.person %>
-				<span class="author">
-					&lt;<%= link_to elt.person.name, :controller => 'person', :action => 'show', :id => elt.person %>&gt;
-				</span>
-			<% elsif not displayTitle? elt %>
-				<span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>
-			<% end %>
+<% if elt.new_record? %>
+	<% flash.each do |key, value| %>
+		<div class="<%= key %>"><%= value %></div>
+	<% end %>
+<% end %>
 
-			<% if displayTitle? elt %>
-				<h1>
-					<% if elt.new_record? %>
-						<%= textilize_without_paragraph elt.subject.gsub(/\[.*\]/, '') %>
-					<% else %>
-						<%= link_to(textilize_without_paragraph(elt.subject.gsub(/\[.*\]/, '')),
-							:controller => 'elt', :action => 'show', :id => elt) %>
-					<% end %>
-				</h1>
-			<% end %>
+<% # That element is newly created, its creator is also new
+	if created ||= false and !elt.new_record? and elt.person and not session[:person] %>
+	<script type="text/javascript">
+		<%= remote_function(
+      :update => 'identity',
+      :url => { :controller => 'account', :action => 'login',
+        'person[name]' => elt.person.name, 'user[password]' => '' },
+      :method => :post,
+      :before => visual_effect(:BlindUp, 'identity', { :queue => 'login' }) \
+        +";resetChoices();",
+      :loaded => visual_effect(:BlindDown, 'identity', { :queue => 'login' }) \
+        +visual_effect(:BlindDown, 'subscriptionLink')) %>;
+	</script>
+<% end %>
 
-			<% formattedBody = format elt.body %>
+<li id="elt_<%= elt.id %>" class="elt <%= 'titled' if displayTitle? elt %>">
+	<script type="text/javascript">setKnobs($('elt_<%= elt.id %>'));</script>
 
-			<%= image_tag (elt.person && elt.person.image ? elt.person.image : "/javascripts/blank.gif"),
-					:onload => "setSize(this)",
-					:class => "avatar" \
-				if formattedBody.match(/[.\s]<p>/) %>
+	<% if displayTitle? elt and elt.created_on %>
+		<span class="created_on"><%= elt.created_on.strftime('%d/%m/%y %H:%M') %></span>
+	<% end %>
 
-			<%= formattedBody %>
+	<% if elt.person %>
+		<span class="author">
+			&lt;<%= link_to elt.person.name, :controller => 'person', :action => 'show', :id => elt.person %>&gt;
+		</span>
+	<% elsif not displayTitle? elt %>
+		<span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>
+	<% end %>
 
-			<span class="attachments">
-				<% for att in elt.attachments %>
-					<%= link_to image_tag("/attachment/file/#{att.file_relative_path}"),
-						"/attachment/file/#{att.file_relative_path}" %>
-				<% end %>
-			</span>
-		<% end %>
-		<% @controller.expire_fragment( :action => 'show', :id => elt.id) if elt.new_record? %>
+	<% if displayTitle? elt
+		titleText = elt.subject.gsub(/\[.*\]/, '')%>
+		<h<%= eltTop ? 1:2 %>>
+			<% if elt.new_record? %>
+				<%= link_to(titleText, { }, :title => titleText) %>
+			<% else %>
+				<%= link_to(titleText, { :controller => 'elt', :action => 'show', :id => elt }, :title => titleText) %>
+			<% end %>
+		</h<%= eltTop ? 1:2 %>>
+	<% end %>
 
-		<% unless elt.new_record? %>
-			<span class="choice" id="eltChoice_<%= elt.id %>">
-				<%= render :partial => '/elt/choice', :locals => { :elt => elt } %>
-			</span>
-		<% end %>
+  <%= image_tag (elt.person && elt.person.image ? elt.person.image : "/javascripts/blank.gif"),
+		:onload => "setSize(this)", :class => "avatar" \
+    if elt.body =~ /\n/ %>
 
-		<span class="eltMore" id="eltMore_<%= elt.id %>"
-			<%= 'style="display: none"' if (eltTop or elt.elts_count < SUB_THREAD_LENGTH) %>>
-			<%= link_to_remote(n_('%s message...', '%s messages...', elt.elts_count) % elt.elts_count,
-				{ :update => 'eltSubs_'+elt.id.to_s,
-					:url => { :controller => 'elt', :action => 'list', :id => elt },
-					:before => visual_effect(:BlindUp, "eltMore_#{elt.id.to_s}")+
-						visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}"),
-					:loading => visual_effect(:BlindDown, "eltSubs_#{elt.id.to_s}") },
-				{ :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
+	<% @controller.expire_fragment( :action => 'show', :id => elt.id) if elt.new_record? %>
+	<% cache :action => 'show', :id => elt.id do %>
+		<%= format elt.body %>
+		<span class="attachments">
+			<% for att in elt.attachments %>
+				<%= link_to image_tag("/attachment/file/#{att.file_relative_path}"),
+					"/attachment/file/#{att.file_relative_path}" %>
+			<% end %>
 		</span>
-	<!-- The choice end form, here to make sure it looks nice in text browsers -->
 	<% end %>
+	<% @controller.expire_fragment( :action => 'show', :id => elt.id) if elt.new_record? %>
 
-	<ul class="eltNew" id="eltNew_<%= elt.id %>"></ul>
+	<span class="choice" id="eltChoice_<%= elt.id %>">
+		<%= render :partial => '/elt/choice', :locals => { :elt => elt } unless elt.new_record? %>
+	</span>
+
+  <div class="eltMore" id="eltMore_<%= elt.id %>"
+    <%= 'style="display: none"' if (eltTop or elt.elts_count < SUB_THREAD_LENGTH) %>>
+    <%= link_to_remote(n_('%s message...', '%s messages...', elt.elts_count) % elt.elts_count,
+      { :update => 'eltSubs_'+elt.id.to_s,
+        :url => { :controller => 'elt', :action => 'list', :id => elt },
+        :before => visual_effect(:BlindUp, "eltMore_#{elt.id.to_s}")+
+          visual_effect(:BlindDown, "eltSubsClose_#{elt.id.to_s}"),
+        :loading => visual_effect(:BlindDown, "eltSubs_#{elt.id.to_s}") },
+      { :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
+  </div>
+
+  <ul class="eltNew" id="eltNew_<%= elt.id %>"><li style="display: none"/></ul>
 
 	<ul <%= 'style="display: none"' unless (eltTop or elt.elts_count < SUB_THREAD_LENGTH) %>
 		id="eltSubs_<%= elt.id %>" class="eltSub">
-		<%= render :partial => '/elt/list', :locals => { :elt => elt } if (eltTop or elt.elts_count < SUB_THREAD_LENGTH) %>
+    <%= render :partial => '/elt/list/children', :locals => { :elt => elt } \
+      if (eltTop or elt.elts_count < SUB_THREAD_LENGTH) %>
+    <%= "<li style=\"display: none\"></li>" \
+      unless (eltTop or (elt.elts_count > 0 and elt.elts_count < SUB_THREAD_LENGTH)) %>
 	</ul>
 
 	<span <%= 'style="display: none"' unless (elt.elts_count > 0 and (eltTop or elt.elts_count < SUB_THREAD_LENGTH)) %>
@@ -95,4 +105,3 @@
 		-->
 	</span>
 </li>
-

data/app/views/elt/choices.rhtml

@@ -1,29 +1,33 @@
+<% @elt = Elt.find params[:id] %>
+
 <table border="1" id="choices_<%= @elt.id %>" class="choices">
-	<caption><h2><%= @elt.subject %></h2></caption>
-	<tr onclick="Element.remove(this.parentNode);return false;">
-		<th><label class="con" title="-1">V</label></th>
-		<th><label title="0">0</label></th>
-		<th><label class="pro" title="+1">Λ</label></th>
-		<th style="border: none"><a href="#" class="closeChoices">X</a></th>
+	<tr>
+    <th><%= image_tag('vote_minus.png', :class => "con") %></th>
+		<th>0</th>
+    <th><%= image_tag('vote_plus.png', :class => "pro") %></th>
 	</tr>
 	<tr>
 		<% (-1..1).each { |n| %>
 			<td>
 				<% @elt.choices.select{ |c| c.value == n }.reverse.each { |c| %>
-					<div class="personalChoice" title="<%= c.created_on.strftime('%d/%m %H:%M') %>">
-						<span class="created_on"><%= c.created_on.strftime('%d/%m %H:%M') %></span>
-						<% if c.person %>
-							<span class="author">
-								&lt;<%= link_to c.person.name, :controller => 'person',
-									:action => 'show', :id => c.person %>&gt;
-							</span>
-						<% else %>
-							<span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>
-						<% end %>
-					</div>
+          <% if c.person %>
+            <span class="author" title="<%= c.created_on.strftime('%d/%m %H:%M') %>">
+              &lt;<%= link_to c.person.name, :controller => 'person',
+                :action => 'show', :id => c.person %>&gt;
+            </span>
+          <% else %>
+            <span class="author" title="<%= c.created_on.strftime('%d/%m %H:%M') %>">
+              &lt;<%= ANONYMOUS_POSTER %>&gt;
+            </span>
+          <% end %>
 				<% } %>
 			</td>
 		<% } %>
 	</tr>
 </table>
-
+<script type="text/javascript">
+  document.onclick = function() {
+    Element.remove($('choices_<%= @elt.id %>'));
+    document.onclick = null;
+  }
+</script>

data/app/views/elt/list/_byDate.rhtml

@@ -0,0 +1,71 @@
+<%= link_to image_tag("/images/feed-icon-14x14.png"),
+  { :action => 'rss', :id => @elt }, :class => 'feed',
+    :title => _('Webfeed') %>
+<h3 class="boxTitle"><%= _('Latest posts') %></h3>
+
+<%e_pages = ActionController::Pagination::Paginator.new(
+		self, countEltsAboveFilter, LIST_LENGTH, params['page'])
+	elts = Elt.find_by_sql " \
+		SELECT COALESCE(SUM(value), 0) AS resultLocal, elts.id, elts.created_on, subject \
+      FROM elts \
+      LEFT JOIN choices ON choices.elt_id = elts.id \
+     WHERE lft > #{@elt.lft} AND rgt < #{@elt.rgt} \
+     GROUP BY elts.id, elts.created_on, subject \
+    HAVING COALESCE(SUM(value), 0) >= #{filter||-10**10} \
+		 ORDER BY created_on DESC \
+     LIMIT #{e_pages.items_per_page} \
+    OFFSET #{e_pages.current.offset}" %>
+
+<ul>
+  <% if e_pages.length > 1 %>
+    <li class="nav">
+      <%= link_to_remote('|&lt;',
+        { :update => 'listByDate',
+          :url => { :action => 'listByDate', :id => @elt, :page => e_pages.last },
+          :before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
+          if e_pages.last != e_pages.current %>
+      <%= link_to_remote('&lt;',
+        { :update => 'listByDate',
+          :url => { :action => 'listByDate', :id => @elt, :page => e_pages.current.next },
+          :before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
+          if e_pages.current.next and e_pages.current.next != e_pages.last %>
+
+      <span class="pageCount"><%= e_pages.length-e_pages.current.to_i+1 %></span>
+
+      <%= link_to_remote('&gt;',
+        { :update => 'listByDate',
+          :url => { :action => 'listByDate', :id => @elt, :page => e_pages.current.previous },
+          :before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
+          if e_pages.current.previous and e_pages.current.previous != e_pages.first %>
+      <%= link_to_remote('&gt;|',
+        { :update => 'listByDate',
+          :url => { :action => 'listByDate', :id => @elt, :page => e_pages.first },
+          :before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
+          if e_pages.first != e_pages.current %>
+    </li>
+  <% end %>
+
+  <% elts.each do |elt| %>
+    <li class="boxLine elt" title="<%= elt.created_on.strftime '%d/%m %H:%M' %>">
+      <span class="created_on"><%= elt.created_on.strftime '%d/%m %H:%M' %></span>
+      <span class="result">
+        <%= ("%+d" % elt.resultlocal) if elt.resultlocal %>
+      </span>
+
+      <% if elt.person %>
+        <span class="author">
+          &lt;<%= link_to elt.person.name, :controller => 'person', :action => 'show', :id => elt.person %>&gt;
+        </span>
+      <% elsif not displayTitle? elt %>
+        <span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>
+      <% end %>
+
+      <%= link_to elt.subject.gsub(/\[.*\]/, ''), :action => 'show', :id => elt %>
+    </li>
+  <% end %>
+</ul>
+

data/app/views/elt/list/_byVote.rhtml

@@ -0,0 +1,71 @@
+<%= link_to image_tag("/images/feed-icon-14x14.png"),
+  { :action => 'vote_rss', :id => @elt }, :class => 'feed',
+    :title => _('Webfeed') %>
+<h3 class="boxTitle"><%= _('Highest posts') %></h3>
+
+<%e_pages = ActionController::Pagination::Paginator.new(
+		self, countEltsAboveFilter, LIST_LENGTH, params['page'])
+	elts = Elt.find_by_sql " \
+		SELECT COALESCE(SUM(value), 0) AS resultLocal, elts.id, elts.created_on, subject \
+      FROM elts \
+      LEFT JOIN choices ON choices.elt_id = elts.id \
+     WHERE lft > #{@elt.lft} AND rgt < #{@elt.rgt} \
+     GROUP BY elts.id, elts.created_on, subject \
+    HAVING COALESCE(SUM(value), 0) >= #{filter||-10**10} \
+		 ORDER BY COALESCE(SUM(value), 0) DESC, created_on DESC \
+     LIMIT #{e_pages.items_per_page} \
+    OFFSET #{e_pages.current.offset}" %>
+
+<ul>
+  <% if e_pages.length > 1 %>
+    <li class="nav">
+      <%= link_to_remote('|&lt;',
+        { :update => 'listByVote',
+          :url => { :action => 'listByVote', :id => @elt, :page => e_pages.last },
+          :before => visual_effect(:BlindUp, 'listByVote', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByVote', { :queue => 'end' }) }) \
+          if e_pages.last != e_pages.current %>
+      <%= link_to_remote('&lt;',
+        { :update => 'listByVote',
+          :url => { :action => 'listByVote', :id => @elt, :page => e_pages.current.next },
+          :before => visual_effect(:BlindUp, 'listByVote', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByVote', { :queue => 'end' }) }) \
+          if e_pages.current.next and e_pages.current.next != e_pages.last %>
+
+      <span class="pageCount"><%= e_pages.length-e_pages.current.to_i+1 %></span>
+
+      <%= link_to_remote('&gt;',
+        { :update => 'listByVote',
+          :url => { :action => 'listByVote', :id => @elt, :page => e_pages.current.previous },
+          :before => visual_effect(:BlindUp, 'listByVote', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByVote', { :queue => 'end' }) }) \
+          if e_pages.current.previous and e_pages.current.previous != e_pages.first %>
+      <%= link_to_remote('&gt;|',
+        { :update => 'listByVote',
+          :url => { :action => 'listByVote', :id => @elt, :page => e_pages.first },
+          :before => visual_effect(:BlindUp, 'listByVote', { :queue => 'end' }),
+          :loaded => visual_effect(:BlindDown, 'listByVote', { :queue => 'end' }) }) \
+          if e_pages.first != e_pages.current %>
+    </li>
+  <% end %>
+
+  <% elts.each do |elt| %>
+    <li class="boxLine elt" title="<%= elt.created_on.strftime '%d/%m %H:%M' %>">
+      <span class="created_on"><%= elt.created_on.strftime '%d/%m %H:%M' %></span>
+      <span class="result">
+        <%= ("%+d" % elt.resultlocal) if elt.resultlocal %>
+      </span>
+
+      <% if elt.person %>
+        <span class="author">
+          &lt;<%= link_to elt.person.name, :controller => 'person', :action => 'show', :id => elt.person %>&gt;
+        </span>
+      <% elsif not displayTitle? elt %>
+        <span class="author">&lt;<%= ANONYMOUS_POSTER %>&gt;</span>
+      <% end %>
+
+      <%= link_to elt.subject.gsub(/\[.*\]/, ''), :action => 'show', :id => elt %>
+    </li>
+  <% end %>
+</ul>
+

data/app/views/elt/{_list.rhtml → list/_children.rhtml}

@@ -2,13 +2,13 @@
 		self, elt.elts_count, PAGE_LENGTH, params['page'])
 	elts = Elt.find(:all,
 		:conditions => "parent_id = '#{elt.id}'",
-		:order => 'position, last_activity DESC, elts.created_on DESC',
+		:order => 'position, last_activity IS NULL, last_activity DESC, elts.created_on DESC',
 		:include => :person,
 		:limit  =>  e_pages.items_per_page,
 		:offset =>  e_pages.current.offset) %>
 
 <% if e_pages.length > 1 && e_pages.current.to_i != 1 %>
-	<li class="pager">
+	<li class="nav">
 		<%= link_to_remote('|&lt;',
 			{ :update => 'eltSubs_'+elt.id.to_s,
 				:url => { :action => 'list', :id => elt, :page => e_pages.first },
@@ -50,7 +50,7 @@
 <%= render :partial => '/elt/elt', :collection => elts, :locals => { :eltTop => false } %>
 
 <% if e_pages.length > 1 %>
-	<li class="pager">
+	<li class="nav">
 		<%= link_to_remote('|&lt;',
 			{ :update => 'eltSubs_'+elt.id.to_s,
 				:url => { :action => 'list', :id => elt, :page => e_pages.first },

data/app/views/elt/{_listByVote.rhtml → list/byVote.rhtml}

@@ -1,5 +1,6 @@
-<%= link_to image_tag("/images/feed-icon-28x28.png"),
-  { :action => 'vote_rss', :id => @elt }, :class => 'feed' %>
+<%= link_to image_tag("/images/feed-icon-14x14.png"),
+  { :action => 'vote_rss', :id => @elt }, :class => 'feed',
+    :title => _('Webfeed') %>
 <h3 class="boxTitle">
   <%= _('Highest posts') %>
 </h3>

data/app/views/elt/new.rhtml

@@ -14,18 +14,33 @@
 
 	<%= hidden_field 'elt', 'parent_id' %>
 
-  <span id="eltNewWrite_<%= @elt.parent_id %>">
-    <h2>
-      <%= text_field 'elt', 'subject' %>
+	<span id="eltNewWrite_<%= @elt.parent_id %>">
+		<span class="for_anon">
+			<div>
+				<label for="person_name"><%= _('Name') %>:</label>
+				<%= text_field 'person', 'name' %>
+			</div>
 
-      <%= render :partial => '/help',
-        :locals => { :divId => 'title'+@elt.parent_id,
-          :content => _('This is the title of your proposition.<br/>If you leave it as it is then it won\'t be displayed (recommanded if your text is short, like in a conversation).') } %>
-    </h2>
+			<div>
+				<label for="person_email"><%= _('Email') %>:</label>
+				<%= text_field 'person', 'email' %>
+			</div>
+		</span>
 
-    <%= text_area 'elt', 'body' %>
+		<div>
+			<label for="elt_subject"><%= _('subject') %>:</label>
+			<%= text_field 'elt', 'subject' %>
+			<%= render :partial => '/help',
+				:locals => { :divId => 'title'+@elt.parent_id,
+					:content => _('This is the title of your proposition.<br/>If you leave it as it is then it won\'t be displayed (recommanded if your text is short, like in a conversation).') } %>
+		</div>
 
-    <div class="eltNewButtons">
+		<div>
+			<label for="elt_body"><%= _('Content') %>:</label>
+			<%= text_area 'elt', 'body' %>
+		</div>
+
+		<div class="eltNewButtons">
       <%= submit_to_remote(_('Preview'), _('Preview'),
         :update => "eltNewPreview_"+@elt.parent_id,
         :url => { :action => "create", :id => @elt.parent, :submit => "preview" },
@@ -43,8 +58,8 @@
 
     <div class="eltNewButtons">
       <%= link_to_function('<span class="icon">&lt;&lt;</span> '+_('Modify'),
-        visual_effect(:BlindDown, 'eltNewWrite_'+@elt.parent_id) \
-          +visual_effect(:BlindUp, 'eltNewPropose_'+@elt.parent_id)) %>
+        visual_effect(:BlindUp, 'eltNewPropose_'+@elt.parent_id) \
+          +visual_effect(:BlindDown, 'eltNewWrite_'+@elt.parent_id)) %>
 
       <%= submit_tag _('Propose!') %>
     </div>

data/app/views/elt/show.rhtml

@@ -1,46 +1,47 @@
 <% 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' %>
+
+  <%= periodically_call_remote(:update => 'spinner', :url => { :action => 'updateView', :id => @elt })%>
+  <span id="spinner"></span>
 
-<div class="sidebar">
   <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">
@@ -63,8 +64,6 @@
     <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">
@@ -76,10 +75,12 @@
 	<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>
 
@@ -91,7 +92,7 @@
       </td>
       <td colspan="3">
         <b><font size="3">DIRECT DEMOCRACY</font></b>
-        <br/>
+        <br />
         <font size="4">Web Ring</font>
       </td>
     </tr>
@@ -138,8 +139,8 @@
 <% 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">