parlement 0.12 → 0.13

data/CHANGES

@@ -1,5 +1,21 @@
 - parlement changelog
 
+== Version 0.13 ==
+
+Better filtering. Periodical updating of visitors, subscribers and elements
+lists.
+
+* do not filter out the top element
+* filtered elements are now only displayed as simple clickable >
+* correction, no more showing the subscriptionLink even when it is not already
+  present
+* lists didn't refer to the proper div id, resulting in the creation of
+  infinitely nested div over time
+* possibility to preview then modify, in two distinct steps
+* visits, subscribers and elements lists updated every 10s
+* lists only display elements whose rating is above the filter
+* new feed icon, placed alongside the associated box title
+
 == Version 0.12
 
 Internationalization

data/MEMORY

@@ -1,3 +1,7 @@
+TODO
+* factorise paginations
+* new and preview using tabs
+
 What is below is just for future personal reference...
 
 http://www.ajaxchat.org/chat/

data/README

@@ -14,6 +14,7 @@ On debian, here are the commands used to setup a parlement server:
 # apt-get install libpgsql-ruby
 # apt-get install irb
 # apt-get install rdoc
+# apt-get install rake
 
 Basically this install postgresql, ruby and the ruby driver to psql. Ruby on
 Rails is database agnostic, parlement will be sometimes in the future.

data/app/controllers/account_controller.rb

@@ -100,6 +100,9 @@ class AccountController < UserController
 		if session[:person]
 			cookies[:person_name] = { :value => session[:person].name, :expires => 3.years.from_now }
 			cookies[:salted_password] = { :value => @user.salted_password, :expires => 3.years.from_now } if @user
+
+      @person.last_login = Time.now
+      @person.save
 		end
 
 		# To make sure the logout knows which elt's choices to update

data/app/controllers/application.rb

@@ -5,6 +5,8 @@ require 'login_engine'
 require 'term/ansicolor'
 
 class ApplicationController < ActionController::Base
+  helper_method :filter
+
 	include LoginEngine
 	include Term::ANSIColor
 
@@ -32,8 +34,21 @@ class ApplicationController < ActionController::Base
 				logger.info yellow { bold { "#{person.name} is back" } }
 				session[:person] = person 
 				session[:user] = person.user
+
+        person.last_login = Time.now
+        person.save
 			end
 		end
 	end
+
+  def filter
+    if request.cookies['filter'] && request.cookies['filter'][0]
+      filter = request.cookies['filter'][0].to_i - 1
+      filter = nil unless filter >= 0
+    else
+      filter = 0
+    end
+    filter
+  end
 end
 

data/app/controllers/elt_controller.rb

@@ -14,6 +14,7 @@ class EltController < ApplicationController
 		@elt = Elt.find(params[:id])
 		@title = @elt.subject
 		@title += " (parlement)" if !@title.downcase.include? "parlement"
+
 		render :layout => 'top'
 
 	rescue ActiveRecord::RecordNotFound => e
@@ -37,6 +38,68 @@ class EltController < ApplicationController
 		render :partial => 'listByVote'
 	end
 
+	def listVisitors
+		@elt = Elt.find params[:id] unless @elt
+    render :partial => 'listVisitors'
+  end
+
+	def listSubscribers
+		@elt = Elt.find params[:id] unless @elt
+    render :partial => '/subscriber/list'
+  end
+
+	def updateView
+    session[:lastUpdatedView] ||= Time.now - 10
+    acts = ""
+    visits = Visit.count \
+      :joins => "JOIN elts e1 ON e1.id = '#{params[:id]}' \
+        JOIN elts e2 ON visits.elt_id = e2.id \
+          AND ((e1.lft <= e2.lft AND e2.rgt <= e1.rgt) \
+            OR (e1.lft > e2.lft AND e2.rgt > e1.rgt))",
+      :conditions => "visits.updated_on >= '#{session[:lastUpdatedView]}'"
+    acts += "new Ajax.Updater('listVisitors', '/elt/listVisitors/#{params[:id]}', \
+      {asynchronous:true, evalScripts:true}); \
+      " if visits > 0
+
+    subscribers = Subscription.count \
+      :joins => "JOIN elts e1 ON e1.id = '#{params[:id]}' \
+        JOIN elts e2 ON subscriptions.elt_id = e2.id \
+          AND ((e1.lft <= e2.lft AND e2.rgt <= e1.rgt) \
+            OR (e1.lft > e2.lft AND e2.rgt > e1.rgt))",
+      :conditions => "subscriptions.created_on >= '#{session[:lastUpdatedView]}'"
+    acts += "new Ajax.Updater('listSubscribers', '/elt/listSubscribers/#{params[:id]}', \
+      {asynchronous:true, evalScripts:true}); \
+      " if subscribers > 0
+
+    elts = Elt.count \
+      :joins => "LEFT JOIN choices ON choices.elt_id = elts.id \
+        JOIN elts e2 ON elts.lft <= e2.lft AND e2.rgt <= elts.rgt",
+      :conditions => "elts.id = '#{params[:id]}' \
+        AND e2.created_on >= '#{session[:lastUpdatedView]}'"
+    acts += "new Ajax.Updater('listByDate', '/elt/listByDate/#{params[:id]}', \
+      {asynchronous:true, evalScripts:true});" \
+      + "new Ajax.Updater('listByVote', '/elt/listByVote/#{params[:id]}', \
+      {asynchronous:true, evalScripts:true}); \
+      " if subscribers > 0
+
+    if person = session[:person]
+      visit = Visit.find_by_person_id_and_elt_id(person, params[:id])
+      if visit and person.last_login and person.last_login > visit.created_on then
+        logger.info "New visit"
+        visit.destroy
+        visit = nil
+      end
+      visit = Visit.new(:person => person, :elt_id => params[:id]) unless visit
+      visit.filter = filter
+      visit.save!
+    end
+
+    logger.info "#{visits} visits, #{subscribers} subscribers, #{elts} elts"
+    session[:lastUpdatedView] = Time.now
+    render :inline => " \
+      <script type=\"text/javascript\">#{acts}</script>"
+	end
+
 	def rss
 		params[:id] = params[:id].gsub(/.rss/, '')
 		headers["Content-Type"] = "text/xml; charset=utf-8" 
@@ -51,8 +114,7 @@ class EltController < ApplicationController
 
 	# Used to initialise the elt, its subject mainly
 	def new
-		@elt = Elt.new
-		@elt.parent = Elt.find(params[:id])
+		@elt = Elt.new(:parent_id => params[:id], :body => "")
 
 		if @elt.parent.subject.include? 'Re: '
 			@elt.subject = @elt.parent.subject 

data/app/controllers/subscriber_controller.rb

@@ -17,12 +17,6 @@ class SubscriberController < ApplicationController
 				Subscription.find_by_person_id_and_elt_id(session[:person].id, elt2.id).destroy
 				logger.info yellow { "User #{session[:person].name} unsubscribed from #{elt2.subject}..." }
 			else
-				if cookies[:filter]
-					filter = cookies[:filter].to_i - 1
-					filter = nil unless filter >= 0
-				else
-					filter = 0
-				end
 				@elt.subscriptions.create :person => session[:person], :filter => filter
 				logger.info yellow { "User #{session[:person].name} subscribed to #{@elt.id} with filter #{filter}..." }
 			end

data/app/helpers/elt_helper.rb

@@ -1,8 +1,33 @@
 module EltHelper
+  def countEltsAboveFilter
+    Elt.count_by_sql "\
+      SELECT COUNT(*) \
+        FROM (SELECT elts.id FROM elts \
+                LEFT JOIN choices ON choices.elt_id = elts.id \
+               WHERE lft > #{@elt.lft} AND rgt < #{@elt.rgt} \
+               GROUP BY elts.id \
+              HAVING SUM(value) >= #{filter||-10**10}) AS notUsed"
+  end
+
+	#
+	# Should we display an element's title
+	#
+	# The algo used is simple, display a title if it is not a simple reply to its
+	# parent
+	#
+	def displayTitle? elt
+		#elt.id and elt.subject.reverse.index(elt.parent.subject.reverse) != 0
+		elt.id and elt.parent and elt.subject and !elt.subject.empty? \
+			and elt.subject != elt.parent.subject \
+			and elt.parent.subject \
+			and elt.subject.downcase != elt.parent.subject.downcase \
+			and not elt.subject.sub(/(Re|RE|r�f|re|sv|aw):\s*/, '') == elt.parent.subject
+	end
+
 	def format(data)
 		# for italics /.../ to _..._ \
-				#.gsub(/(\s+)\/([\w\s�������]*)\//, '\\1_\\2_') \
-
+		#		.gsub(/(\s+)\/([\w\s�������]*)\//, '\\1_\\2_') \
+    #
 		# On Date Time someone wrote: blockquote
 		# Yahoo footer
 		# Google footer
@@ -24,7 +49,7 @@ module EltHelper
 				.gsub(/^\s\*(.*)\*/, '*\\1*') \
 				.gsub(/^\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
 				.gsub(/\n*^\b(position\s*:\s*(\d*(\.\d+)?))\s*$\n*/, ' <span class="position">\1</span>') \
-			if data != nil
+        if data != nil
 
 		# Only show the n first paragraphs
 		text.gsub!(/((?:(\n)(?:^.+$\n)*){#{NB_PARAGRAPH_TO_DISPLAY}})((?:.|\n)*)/,
@@ -55,20 +80,5 @@ module EltHelper
 
 		textiled
 	end
-
-	#
-	# Should we display an element's title
-	#
-	# The algo used is simple, display a title if it is not a simple reply to its
-	# parent
-	#
-	def displayTitle? elt
-		#elt.id and elt.subject.reverse.index(elt.parent.subject.reverse) != 0
-		elt.id and elt.parent and elt.subject and !elt.subject.empty? \
-			and elt.subject != elt.parent.subject \
-			and elt.parent.subject \
-			and elt.subject.downcase != elt.parent.subject.downcase \
-			and not elt.subject.sub(/(Re|RE|r�f|re|sv|aw):\s*/, '') == elt.parent.subject
-	end
 end
 

data/app/models/elt.rb

@@ -25,6 +25,11 @@ class Elt < ActiveRecord::Base
 	has_many :subscriptions, :dependent => :destroy
 	has_many :subscribers, :through => :subscriptions, :source => :person
 
+	has_many :visits, :dependent => :destroy
+	has_many :visitors, :through => :visits, :source => :person
+	has_many :old_visits, :dependent => :destroy
+	has_many :old_visitors, :through => :old_visits, :source => :person
+
 	acts_as_nested_set :order => "position is not null, position, last_activity DESC, created_on DESC"
 	acts_as_tree :order => "position is not null, position, last_activity DESC, created_on DESC", :counter_cache => true
 
@@ -39,9 +44,9 @@ class Elt < ActiveRecord::Base
 
 	def all_subscriptions
 		if parent
-		(subscriptions + parent.all_subscriptions).uniq
+      (subscriptions + parent.all_subscriptions).uniq
 		else
-		subscriptions
+      subscriptions
 		end
 	end
 
@@ -73,7 +78,7 @@ class Elt < ActiveRecord::Base
 
 		parent.vote Regexp.last_match(1), person if body =~ /^\s*(-1|0|\+1)(\s|$)/
 		if Regexp.last_match(1) and self.body.gsub(/(-1|0|\+1)/, '').strip.empty?
-		# Hide simple votes
+      # Hide simple votes
 			vote -1
 		else
 			vote if person

data/app/models/old_visit.rb

@@ -0,0 +1,4 @@
+class OldVisit < ActiveRecord::Base
+	belongs_to :person
+	belongs_to :elt
+end

data/app/models/person.rb

@@ -7,6 +7,10 @@ class Person < ActiveRecord::Base
 	has_many :subscribed_elts, :through => :subscriptions, :source => :elt
 	has_many :person_mails, :dependent => :destroy
 	has_many :mails, :through => :person_mails, :source => :mail
+	has_many :visits, :dependent => :destroy
+	has_many :visited, :through => :visits, :source => :elt
+	has_many :old_visits, :dependent => :destroy
+	has_many :old_visited, :through => :old_visits, :source => :elt
 
 	validates_presence_of :name, :on => :create
 	validates_length_of :name, :within => 3..80, :on => :create

data/app/models/visit.rb

@@ -0,0 +1,4 @@
+class Visit < ActiveRecord::Base
+	belongs_to :person
+	belongs_to :elt
+end

data/app/views/account/_show.rhtml

@@ -1,3 +1,5 @@
+<h3 class="boxTitle"><%= _('Identity')%></h3>
+
 <% flash.each do |key, value| %>
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
@@ -19,12 +21,18 @@
 <% end %>
 
 <% if @person = session[:person] %>
-  <script language="JavaScript">Element.show($('subscriptionLink'));</script>
+  <script language="JavaScript">
+    if ($('subscriptionLink')) {
+      Element.show($('subscriptionLink'));
+    }
+  </script>
 	<span class="logout">
 		<%= link_to_remote('[X]',
 			{ :update => 'identity',
 				:url => { :controller => 'account', :action => 'logout', :elt => @elt },
-				:before => visual_effect(:BlindUp, 'identity', { :queue => 'login' })+visual_effect(:BlindUp, 'subscriptionLink', { :queue => 'login' })+";resetChoices();",
+        :before => visual_effect(:BlindUp, 'identity', { :queue => 'login' }) \
+          +visual_effect(:BlindUp, 'subscriptionLink', { :queue => 'login' }) \
+          +"resetChoices();",
 				:loaded => visual_effect(:BlindDown, 'identity', { :queue => 'login' }) },
 			{ :href => url_for(:controller => 'account', :action => 'logout') }) %>
 	</span>
@@ -41,7 +49,7 @@
 	</div>
 
   <fieldset id="edit">
-  <legend><%= _('Edit') %></legend>
+    <legend><%= _('Edit') %></legend>
 		<% form_remote_tag(
 			:update => 'identity',
 			:url => { :controller => 'account', :action => 'setPassword' },

data/app/views/elt/_listByDate.rhtml

@@ -1,60 +1,76 @@
+<%= link_to image_tag("/images/feed-icon-28x28.png"),
+  { :action => 'rss', :id => @elt }, :class => 'feed' %>
+<h3 class="boxTitle"><%= _('Latest posts') %></h3>
+
 <%e_pages = ActionController::Pagination::Paginator.new(
-		self, (@elt.rgt-@elt.lft-1)/2, LIST_LENGTH, params['page'])
-	elts = Elt.find :all,
-		:conditions => "lft > #{@elt.lft} AND rgt < #{@elt.rgt}",
-		:order => 'elts.created_on DESC',
-		:include => :person,
-		:limit  => e_pages.items_per_page,
-		:offset => e_pages.current.offset %>
-
-<div id="listByDate">
-	<% if e_pages.length > 1 %>
-		<%= link_to_remote('|&lt;',
-			{ :update => 'listByDate',
-				:url => { :action => 'listByDate', :id => @elt, :page => e_pages.last },
-				:before => visual_effect(:BlindUp, 'listByDate', { :queue => 'end' }),
-				:loading => 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' }),
-				:loading => 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' }),
-				:loading => 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' }),
-				:loading => visual_effect(:BlindDown, 'listByDate', { :queue => 'end' }) }) \
-					if e_pages.first != e_pages.current %>
-	<% end %>
-
-	<ul>
-		<% 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>
-				<% 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>
-
-	<%= link_to image_tag("/images/webfeed.gif"), :action => 'rss', :id => @elt %>
-</div>
+		self, countEltsAboveFilter, LIST_LENGTH, params['page'])
+	elts = Elt.find_by_sql " \
+		SELECT SUM(value) AS resultLocal, elts.id, parent_id, elts.created_on, parent_id, \
+           elts_count, position, elts.person_id, subject, body, lft, rgt \
+      FROM elts \
+      LEFT JOIN choices ON choices.elt_id = elts.id \
+     WHERE lft > #{@elt.lft} AND rgt < #{@elt.rgt} \
+     GROUP BY elts.id, parent_id, elts.created_on, parent_id, elts_count, \
+           position, elts.person_id, subject, body, lft, rgt \
+    HAVING SUM(value) >= #{filter||-10**10} \
+		 ORDER BY created_on DESC \
+     LIMIT #{e_pages.items_per_page} \
+    OFFSET #{e_pages.current.offset}" %>
+
+<% if e_pages.length > 1 %>
+  <%= 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 %>
+<% end %>
+
+<ul>
+  <% 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>
+        <%= link_to_remote("%+d" % elt.resultlocal,
+          { :update => 'resultList_'+elt.id,
+            :position => :top,
+            :url => { :action => 'choices', :id => elt } },
+          { :class => 'result', :id => "resultList_#{ elt.id}",
+            :href => url_for(:controller => 'elt', :action => 'choices', :id => elt) }
+            ) 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/_listByVote.rhtml

@@ -1,73 +1,78 @@
-<%e_pages = ActionController::Pagination::Paginator.new(
-		self, (@elt.rgt-@elt.lft-1)/2, LIST_LENGTH, params['page'])
-	elts = Elt.find :all,
-		:select => 'SUM(value) AS resultLocal, elts.id, parent_id, elts.created_on, parent_id,' \
-			+'elts_count, position, elts.person_id, subject, body, lft, rgt',
-		:conditions => "lft > #{@elt.lft} AND rgt < #{@elt.rgt}",
-		:order => 'SUM(value) IS NULL, SUM(value) DESC, created_on DESC',
-		:group => 'elts.id, parent_id, elts.created_on, parent_id, elts_count,' \
-			+'position, elts.person_id, subject, body, lft, rgt',
-		:limit  => e_pages.items_per_page,
-		:offset => e_pages.current.offset,
-		:joins => "LEFT JOIN choices ON choices.elt_id = elts.id" %>
+<%= link_to image_tag("/images/feed-icon-28x28.png"),
+  { :action => 'vote_rss', :id => @elt }, :class => 'feed' %>
+<h3 class="boxTitle">
+  <%= _('Highest posts') %>
+</h3>
 
-<div id="listByVote">
-	<% if e_pages.length > 1 %>
-		<%= 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 %>
+<%e_pages = ActionController::Pagination::Paginator.new(
+		self, countEltsAboveFilter, LIST_LENGTH, params['page'])
+	elts = Elt.find_by_sql " \
+		SELECT SUM(value) AS resultLocal, elts.id, parent_id, elts.created_on, parent_id, \
+           elts_count, position, elts.person_id, subject, body, lft, rgt \
+      FROM elts \
+      LEFT JOIN choices ON choices.elt_id = elts.id \
+     WHERE lft > #{@elt.lft} AND rgt < #{@elt.rgt} \
+     GROUP BY elts.id, parent_id, elts.created_on, parent_id, elts_count, \
+           position, elts.person_id, subject, body, lft, rgt \
+    HAVING SUM(value) >= #{filter||-10**10} \
+		 ORDER BY SUM(value) IS NULL, SUM(value) DESC, created_on DESC \
+     LIMIT #{e_pages.items_per_page} \
+    OFFSET #{e_pages.current.offset}" %>
 
-		<span class="pageCount"><%= e_pages.length-e_pages.current.to_i+1 %></span>
+<% if e_pages.length > 1 %>
+  <%= 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 %>
 
-		<%= 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 %>
-	<% end %>
+  <span class="pageCount"><%= e_pages.length-e_pages.current.to_i+1 %></span>
 
-	<ul>
-		<% elts.each do |elt| %>
-			<li class="boxLine elt" title="<%= elt.created_on.strftime('%d/%m %H:%M') %>">
-				<span>
-					<%= link_to_remote("%+d" % elt.resultlocal,
-						{ :update => 'resultList_'+elt.id,
-							:position => :top,
-							:url => { :action => 'choices', :id => elt } },
-						{ :class => 'result', :id => "resultList_#{ elt.id}",
-							:href => url_for(:controller => 'elt', :action => 'choices', :id => elt) }
-							) if elt.resultlocal %>
-				</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 %>
+<% 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 %>
+<ul>
+  <% 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>
+        <%= link_to_remote("%+d" % elt.resultlocal,
+          { :update => 'resultList_'+elt.id,
+            :position => :top,
+            :url => { :action => 'choices', :id => elt } },
+          { :class => 'result', :id => "resultList_#{ elt.id}",
+            :href => url_for(:controller => 'elt', :action => 'choices', :id => elt) }
+            ) if elt.resultlocal %>
+      </span>
 
-				<%= link_to elt.subject.gsub(/\[.*\]/, ''), :action => 'show', :id => elt %>
-			</li>
-		<% end %>
-	</ul>
+      <% 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 image_tag("/images/webfeed.gif"), :action => 'vote_rss', :id => @elt %>
-</div>
+      <%= link_to elt.subject.gsub(/\[.*\]/, ''), :action => 'show', :id => elt %>
+    </li>
+  <% end %>
+</ul>