parlement 0.8 → 0.9

data/CHANGES

@@ -1,5 +1,27 @@
 - parlement changelog
 
+== Version 0.9
+
+Improved look, particularly the voting and writing part. Long posts and lists
+now truncated. Permanent login. Positioned elements. Search form (though
+google).
+
+* now asking to choose a pseudo
+* focus now on the login box
+* anonymous mails can also be received
+* correcting personal page
+* choices now on the right bottom side of elements
+* elements can now be positioned
+* new elements are directly placed under their parent
+* long posts and lists only display their n first paragraphs or items
+* google search form
+* position text is hidden
+* the >> link now more closely associated associated to the choices
+* images for vote and write
+* anonymous users now have a hidden subscription link
+* login is permanent over browser sessions
+* some font encoding corrections in mails
+
 == Version 0.8
 
 Users can now filter elements according to an acceptation's threshold

data/Rakefile

@@ -35,8 +35,8 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
 	'[A-Z]*', 'app/**/*', 'components/**/*', 'config/**/*', 'db/**/*',
 	'lib/**/*', 'public/*.*', 'public/dynamic/*', 'public/images/*',
-	'public/engine_files/*', 'public/javascripts/*', 'script/stylesheets/*',
-	'test/**/*', 'vendor/**/*'
+	'public/engine_files/*', 'public/engine_files/**/*', 'public/javascripts/*',
+	'public/stylesheets/*', 'script/*', 'script/**/*' 'test/**/*', 'vendor/**/*'
 ].exclude(/\b(svn|tmp|attachment)\b|~$/)
 
 spec = Gem::Specification.new do |s|

data/app/controllers/account_controller.rb

@@ -7,14 +7,16 @@ class AccountController < UserController
 
 	def login
 		# Cleaning up
-		session[:person] = session[:user] = nil
+		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]
 
 		@person = Person.find_by_name(login)
-		@user = User.find_by_login(login) if @person
+		@user = @person.user if @person
 
 		# First we eventually create a new pseudo
 		if not @person
@@ -112,14 +114,23 @@ class AccountController < UserController
 			end
 		end
 
-		render :partial => 'show', :locals => {
-			:divId => params[:divId], :choices => getAllVotes }
-	end
+		# Record cookies for re authentication
+		if session[:person]
+			cookies[:person_name] = session[:person].name
+			cookies[:salted_password] = @user.salted_password if @user
+		end
 
+		render :partial => 'show',
+			:locals => { :divId => params[:divId], :choices => getAllVotes },
+			:status => (session[:person] ? 200 : 403)
+	end
 
 	def logout
-		session[:person] = @person = nil
-		session[:user] = @user = nil
+		# Cleaning up
+		session[:person] = @person = session[:user] = @user = nil
+		cookies.delete :person_name
+		cookies.delete :salted_password
+
 		render :partial => 'show', :locals => {
 			:divId => params[:divId], :choices => getAllVotes }
 	end
@@ -148,6 +159,8 @@ class AccountController < UserController
 	end
 
 	def setAvatar
+		return render(:text => "Not logged in", :status => 403) \
+			unless session[:person]
 		logger.info "Setting up an avatar for person #{session[:person].name}"
 
 		@elt = Elt.find_by_id 'people'

data/app/controllers/application.rb

@@ -8,21 +8,34 @@ class ApplicationController < ActionController::Base
 	model :user
 
   before_filter :set_charset
+  before_filter :set_login_from_cookie
 	after_filter :fix_unicode_for_safari
 	after_filter OutputCompressionFilter
 
 	# 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
+	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] }
-    end
-  end
+		end
+	end
 
 	def set_charset
 		#@headers["Content-Type"] = "text/html; charset=iso-8859-15" 
 		@headers["Content-Type"] = "text/html; charset=utf-8" 
 	end
+
+	def set_login_from_cookie
+		unless session[:person]
+			if (person = Person.find_by_name(cookies[:person_name])) and \
+				((!person.user and !cookies[:salted_password]) \
+				 or (person.user \
+						 and person.user.salted_password == cookies[:salted_password]))
+				session[:person] = person 
+				session[:user] = person.user
+			end
+		end
+	end
 end
 

data/app/controllers/elt_controller.rb

@@ -15,13 +15,8 @@ class EltController < ApplicationController
 		@elt = Elt.find(params[:id])
 		@title = @elt.subject
 		@title += " (parlement)" if !@title.downcase.include? "parlement"
-		if request.env['REQUEST_URI'].match '.dyndns'
-			headers["Status"] = "301 Moved Permanently"
-			redirect_to request.env['REQUEST_URI'].gsub(/.dyndns/, '')
-		end
 		render :layout => 'top'
 
-		# TODO
 	rescue ActiveRecord::RecordNotFound => e
 		flash[:error] = "Element '#{params[:id]}' does not exist"
 		headers["Status"] = "301 Moved Permanently"
@@ -67,10 +62,6 @@ class EltController < ApplicationController
 		end
 	end
 
-	def preview
-		render :inline => format(params[:elt][:body])
-	end
-
 	def create
 		@elt = Elt.new(params[:elt])
 		@elt.person = @session[:person]
@@ -82,7 +73,7 @@ class EltController < ApplicationController
 			headers["Status"] = "404 Post considered as spam"
 			render :controller => 'elt', :action => 'new', :status => 404
 		elsif params[:submit] == "preview" or (@elt.publish and @elt.parent.add_child(@elt)) then
-			headers["Status"] = "201 Created"
+			#headers["Status"] = "201 Created"
 			render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false }
 		else
 			flash[:notice] = 'Error'

data/app/controllers/person_controller.rb

@@ -15,7 +15,7 @@ class PersonController < ApplicationController
   end
 
   def list
-    @person = Person.find(params[:id]) if @person == nil
+    @person = Person.find(params[:id]) unless @person
 		render :partial => '/person/listElts', :locals => { :person => @person }
   end
 end

data/app/helpers/elt_helper.rb

@@ -11,6 +11,7 @@ module EltHelper
 		# 1. numbered list
 		# chat log lines become list elements
 		# short lines to which are added a break
+		# positions have a special treatment in the view
 		text = auto_link data \
 				.gsub(/^\b(.*:)$(\n)^>\s/, '\\1<br/>\\2\\2> ') \
 				.gsub(/^Yahoo! Groups Links$(\n{2}^<*.*$\s.*$)*/, '') \
@@ -20,8 +21,19 @@ module EltHelper
 				.gsub(/^\d+[\.-]\s+/, '# ') \
 				.gsub(/^(\d\d:\d\d\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
 
+		# Only show the n first paragraphs
+		text.gsub!(/((?:(\n)(?:^.+$\n)*){#{NB_PARAGRAPH_TO_DISPLAY}})((?:.|\n)*)/,
+			'\1\2<a class="readMore" href="#" onclick="Element.hide(this); Element.removeClassName(this.parentNode.nextSibling, \'tooLarge\'); return false;">Read more...</a>\2<div class="tooLarge">\2\3\2</div>') \
+			if data and text.strip =~ /((?:(\n)(?:^.+$\n)*){#{NB_PARAGRAPH_TO_DISPLAY+2}})/
+
+		# Only show the n*2 first list items
+		text.gsub!(/((?:^\*\s+.+$\n){#{NB_PARAGRAPH_TO_DISPLAY*2}})((?:.|\n)*)(\n)/,
+			'\1\3\3* <a class="readMore" href="#" onclick="Element.hide(this.parentNode.parentNode); Element.removeClassName(this.parentNode.parentNode.nextSibling.nextSibling, \'tooLarge\'); return false;">Read more...</a>\3\3<div class="tooLarge">\3\3\2</div>') \
+			if data and text.strip =~ /(?:(?:^\*\s+.+$\n){#{NB_PARAGRAPH_TO_DISPLAY*2+2}})/
+
 		#hard_breaks = true
 		textiled = text.blank? ? "" : RedCloth.new(text)
 		begin
@@ -35,6 +47,8 @@ module EltHelper
 			# 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
+			# Here to push away the choice span
+			textiled += " "+"&#160;"*22
 		end
 
 		textiled

data/app/models/elt.rb

@@ -56,6 +56,8 @@ class Elt < ActiveRecord::Base
 
 		build_mail(:elt => self) unless mail
 		mail.publish
+
+		self.position = Regexp.last_match(1) if body =~ /^\s*position:\s*(\d+(\.\d+)?)(\s|$)/
 		save!
 
 		parent.vote Regexp.last_match(1), person if body =~ /^\s*(-1|0|\+1)(\s|$)/

data/app/models/mail.rb

@@ -98,7 +98,8 @@ class Mail < ActiveRecord::Base
 			|| Person.find_by_name(unquote(mail.friendly_from)) \
 			|| elt.build_person(:id =>  unquote(mail.friendly_from).gsub(/\s/, '_'),
 													:name => unquote(mail.friendly_from),
-													:email => mail.from.first)
+													:email => mail.from.first) \
+			if not mail.from.first.match(/#{ANONYMOUS_POSTER}@#{ActionMailer::Base.server_settings[:domain]}/)
 
 		self.mail_parents = mail.references
 		self.message = mail.message_id
@@ -183,9 +184,9 @@ class Mail < ActiveRecord::Base
 
 	private
 
-	# This is to make sure we only have utf-8, no iso-8859
+	# This is to make sure we only have text, no iso-8859 or utf-8 encoding
 	def unquote(text)
-		text.gsub(/\=\?.*?\?\=/) { |m| TMail::Unquoter.unquote_and_convert_to m, 'utf-8' }
+		text.gsub(/\=\?(.*)\?(Q|q)\?.*?\?\=/) { |m| TMail::Unquoter.unquote_and_convert_to m, Regexp.last_match(1) }
 	end
 
 	# Get and store the attachments
@@ -210,9 +211,9 @@ class Mail < ActiveRecord::Base
 					# Here to correct a null character which can occur in some mails
 					# It looks like ==0 or ^@ !!!
 					# Otherwise the elt can not be saved in the db :(
-					elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body).gsub(/\0/, '')
+					elt.body += Iconv.new(charset, 'iso-8859-1').iconv(attachment.body).gsub(/\0/, '')
 				else
-					elt.body += Iconv.new(charset, 'utf-8').iconv(attachment.body)
+					elt.body += Iconv.new(charset, 'iso-8859-1').iconv(attachment.body)
 				end
 			else
 				# Here too have to remove any eventual null character!

data/app/models/person.rb

@@ -14,5 +14,10 @@ class Person < ActiveRecord::Base
 	has_and_belongs_to_many :subscribed_elts,
 		:class_name => "Elt",
 		:join_table => "subscribers"
+
+	# Convenience method, because User is as it was from the salted login plugin
+	def user
+		return User.find_by_login(name)
+	end
 end
 

data/app/views/account/_login.rhtml

@@ -7,55 +7,59 @@
 	<%= hidden_field 'elt', 'id' if @elt %>
 	<input type="hidden" id="divId" name="divId" value="<%= divId %>"/>
 
-	<div class="login">
-		<label for="person_name">Pseudo:
-			<%= text_field "person", "name", :size => 10 %>
+	<div class="login">Please, choose a pseudo</div>
+
+	<label for="person_name">Pseudo:
+		<%= text_field "person", "name", :size => 10 %>
+		<script type="text/javascript">Form.focusFirstElement(document.forms[0]);</script>
+	</label>
+
+	<%= link_to_function('<span class="icon">&gt;&gt;</span>',
+		"Element.toggle(this);" \
+			+visual_effect(:Grow, 'user_password_'+divId.to_s) \
+			+"Form.focusFirstElement(document.forms[0])") %>
+
+	<span style="display: none;" id="user_password_<%= divId %>">
+		<br/>
+		<label for="user_password">Password:
+			<%= password_field "user", "password", :size => 10 %>
 		</label>
 
-		<%= link_to_function('+',
-			"Element.show(this);"+visual_effect(:Grow, 'user_password_'+divId.to_s),
-			:class => "subscribeLink") %>
-
-		<span style="display: none;" id="user_password_<%= divId %>">
-			<br/>
-			<label for="user_password">Password:
-				<%= password_field "user", "password", :size => 10 %>
-			</label>
-
-			<%= link_to_function('email? &gt;',
-				"Element.toggle(this);"+visual_effect(:Grow, 'person_email_'+divId.to_s),
-				:class => "subscribeLink") %>
-		</span>
-
-		<span style="display: none;" id="person_email_<%= divId %>">
-			<br/>
-			<label for="person_email">Email (or check key):</label>
-			<%= text_field "person", "email", :size => 20 %>
-		</span>
-
-		<%= submit_tag 'Ok' %>
-
-		<%= render :partial => '/help',
-			:locals => { :divId => 'login'+divId.to_s, :content => '
-				<p>You can propose an element with</p>
-				<ul>
-					<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
-					<strong>this</strong> server.
-				</p>
-				<p>
-					If a nick is not protected and verified, anybody else can protect it for
-					themselves if they at least supply a password <em>and</em> an email.
-				</p>
-				<p>
-					A login must contain [3..40] characters, a password [5..40].
-				</p>
-			' } %>
-	</div>
+		<%= link_to_function('<span class="icon">&gt;&gt;</span>',
+			"Element.toggle(this);" \
+				+visual_effect(:Grow, 'person_email_'+divId.to_s) \
+				+"Form.focusFirstElement(document.forms[0])") %>
+	</span>
+
+	<span style="display: none;" id="person_email_<%= divId %>">
+		<br/>
+		<label for="person_email">Email (or check key):</label>
+		<%= text_field "person", "email", :size => 20 %>
+	</span>
+
+	<%= submit_tag 'OK' %>
+
+	<%= render :partial => '/help',
+		:locals => { :divId => 'login'+divId.to_s, :content => '
+			<p>You can participate with:</p>
+			<ul>
+				<li>no pseudo</li>
+				<li>an unprotected pseudo</li>
+				<li>a password protected pseudo (click on "<span class="icon">&gt;&gt;</span>")</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
+				<strong>this</strong> server.
+			</p>
+			<p>
+				If a pseudo is not protected <strong>and</strong> verified, anybody
+				else can protect it for themselves if they at least supply a password
+				<em>and</em> an email.
+			</p>
+			<p>
+				A login must contain [3..40] characters, a password [5..40].
+			</p>
+		' } %>
 <%= end_form_tag %>
 

data/app/views/account/_show.rhtml

@@ -7,7 +7,7 @@
 
 <% if choices ||= false %>
 	<!-- Here are updated all choices, watch out, javascript! -->
-	<div class="choicesToUpdate" title="choicesToUpdate">
+	<span class="choicesToUpdate" title="choicesToUpdate">
 		<%= choices.size %>
 		<script language="JavaScript">
 			var choices_to_update = {
@@ -15,7 +15,7 @@
 			};
 			updateChoices(choices_to_update);
 		</script>
-	</div>
+	</span>
 <% end %>
 
 <% if @person = session[:person] %>
@@ -28,32 +28,33 @@
 			{ :href => url_for(:controller => 'account', :action => 'logout') }) %>
 	</span>
 
-	<% if session[:person].name and session[:person].name != '' %>
-		<span class="author">
-			&lt;<%= link_to session[:person].name,
-				:controller => 'person',
-				:action => 'show',
-				:id => session[:person] %>&gt;
-		</span>
-	<% end %>
+	<span class="author">
+		&lt;<%= link_to session[:person].name,
+			:controller => 'person',
+			:action => 'show',
+			:id => session[:person] %>&gt;
+	</span>
 
 	<div>
 		<%= image_tag (@person.image ? @person.image : "/javascripts/blank.gif"),
-				:id => "person_avatar", :class => "avatar" %>
+			:id => "person_avatar", :class => "avatar" %>
 	</div>
 
 	<%= form_tag( { :controller => "account", :action => "setAvatar"},
 			:multipart => true, :target => "avatar", :class => "setAvatar") %>
 		<label>
 			Avatar:
-			<%= file_field "person", "image", :onchange => "submit()" %>
+			<%= file_field "person", "image", :onchange => "submit()", :size => "18" %>
 		</label>
 		<%= submit_tag 'Ok' %>
 	<%= end_form_tag %>
 
 	<iframe id="avatar" name="avatar" style="display: none"></iframe>
+
+	<script language="JavaScript">Element.show($('subscription'));</script>
 <% else %>
 
 	<%= render :partial => '/account/login', :locals => { :divId => divId } %>
+	<script language="JavaScript">Element.hide($('subscription'));</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">
-	V
+	<%= image_tag 'vote_minus' %>
 	<%= 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' %>
 	<%= radio_button_tag "choice[value]", "+1",
 		(choice and choice.value == +1),
 		:id => "choice_#{elt.id}_pro",
@@ -31,3 +31,12 @@ result = elt.result
 
 <%= submit_tag 'Vote!' %>
 
+<span class="eltQuickAdd" id="eltQuickAdd_<%= elt.id %>" title="<%= elt.created_on %>">
+	<%= link_to_remote(image_tag('write'),
+		{ :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>
+