Merge pull request #1157 from nla/ph-ctpl-265

CTPL-265: Update links to new pages at library.gov.au

.env.development

@@ -55,8 +55,8 @@ FINDING_AIDS_SEARCH_URL="define FINDING_AIDS_SEARCH_URL"
 
 GLOBAL_MESSAGE_URL="define GLOBAL_MESSAGE_URL"
 
-NATIONAL_LIBRARY_CARD_URL="https://www.nla.gov.au/getting-started/join-us"
-ASK_LIBRARIAN_URL=https://www.nla.gov.au/using-library/getting-started/ask-librarian
+NATIONAL_LIBRARY_CARD_URL="https://www.library.gov.au/research/join-library"
+ASK_LIBRARIAN_URL=https://www.library.gov.au/services/ask-librarian
 
 # Requesting
 CATALOGUE_SERVICES_API_BASE_URL="define CATALOGUE_SERVICES_API_BASE_URL"
@@ -74,7 +74,7 @@ FEEDBACK_ERROR_URL=https://reftracker.nla.gov.au/reft100.aspx?key=Report_an_erro
 EMAIL_2FA_REGISTRATION_URL="define EMAIL_2FA_REGISTRATION_URL"
 EMAIL_2FA_REGISTRATION_REDIRECT_URL="define EMAIL_2FA_REGISTRATION_REDIRECT_URL"
 EMAIL_2FA_ACTION="define EMAIL_2FA_ACTION"
-ABOUT_2FA_URL=https://www.nla.gov.au/using-library/getting-started/getting-started-catalogue/two-factor-authentication
+ABOUT_2FA_URL=https://www.library.gov.au/research/start-researching/get-started-catalogue/two-factor-authentication
 
 # disable functionality during FOLIO updates
 FOLIO_UPDATE_IN_PROGRESS=

.env.staging

@@ -52,8 +52,8 @@ FINDING_AIDS_SEARCH_URL="define FINDING_AIDS_SEARCH_URL"
 
 GLOBAL_MESSAGE_URL="define GLOBAL_MESSAGE_URL"
 
-NATIONAL_LIBRARY_CARD_URL="https://www.nla.gov.au/getting-started/join-us"
-ASK_LIBRARIAN_URL=https://www.nla.gov.au/using-library/getting-started/ask-librarian
+NATIONAL_LIBRARY_CARD_URL="https://www.library.gov.au/research/join-library"
+ASK_LIBRARIAN_URL=https://www.library.gov.au/services/ask-librarian
 
 # Requesting
 CATALOGUE_SERVICES_API_BASE_URL="define CATALOGUE_SERVICES_API_BASE_URL"
@@ -68,7 +68,7 @@ THUMBNAIL_SERVICE_API_BASE_URL="define THUMBNAIL_SERVICE_API_BASE_URL"
 EMAIL_2FA_REGISTRATION_URL="define EMAIL_2FA_REGISTRATION_URL"
 EMAIL_2FA_REGISTRATION_REDIRECT_URL="define EMAIL_2FA_REGISTRATION_REDIRECT_URL"
 EMAIL_2FA_ACTION="define EMAIL_2FA_ACTION"
-ABOUT_2FA_URL=https://www.nla.gov.au/using-library/getting-started/getting-started-catalogue/two-factor-authentication
+ABOUT_2FA_URL=https://www.library.gov.au/research/start-researching/get-started-catalogue/two-factor-authentication
 
 # disable functionality during FOLIO updates
 FOLIO_UPDATE_IN_PROGRESS=

.env.test

@@ -31,8 +31,8 @@ EBSCO_SEARCH_URL=https://search.ebscohost.com/login.aspx?authtype=ip,guest&group
 
 GLOBAL_MESSAGE_URL=http://test.nla.gov.au/catalogue-message/1234
 
-NATIONAL_LIBRARY_CARD_URL="https://www.nla.gov.au/getting-started/join-us"
-ASK_LIBRARIAN_URL=https://www.nla.gov.au/using-library/getting-started/ask-librarian
+NATIONAL_LIBRARY_CARD_URL="https://www.library.gov.au/research/join-library"
+ASK_LIBRARIAN_URL=https://www.library.gov.au/services/ask-librarian
 
 # Requesting
 KEYCLOAK_URL=https://auth.test

app/components/blacklight/top_navbar_component.html.erb

@@ -6,7 +6,7 @@
           <%= link_to t("blacklight.header_top_links.trove"), "https://trove.nla.gov.au", class: "nav-link" %>
         </li>
         <li class="nav-item">
-          <%= link_to t("blacklight.header_top_links.first_australians"), "https://library.gov.au/first-australians", class: "nav-link" %>
+          <%= link_to t("blacklight.header_top_links.first_australians"), "https://www.library.gov.au/first-australians", class: "nav-link" %>
         </li>
       </ul>
     </div>

app/components/copyright_status_component.html.erb

@@ -48,5 +48,5 @@
   </dl>
   <p>Copyright status may not be correct if data in the record is incomplete or inaccurate.
     Other access conditions may also apply. For more information please see:
-    <a href="https://www.nla.gov.au/using-library/copies-and-interlibrary-loans/copyright-library-collections">Copyright in library collections</a>.</p>
+    <a href="https://www.library.gov.au/services/copyright-library-collections">Copyright in library collections</a>.</p>
 </div>

app/controllers/catalog_controller.rb

@@ -50,7 +50,7 @@ class CatalogController < ApplicationController
     # config.response_model = Blacklight::Solr::Response
     #
     ## The destination for the link around the logo in the header
-    config.logo_link = "https://library.gov.au"
+    config.logo_link = "https://www.library.gov.au"
 
     ## Should the raw solr document endpoint (e.g. /catalog/:id/raw) be enabled
     config.raw_endpoint.enabled = false

app/helpers/request_helper.rb

@@ -42,13 +42,13 @@ def compact_merged_array(merged)
 
   def pickup_location_text(item)
     if pickup_location_code(item).start_with? "MRR"
-      link = link_to "Main Reading Room", "https://www.nla.gov.au/reading-rooms/main"
+      link = link_to "Main Reading Room", "https://www.library.gov.au/visit/reading-rooms/main-reading-room"
       t("requesting.collect_from.base", link: link, location: ", Ground Floor")
     elsif pickup_location_code(item).start_with? "SCRR"
-      link = link_to "Special Collections Reading Room", "https://www.nla.gov.au/reading-rooms/special-collections"
+      link = link_to "Special Collections Reading Room", "https://www.library.gov.au/visit/reading-rooms/special-collections-reading-room"
       t("requesting.collect_from.base", link: link, location: ", First Floor")
     else
-      link = link_to "Newspapers and Family History Zone", "https://www.nla.gov.au/reading-rooms/main/newspapers-and-family-history"
+      link = link_to "Newspapers and Family History Zone", "https://www.library.gov.au/visit/reading-rooms/main-reading-room/newspapers-and-family-history-zone"
       t("requesting.collect_from.base", link: link, location: " in the Main Reading Room, Ground Floor")
     end
   end

app/views/request/_manuscripts_form.html.erb

@@ -14,7 +14,7 @@
         <div class="col-sm-6">
           <%= f.text_field :year, class: "form-control", maxlength: 20, data: {"form-validation-target": "required", action: "form-validation#validate"} %>
         </div>
-        <span id="year-help" class="form-text text-muted col-sm-3"><%= t("requesting.help.need_help", contact_us: "https://www.nla.gov.au/using-library/getting-started/ask-librarian").html_safe %></span>
+        <span id="year-help" class="form-text text-muted col-sm-3"><%= t("requesting.help.need_help", contact_us: "https://www.library.gov.au/services/ask-librarian").html_safe %></span>
       </div>
       <div class="mb-3 row">
         <label class="col-md-3 col-form-label text-md-right">OR</label>

app/views/shared/_footer.html.erb

@@ -19,7 +19,7 @@
     <h2 class="h2 mb-3"><%= t('blacklight.footer.ask_a_librarian.title') %></h2>
     <div class="mb-3"><%= t("blacklight.footer.ask_a_librarian.description") %></div>
     <div>
-      <%= link_to t("blacklight.footer.ask_a_librarian.button"), "https://library.gov.au/services/ask-librarian", class: "btn btn-secondary mt-3" %>
+      <%= link_to t("blacklight.footer.ask_a_librarian.button"), "https://www.library.gov.au/services/ask-librarian", class: "btn btn-secondary mt-3" %>
     </div>
   </section>
   <div class="footer-top">
@@ -29,7 +29,7 @@
           <section class="opening-hours">
             <h2 class="h4 mb-4"><%= t('blacklight.footer.opening_hours.title') %></h2>
             <p><%= t('blacklight.footer.opening_hours.description') %></p>
-            <div><%= link_to t("blacklight.footer.opening_hours.more_opening_hours"), "https://library.gov.au/visit/opening-hours", class: "btn btn-tertiary mt-4" %></div>
+            <div><%= link_to t("blacklight.footer.opening_hours.more_opening_hours"), "https://www.library.gov.au/visit/opening-hours", class: "btn btn-tertiary mt-4" %></div>
           </section>
         </div>
         <div class="col-lg-4 mb-5">
@@ -39,7 +39,7 @@
               <%= link_to t("blacklight.footer.contact.telephone"), "tel:+61262621111" %><br>
               <%= t('blacklight.footer.contact.address').html_safe %>
             </p>
-            <div><%= link_to t("blacklight.footer.contact.more_contact_info"), "https://library.gov.au/about-us/contact-us", class: "btn btn-tertiary mt-2 mb-5" %></div>
+            <div><%= link_to t("blacklight.footer.contact.more_contact_info"), "https://www.library.gov.au/about-us/contact-us", class: "btn btn-tertiary mt-2 mb-5" %></div>
           </section>
           <section class="connect">
             <h2 class="h4 mb-4"><%= t('blacklight.footer.connect.title') %></h2>
@@ -64,7 +64,7 @@
               </li>
             </ul>
             <div>
-              <%= link_to t("blacklight.footer.connect.enews"), "https://library.gov.au/services/contact-us/subscribe-our-newsletters", class: "btn btn-tertiary mt-2" %>
+              <%= link_to t("blacklight.footer.connect.enews"), "https://www.library.gov.au/services/contact-us/subscribe-our-newsletters", class: "btn btn-tertiary mt-2" %>
             </div>
           </section>
         </div>
@@ -84,28 +84,28 @@
       <div class="row">
         <ul class="primary-links mb-4">
             <li>
-              <%= link_to t("blacklight.footer.primary_links.discover"), "https://library.gov.au/discover" %>
+              <%= link_to t("blacklight.footer.primary_links.discover"), "https://www.library.gov.au/discover" %>
             </li>
             <li>
-              <%= link_to t("blacklight.footer.primary_links.research"), "https://library.gov.au/research" %>
+              <%= link_to t("blacklight.footer.primary_links.research"), "https://www.library.gov.au/research" %>
             </li>
             <li>
-              <%= link_to t("blacklight.footer.primary_links.visit"), "https://library.gov.au/visit" %>
+              <%= link_to t("blacklight.footer.primary_links.visit"), "https://www.library.gov.au/visit" %>
             </li>
         </ul>
         <ul class="secondary-links mb-5">
             <li>
-              <%= link_to t("blacklight.footer.secondary_links.privacy"), "https://library.gov.au/visit/about-website/privacy" %>
+              <%= link_to t("blacklight.footer.secondary_links.privacy"), "https://www.library.gov.au/visit/about-website/privacy" %>
             </li>
-            <li><%= link_to t("blacklight.footer.secondary_links.disclaimer"), "https://library.gov.au/visit/about-website/disclaimer" %>
+            <li><%= link_to t("blacklight.footer.secondary_links.disclaimer"), "https://www.library.gov.au/visit/about-website/disclaimer" %>
             </li>
-            <li><%= link_to t("blacklight.footer.secondary_links.terms"), "https://library.gov.au/visit/about-website/terms-and-conditions" %>
+            <li><%= link_to t("blacklight.footer.secondary_links.terms"), "https://www.library.gov.au/visit/about-website/terms-and-conditions" %>
             </li>
         </ul>
       </div>
       <div class="row">
         <section class="text-center footer-logo mt-3">
-          <%= link_to image_tag("nla-stacked-logo-black.svg", :alt => "National Library of Australia logo", :width => "134", :height => "111", class: "logo"), "https://library.gov.au" %>
+          <%= link_to image_tag("nla-stacked-logo-black.svg", :alt => "National Library of Australia logo", :width => "134", :height => "111", class: "logo"), "https://www.library.gov.au" %>
         </section>
       </div>
     </div>

app/views/shared/_user_util_links.html.erb

@@ -17,7 +17,7 @@
       </li>
     <% else %>
       <li class="nav-item">
-        <%= link_to t("blacklight.header_links.register"), "https://library.gov.au/research/join-library", class: "nav-link" %>
+        <%= link_to t("blacklight.header_links.register"), "https://www.library.gov.au/research/join-library", class: "nav-link" %>
       </li>
       <% unless ENV["FOLIO_UPDATE_IN_PROGRESS"] == "true" %>
         <li class="nav-item">

app/views/shared/nav/_ask_a_librarian.html.erb

@@ -1 +1 @@
-<%= link_to t("blacklight.header_links.ask_a_librarian"), "https://www.nla.gov.au/using-library/getting-started/ask-librarian", class: "nav-link" %>
+<%= link_to t("blacklight.header_links.ask_a_librarian"), "https://www.library.gov.au/services/ask-librarian", class: "nav-link" %>

app/views/shared/nav/_help.html.erb

@@ -1 +1 @@
-<%= link_to t("blacklight.header_links.help"), "https://library.gov.au/where-start/getting-started-catalogue", class: "nav-link" %>
+<%= link_to t("blacklight.header_links.help"), "https://www.library.gov.au/research/start-researching/get-started-catalogue", class: "nav-link" %>

app/views/static_pages/home.html.erb

@@ -45,7 +45,7 @@
 
   <p><%= t('blacklight.library_card.intro.p1') %></p>
   <p><%= t('blacklight.library_card.intro.p2') %></p>
-  <p><%= link_to t("blacklight.library_card.button"), "https://library.gov.au/research/join-library", class: "btn btn-secondary arrow-after" %></p>
+  <p><%= link_to t("blacklight.library_card.button"), "https://www.library.gov.au/research/join-library", class: "btn btn-secondary arrow-after" %></p>
 </div>
 </section>
 

config/catalogue.yml

@@ -4,7 +4,7 @@ development:
     search_url: "https://mapsearch.nla.gov.au/search/search?type=map&text="
 
   nla_shop_url: https://bookshop.nla.gov.au/api/jsonDetails.do
-  contact_us_url: https://www.nla.gov.au/using-library/getting-started/ask-librarian
+  contact_us_url: https://www.library.gov.au/services/ask-librarian
   staff_borrowing_url: https://my.nla.gov.au/our-people/staff-benefits/access-to-collections/staff-borrowing
   data_services_enquiry_form: https://ourweb.nla.gov.au/apps/jira/servicedesk/customer/portal/1/create/97
 
@@ -14,7 +14,7 @@ test:
     search_url: "https://mapsearch.nla.gov.au/search/search?type=map&text="
 
   nla_shop_url: https://bookshop.nla.gov.au/api/jsonDetails.do
-  contact_us_url: https://www.nla.gov.au/using-library/getting-started/ask-librarian
+  contact_us_url: https://www.library.gov.au/services/ask-librarian
   staff_borrowing_url: https://my.nla.gov.au/our-people/staff-benefits/access-to-collections/staff-borrowing
   data_services_enquiry_form: https://ourweb.nla.gov.au/apps/jira/servicedesk/customer/portal/1/create/97
 
@@ -24,7 +24,7 @@ staging:
     search_url: "https://mapsearch.nla.gov.au/search/search?type=map&text="
 
   nla_shop_url: https://bookshop.nla.gov.au/api/jsonDetails.do
-  contact_us_url: https://www.nla.gov.au/using-library/getting-started/ask-librarian
+  contact_us_url: https://www.library.gov.au/services/ask-librarian
   staff_borrowing_url: https://my.nla.gov.au/our-people/staff-benefits/access-to-collections/staff-borrowing
   data_services_enquiry_form: https://ourweb.nla.gov.au/apps/jira/servicedesk/customer/portal/1/create/97
 
@@ -34,6 +34,6 @@ production:
     search_url: "https://mapsearch.nla.gov.au/search/search?type=map&text="
 
   nla_shop_url: https://bookshop.nla.gov.au/api/jsonDetails.do
-  contact_us_url: https://www.nla.gov.au/using-library/getting-started/ask-librarian
+  contact_us_url: https://www.library.gov.au/services/ask-librarian
   staff_borrowing_url: https://my.nla.gov.au/our-people/staff-benefits/access-to-collections/staff-borrowing
   data_services_enquiry_form: https://ourweb.nla.gov.au/apps/jira/servicedesk/customer/portal/1/create/97

config/locales/en.yml

@@ -79,8 +79,8 @@ en:
     success:
       heading: "Request complete"
       message: "Thank you for your request. We will email you when it is being processed or if there are any issues with delivery. You can also track the status of your requests by visiting your <a href=\"%{request_summary_url}\">Request page</a>."
-      collection: 'Please bring your library card to collect this material. If you do not have a library card you will need to show proof of identity. Also check our collection <a href="https://library.gov.au/services/onsite-access/collection-delivery-service">delivery times</a> and <a href="https://library.gov.au/visit/opening-hours">opening hours</a>.'
-      scrr: 'To prepare for your visit, and find out more about use of and access to our special collections, view our Research Guide on <a href="https://library.gov.au/visit/reading-rooms/special-collections-reading-room">Using the Special Collections Reading Room</a>.'
+      collection: 'Please bring your library card to collect this material. If you do not have a library card you will need to show proof of identity. Also check our collection <a href="https://www.library.gov.au/services/onsite-access/collection-delivery-service">delivery times</a> and <a href="https://www.library.gov.au/visit/opening-hours">opening hours</a>.'
+      scrr: 'To prepare for your visit, and find out more about use of and access to our special collections, view our Research Guide on <a href="https://www.library.gov.au/visit/reading-rooms/special-collections-reading-room">Using the Special Collections Reading Room</a>.'
     errors:
       manuscripts:
         required: "Additional information is required to complete your request. Please provide information on either the Box Number, or Series Number or Folder/item Number that you are requesting."
@@ -151,7 +151,7 @@ en:
       sol: '<p>Your request limit has been reached. You are unable to make any further Staff Official Loan requests until you have returned some items. Please read the borrowing conditions for <a href="%{staff_borrowing}">Staff Official Loans</a>.</p><p>For assistance, please contact Data Systems via the <a href="%{enquiry_form}">Data Systems Enquiry Form</a>.</p>'
       spl: '<p>Your request limit has been reached. You are unable to make any further Staff Personal Loan requests until you have returned some items. The borrowing limit for Staff Personal Loans is two (2) items only. Please read the borrowing conditions for <a href="%{staff_borrowing}">Staff Personal Loans</a>.</p><p>For assistance, please contact Reading Room Operations on <a href="mailto:readingroomissues@nla.gov.au">readingroomissues@nla.gov.au</a></p>'
       tol: '<p>Your request limit has been reached. You are unable to make any further Team Official Loan requests until you have returned some items. Please read the borrowing conditions for <a href="%{staff_borrowing}">Team Official Loans</a>.</p><p>For assistance, please contact Data Systems via the <a href="%{enquiry_form}">Data Systems Enquiry Form</a>.</p>'
-      patron: '<p>Your request limit has been reached and you are unable to make any further requests until you have returned some items.</p><p>For further assistance please see desk staff in our reading rooms or <a href="%{url}">Ask a Librarian</a>.</p><p><a href="https://nla.gov.au">National Library of Australia</a></p>'
+      patron: '<p>Your request limit has been reached and you are unable to make any further requests until you have returned some items.</p><p>For further assistance please see desk staff in our reading rooms or <a href="%{url}">Ask a Librarian</a>.</p><p><a href="https://www.library.gov.au">National Library of Australia</a></p>'
   bento_search:
     search_error: "Sorry! An error occurred and results could not be retrieved."
   citation:
@@ -241,8 +241,8 @@ en:
     nla_shop: "Buy at our online shop"
   home:
     p1: "Search the Catalogue to find books, pictures, maps, oral history interviews, manuscripts and more. Some items can be viewed online but most can be requested to view at the Library."
-    p2: "If you need help then try our <a href=\"https://www.nla.gov.au/research-guides\">research guides</a>. They cover a variety of topics, and are where you'll find research advice, key resources and featured collection items."
-    p3: "Have a question? Take a look at our <a href=\"https://www.nla.gov.au/faq\">frequently asked questions</a> page. You can also <a href=\"https://www.nla.gov.au/using-library/getting-started/ask-librarian\">Ask a Librarian</a>."
+    p2: "If you need help then try our <a href=\"https://www.library.gov.au/research/research-guides\">research guides</a>. They cover a variety of topics, and are where you'll find research advice, key resources and featured collection items."
+    p3: "Have a question? You can also <a href=\"https://www.library.gov.au/services/ask-librarian\">Ask a Librarian</a>."
   feedback:
     title: "Feedback"
     report_error: "Report an error"