diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 8af735594..48618a5a5 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -276,7 +276,7 @@ def notification_of_technical_registration(user) @user = user manager = nil if appname.downcase == 'freereg' - manager = UseridDetail.userid("REGManager").first + manager = UseridDetail.userid("FR Exec Lead").first get_coordinator_name mail(:to => "#{@coordinator.person_forename} <#{@coordinator.email_address}>", :cc => "#{manager.person_forename} <#{manager.email_address}>", :subject => "#{appname} transcriber registration") unless @coordinator.nil? elsif appname.downcase == 'freecen' @@ -288,8 +288,14 @@ def notification_of_technical_registration(user) def notification_of_transcriber_creation(user) @appname = appname @user = user - get_coordinator_name - mail(:to => "#{@coordinator.person_forename} <#{@coordinator.email_address}>", :subject => "#{appname} userid creation") unless @coordinator.nil? + if appname.downcase == 'freereg' + manager = UseridDetail.userid("FR Exec Lead").first + get_coordinator_name + mail(:to => "#{@coordinator.person_forename} <#{@coordinator.email_address}>", :cc => "#{manager.person_forename} <#{manager.email_address}>", :subject => "#{appname} transcriber creation") unless @coordinator.nil? + elsif appname.downcase == 'freecen' + get_coordinator_name + mail(:to => "#{@coordinator.person_forename} <#{@coordinator.email_address}>", :subject => "#{appname} userid creation") unless @coordinator.nil? + end end def notification_of_transcriber_registration(user) @@ -297,7 +303,7 @@ def notification_of_transcriber_registration(user) @user = user manager = nil if appname.downcase == 'freereg' - manager = UseridDetail.userid("REGManager").first + manager = UseridDetail.userid("FR Exec Lead").first get_coordinator_name mail(:to => "#{@coordinator.person_forename} <#{@coordinator.email_address}>", :cc => "#{manager.person_forename} <#{manager.email_address}>", :subject => "#{appname} transcriber registration") unless @coordinator.nil? elsif appname.downcase == 'freecen' diff --git a/app/views/freecen2_contents/index.html.erb b/app/views/freecen2_contents/index.html.erb index a3401e69e..50f78a833 100644 --- a/app/views/freecen2_contents/index.html.erb +++ b/app/views/freecen2_contents/index.html.erb @@ -1,3 +1,10 @@ +<% title "Records" %> +<% content_for :meta_robots do %> + +<% end %> +<% content_for :meta_description do %> + +<% end %>
<%= render 'flash_notice' %> diff --git a/app/views/freecen_coverage/graph.html.erb b/app/views/freecen_coverage/graph.html.erb index 00a9664ee..0374c1bbb 100644 --- a/app/views/freecen_coverage/graph.html.erb +++ b/app/views/freecen_coverage/graph.html.erb @@ -1,3 +1,6 @@ +<% content_for :meta_robots do %> + +<% end %>

<%= @year %> – <%= @county %> <%='('+@chapman_code+')' unless 'all'==@chapman_code%>


<%# ----------- set up graph variables --------- %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 8e04e6436..1bb0036f8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -36,12 +36,20 @@ <% elsif MyopicVicar::Application.config.template_set == 'freecen' %> - + <% if content_for?(:meta_description) %> + <%= yield(:meta_description) %> + <% else %> + + <% end %> + <% if content_for?(:meta_robots) %> + <%= yield(:meta_robots) %> + <% else %> + + <% end %> <% elsif MyopicVicar::Application.config.template_set == 'freebmd' %> <% end %> -