parlement 0.10 → 0.11

data/CHANGES

@@ -1,5 +1,16 @@
 - parlement changelog
 
+== Version 0.11
+
+Most active forums presented first
+
+* Corrected a small javascript error displaying subscriptionLink
+* last_activity field added to elts
+* passage to rails 1.2
+* removal of the guid plugin, now id are generated from internal data
+* better anti spam check. Won't block on any url
+* corrected person's page
+
 == Version 0.10
 
 Democratically moderated mails.

data/MEMORY

@@ -47,5 +47,13 @@ select count(*) from mails;
 select * from people;
 select * from subscriptions;
 select * from person_mails;
-\dt
+select distinct last_activity from elts;
+UPDATE elts SET last_activity = (SELECT MAX(created_on) FROM elts c WHERE elts.lft <= c.lft AND c.rgt <= elts.rgt);
+
+
+Processing EltController#create (for 192.168.0.254 at 2007-02-11 00:07:05) [POST] 
+  Session ID: 23a1ab5f9b11763838d64c50157610f3 
+  Parameters: {"commit"=>"Propose!", "elt"=>{"body"=>"arg", "subject"=>"Re: Testez", "parent_id"=>"Testez"}, "submit"=>"preview", "action"=>"create", "id"=>"Testez", "controller"=>"elt"} 
+Response body was encoded with gzip 
+Completed in 0.05879 (17 reqs/sec) | Rendering: 0.05682 (96%) | DB: 0.00072 (1%) | 200 OK [http://leparlement.org/elt/create/Testez?submit=preview] 
 

data/README

@@ -5,7 +5,7 @@
                | .__/ \__,_|_|  |_|\___|_| |_| |_|\___|_| |_|\__|
                |_|                                               
 
-On debian, here are the commands used to setup the parlement machine:
+On debian, here are the commands used to setup a parlement server:
 # apt-get install postgresql
 # sudo su - postgres
 ~ createuser /your_login/
@@ -16,7 +16,7 @@ On debian, here are the commands used to setup the parlement machine:
 # apt-get install rdoc
 
 Basically this install postgresql, ruby and the ruby driver to psql. Ruby on
-Rails is database agnostic, parlement will be sometimes in the near future.
+Rails is database agnostic, parlement will be sometimes in the future.
 
 You need to install "ruby gems":http://docs.rubygems.org
 
@@ -45,8 +45,9 @@ filtering tool), define this kind of rule:
 Once you have everything set up (ruby, postgresql, redcloth, irb), you can
 initialise and launch parlement this way:
 
-~ svn checkout svn://rubyforge.org/var/svn/parlement # Get the code source
-~ cd parlement/trunk                                 # Go into the right folder
+# Get the source code
+~ svn checkout svn://rubyforge.org/var/svn/parlement/trunk parlement
+~ cd parlement                                       # Go into the right folder
 ~ createdb parlement_development                     # Create database
 ~ psql -q template1 -f db/schema.sql                 # Initiate the db schema
 ~ rake migrate                                       # Get the db to its last version

data/app/controllers/account_controller.rb

@@ -2,18 +2,15 @@
 # This class manages users inscription, login and logout
 #
 class AccountController < UserController
-	model :person
-  model :user
-
 	def login
 		# Cleaning up
 		session[:person] = @person = session[:user] = @user = nil
 		cookies.delete :person_name
 		cookies.delete :salted_password
 
-		login = @params[:person][:name]
-		email = @params[:person][:email]
-		password = @params[:user][:password]
+		login = params[:person][:name]
+		email = params[:person][:email]
+		password = params[:user][:password]
 
 		@person = Person.find_by_name(login)
 		@user = @person.user if @person
@@ -22,7 +19,7 @@ class AccountController < UserController
 		if not @person
 			# Create the pseudo
 			begin
-				Person.transaction(@person) do
+				Person.transaction do
 					@person = Person.new :id => login.gsub(/\s/, '_'), :name => login
 					if @person.save
 						logger.info yellow { bold { "Person: #{@person.name}, id: #{@person.id}" } }
@@ -59,7 +56,7 @@ class AccountController < UserController
 			elsif email and not email.empty?
 				# There is a check key, used to change the password
 				begin
-					User.transaction(@user) do
+					User.transaction do
 						if User.authenticate_by_token(@user.id, email)
 							@user.change_password(password)
 							@user.security_token = nil
@@ -127,7 +124,7 @@ class AccountController < UserController
 	end
 
 	def check_key
-		if @user = User.authenticate_by_token(@params[:user][:id], @params[:key])
+		if @user = User.authenticate_by_token(params[:user][:id], params[:key])
 			#@user = User.find(:first, :conditions => "security_token = '#{params[:key]}'")
 			@person = Person.find_by_name(@user.login) if @user
 			@person.email = @user.email
@@ -200,10 +197,10 @@ class AccountController < UserController
 	protected
 
 	def mngPassword
-		if @person and password = @params[:user][:password] and !password.empty?
+		if @person and password = params[:user][:password] and !password.empty?
 			@user = @person.user || User.new()
 			begin
-				User.transaction(@user) do
+				User.transaction do
 					@user.login = @person.name
 					# To make sure even a non email protected user can use a password
 					@user.email ||= @person.name+'@nomailyet'
@@ -232,9 +229,9 @@ class AccountController < UserController
 			@user.login = @person.name
 		end
 
-		@user.email = @params[:person][:email]
+		@user.email = params[:person][:email]
 		begin
-			User.transaction(@user) do
+			User.transaction do
 				unless LoginEngine.config(:use_email_notification)
 					@user.verified = 1
 				end

data/app/controllers/application.rb

@@ -7,7 +7,6 @@ require 'term/ansicolor'
 class ApplicationController < ActionController::Base
 	include LoginEngine
 	include Term::ANSIColor
-	model :user
 
   before_filter :set_charset
   before_filter :set_login_from_cookie
@@ -17,15 +16,15 @@ class ApplicationController < ActionController::Base
 	# automatically and transparently fixes utf-8 bug 
 	# with Safari when using xmlhttp
 	def fix_unicode_for_safari 
-		if @headers["Content-Type"] == "text/html; charset=utf-8" and
-			@request.env['HTTP_USER_AGENT'].to_s.include? 'AppleWebKit' then
-			@response.body = @response.body.gsub(/([^\x00-\xa0])/u) { |s| "&#x%x;" % $1.unpack('U')[0] }
+		if headers["Content-Type"] == "text/html; charset=utf-8" and
+			request.env['HTTP_USER_AGENT'].to_s.include? 'AppleWebKit' then
+			response.body = response.body.gsub(/([^\x00-\xa0])/u) { |s| "&#x%x;" % $1.unpack('U')[0] }
 		end
 	end
 
 	def set_charset
 		#@headers["Content-Type"] = "text/html; charset=iso-8859-15" 
-		@headers["Content-Type"] = "text/html; charset=utf-8" 
+		headers["Content-Type"] = "text/html; charset=utf-8" 
 	end
 
 	def set_login_from_cookie

data/app/controllers/elt_controller.rb

@@ -4,7 +4,6 @@
 # An element is just the name for a poll/message/issue
 #
 class EltController < ApplicationController
-
 	def index
 		params[:id] = params[:id].gsub(/.html/, '')
 		show
@@ -40,13 +39,13 @@ class EltController < ApplicationController
 
 	def rss
 		params[:id] = params[:id].gsub(/.rss/, '')
-		@headers["Content-Type"] = "text/xml; charset=utf-8" 
+		headers["Content-Type"] = "text/xml; charset=utf-8" 
 		@elt = Elt.find(params[:id]) if @elt == nil
 	end
 
 	def vote_rss
 		params[:id] = params[:id].gsub(/.rss/, '')
-		@headers["Content-Type"] = "text/xml; charset=utf-8" 
+		headers["Content-Type"] = "text/xml; charset=utf-8" 
 		@elt = Elt.find(params[:id]) if @elt == nil
 	end
 
@@ -64,12 +63,13 @@ class EltController < ApplicationController
 
 	def create
 		@elt = Elt.new(params[:elt])
-		@elt.person = @session[:person]
+		@elt.person = session[:person]
 
-		if @elt.subject =~ /([<>\/]|href)/ \
-			 or @elt.body =~ /(.*([<>\/]|href).*){3}/ \
+		if !session[:person] and \
+      (@elt.subject =~ /([<>\/]|href)/ \
+			 or @elt.body =~ /(.*(http|href).*){3}/ \
 			 or @elt.body =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i \
-			 or @elt.body =~ /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}.*){3}/i
+			 or @elt.body =~ /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,}.*){3}/i) then
 			logger.error red { underline { "SPAM! '#{@elt.subject}'" } }
 			logger.error "SPAM! '#{@elt.body}'"
 			flash[:error] = 'Sorry, to fight spam "<" ">" or "href" are forbidden in the subject, and there can not be more than 3 links in the body, you also can\'t input one simple email or more than 3 emails!'
@@ -79,6 +79,8 @@ class EltController < ApplicationController
 			#headers["Status"] = "201 Created"
 			render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false }
 		else
+      logger.error "Strange error, can't preview or save an element"
+      puts "Strange error, can't preview or save an element"
 			flash[:notice] = 'Error'
 			render :controller => 'elt', :action => 'new'
 		end

data/app/controllers/person_controller.rb

@@ -3,8 +3,6 @@ class PersonController < ApplicationController
 	helper :elt
 
 	layout 'top'
-	model :person
-
   def show
     @person = Person.find(params[:id])
 		@title = @person.name+' (parlement)'
@@ -15,7 +13,7 @@ class PersonController < ApplicationController
   end
 
   def list
-    @person = Person.find(params[:id]) unless @person
+    @person = Person.find(params[:id])
 		render :partial => '/person/listElts', :locals => { :person => @person }
   end
 end

data/app/controllers/subscriber_controller.rb

@@ -7,15 +7,15 @@ class SubscriberController < ApplicationController
   def subscribe
     @elt = Elt.find params[:id]
 
-		if @session[:person]
-			if @elt.subscribers.include?(@session[:person])
-				Subscription.find_by_person_id_and_elt_id(@session[:person].id, @elt.id).destroy
-				logger.info yellow { "User #{@session[:person].name} unsubscribed from #{@elt.subject}..." }
-			elsif @elt.all_recipients.include?(@session[:person])
+		if session[:person]
+			if @elt.subscribers.include?(session[:person])
+				Subscription.find_by_person_id_and_elt_id(session[:person].id, @elt.id).destroy
+				logger.info yellow { "User #{session[:person].name} unsubscribed from #{@elt.subject}..." }
+			elsif @elt.all_recipients.include?(session[:person])
 				elt2 = @elt
-				elt2 = elt2.parent until elt2.subscribers.include?(@session[:person])
-				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}..." }
+				elt2 = elt2.parent until elt2.subscribers.include?(session[:person])
+				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
@@ -23,8 +23,8 @@ class SubscriberController < ApplicationController
 				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}..." }
+				@elt.subscriptions.create :person => session[:person], :filter => filter
+				logger.info yellow { "User #{session[:person].name} subscribed to #{@elt.id} with filter #{filter}..." }
 			end
 		else
 			puts "Not logged in!"

data/app/helpers/elt_helper.rb

@@ -9,6 +9,7 @@ module EltHelper
 		# /italic/
 		# - listElement
 		# 1. numbered list
+		#  *headed list* text
 		# chat log lines become list elements
 		# short lines to which are added a break
 		# positions have a special treatment in the view
@@ -20,6 +21,7 @@ module EltHelper
 				.gsub(/^-\s/, '* ') \
 				.gsub(/^\d+[\.-]\s+/, '# ') \
 				.gsub(/^(\d\d:\d\d\s)/, '* \\1') \
+				.gsub(/^\s\*(.*)\*/, '*\\1*') \
 				.gsub(/^\b(.{2,50})$(\n)\b/, '\\1<br/>\\2') \
 				.gsub(/\n*^\b(position:\s*(\d*(\.\d+)?))\s*$\n*/, ' <span class="position">\1</span>') \
 			if data != nil

data/app/models/elt.rb

@@ -25,8 +25,8 @@ class Elt < ActiveRecord::Base
 	has_many :subscriptions, :dependent => :destroy
 	has_many :subscribers, :through => :subscriptions, :source => :person
 
-	acts_as_nested_set :order => "position is not null, position, created_on"
-	acts_as_tree :order => "position is not null, position, created_on", :counter_cache => true
+	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
 
 	# Just a quick method to get all subscribers as a simple list
 	def all_recipients
@@ -39,9 +39,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 +73,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
@@ -81,20 +81,29 @@ class Elt < ActiveRecord::Base
 		true
 	end
 
-	def save
-		if new_record?
-			# Let's generate a nice looking id
-			self.id = new_id =
-				subject.gsub(/\[[\w-]*\]/, '').strip \
-				.gsub(/\s/, '_').gsub(/[^\w]+/, '') \
-				.gsub(/_+/, '_').gsub(/(^_|_$)/, '') if subject
-			self.id ||= "elt"
-
-			i = 0
-			self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
-		end
-
-		super
+  def before_create
+    # Let's generate a nice looking id
+    self.id ||= new_id =
+      subject.gsub(/\[[\w-]*\]/, '').strip \
+      .gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+      .gsub(/_+/, '_').gsub(/(^_|_$)/, '') if subject
+    self.id ||= "elt"
+
+    i = 0
+    self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
+  end
+
+	def add_child(c)
+    result = super(c)
+    p = c
+    while p
+      if !p.last_activity or p.last_activity < c.created_on then
+        p.last_activity = c.created_on
+        p.save!
+      end
+      p = p.parent
+    end
+    result
 	end
 
 	#

data/app/models/mail.rb

@@ -5,7 +5,7 @@
 # are also managed in an associated table
 #
 class Mail < ActiveRecord::Base
-	usesguid
+	#usesguid
 
 	belongs_to :elt
 	has_many :person_mails, :dependent => :destroy
@@ -30,6 +30,18 @@ class Mail < ActiveRecord::Base
 		end
 	end
 
+  def before_create
+    # Let's generate a nice looking id
+    self.id ||= new_id =
+      message.gsub(/\[[\w-]*\]/, '').strip \
+      .gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+      .gsub(/_+/, '_').gsub(/(^_|_$)/, '') if message
+    self.id ||= "mail"
+
+    i = 0
+    self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
+  end
+
 	"""                  _           
 		 _ __ ___  ___ ___(_)_   _____ 
 		| '__/ _ \/ __/ _ \ \ \ / / _ \
@@ -41,12 +53,15 @@ class Mail < ActiveRecord::Base
 	# The algorithm to define its parent is simple:
 	# - header "references"
 	# - or any subject between []
-	# - the "to" part before @#{ActionMailer::Base.server_settings[:domain]}
+	# - the "to" part before @#{ActionMailer::Base.smtp_settings[:domain]}
 	# - in a "mail/lost+found" thread
 	#
 	def receive(mail)
 		logger.info "Receive mail #{mail.message_id}"
-		#puts "Receive mail #{mail.message_id}"
+		self.mail_parents = mail.references
+		self.message = mail.message_id
+		self.file = mail.encoded
+
 		build_elt :created_on => mail.date,
 			:subject => unquote(mail.subject),
 			:body => '',
@@ -76,9 +91,9 @@ class Mail < ActiveRecord::Base
 
 			# 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]}/, '')
+			if not elt.parent and to.match(/[\w-]*@#{ActionMailer::Base.smtp_settings[:domain]}/)
+				parentId = to.match(/[\w-]*@#{ActionMailer::Base.smtp_settings[:domain]}/)[0] \
+					.gsub(/@#{ActionMailer::Base.smtp_settings[:domain]}/, '')
 				elt.parent = Elt.find parentId
 			end
 
@@ -104,14 +119,11 @@ class Mail < ActiveRecord::Base
 			|| elt.build_person(:id =>  unquote(mail.friendly_from).gsub(/\s/, '_'),
 													:name => unquote(mail.friendly_from),
 													:email => mail.from.first) \
-			if not mail.from.first.match(/#{ANONYMOUS_POSTER}@#{ActionMailer::Base.server_settings[:domain]}/)
+			if not mail.from.first.match(/#{ANONYMOUS_POSTER}@#{ActionMailer::Base.smtp_settings[:domain]}/)
 
-		self.mail_parents = mail.references
-		self.message = mail.message_id
-		self.file = mail.encoded
 		elt.publish
 
-		if mail.to.to_s.match(/people@#{ActionMailer::Base.server_settings[:domain]}/)
+		if mail.to.to_s.match(/people@#{ActionMailer::Base.smtp_settings[:domain]}/)
 			elt.person.image = "/attachment/file/#{elt.attachments.first.file_relative_path}"
 			elt.person.save
 		end
@@ -145,9 +157,9 @@ class Mail < ActiveRecord::Base
 		end
 
 		mail['Precedence'] = 'list'
-		mail['X-Loop'] = ActionMailer::Base.server_settings[:domain]
-		mail['List-Archive'] = "http://"+ActionMailer::Base.server_settings[:domain]
-		mail['Errors-To'] = "errors@"+ActionMailer::Base.server_settings[:domain]
+		mail['X-Loop'] = ActionMailer::Base.smtp_settings[:domain]
+		mail['List-Archive'] = "http://"+ActionMailer::Base.smtp_settings[:domain]
+		mail['Errors-To'] = "errors@"+ActionMailer::Base.smtp_settings[:domain]
 
 		subscriptions = elt.all_subscriptions \
 			.select { |s| s.person.email and not s.person.email.blank? } \

data/app/models/mail_notify.rb

@@ -12,12 +12,12 @@ class MailNotify < ActionMailer::Base
 		ml = mailing_list(elt.parent)
 
 		recipients ml.subject.to_s \
-			+ " <#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}>"
+			+ " <#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}>"
 
 		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]}") \
+				? elt.person.email : "#{ANONYMOUS_POSTER}@#{ActionMailer::Base.smtp_settings[:domain]}") \
 			+ ">"
 
 		# Try to render the element as html
@@ -49,7 +49,8 @@ class MailNotify < ActionMailer::Base
 		# 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'] = "#{ml.id}@#{ActionMailer::Base.server_settings[:domain]}"
+		@headers['Reply-to'] = "#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}"
+		#puts "#{ml.id}@#{ActionMailer::Base.smtp_settings[:domain]}"
 
 		@headers['In-Reply-To'] = elt.parent.mail.message \
 			if elt.parent and elt.parent.mail and elt.parent.mail.message
@@ -64,7 +65,7 @@ class MailNotify < ActionMailer::Base
 			@headers['references'] << parentMsg.message if parentMsg.message
 		end
 
-		@headers['X-Mailer'] = "#{ActionMailer::Base.server_settings[:domain]} v#{PARLEMENT_VERSION}"
+		@headers['X-Mailer'] = "#{ActionMailer::Base.smtp_settings[:domain]} v#{PARLEMENT_VERSION}"
 
 		logger.info "Mail created"
 	end

data/app/models/person.rb

@@ -1,6 +1,4 @@
 class Person < ActiveRecord::Base
-	usesguid
-
 	has_many :elts
 
 	has_many :choices, :dependent => :destroy
@@ -20,5 +18,16 @@ class Person < ActiveRecord::Base
 	def user
 		return User.find_by_login(name)
 	end
+
+  def before_create
+    # Let's generate a nice looking id
+    self.id ||= new_id =
+      name.gsub(/\[[\w-]*\]/, '').strip \
+      .gsub(/\s/, '_').gsub(/[^\w]+/, '') \
+      .gsub(/_+/, '_').gsub(/(^_|_$)/, '') if name
+
+    i = 0
+    self.id = "#{new_id}_#{i+=1}" while self.class.find_by_id self.id
+  end
 end
 

data/app/views/account/_login.rhtml

@@ -1,8 +1,8 @@
-<%= form_remote_tag(
+<% form_remote_tag(
 	:update => 'identity',
 	:url => { :controller => 'account', :action => 'login', :elt => @elt },
 	:before => visual_effect(:BlindUp, 'identity')+";resetChoices();",
-	:loaded => visual_effect(:BlindDown, 'identity')) %>
+	:loaded => visual_effect(:BlindDown, 'identity')) do %>
 
 	<div class="login">Please, choose a pseudo</div>
 
@@ -58,5 +58,5 @@
 				A login must contain [3..40] characters, a password [5..40].
 			</p>
 		' } %>
-<%= end_form_tag %>
+<% end %>
 

data/app/views/account/_show.rhtml

@@ -1,4 +1,4 @@
-<% @flash.each do |key, value| %>
+<% flash.each do |key, value| %>
 	<div class="<%= key %>"><%= value %></div>
 <% end %>
 
@@ -15,6 +15,7 @@
 			};
 			updateChoices(choices_to_update);
 		</script>
+		<script language="JavaScript">Element.show($('subscriptionLink'));</script>
 	</span>
 <% end %>
 
@@ -23,7 +24,7 @@
 		<%= link_to_remote('[X]',
 			{ :update => 'identity',
 				:url => { :controller => 'account', :action => 'logout', :elt => @elt },
-				:before => visual_effect(:BlindUp, 'identity')+";resetChoices();",
+				:before => visual_effect(:BlindUp, 'identity')+visual_effect(:BlindUp, 'subscriptionLink')+";resetChoices();",
 				:loaded => visual_effect(:BlindDown, 'identity') },
 			{ :href => url_for(:controller => 'account', :action => 'logout') }) %>
 	</span>
@@ -40,40 +41,37 @@
 	</div>
 
 	<fieldset id="edit"><legend>Edit</legend>
-		<%= form_remote_tag(
+		<% form_remote_tag(
 			:update => 'identity',
 			:url => { :controller => 'account', :action => 'setPassword' },
 			:before => visual_effect(:BlindUp, 'identity'),
-			:loaded => visual_effect(:BlindDown, 'identity')) %>
+			:loaded => visual_effect(:BlindDown, 'identity')) do %>
 			<label for="user_password">Password:</label>
 			<%= password_field "user", "password", :size => 12 %>
 			<%= submit_tag 'OK' %>
-		<%= end_form_tag %>
+		<% end %>
 
-		<%= form_remote_tag(
+		<% form_remote_tag(
 			:update => 'identity',
 			:url => { :controller => 'account', :action => 'setEmail' },
 			:before => visual_effect(:BlindUp, 'identity'),
-			:loaded => visual_effect(:BlindDown, 'identity')) %>
+			:loaded => visual_effect(:BlindDown, 'identity')) do %>
 			<label for="person_email">Email:</label>
 			<%= text_field "person", "email", :size => 16 %>
 			<%= submit_tag 'OK' %>
-		<%= end_form_tag %>
+		<% end %>
 
-		<%= form_tag( { :controller => "account", :action => "setAvatar"},
-				:multipart => true, :target => "avatar", :class => "setAvatar") %>
+		<% form_tag( { :controller => "account", :action => "setAvatar"},
+				:multipart => true, :target => "avatar", :class => "setAvatar") do %>
 			<label>Avatar:</label>
 			<%= file_field "person", "image", :onchange => "submit()", :size => 3 %>
 			<%= submit_tag 'OK' %>
-		<%= end_form_tag %>
+		<% end %>
 	</fieldset>
 
 	<iframe id="avatar" name="avatar" style="display: none"></iframe>
-
-	<script language="JavaScript">Element.show($('subscriptionLink'));</script>
 <% else %>
 
 	<%= render :partial => '/account/login' %>
-	<script language="JavaScript">Element.hide($('subscriptionLink'));</script>
 <% end %>
 

data/app/views/elt/_choice.rhtml

@@ -5,7 +5,7 @@ result = elt.result
 
 <label class="con <%= choice and choice.value == -1 ? "selected" : "" %>"
 	title="-1" for="choice_<%= elt.id %>_con">
-	<%= image_tag 'vote_minus' %>
+	<%= image_tag 'vote_minus.png' %>
 	<%= radio_button_tag "choice[value]", "-1",
 		(choice and choice.value == -1),
 		:id => "choice_#{elt.id}_con",
@@ -22,7 +22,7 @@ result = elt.result
 
 <label class="pro <%= choice and choice.value == 1 ? "selected" : "" %>"
 	title="+1" for="choice_<%= elt.id %>_pro">
-	<%= image_tag 'vote_plus' %>
+	<%= image_tag 'vote_plus.png' %>
 	<%= radio_button_tag "choice[value]", "+1",
 		(choice and choice.value == +1),
 		:id => "choice_#{elt.id}_pro",
@@ -32,7 +32,7 @@ result = elt.result
 <%= submit_tag 'Vote!' %>
 
 <span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
-	<%= link_to_remote(image_tag('write'),
+	<%= link_to_remote(image_tag('write.png'),
 		{ :update => 'eltNew_'+elt.id.to_s,
 			:url => { :controller => 'elt', :action => 'new', :id => elt },
 			:loaded => visual_effect(:BlindDown, 'eltNew_'+elt.id.to_s)+

data/app/views/elt/_elt.rhtml

@@ -2,13 +2,13 @@
 	<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(
+	<% 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' })) %>
+		:loaded => visual_effect(:Grow, 'eltChoice_'+elt.id.to_s, { :queue => 'end' })) do
 
-		<% cache :action => 'show', :id => elt.id 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 %>
@@ -67,7 +67,7 @@
 				{ :href => url_for(:controller => 'elt', :action => 'show', :id => elt) }) %>
 		</span>
 	<!-- The choice end form, here to make sure it looks nice in text browsers -->
-	<%= end_form_tag %>
+	<% end %>
 
 	<ul class="eltNew" id="eltNew_<%= elt.id %>"></ul>