diff --git a/app/views/catalog/show.html.erb b/app/views/catalog/show.html.erb index 4f073c6a8d..e373fac92e 100644 --- a/app/views/catalog/show.html.erb +++ b/app/views/catalog/show.html.erb @@ -62,16 +62,12 @@ {target: '_blank'} ) %> <% end %> - <% elsif @pbcore.public? && !current_user.usa? %> - Please note: This content is currently not available at your location. - <% elsif @pbcore.protected? %> - Please note: This content is only available at WGBH and - the Library of Congress. For information about on location research, - click here. + <% elsif (@pbcore.public? && !current_user.usa?) || @pbcore.protected? %> + Please note: This content is currently not available at your location. If you are a scholar engaged in research, please contact us for more information. <% elsif @pbcore.private? %> - Please note: This content is only available at - the Library of Congress. For information about on location research, - click here. + Please note: This content is not currently available in the Online Reading Room. If you are a scholar engaged in research, please contact us for more information. + <% elsif !@pbcore.digitized? && !@pbcore.contributing_organization_objects.empty? %> + Please note: This content is not currently available in the Online Reading Room. If you are a scholar engaged in research, please contact us for more information. <% elsif !@pbcore.digitized? && !@pbcore.contributing_organization_objects.empty? %> This content has not been digitized. Please contact the contributing organization(s) listed below. <% elsif !@pbcore.digitized? && @pbcore.contributing_organization_objects.empty? %> diff --git a/spec/features/catalog_spec.rb b/spec/features/catalog_spec.rb index 58e0490a10..e6ef204219 100644 --- a/spec/features/catalog_spec.rb +++ b/spec/features/catalog_spec.rb @@ -424,7 +424,7 @@ def expect_all_the_text(fixture_name) visit '/catalog/cpb-aacip-80-12893j6c' # No need to click through expect_all_the_text('clean-bad-essence-track.xml') - expect(page).to have_text('This content has not been digitized.') + expect(page).to have_text('Please note: This content is not currently available in the Online Reading Room.') expect_no_media end @@ -459,7 +459,7 @@ def expect_all_the_text(fixture_name) visit 'catalog/cpb-aacip_111-21ghx7d6' ENV.delete('RAILS_TEST_IP_ADDRESS') expect_all_the_text('clean-exhibit.xml') - expect(page).to have_text('only available at WGBH and the Library of Congress. ') + expect(page).to have_text('Please note: This content is currently not available at your location.') expect_no_media end diff --git a/spec/support/link-check-ignore.txt b/spec/support/link-check-ignore.txt index 7ab2ac62d7..2861fb664e 100644 --- a/spec/support/link-check-ignore.txt +++ b/spec/support/link-check-ignore.txt @@ -221,4 +221,4 @@ http://www.nytimes.com/2012/12/25/us/alcatraz-american-indian-occupation-graffit https://www.imls.gov/ https://www.loc.gov/collections/civil-rights-history-project/?q=emmett+till http://digicoll.library.wisc.edu/cgi/f/findaid/findaid-idx?c=wiarchives;cc=wiarchives;q1=Carnegie%20Commission;rgn=main;view=text;didno=uw-whs-us0066af - +https://www.senate.gov/artandhistory/history/common/investigations/Watergate.htm