parlement 0.13 → 0.14

data/CHANGES

@@ -1,5 +1,20 @@
 - parlement changelog
 
+== Version 0.14 ==
+
+Heavily modified skin where anonymous users can no longer vote. Simplified and
+faster HTML. Shaded border.
+
+* protection against some browsers who update too frequently their views
+* no more deprecations and errors
+* moved all elt lists to app/views/elt/list directory
+* skin heavily modified, simplified
+* shaded border script
+* anonymous users are not able to vote anymore
+* results displayed only to those who have voted
+* faster view update
+* anonymous users can write and create their login at the same time, blog like
+
 == Version 0.13 ==
 
 Better filtering. Periodical updating of visitors, subscribers and elements

data/Rakefile

@@ -180,7 +180,7 @@ end
 desc "Update pot/po files."
 task :updatepo do
   require 'gettext/utils'
-  GetText.update_pofiles(PKG_NAME, Dir.glob("{app}/**/*.{rb,rhtml}"), "#{PKG_NAME} #{PKG_VERSION}")
+  GetText.update_pofiles(PKG_NAME, Dir.glob("{app}/{views,controllers}/**/*.{rb,rhtml}"), "#{PKG_NAME} #{PKG_VERSION}")
 end
 
 desc "Create mo-files"

data/app/controllers/account_controller.rb

@@ -23,26 +23,26 @@ class AccountController < UserController
 					@person = Person.new :id => login.gsub(/\s/, '_'), :name => login
 					if @person.save
 						logger.info yellow { bold { "Person: #{@person.name}, id: #{@person.id}" } }
-						flash.now[:notice]  = "Pseudo created"
+						flash.now[:notice]  = _("Pseudo recorded")
 						session[:person] = @person
 					else
-						flash.now[:error] = 'Error creating account'
+						flash.now[:error] = _('Error creating account')
 					end
 				end
 			rescue Exception => e 
-				flash.now[:error] = 'Error creating account'
+				flash.now[:error] = _('Error creating account')
 				logger.error red { e }
 			end
 		end
 
 		# We record the password or try to authenticate
 		if @person and @person.errors.empty?
-			if password.empty?
+			if password and password.empty?
 				if not @user or not @user.salted_password \
 					or @user.salted_password.empty?
 					session[:person] = @person
 				else
-					flash.now[:error]  = "This pseudo is protected with a password"
+					flash.now[:error]  = _("This pseudo is protected with a password")
 				end
 			elsif not @user
 				# Record password
@@ -62,7 +62,7 @@ class AccountController < UserController
 							@user.security_token = nil
 							if @user.save
 								logger.info yellow { "Person: #{@person.name} changed its password" }
-								flash.now['notice 2']  = 'Password successfully modified!'
+								flash.now['notice 2']  = _('Password successfully modified!')
 								session[:person] = @person
 								session[:user] = @user
 							else
@@ -71,17 +71,17 @@ class AccountController < UserController
 						end
 					end
 				rescue
-					flash.now[:error] = 'Wrong check key'
+					flash.now[:error] = _('Wrong check key')
 				end
 			else
-				flash.now[:error]  = "Wrong password"
+				flash.now[:error]  = _("Wrong password")
 			end
 
 			# Record the email or send a check_key for a password reset
 			if email and not email.empty?
 				if session[:person]
 					if email == @person.email
-						flash.now['notice 3']  = "Email already recorded and verified"
+						flash.now['notice 3']  = _("Email already recorded and verified")
 					else
 						mngEmail
 					end
@@ -166,8 +166,7 @@ class AccountController < UserController
 	end
 
 	def setAvatar
-		return render(:text => "Not logged in", :status => 403) \
-			unless session[:person]
+		return render(:text => _("Not logged in"), :status => 403) unless session[:person]
 		logger.info yellow { "Setting up an avatar for person #{session[:person].name}" }
 
 		@elt = Elt.find_by_id 'people'
@@ -252,19 +251,20 @@ class AccountController < UserController
 				end
 			end
 		rescue Exception => e 
-			flash.now[:notice] = nil
-			flash.now['notice 2'] = nil
-			flash.now['notice 3'] = nil
-			flash.now[:warning] = 'Error creating account: confirmation email not sent'
+			flash.now[:notice] = flash.now['notice 2'] = flash.now['notice 3'] = nil
+			flash.now[:warning] = _('Error creating account: confirmation email not sent')
 			e.backtrace.each { |m| logger.error m }
 		end
 	end
 
 	def getAllVotes
-		return unless @elt
-		Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil),
-			:include => 'elt',
-			:conditions => "elts.lft >= '#{@elt.lft}' AND elts.rgt <= '#{@elt.rgt}'")
+		if @elt then
+			Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil),
+				:include => 'elt',
+				:conditions => "elts.lft >= '#{@elt.lft}' AND elts.rgt <= '#{@elt.rgt}'")
+		else
+			# This should only happen for very new people
+			Choice.find_all_by_person_id((session[:person] ? session[:person].id : nil))
+		end
 	end
 end
-

data/app/controllers/application.rb

@@ -5,15 +5,15 @@ require 'login_engine'
 require 'term/ansicolor'
 
 class ApplicationController < ActionController::Base
-  helper_method :filter
+	helper_method :filter
 
 	include LoginEngine
 	include Term::ANSIColor
 
-  init_gettext "parlement"
+	init_gettext "parlement"
 
-  before_filter :set_login_from_cookie
-	after_filter :fix_unicode_for_safari
+	before_filter :set_login_from_cookie
+	#after_filter :fix_unicode_for_safari
 	after_filter OutputCompressionFilter
 
 	# automatically and transparently fixes utf-8 bug 
@@ -26,8 +26,9 @@ class ApplicationController < ActionController::Base
 	end
 
 	def set_login_from_cookie
-		unless session[:person]
-			if (person = Person.find_by_name(cookies[:person_name])) and \
+		unless session[:lastUpdatedView] or session[:person]
+			if (cookies[:person_name] and \
+        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]))
@@ -35,20 +36,20 @@ class ApplicationController < ActionController::Base
 				session[:person] = person 
 				session[:user] = person.user
 
-        person.last_login = Time.now
-        person.save
+				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
+	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

@@ -25,79 +25,91 @@ class EltController < ApplicationController
 
 	def list
 		@elt = Elt.find(params[:id]) if @elt == nil
-		render :partial => '/elt/list', :locals => { :elt => @elt }
+		render :partial => '/elt/list/children', :locals => { :elt => @elt }
 	end
 
 	def listByDate
 		@elt = Elt.find params[:id] unless @elt
-		render :partial => 'listByDate'
+		render :partial => '/elt/list/byDate'
 	end
 
 	def listByVote
 		@elt = Elt.find params[:id] unless @elt
-		render :partial => 'listByVote'
+		render :partial => '/elt/list/byVote'
 	end
 
 	def listVisitors
 		@elt = Elt.find params[:id] unless @elt
-    render :partial => 'listVisitors'
-  end
+		render :partial => '/elt/list/visitors'
+	end
 
 	def listSubscribers
 		@elt = Elt.find params[:id] unless @elt
-    render :partial => '/subscriber/list'
-  end
+		render :partial => '/elt/list/subscribers'
+	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>"
+		if session[:lastUpdatedView] && session[:lastUpdatedView] > Time.now - 9 then
+			# Protection against some browsers updating too fast
+			logger.info "Too soon"
+			render :inline => ""
+			return
+		end
+
+		session[:lastUpdatedView] ||= Time.now - 10
+
+		@elt = Elt.find(params[:id])
+		acts = ""
+		acts += " \
+			<script type=\"text/javascript\"> \
+				new Ajax.Updater('listByDate', '/elt/listByDate/#{params[:id]}', \
+					{asynchronous:true, evalScripts:true}); \
+				new Ajax.Updater('listByVote', '/elt/listByVote/#{params[:id]}', \
+					{asynchronous:true, evalScripts:true}); \
+			</script> \
+			" if @elt.last_activity > session[:lastUpdatedView]
+
+		if person = session[:person]
+			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 += " \
+				<script type=\"text/javascript\"> \
+					new Ajax.Updater('listVisitors', '/elt/listVisitors/#{params[:id]}', \
+						{asynchronous:true, evalScripts:true}); \
+				</script> \
+				" 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 += " \
+				<script type=\"text/javascript\"> \
+					new Ajax.Updater('listSubscribers', '/elt/listSubscribers/#{params[:id]}', \
+						{asynchronous:true, evalScripts:true}); \
+				</script> \
+				" if subscribers > 0
+
+			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!
+			logger.info "#{visits} visit(s), #{subscribers} subscriber(s)"
+		end
+
+		session[:lastUpdatedView] = Time.now
+		render :inline => acts
 	end
 
 	def rss
@@ -127,24 +139,38 @@ class EltController < ApplicationController
 		@elt = Elt.new(params[:elt])
 		@elt.person = session[:person]
 
-		if !session[:person] and \
-      (@elt.subject =~ /([<>\/]|href)/ \
+		if !session[:person] \
+			and (@elt.subject =~ /([<>\/]|href)/ \
 			 or @elt.body =~ /(.*(http|href)(.*\n)*){3}/ \
 			 or @elt.body =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/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!'
+			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!')
 			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"
-			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'
+			if not @elt.person and params[:person] and login = params[:person][:name] and !login.empty? then
+				@elt.person = Person.find_by_name(login) || Person.new(params[:person])
+				if @elt.person.user
+					flash[:warning] = _('This name is password protected, login in top right box')
+					@elt.person = nil
+				elsif params[:submit] != "preview"
+					@elt.person.save!
+				end
+			elsif params[:person] and email = params[:person][:email] and !email.empty? then
+					@elt.person.save!
+			end
+
+			if params[:submit] == "preview" or (@elt.publish and headers["Status"] = "201 Created") then
+				render :partial => '/elt/elt', :locals => { :elt => @elt, :eltTop => false, :created => true }
+			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
 		end
 	end
 
@@ -185,9 +211,4 @@ class EltController < ApplicationController
 
 		render :partial => '/elt/choice', :locals => { :elt => @elt }
 	end
-
-	def choices
-		@elt = Elt.find params[:id]
-	end
 end
-

data/app/controllers/subscriber_controller.rb

@@ -25,7 +25,7 @@ class SubscriberController < ApplicationController
 			#render :inline => "First you need to login... it's easy, type a pseudo with at least 3 characters. Then OK"
 			flash.now[:error] = 'First you need to login!'
 		end
-		render :partial => 'list'
+		render :partial => '/elt/list/subscribers'
   end
 end
 

data/app/helpers/elt_helper.rb

@@ -17,7 +17,7 @@ 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 and !elt.subject.empty? \
+		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 \
@@ -76,6 +76,7 @@ module EltHelper
 			if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
 			# Here to push away the choice span
 			textiled += " "+"&#160;"*22
+      textiled = "<span>"+textiled+"</span>"
 		end
 
 		textiled

data/app/models/elt.rb

@@ -63,7 +63,7 @@ class Elt < ActiveRecord::Base
 		#(Choice.count("elt_id = '#{self.id}' AND value = 1") \
 		#	- \
 		#	Choice.count("elt_id = '#{self.id}' AND value = -1"))
-		Choice.sum(:value, :conditions => "elt_id = '#{self.id}'")
+		Choice.sum(:value, :conditions => "elt_id = '#{self.id}'") || 0
 	end
 
 	# Mail this elt to all subscribers
@@ -83,6 +83,8 @@ class Elt < ActiveRecord::Base
 		else
 			vote if person
 		end
+
+    parent.add_child(self) unless lft or rgt
 		true
 	end
 

data/app/models/mail.rb

@@ -109,7 +109,6 @@ class Mail < ActiveRecord::Base
 			elt.parent.id = parentId
 			elt.parent.publish
 			elt.save
-			elt.parent.parent.add_child elt.parent
 		end
 
 		mngAttachment mail if mail
@@ -127,8 +126,6 @@ class Mail < ActiveRecord::Base
 			elt.person.image = "/attachment/file/#{elt.attachments.first.file_relative_path}"
 			elt.person.save
 		end
-
-		elt.parent.add_child elt
 		self
 	end
 

data/app/views/_help.rhtml

@@ -3,6 +3,7 @@
 		visual_effect(:Grow, "help_#{divId}")+
 		visual_effect(:Grow, "help_close_#{divId}_link"),
 		:class => "helpLink",
+    :title => "?",
 		:id => "help_#{divId}_link") %>
 
 <%= link_to_function("?",
@@ -10,6 +11,7 @@
 		visual_effect(:Shrink, "help_close_#{divId}_link")+
 		visual_effect(:Grow, "help_#{divId}_link"),
 		:class => "helpLinkClose",
+    :title => "?",
 		:id => "help_close_#{divId}_link",
 		:style => "display:none") %>
 

data/app/views/account/_login.rhtml

@@ -1,42 +1,44 @@
 <% form_remote_tag(
 	:update => 'identity',
 	:url => { :controller => 'account', :action => 'login', :elt => @elt },
-	:before => visual_effect(:BlindUp, 'identity', { :queue => 'login' })+";resetChoices();",
-	:loaded => visual_effect(:BlindDown, 'identity', { :queue => 'login' })+visual_effect(:BlindDown, 'subscriptionLink')) do %>
-
-  <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_identity') \
-			+"Form.focusFirstElement(document.forms[0])") %>
-
-	<span id="user_password_identity" style="display: none">
-		<br/>
-    <label for="user_password"><%= _('Password') %>:
-			<%= password_field "user", "password", :size => 10 %>
-		</label>
-
-		<%= link_to_function('<span class="icon">&gt;&gt;</span>',
-			"Element.toggle(this);" \
-				+visual_effect(:Grow, 'person_email_identity') \
-				+"Form.focusFirstElement(document.forms[0])") %>
-	</span>
-
-	<span id="person_email_identity" style="display: none">
-		<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', :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>') } %>
+  :before => visual_effect(:BlindUp, 'identity', { :queue => 'login' }) \
+    +";resetChoices();",
+  :loaded => visual_effect(:BlindDown, 'identity', { :queue => 'login' }) \
+    +visual_effect(:BlindDown, 'subscriptionLink')) do %>
+
+  <fieldset>
+    <label for="person_name"><%= _('Pseudo') %>:</label>
+    <%= text_field "person", "name", :size => 10 %>
+    <script type="text/javascript">Form.focusFirstElement(document.forms[0]);</script>
+
+    <%= link_to_function('<span class="icon">&gt;&gt;</span>',
+      "Element.toggle(this);" \
+        +visual_effect(:Grow, 'user_password_identity') \
+        +"Form.focusFirstElement(document.forms[0])") %>
+
+    <span id="user_password_identity" style="display: none">
+      <br />
+      <label for="user_password"><%= _('Password') %>:</label>
+      <%= password_field "user", "password", :size => 10 %>
+
+      <%= link_to_function('<span class="icon">&gt;&gt;</span>',
+        "Element.toggle(this);" \
+          +visual_effect(:Grow, 'person_email_identity') \
+          +"Form.focusFirstElement(document.forms[0])") %>
+    </span>
+
+    <span id="person_email_identity" style="display: none">
+      <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',
+        :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>') } %>
+  </fieldset>
 <% end %>
 

data/app/views/account/_show.rhtml

@@ -9,23 +9,31 @@
 
 <% if choices ||= false %>
 	<!-- Here are updated all choices, watch out, javascript! -->
-	<span class="choicesToUpdate" title="choicesToUpdate">
-		<%= choices.size %>
-		<script language="JavaScript">
-			var choices_to_update = {
-				<%= choices.collect { |c| "'elt_#{ c.elt_id }' : '#{ c.value }'" }.join(', ') %>
-			};
-			updateChoices(choices_to_update);
+	<span class="choicesToUpdate">
+		<script type="text/javascript">
+      updateChoices(
+          {<%= choices.collect { |c| "'elt_#{ c.elt_id }' : '#{ c.value }'" }.join(', ') %>}
+			);
 		</script>
 	</span>
 <% end %>
 
 <% if @person = session[:person] %>
-  <script language="JavaScript">
-    if ($('subscriptionLink')) {
-      Element.show($('subscriptionLink'));
-    }
-  </script>
+	<script type="text/javascript">
+		if ($('subscriptionLink')) {
+			Element.show($('subscriptionLink'));
+		}
+		Element.addClassName(document.body, "logged");
+		Element.removeClassName(document.body, "anon");
+	</script>
+
+	<span class="author">
+		&lt;<%= link_to session[:person].name,
+			:controller => 'person',
+			:action => 'show',
+			:id => session[:person] %>&gt;
+	</span>
+
 	<span class="logout">
 		<%= link_to_remote('[X]',
 			{ :update => 'identity',
@@ -36,12 +44,6 @@
 				:loaded => visual_effect(:BlindDown, 'identity', { :queue => 'login' }) },
 			{ :href => url_for(:controller => 'account', :action => 'logout') }) %>
 	</span>
-	<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"),
@@ -80,6 +82,10 @@
 
 	<iframe id="avatar" name="avatar" style="display: none"></iframe>
 <% else %>
+  <script type="text/javascript">
+    Element.removeClassName(document.body, "logged");
+    Element.addClassName(document.body, "anon");
+  </script>
 
 	<%= render :partial => '/account/login' %>
 <% end %>