Pre registration

app/views/application/404.html.haml

@@ -5,5 +5,4 @@
 	= columns(medium: 12) do
 		%h1
 			=_'error.404.title','This page does not exist!'
-		%p
-			=p(_'error.404.description', :p)
+		=paragraph(_'error.404.description', :p)

app/views/application/_header.html.haml

@@ -5,13 +5,14 @@
 	- figure = nil
 	- if capable_of(:css_mixblendmode)
 		- cover = "<div class=\"cover\" style=\"background-image: url(#{image})\"></div>"
-	- elsif capable_of(:svg) && Rails.env != 'test'
-		- banner_image = 'application/banner_image.svg'
 	- else
 		- style = "background-image: url(#{image})"
 	#header-title.short{style: style}
-		= (render banner_image, {:image => image}) if banner_image
+		= (render banner_image, {:image => image}) if defined?(banner_image) == "local-variable"
 		= cover.html_safe if cover
-		= row do
-			= columns do
-				%h1=_(@page_title || "page_titles.#{page_group.to_s}.#{page_key.to_s}")
+		- if @page_title.present? || defined?(page_group)
+			- content_for :title do
+				=@page_title.present? ? I18n.t(@page_title, @page_title_vars) : I18n.t("page_titles.#{page_group.to_s}.#{page_key.to_s}")
+			= row do
+				= columns do
+					%h1=(_"page_titles.#{page_group.to_s}.#{page_key.to_s}")

app/views/application/_login_confirmation_sent.html.haml

@@ -2,4 +2,4 @@
 	= columns(medium: 12) do
 		%h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent'
 	= columns(medium: 6) do
-		=m('articles.permission_denied.paragraphs.confirmation_sent', :p)
+		%p='articles.permission_denied.paragraphs.confirmation_sent', :p

app/views/application/home.html.haml

@@ -9,16 +9,16 @@
 				- if @schedule
 					%h3=_'articles.workshops.headings.Schedule'
 					= render 'schedule/programme', :schedule => @schedule, :conference => @conference, :workshops => @workshops, :events => @events, :locations => @locations, :show_interest => true, :day_parts => @day_parts, :show_previews => true
-				- elsif @conference.registration_open
-					%h3=_'articles.workshops.headings.Proposed_Workshops'
-					%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
-					%ul.workshop-list
-						- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
-							%li
-								%h4=w.title
-								.workshop-interest
-									- if w.interested?(current_user)
-										=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
-									- elsif w.interested_count > 0
-										=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
-								.workshop-description=markdown w.info
+			- if @conference.registration_status == :open
+				%h3=_'articles.workshops.headings.Proposed_Workshops'
+				%p=_'articles.workshops.paragraphs.Proposed_Workshops', "Would you like to facilitate your own workshop? Simply register and visit the workshops page. If you have already registered you can access the page by restarting the registration process."
+				%ul.workshop-list
+					- @conference.workshops.sort_by{ |w| w.title.downcase }.each do |w|
+						%li
+							%h4=w.title
+							.workshop-interest
+								- if w.interested?(current_user)
+									=_'articles.workshops.info.you_are_interested_count', "You and #{w.interested_count - 1} others are interested in this workshop", :vars => {:count => (w.interested_count - 1)}
+								- elsif w.interested_count > 0
+									=_'articles.workshops.info.interested_count', "#{w.interested_count} people are interested in this workshop", :vars => {:count => w.interested_count}
+							.workshop-description=markdown w.info

app/views/application/permission_denied.html.haml

@@ -1,7 +1,9 @@
 = render :partial => 'application/header', :locals => {:image_file => @banner_image || '403.jpg'}
 %article
-	- if @template
+	- if @template.present?
 		=render @template
 	- else
-		%h2=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
-		%p=_'articles.permission_denied.paragraphs.main', :p
+		= row do
+			= columns do
+				%h2=_'articles.permission_denied.headings.main','Sorry, you currently don\'t have access to this page'
+				%p=_'articles.permission_denied.paragraphs.main', :p