parlement 0.3 → 0.4

data/CHANGES

@@ -1,5 +1,21 @@
 - parlement changelog
 
+== Version 0.4
+
+Evolutions and corrections
+
+* bug correction in the regexp managing title display
+* bug managing incoming mails into the "lost+found" folder
+* received mails are resent with the same id
+* no more strange backgrounds in IE
+* short lines (formatted lines in email for exemple), are now wrapped correctly
+* permanent redirect header if an inexistant element is requested
+* rails 1.1
+* plugins now linked to their respective svn
+* elements now in a list (ul/li)
+* 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

@@ -5,15 +5,15 @@ I am using debian, so here are a few commands I use:
 # apt-get install ruby
 # apt-get install libpgsql-ruby
 # apt-get install irb
-# apt-get install libredcloth-ruby
 # apt-get install rdoc
 
 -> why???
 # ln -s /sbin/ifconfig /bin/
 
-# gem install -r rails
+# gem install rails
+# gem install redcloth
 Only if you expect to develop and release:
-# gem install -r meta_project
+# gem install meta_project
 
 
 The database is setup for user "manu", you may need to change the file
@@ -38,3 +38,36 @@ launch parlement thus:
 
 Now you can go to localhost:3000
 
+
+The problem: "how to display conversations"
+The entities involved:
+	- element
+	- ancestor
+	- children
+	- children number
+	- author
+	- element's size
+	- title
+	- body
+The possibilities
+	- show one element and its children closed
+	- show one element opened and its children closed
+	- show one element and its children opened, its grand children closed
+	- show one element opened, its children and grand children opened
+	- when an element is closed, also show its children?
+Limits
+	- can not display all elements at once
+	- can not display one element and all its direct children at once
+Parameters
+	- ordering
+	- date
+	- number of children displayed
+	- votes
+
+
+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
+

data/Rakefile

@@ -34,8 +34,10 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 PKG_FILES = FileList[
 	'[A-Z]*', 'app/**/*', 'components/**/*', 'config/**/*', 'db/**/*',
-	'lib/**/*', 'public/**/*', 'script/**/*', 'test/**/*', 'vendor/**/*'
-].exclude(/\bsvn\b|~$/)
+	'lib/**/*', 'public/*.*', 'public/dynamic/*', 'public/images/*',
+	'public/engine_files/*', 'public/javascripts/*', 'script/stylesheets/*',
+	'test/**/*', 'vendor/**/*'
+].exclude(/\b(svn|tmp|attachment)\b|~$/)
 
 spec = Gem::Specification.new do |s|
 	## Basic information.
@@ -54,7 +56,7 @@ spec = Gem::Specification.new do |s|
 EOF
 	s.files = PKG_FILES
 	s.require_path = 'lib'
-	s.autorequire = 'rails'
+	s.autorequire = 'rails redcloth'
 	s.has_rdoc = false
 	s.requirements << 'none'
 	s.test_files = Dir.glob('test/unit/*')
@@ -163,21 +165,15 @@ task :publish_news => [:verify_env_vars] do
 	fm = DevTools::Freshmeat::FreshmeatService.new(ENV['FRESHMEAT_USER'], ENV['FRESHMEAT_PASSWORD'])
 	fm.get_project_list.each do |p|
 		branches = fm.get_branch_list( p.shortName )
+		puts branches.inspect
 		release = fm.get_release( p.shortName, branches[0], p.version )
 		if PKG_NAME == p.shortName
 			puts p
-			release.version = PKG_VERSION
-			release.changes = PKG_VERSION
+			#release.version = PKG_VERSION
+			#release.changes = PKG_VERSION
 		end
 	end
 	puts fm.logout
-
- 
-  Rake::XForge::NewsPublisher.new(MetaProject::Project::XForge::Fresh.new(PKG_NAME)) do |news|
-    # Never hardcode user name and password in the Rakefile!
-    news.user_name = ENV['RUBYFORGE_USER']
-    news.password = ENV['RUBYFORGE_PASSWORD']
-  end
 	"""
 end
 

data/app/controllers/account_controller.rb

@@ -53,6 +53,8 @@ class AccountController < UserController
 					User.transaction(@user) do
 						@user.login = login
 						@user.change_password(password)
+						# To make sure even a non email protected user can use a password
+						@user.email = login+'@nomailyet'
 						# This is a hack, to make sure this user can login even if he
 						# didn't verify his email
 						@user.verified = true

data/app/controllers/elt_controller.rb

@@ -18,14 +18,10 @@ class EltController < ApplicationController
 		# TODO
 		rescue ActiveRecord::RecordNotFound => e
 			flash[:error] = "Element '#{params[:id]}' does not exist"
+			headers["Status"] = "301 Moved Permanently"
 			redirect_to '/'
   end
 
-  #def show
-  #  @elt = Elt.find(params[:id]) if @elt == nil
-	#	render :partial => 'show'
-  #end
-
   def list
     @elt = Elt.find(params[:id]) if @elt == nil
 		render :partial => '/elt/list', :locals => { :elt => @elt }

data/app/controllers/subscriber_controller.rb

@@ -15,7 +15,7 @@ class SubscriberController < ApplicationController
 			end
 		else
 			puts "Not logged in!"
-			render :inline => "First you need to login... it's easy, juste type a pseudo, any pseudo ;-) "
+			render :inline => "First you need to login... it's easy, type a pseudo with at least 3 characters. Then ok. Then subscribe"
 		end
   end
 end

data/app/helpers/elt_helper.rb

@@ -3,26 +3,44 @@ module EltHelper
 		# for italics /.../ to _..._ \
 				#.gsub(/(\s+)\/([\w\s�������]*)\//, '\\1_\\2_') \
 
-		# ^here: data
+		# On Date Time someone wrote: blockquote
+		# Yahoo footer
+		# Google footer
 		# /italic/
 		# - listElement
-		# in reply to:\n>
 		# 1. numbered list
+		# short lines to which are added a break
 		text = auto_link data \
-				.gsub(/^(\w*):\s/, ' \\1: ') \
+				.gsub(/(wrote:.*)$(\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(/(:)(\n)(^>\s)/, '\\1\\2\\2\\3') \
 				.gsub(/^\d+[\.-]\s+/, '# ') \
+				.gsub(/^\s*\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
 			if data != nil
 
-		# Remove any leading and finishing <p> </p>
-		textiled = text.blank? ? "" : RedCloth.new(text).to_html
-		if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-		if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
+		textiled = text.blank? ? "" : RedCloth.new(text)
+		begin
+			textiled = textiled.to_html if !textiled.blank?
+		rescue
+			# TODO discover why RedCloth fails on this!!!
+			textiled = textiled.gsub(/[->\[]/, ' ')
+			textiled = textiled.to_html
+		end
+		if ! textiled.match(/[.\s]<p>/) then
+			# Remove any leading and finishing <p> </p> as they are not required
+			if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
+			if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
+		end
 
 		textiled
 
+		# in reply to:\n>
+		#		.gsub(/(:)(\n)(^>\s)/, '\\1\\2\\2\\3') \
+		# ^here: data
+		#		.gsub(/^(\w*):\s/, ' \\1: ') \
+
 #		hard_breaks = false
 #    auto_link textilize_without_paragraph(data \
 #        .gsub(/\&\#8211\;/, '* ') \
@@ -42,8 +60,10 @@ module EltHelper
 	#
 	def displayTitle? elt
 		#elt.id and elt.subject.reverse.index(elt.parent.subject.reverse) != 0
-		elt.id and elt.parent and elt.subject != elt.parent.subject \
-			and not elt.subject =~ /^((\[[\w]*\] )*(r�f|re|sv|aw)*(.)*:[ \t]*)+#{elt.parent.subject}/
+		elt.id and elt.parent and !elt.subject.empty? \
+			and elt.subject != elt.parent.subject \
+			and elt.subject.downcase != elt.parent.subject.downcase \
+			and not elt.subject =~ /^((\[[\w]*\] )*(r�f|re|sv|aw)*(.)*:[ \t]*)+(#{Regexp.escape(elt.parent.subject)})/
 	end
 end
 

data/app/models/elt.rb

@@ -48,6 +48,7 @@ class Elt < ActiveRecord::Base
 			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"
@@ -70,7 +71,7 @@ class Elt < ActiveRecord::Base
 	#
 	def publish
 		logger.info "Publish #{subject}"
-		self.mail = Mail.new if not self.mail
+		self.mail ||= Mail.new
 		self.mail.elt = self
 		self.mail.publish
 		self.mail.save

data/app/models/mail.rb

@@ -39,62 +39,51 @@ class Mail < ActiveRecord::Base
 		elt.person.email = mail.from.first
 
 		# Try to find its mail parent in the db
-		if mail.references
+		if mail.in_reply_to
+			m = Mail.find_by_message(mail.in_reply_to)
+			elt.parent = m.elt if m
+		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)
 				elt.parent = m.elt if m
 			end
 		end
 
-		# No reference matching an existing parent, let's try a mailing list we
-		# deduce from an eventual [subject]
-		if not elt.parent and elt.subject.match(/\[\w*\]/)
-			parentId = elt.subject.match(/\[\w*\]/)
-			parentId = parentId[0].gsub(/[\[\]]/, '') if parentId
+		begin
+			# No reference matching an existing parent, let's try a mailing list we
+			# deduce from an eventual [subject]
+			if not elt.parent and elt.subject.match(/\[[\w-]*\]/)
+				parentId = elt.subject.match(/\[[\w-]*\]/)
+				parentId = parentId[0].gsub(/[\[\]]/, '') if parentId
 
-			begin
 				elt.parent = Elt.find(parentId)
-
-			rescue ActiveRecord::RecordNotFound
-				elt.parent = elt.build_parent
-				elt.parent.parent_id = 'mail'
-				elt.parent.subject = parentId
-				elt.parent.body = ''
-				elt.parent.save
 			end
-		end
 
-		# No reference matching an existing parent, let's try the "to" field
-		if not elt.parent and mail.to.to_s.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)
-			parentId = mail.to.to_s.match(/\w*@#{ActionMailer::Base.server_settings[:domain]}/)[0] \
-				.gsub(/@#{ActionMailer::Base.server_settings[:domain]}/, '')
+			# 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] \
+					.gsub(/@#{ActionMailer::Base.server_settings[:domain]}/, '')
 
-			begin
 				elt.parent = Elt.find(parentId)
-
-			rescue ActiveRecord::RecordNotFound
-				elt.parent = elt.build_parent
-				elt.parent.parent_id = 'mail'
-				elt.parent.subject = parentId
-				elt.parent.body = ''
-				elt.parent.save
 			end
-		end
 
-		if not elt.parent
-			parentId = "lost+found"
+			if not elt.parent
+				parentId = "lost+found"
 
-			begin
 				elt.parent = Elt.find(parentId)
-
-			rescue ActiveRecord::RecordNotFound
-				elt.id = parentId
-				elt.parent = elt.build_parent
-				elt.parent.parent_id = 'mail'
-				elt.parent.subject = parentId
-				elt.parent.body = ''
-				elt.parent.save
 			end
+
+		rescue ActiveRecord::RecordNotFound
+			elt.parent = elt.build_parent
+			elt.parent.id = parentId
+			elt.parent.parent_id = 'mail'
+			elt.parent.subject = parentId
+			elt.parent.body = ''
+			elt.parent.save
 		end
 
 		#elt.parent = Elt.find('mail') if not elt.parent
@@ -121,7 +110,9 @@ class Mail < ActiveRecord::Base
 		if message and not message.blank? and file
 			mail = TMail::Mail.parse(file)
 		else
-			mail = MailNotify::create_publish(elt)
+			logger.info "there"
+			mail = MailNotify.create_publish(elt)
+			logger.info "tehre"
 			self.mail_parents = mail.references
 			self.file = mail.encoded
 		end
@@ -153,11 +144,19 @@ class Mail < ActiveRecord::Base
 			ret.empty? ? default : ret
 		end
 
+		if mail.message_id
+			# Let's not change the message id
+			def mail.add_message_id
+			end
+		end
+
 		# 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 not mail.destinations.empty?
+		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
 		# Note that the id of a resent mail is regenerated, but we don't record it,
@@ -185,6 +184,7 @@ class Mail < ActiveRecord::Base
 	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)
 
 		elsif attachment.multipart?
 			attachment.parts.each { |part| mngAttachment(part) }

data/app/models/mail_notify.rb

@@ -6,29 +6,46 @@
 #
 class MailNotify < ActionMailer::Base
 	def publish(elt)
-		@subject = elt.subject
-		# Try to render the element as html
-		#@body = elt.body
-		@body[:elt] = elt
+		logger.info "Create a mail for publication"
+		subject elt.subject
 
-		@recipients = (mailing_list(elt.parent).subject.blank? ? '' : mailing_list(elt.parent).subject ) \
+		recipients (mailing_list(elt.parent).subject.blank? ? '' : mailing_list(elt.parent).subject ) \
 			+ ' <' \
 			+ mailing_list(elt.parent).id + '@' + ActionMailer::Base.server_settings[:domain] \
 			+ '>'
 
-		@from = ((elt.person and elt.person.name) ? elt.person.name : ANONYMOUS_POSTER) \
+		from ((elt.person and elt.person.name) ? elt.person.name : ANONYMOUS_POSTER) \
 			+ ' <' \
 			+ ((elt.person and elt.person.email) \
 				? elt.person.email : ANONYMOUS_POSTER + '@' + ActionMailer::Base.server_settings[:domain]) \
 			+ '> '
 
+		# Try to render the element as html
+		body(:elt => elt)
+
+		#content_type 'multipart/alternative'
+		#part "text/html" do |a|
+		#	a.body = render(:template => "/home/manu/develop/parlement/trunk/app/views/mail_notify/publish.text.html.rhtml",
+		#									:locals => { :elt => elt })
+		#end
+		#part "text/plain" do |a|
+		#	a.body = render(:template => "mail_notify/publish.text.plain",
+		#									:locals => { :elt => elt })
+		#end
+		#	:body => email_builder.render(:file => "mail_notify/publish.text.html.rhtml")
+		#attachment :content_type => "text/html",
+		#	:body => email_builder.render(:file => "mail_notify/publish.text.html.rhtml")
+		#attachment :content_type => "text/plain",
+		#	:body => email_builder.render(:file => "mail_notify/publish.text.plain.rhtml")
+
+
 		# This is the essential of a mailing list, you reply to the mailing list,
 		# where every body sends their mail.
 		# This very mail can be a mailing list all by itself...
 		@headers['Reply-to'] = mailing_list(elt).id + '@' + ActionMailer::Base.server_settings[:domain]
 
-		@headers['In-Reply-To'] = elt.parent.mail.message if elt.parent \
-			and elt.parent.mail and elt.parent.mail.message
+		@headers['In-Reply-To'] = elt.parent.mail.message \
+			if elt.parent and elt.parent.mail and elt.parent.mail.message
 
 		@sent_on = elt.created_on
 
@@ -39,9 +56,9 @@ class MailNotify < ActionMailer::Base
 			@headers['references'] << parentMsg.message if parentMsg.message
 		end
 
-		@content_type = 'multipart/alternative'
-
 		@headers['X-Mailer'] = ActionMailer::Base.server_settings[:domain] + " v" + PARLEMENT_VERSION
+
+		logger.info "Mail created"
 	end
 
 	private

data/app/views/account/_login.rhtml

@@ -11,7 +11,8 @@
 			<%= text_field "person", "name", :size => 10 %>
 
 			<%= link_to_function('+',
-				"Element.toggle(this);"+visual_effect(:Grow, 'user_password_'+divId.to_s)) %>
+					"Element.toggle(this);"+visual_effect(:Grow, 'user_password_'+divId.to_s),
+					:class => "subscribeLink") %>
 		</span>
 
 		<span style="display: none;" id="user_password_<%= divId %>">
@@ -20,7 +21,8 @@
 			<%= password_field "user", "password", :size => 10 %>
 
 			<%= link_to_function('email? &gt;',
-				"Element.toggle(this);"+visual_effect(:Grow, 'person_email_'+divId.to_s)) %>
+					"Element.toggle(this);"+visual_effect(:Grow, 'person_email_'+divId.to_s),
+					:class => "subscribeLink") %>
 		</span>
 
 		<span style="display: none;" id="person_email_<%= divId %>">
@@ -36,12 +38,12 @@
 
 		<%= render :partial => '/help',
 			:locals => { :divId => 'login'+divId.to_s, :content => '
-				<p>You can propose an element</p>
+				<p>You can propose an element with</p>
 				<ul>
-					<li>with no pseudo</li>
-					<li>with an unprotected pseudo</li>
-					<li>with a password protected pseudo (click on the "+")</li>
-					<li>with a password protected and email verified pseudo (TODO)</li>
+					<li>no pseudo</li>
+					<li>an unprotected pseudo</li>
+					<li>a password protected pseudo (click on "+")</li>
+					<li>a password protected and email verified pseudo</li>
 				</ul>
 				<p>
 					The last method is the only secure way to protect a nickname on

data/app/views/account/_show.rhtml

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

data/app/views/elt/_elt.rhtml

@@ -1,35 +1,21 @@
 <% eltSubsNb = elt.children.count if eltSubsNb == nil %>
 
-<div id="elt_<%= elt.id %>" class="elt">
-	<% if elt.person %>
-		<div class="author">
-			<%= link_to(elt.person.name,
-					:controller => 'person', :action => 'show', :id => elt.person) %>
-		</div>
-	<% elsif not displayTitle? elt %>
-		<div class="author">
-			<%= ANONYMOUS_POSTER %>
-		</div>
-	<% end %>
-
-	<div class="eltInfo" title="<%= elt.created_on %>">
-		<!--
-		<= link_to('@', :action => 'raw_elt', :id => elt) if elt.mail != nil >
-		-->
-		<% if elt.id 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 },
-					:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+
-						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)) %>
-		<% end %>
-	</div>
-
+<li id="elt_<%= elt.id %>" class="elt <%= displayTitle?(elt) ? 'titled' : '' %>">
 	<% if eltTop or displayTitle? elt %>
 		<span class="created_on">
 			<%= elt.created_on.strftime('%d/%m/%y %H:%M') %>
 		</span>
+	<% end %>
+
+	<% if elt.person %>
+		<span class="author">
+			<%= link_to(elt.person.name, :controller => 'person', :action => 'show', :id => elt.person) %>
+		</span>
+	<% elsif not displayTitle? elt %>
+		<span class="author" <%= ANONYMOUS_POSTER %>><%= ANONYMOUS_POSTER %></span>
+	<% end %>
 
+	<% if eltTop or displayTitle? elt %>
 		<<%= eltTop ? 'h1' : 'h2' %>>
 			<% if elt.id %>
 				<%= link_to(textilize_without_paragraph(elt.subject),
@@ -40,46 +26,60 @@
 		</<%= eltTop ? 'h1' : 'h2' %>>
 	<% end %>
 
-	<div class="eltBody">
-		<p style="margin-top:0px;margin-bottom:0px"><%= format elt.body %></p>
+	<%= 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;
 
-		<% for att in elt.attachments %>
-			<%= link_to image_tag('/attachment/file/'+att.file_relative_path),
-				'/attachment/file/'+att.file_relative_path %>
+	<span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
+		<% if elt.id 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 },
+					:loading => visual_effect(:SwitchOff, 'eltQuickAdd_'+elt.id.to_s),
+					: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)}) %>
 		<% end %>
-	</div>
+	</span>
 
-	<div class="eltSub">
+	<span class="eltSub">
 		<!-- Display automatically one element threads -->
-		<div style="display:<%= (eltTop or eltSubsNb < 2) ? 'none' : '' %>"
+		<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,
+				{ :update => 'eltSubs_'+elt.id.to_s,
 					:url => { :controller => 'elt', :action => 'list', :id => elt },
-					:loading => visual_effect(:SwitchOff, 'eltMore_'+elt.id.to_s)+
-						visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s),
-					:loaded => visual_effect(:BlindDown, 'eltSubs_'+elt.id.to_s)) %>
+					: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,
+				{ :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)) %>
-		</div>
+					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
+				{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
+		</span>
 
-		<div style="display:<%= (eltTop or eltSubsNb == 1) ? '' : 'none' %>"
-			class="eltSubs" id="eltSubs_<%= elt.id %>">
+		<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 %>
-		</div>
+		</span>
 
-		<div style="display:none" class="eltNew" id="eltNew_<%= elt.id %>">
+		<span style="display: none" class="eltNew" id="eltNew_<%= elt.id %>">
 			&nbsp;
-		</div>
-	</div>
+		</span>
+	</span>
 
-	<div style="display:<%= ((eltTop and eltSubsNb > 0) or eltSubsNb == 1) ?  '' : 'none' %>"
+	<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',
@@ -96,10 +96,11 @@
 		<% end %>
 
 		<%= link_to_remote('Add <span class="icon">&gt;&gt;</span>',
-				:update => 'eltNew_'+elt.id.to_s,
+			{ :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)) %>
-	</div>
-</div>
+					visual_effect(:BlindDown, 'eltSubsClose_'+elt.id.to_s)},
+			{ :href => url_for(:controller => 'elt', :action => 'new', :id => elt)}) %>
+	</span>
+</li>