Merge remote-tracking branch 'origin' into fc_1788_av

FreeUKGen · Jun 14, 2024 · bdad68e · bdad68e
2 parents b08d21a + ac05bf2
commit bdad68e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 6 deletions.
diff --git 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,16 +288,22 @@ 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)
     @appname = appname
     @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
@@ -1,3 +1,10 @@
+<% title "Records" %>
+<% content_for :meta_robots do %>
+  <meta name="robots" content="index, follow" />
+<% end %>
+<% content_for :meta_description do %>
+  <meta name="description" content="Find out about the coverage of our transcriptions">
+<% end %>
 <div class="grid">
   <div class="grid__item one_whole palm-one-whole" >
     <%= render 'flash_notice' %>

diff --git 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 %>
+	<meta name="robots" content="noindex, nofollow" />
+<% end %>
 <h1 class="title text--center"><%= @year %> &ndash; <%= @county %> <%='('+@chapman_code+')' unless 'all'==@chapman_code%></h1>
 <br>
 <%# ----------- set up graph variables --------- %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -36,12 +36,20 @@
       <meta name="description" content="Search your ancestry with FreeREG. FreeREG provides free online access to transcriptions of birth, marriage and burial records from Church of England and Church of Scotland registers. You can also use FreeREG to discover: non-Conformist records from England, Scotland and Wales, Municipal Cemetary records, Memorial records and documents relating to life events out of country, at sea and in the military.  ">
     <% elsif MyopicVicar::Application.config.template_set == 'freecen' %>
       <meta name="keywords" content="genealogy,census,census records,transcriptions,indexes,family history">
-      <meta name="description" content="Use FreeCEN to access 19th Century UK Censuses online and for free. You can use FreeCEN transcriptions to discover your ancestors' occupation, family history and household information.">
+      <% if content_for?(:meta_description) %>
+        <%= yield(:meta_description) %>
+      <% else %>
+         <meta name="description" content="Find 19th & 20th Century UK census transcriptions, for free, forever.">
+      <% end %>
+      <% if content_for?(:meta_robots) %>
+        <%= yield(:meta_robots) %>
+      <% else %>
+        <META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
+      <% end %>
     <% elsif MyopicVicar::Application.config.template_set == 'freebmd' %>
       <meta name="keywords" content="genealogy,registers,birth records,birth certificates,transcriptions,indexes,birth,marriage,death">
       <meta name="description" content="FreeBMD provides free on-line access to the GRO indexes of births, marriages and deaths for England and Wales. ">
     <% end %>
-    <META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
     <meta name="google-site-verification" content="zAYAee-PuoiMAfi5hbUreeLsvTGf4XFNXDxMDB9PcCQ" />
     <!--[if lt IE 9]>
       <%#= javascript_include_tag "html5shiv" %>

diff --git a/app/views/search_queries/new.html.erb b/app/views/search_queries/new.html.erb
@@ -1,4 +1,10 @@
 <% title "Search Query" %>
+<% content_for :meta_robots do %>
+  <meta name="robots" content="index, follow" />
+<% end %>
+<% content_for :meta_description do %>
+  <meta name="description" content="Discover your ancestors in our UK census transcriptions">
+<% end %>
 <%= render "flash_notice" %>
 <% unless @page.nil?%>
   <div style="text-align: center">