Added page titles to registration page

app/controllers/conference_administration_controller.rb

@@ -68,13 +68,7 @@ class ConferenceAdministrationController < ApplicationController
   end
 
   rescue_from ActiveRecord::PremissionDenied do |exception|
-    if logged_in?
-      redirect_to :register
-    else
-      @register_template = :confirm_email
-      @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
-      render :register
-    end
+    do_403
   end
 
   rescue_from ActiveRecord::RecordNotFound do |exception|

app/controllers/conferences_controller.rb

@@ -302,6 +302,8 @@ class ConferencesController < ApplicationController
       @page_title = 'articles.conference_registration.headings.Policy_Agreement'
     when :confirm_email
       @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
+      @main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register"
+      @main_title_vars = { vars: { title: @this_conference.title } }
     end
 
   end
@@ -361,12 +363,16 @@ class ConferencesController < ApplicationController
   end
 
   rescue_from ActiveRecord::PremissionDenied do |exception|
-    if logged_in?
-      redirect_to :register
+    if !@this_conference.can_register?
+      do_404
+    elsif logged_in?
+      redirect_to 'conferences/register'
     else
       @register_template = :confirm_email
       @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
-      render :register
+      @main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register"
+      @main_title_vars = { vars: { title: @this_conference.title } }
+      render 'conferences/register'
     end
   end
 

app/controllers/workshops_controller.rb

@@ -354,11 +354,15 @@ class WorkshopsController < ApplicationController
   end
 
   rescue_from ActiveRecord::PremissionDenied do |exception|
-    if logged_in?
+    if !@this_conference.can_register?
+      do_404
+    elsif logged_in?
       redirect_to 'conferences/register'
     else
       @register_template = :confirm_email
       @page_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Registration_Details"
+      @main_title = "articles.conference_registration.headings.#{@this_conference.registration_status == :open ? '': 'Pre_'}Register"
+      @main_title_vars = { vars: { title: @this_conference.title } }
       render 'conferences/register'
     end
   end