parlement 0.4 → 0.5

data/CHANGES

@@ -1,5 +1,13 @@
 - parlement changelog
 
+== Version 0.5
+
+Voting. Mails containing -1, 0 or +1 trigger a vote
+
+* correct charset decoding when receiving a mail
+* better ul li previews and proposals
+
+
 == Version 0.4
 
 Evolutions and corrections
@@ -16,6 +24,7 @@ Evolutions and corrections
 * simplifications for w3m display
 * yahoo and google footers now hidden
 
+
 == Version 0.3
 
 Major version, adding the possibility to use not only the web forums, but mails

data/README

@@ -65,9 +65,15 @@ Parameters
 	- votes
 
 
-Here is my console code to reset threads from their original mails:
-
+# Here is my console code to reset threads from their original mails:
 >> elts=Mail.find_all.select{|m|m.file and mail=TMail::Mail.parse(m.file) and reply=mail.in_reply_to and mailObject=Mail.find_by_message(reply) and mailObject.elt.id!=m.elt.parent_id}.collect{|m| {:elt=>m.elt.id, :parent=>Mail.find_by_message(TMail::Mail.parse(m.file).in_reply_to).elt.id}}; puts elts.size
-
 >> elts.each{|e|print e[:elt], ' ', e[:parent], ' '; puts Elt.update_all("parent_id='#{e[:parent]}'", "id='#{e[:elt]}'")}; puts elts.size
 
+# To get duplicate messages
+>> messages=Mail.find_by_sql "select message from mails group by message having count(message) > 1"; puts messages.length
+>> messages.each{ |m| mail=Mail.find_all_by_message m.message; mail.each{|m| print m.elt.id, ' ', m.elt.subject, ' ', m.elt.children.size; puts } }; puts messages.length
+
+# To get all existing votes
+elts=Elt.find(:all, :conditions => ["body LIKE '%%+1%%' OR body LIKE '%%0%%' OR body LIKE '%%-1%%'"]); puts elts.size
+elts.each { |e| print '(', Regexp.last_match(1), ')' if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size
+elts.each { |e| e.vote(Regexp.last_match(1), e.person) if e.body =~ /^\s*(-1|0|\+1)(\s*|$)/ }; puts; puts elts.size

data/app/helpers/elt_helper.rb

@@ -11,13 +11,13 @@ module EltHelper
 		# 1. numbered list
 		# short lines to which are added a break
 		text = auto_link data \
-				.gsub(/(wrote:.*)$(\n)^>\s/, '\\1<br/>\\2\\2> ') \
+				.gsub(/^\b(.*:)$(\n)^>\s/, '\\1<br/>\\2\\2> ') \
 				.gsub(/^Yahoo! Groups Links$(\n{2}^<*.*$\s.*$)*/, '') \
 				.gsub(/^[-~]*$\n^You.*$\n^To.*$\n^To.*$\n^For more.*$\n^[-~]*$/, '') \
 				.gsub(/(\s+)\/([\w\s]*)\//, '\\1_\\2_') \
 				.gsub(/^-\s/, '* ') \
 				.gsub(/^\d+[\.-]\s+/, '# ') \
-				.gsub(/^\s*\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
+				.gsub(/^\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
 			if data != nil
 
 		textiled = text.blank? ? "" : RedCloth.new(text)

data/app/helpers/mailman.rb

@@ -1,13 +1,12 @@
 #
-# Receive an email from which an elt is created.
+# Receive an email from which a model Mail is created.
 #
-# An associated mail is kept to make sure we don't lose any data. Attachments
-# are also created in an associated table
+# An associated Elt is generated. Attachments are also created in an associated
+# table
 #
 class Mailman < ActionMailer::Base
 	def receive(email)
-		elt = Elt.new
-		elt.receive(email)
+		Mail.receive email
 	end
 end
 

data/app/models/choice.rb

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

data/app/models/elt.rb

@@ -1,6 +1,9 @@
 #
 # This is, in fact, the main parlement class!
 #
+# It holds all posts, that's mostly a subject and a body, plus their
+# relationships in a tree of elements
+#
 class Elt < ActiveRecord::Base
 	usesguid
 
@@ -11,9 +14,10 @@ class Elt < ActiveRecord::Base
 
 	belongs_to :person
 
-	has_and_belongs_to_many :subscribers,
-		:class_name => "Person",
-		:join_table => "subscribers"
+	has_and_belongs_to_many :subscribers, :class_name => "Person", :join_table => "subscribers"
+
+	has_many :choices
+	has_many :voters, :through => :choices, :source => :person
 
 	# for live_tree
 	def name
@@ -22,59 +26,43 @@ class Elt < ActiveRecord::Base
 
 	# Just a quick method to get all subscribers as a simple list
 	def all_recipients
-		result = Array.new
-		eltRecipient = self
-		while eltRecipient
-			result.concat eltRecipient.subscribers
-			eltRecipient = eltRecipient.parent
+		if parent
+			(subscribers + parent.all_recipients).uniq
+		else
+			subscribers
 		end
-		logger.debug "all_recipients result: #{result.to_s}"
-		return result
 	end
 
-	#
-	# Receive this new elt as an email, sent through app/helpers/mailman.rb
-	#
-	def receive(mail)
-		logger.info "Receive \"#{mail.subject}\""
+	alias_method :simple_save, :save
 
-		# TODO
-		# Loop detection, will need more work
-		mail1 = Mail.find_by_message(mail.message_id)
-		# The to_s seems necessary
-		mail2 = Mail.find_by_message(mail['X-Message-Id'].to_s) if mail['X-Message-Id']
+	# Save, publish and vote this elt
+	def save
+		publish
+		simple_save
+		vote
+	end
 
-		if not mail1 and not mail2
-			self.mail = Mail.new if not self.mail
-			self.mail.elt = self
-			self.mail.receive(mail)
-			self.id = mail['X-Leparlement-Elt-Id'].to_s if mail['X-Leparlement-Elt-Id']
-			save
-		else
-			logger.info "Already received (id: #{mail.message_id})...\n"
-		end
+	def vote(value = 1, person = self.person)
+		logger.info "#{person.name if person} vote #{value} on #{subject} #{self.choices}"
+		choices.each{ |c| logger.info c if c.person == person; c.destroy if c.person == person }
+		choice = choices.build :value => value, :person => person
+		choice.save!
 	end
 
-	#
-	# Save and publish this elt
-	#
-	def save
-		super
-		publish
-		logger.info "\n"
+	# Get the vote results
+	def result(electoralList = nil)
+		(Choice.count("elt_id = '#{self.id}' AND value = 1") \
+			- \
+			Choice.count("elt_id = '#{self.id}' AND value = -1"))
 	end
 
 	private
 
-	#
-	# Mail the elt to all subscribers
-	#
+	# Mail this elt to all subscribers
 	def publish
 		logger.info "Publish #{subject}"
-		self.mail ||= Mail.new
-		self.mail.elt = self
-		self.mail.publish
-		self.mail.save
+		build_mail(:elt => self) unless mail
+		mail.publish
 	end
 end
 

data/app/models/mail.rb

@@ -9,7 +9,26 @@ class Mail < ActiveRecord::Base
 
 	belongs_to :elt
 
+	#
+	# Receive this new elt as an email, sent through app/helpers/mailman.rb
+	#
+	# TODO
+	# Loop detection, will need more work
+	#
+	def Mail.receive(mail)
+		logger.info "Receive \"#{mail.subject}\""
 
+		if Mail.find_by_message(mail.message_id) \
+			or (mail['X-Message-Id'] \
+					and Mail.find_by_message(mail['X-Message-Id'].to_s))
+			logger.info "Already received (id: #{mail.message_id})...\n"
+
+		else
+			m = Mail.new
+			m.receive mail
+			m
+		end
+	end
 
 	"""                  _           
 		 _ __ ___  ___ ___(_)_   _____ 
@@ -27,27 +46,34 @@ class Mail < ActiveRecord::Base
 	#
 	def receive(mail)
 		logger.info "Receive mail #{mail.message_id}"
-		elt.created_on = mail.date
-		elt.subject = unquote(mail.subject)
-
-		elt.body = ''
+		if mail['X-Leparlement-Elt-Id'] then
+			build_elt :id => mail['X-Leparlement-Elt-Id'].to_s,
+				:created_on => mail.date,
+				:subject => unquote(mail.subject),
+				:body => '',
+				:mail => self
+		else
+			build_elt :created_on => mail.date,
+				:subject => unquote(mail.subject),
+				:body => '',
+				:mail => self
+		end
 
-		elt.person = Person.find_by_email(mail.from)
-		elt.person = Person.find_by_name(unquote(mail.friendly_from)) if not elt.person
-		elt.person = Person.new if not elt.person
-		elt.person.name = unquote(mail.friendly_from)
+		elt.person = Person.find_by_email(mail.from) \
+			|| Person.find_by_name(unquote(mail.friendly_from)) \
+			|| elt.build_person
+		elt.person.name = unquote mail.friendly_from
 		elt.person.email = mail.from.first
 
 		# Try to find its mail parent in the db
-		if mail.in_reply_to
-			m = Mail.find_by_message(mail.in_reply_to)
-			elt.parent = m.elt if m
+		if mail.in_reply_to and Mail.find_by_message mail.in_reply_to
+			elt.parent_id = mail.in_reply_to
 		end
 
 		# Try to find its mail parent in the db
 		if not elt.parent and mail.references
 			for parent in mail.references
-				m = Mail.find_by_message(parent.to_s)
+				m = Mail.find_by_message parent.to_s
 				elt.parent = m.elt if m
 			end
 		end
@@ -58,40 +84,40 @@ class Mail < ActiveRecord::Base
 			if not elt.parent and elt.subject.match(/\[[\w-]*\]/)
 				parentId = elt.subject.match(/\[[\w-]*\]/)
 				parentId = parentId[0].gsub(/[\[\]]/, '') if parentId
-
-				elt.parent = Elt.find(parentId)
+				elt.parent = Elt.find parentId
 			end
 
 			# No reference matching an existing parent, let's try the "to" field
 			to = mail["Envelope-to"].to_s + ', ' + mail.to.to_s
-			if not elt.parent and to.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)
-				parentId = to.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)[0] \
+			if not elt.parent and to.match(/[\w-]*@#{ActionMailer::Base.server_settings[:domain]}/)
+				parentId = to.match(/[\w-]*@#{ActionMailer::Base.server_settings[:domain]}/)[0] \
 					.gsub(/@#{ActionMailer::Base.server_settings[:domain]}/, '')
-
-				elt.parent = Elt.find(parentId)
+				elt.parent = Elt.find parentId
 			end
 
 			if not elt.parent
 				parentId = "lost+found"
-
-				elt.parent = Elt.find(parentId)
+				elt.parent = Elt.find parentId
 			end
 
 		rescue ActiveRecord::RecordNotFound
-			elt.parent = elt.build_parent
+			elt.build_parent :parent_id => 'mail', :subject => parentId, :body => ''
 			elt.parent.id = parentId
-			elt.parent.parent_id = 'mail'
-			elt.parent.subject = parentId
-			elt.parent.body = ''
-			elt.parent.save
+			elt.parent.save!
 		end
 
-		#elt.parent = Elt.find('mail') if not elt.parent
 		mngAttachment(mail) if mail
 
 		self.message = mail.message_id
 		self.mail_parents = mail.references
 		self.file = mail.encoded
+		elt.save!
+
+		if elt.body =~ /^\s*(-1|0|\+1)(\s*|$)/ then
+			#print '(', $`, ': ', Regexp.last_match(1), ')'
+			#puts
+			elt.parent.vote Regexp.last_match(1)
+		end
 	end
 
 
@@ -102,17 +128,15 @@ class Mail < ActiveRecord::Base
 		| .__/ \__,_|_.__/|_|_|___/_| |_|
 		|_|                              """
 	#
-	# An elt has just been saved, and needs to be published as a mail
+	# An elt needs to be published as a mail
 	#
 	def publish
 		logger.info "Publish mail"
 
 		if message and not message.blank? and file
-			mail = TMail::Mail.parse(file)
+			mail = TMail::Mail.parse file
 		else
-			logger.info "there"
-			mail = MailNotify.create_publish(elt)
-			logger.info "tehre"
+			mail = MailNotify.create_publish elt
 			self.mail_parents = mail.references
 			self.file = mail.encoded
 		end
@@ -152,10 +176,8 @@ class Mail < ActiveRecord::Base
 
 		# Added to make sure it is not lost, but not modified if already existant
 		mail['X-Message-Id'] = mail.message_id if not mail['X-Message-Id']
-
 		mail['X-leparlement-elt-Id'] = elt.id
 
-
 		MailNotify::deliver(mail) if mail.destinations and not mail.destinations.empty?
 
 		# Do it after sending, to get the actual message id as generated by the MTA
@@ -169,33 +191,29 @@ class Mail < ActiveRecord::Base
 
 	private
 
-	#
 	# This is to make sure we only have utf-8, no iso-8859
-	#
 	def unquote(text)
-		text.gsub(/\=\?.*?\?\=/) do |m|
-			TMail::Unquoter.unquote_and_convert_to(m, 'utf-8')
-		end
+		text.gsub(/\=\?.*?\?\=/) { |m| TMail::Unquoter.unquote_and_convert_to m, 'utf-8' }
 	end
 
-	#
 	# Get and store the attachments
-	#
 	def mngAttachment(attachment)
 		if attachment.content_type == 'text/plain'
-			elt.body += attachment.body
-			#elt.body += Iconv.new(attachment.type_param('charset'), 'iso-8859-15').iconv(attachment.body)
+			charset = attachment.type_param 'charset'
+			if charset and !charset.empty?
+				elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body)
+			else
+				elt.body += attachment.body
+			end
 
 		elsif attachment.multipart?
-			attachment.parts.each { |part| mngAttachment(part) }
-
-		elsif attachment.type_param('name')
-			file = File.new('/tmp/'+attachment.type_param('name'), 'w')
-			file << attachment.body
-			file.flush
+			attachment.parts.each { |part| mngAttachment part }
 
-			attach = elt.attachments.build
-			attach.file = file
+		elsif attachment.type_param 'name'
+			File.open('/tmp/'+attachment.type_param('name'), 'w') { |file|
+				file << attachment.body
+				elt.attachments.build :file => file
+			}
 		end
 	end
 end

data/app/models/mail_notify.rb

@@ -70,11 +70,11 @@ class MailNotify < ActionMailer::Base
 	# generated ids
 	#
 	def mailing_list(elt)
-		e = elt
-		while e.id.size > 21 and e.parent_id != 'ROOT'
-			e = e.parent
+		if (elt.id.size > 21 and elt.parent_id != 'ROOT') then
+			mailing_list elt.parent
+		else
+			elt
 		end
-		e
 	end
 end
 

data/app/models/person.rb

@@ -2,6 +2,8 @@ class Person < ActiveRecord::Base
 	usesguid
 
 	has_many :elts
+	has_many :choices
+	has_many :issues, :through => :choices, :source => :elt
 
 	validates_presence_of :name, :on => :create
 	validates_length_of :name, :within => 3..40, :on => :create

data/app/views/account/_show.rhtml

@@ -6,6 +6,13 @@
 <%= error_messages_for 'user' if @user %>
 
 <% if @session[:person] %>
+	<span class="logout">
+		<%= link_to_remote('[X]',
+				:update => divId,
+				:url => { :controller => 'account', :action => 'logout', :divId => divId },
+				:complete => visual_effect(:BlindDown, divId)) %>
+	</span>
+
 	<% if @session[:person].name and @session[:person].name != '' %>
 		<span class="author">
 			<%= link_to(@session[:person].name,
@@ -14,13 +21,6 @@
 					:id => @session[:person]) %>
 		</span>
 	<% end %>
-
-	<span class="logout">
-		<%= link_to_remote('[X]',
-				:update => divId,
-				:url => { :controller => 'account', :action => 'logout', :divId => divId },
-				:complete => visual_effect(:BlindDown, divId)) %>
-	</span>
 <% else %>
 
 	<%= render :partial => '/account/login', :locals => { :divId => divId } %>

data/app/views/elt/_elt.rhtml

@@ -1,7 +1,15 @@
 <% eltSubsNb = elt.children.count if eltSubsNb == nil %>
 
-<li id="elt_<%= elt.id %>" class="elt <%= displayTitle?(elt) ? 'titled' : '' %>">
-	<% if eltTop or displayTitle? elt %>
+<li id="elt_<%= elt.id %>" result="<%= elt.result %>"
+	class="elt <%= displayTitle?(elt) ? 'titled' : '' %>">
+	<span class="result"><%= sprintf("%+d", elt.result) %></span>
+	<!--
+	<form class="vote">
+		<label>-1</span> <span class="vote">0</span> <span class="vote">+1</span>
+	</form>
+	-->
+
+	<% if (eltTop or displayTitle? elt) and elt.created_on %>
 		<span class="created_on">
 			<%= elt.created_on.strftime('%d/%m/%y %H:%M') %>
 		</span>
@@ -17,26 +25,19 @@
 
 	<% if eltTop or displayTitle? elt %>
 		<<%= eltTop ? 'h1' : 'h2' %>>
-			<% if elt.id %>
+			<% if elt.new_record? %>
+				<%= textilize_without_paragraph(elt.subject) %>
+			<% else %>
 				<%= link_to(textilize_without_paragraph(elt.subject),
 						:controller => 'elt', :action => 'show', :id => elt) %>
-			<% else %>
-				<%= textilize_without_paragraph(elt.subject) %>
 			<% end %>
 		</<%= eltTop ? 'h1' : 'h2' %>>
 	<% end %>
 
 	<%= format elt.body %>
 
-	<% for att in elt.attachments %>
-		<%= link_to image_tag('/attachment/file/'+att.file_relative_path),
-			'/attachment/file/'+att.file_relative_path %>
-	<% end %>
-
-	<!-- For IE -->&#160;
-
 	<span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
-		<% if elt.id and elt.children.count == 0 %>
+		<% if !elt.new_record? and elt.children.count == 0 %>
 			<%= link_to_remote('<span class="icon">&gt;&gt;</span>',
 				{ :update => 'eltNew_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'new', :id => elt },
@@ -47,60 +48,65 @@
 		<% end %>
 	</span>
 
-	<span class="eltSub">
-		<!-- Display automatically one element threads -->
-		<span <%= (eltTop or eltSubsNb < 2) ? 'style="display: none"' : '' %>
-			class="eltMore" id="eltMore_<%= elt.id %>">
-			<%= link_to_remote(eltSubsNb.to_s+' more',
-				{ :update => 'eltSubs_'+elt.id.to_s,
-					:url => { :controller => 'elt', :action => 'list', :id => elt },
-					:loading => visual_effect(:SwitchOff, 'eltMore_'+elt.id.to_s),
-					:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)+
-						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
-				{ :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
-
-			<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
-				{ :update => 'eltNew_'+elt.id.to_s,
-					: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)}) %>
-		</span>
-
-		<span <%= (eltTop or eltSubsNb == 1) ? '' : 'style="display: none"' %>
-			id="eltSubs_<%= elt.id %>">
-			<% if eltTop or eltSubsNb == 1 %>
-				<%= render :partial => '/elt/list', :locals => { :elt => elt } %>
-			<% end %>
-		</span>
+	<% for att in elt.attachments %>
+		<%= link_to image_tag('/attachment/file/'+att.file_relative_path),
+			'/attachment/file/'+att.file_relative_path %>
+	<% end %>
 
-		<span style="display: none" class="eltNew" id="eltNew_<%= elt.id %>">
-			&nbsp;
-		</span>
-	</span>
+	<!-- For IE -->&#160;
 
-	<span <%= ((eltTop and eltSubsNb > 0) or eltSubsNb == 1) ?  '' : 'style="display: none"' %>
-		id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
-		class="eltSubsClose">
-		<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
-				visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s)+
-				visual_effect(:BlindUp, 'eltNew_'+elt.id.to_s)+
-				visual_effect(:BlindUp, 'eltSubsClose_'+elt.id.to_s)+
-				visual_effect(:BlindDown, 'eltMore_'+elt.id.to_s)) %>
-
-		<% if elt.person %>
-			<%= link_to(elt.person.name,
-					:controller => 'person', :action => 'show', :id => elt.person) %>
-		<% elsif not displayTitle? elt %>
-			<%= ANONYMOUS_POSTER %>
-		<% end %>
+	<span <%= (eltTop or eltSubsNb < 2) ? 'style="display: none"' : '' %>
+		class="eltMore" id="eltMore_<%= elt.id %>">
+		<%= link_to_remote(eltSubsNb.to_s+' more',
+			{ :update => 'eltSubs_'+elt.id.to_s,
+				:url => { :controller => 'elt', :action => 'list', :id => elt },
+				:loading => visual_effect(:SwitchOff, 'eltMore_'+elt.id.to_s),
+				:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)+
+					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
+			{ :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
 
 		<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
 			{ :update => 'eltNew_'+elt.id.to_s,
 				:url => { :controller => 'elt', :action => 'new', :id => elt },
 				:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
-					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
+				visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
 			{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
 	</span>
+
+	<ul class="eltSubs">
+		<!-- Display automatically one element threads -->
+		<div <%= (eltTop or eltSubsNb == 1) ? '' : 'style="display: none"' %>
+			id="eltSubs_<%= elt.id %>" class="eltSub">
+			<% if eltTop or eltSubsNb == 1 %>
+				<%= render :partial => '/elt/list', :locals => { :elt => elt } %>
+			<% end %>
+		</div>
+
+		<span style="display:none" class="eltNew" id="eltNew_<%= elt.id %>"></span>
+
+		<span <%= ((eltTop and eltSubsNb > 0) or eltSubsNb == 1) ?  '' : 'style="display: none"' %>
+			id="eltSubsClose_<%= elt.id %>" title="<%= elt.created_on %>"
+			class="eltSubsClose">
+			<%= link_to_function('<span class="icon">&lt;&lt;</span> Close',
+					visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s)+
+					visual_effect(:BlindUp, 'eltNew_'+elt.id.to_s)+
+					visual_effect(:BlindUp, 'eltSubsClose_'+elt.id.to_s)+
+					visual_effect(:BlindDown, 'eltMore_'+elt.id.to_s)) %>
+
+			<% if elt.person %>
+				<%= link_to(elt.person.name,
+						:controller => 'person', :action => 'show', :id => elt.person) %>
+			<% elsif not displayTitle? elt %>
+				<%= ANONYMOUS_POSTER %>
+			<% end %>
+
+			<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
+				{ :update => 'eltNew_'+elt.id.to_s,
+					: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)}) %>
+		</span>
+	</ul>
 </li>
 

data/app/views/elt/_list.rhtml

@@ -6,10 +6,6 @@ e = Elt.find_all("parent_id = '#{elt.id}'",
 		'created_on DESC', e_pages.current.to_sql)
 %>
 
-<%
-# TODO There seems to be a problem with firefox when trying to use a visual_effect
-%>
-
 <%= link_to_remote('< Previous page',
 	{ :update => 'eltSubs_'+elt.id.to_s,
 		:url => { :action => 'list', :id => elt, :page => e_pages.current.next },
@@ -34,7 +30,29 @@ e = Elt.find_all("parent_id = '#{elt.id}'",
 	{ :href => url_for(:controller => 'elt', :action => 'show', :id => @elt,
 			:page => (@params['page'] ? @params['page'].to_i-1 : e_pages.length-1))}) if e_pages.current.previous %>
 
-<ul class="eltSubs" style="padding: 0; margin: 0;">
-	<%= render :partial => '/elt/elt', :collection => e.reverse, :locals => { :eltTop => false } %>
-</ul>
+<%= render :partial => '/elt/elt', :collection => e.reverse, :locals => { :eltTop => false } %>
+
+<%= link_to_remote('< Previous page',
+	{ :update => 'eltSubs_'+elt.id.to_s,
+		:url => { :action => 'list', :id => elt, :page => e_pages.current.next },
+		:loading => visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s),
+		:complete => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)+
+			visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s) },
+	{ :href => url_for(:controller => 'elt', :action => 'show', :id => @elt,
+			:page => (@params['page'] ? @params['page'].to_i+1 : 2))}) if e_pages.current.next %>
+
+<% if e_pages.length > 1 %>
+	<span class="pageCount">
+		(<%= e_pages.length-e_pages.current.to_i+1 %>/<%= e_pages.length %>)
+	</span>
+<% end %>
+
+<%= link_to_remote('Next page >',
+	{ :update => 'eltSubs_'+elt.id.to_s,
+		:url => { :action => 'list', :id => elt, :page => e_pages.current.previous },
+		:loading => visual_effect(:BlindUp, 'eltSubs_'+elt.id.to_s),
+		:complete => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)+
+			visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s) },
+	{ :href => url_for(:controller => 'elt', :action => 'show', :id => @elt,
+			:page => (@params['page'] ? @params['page'].to_i-1 : e_pages.length-1))}) if e_pages.current.previous %>