Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update show.html.erb to hint at LRA #1527

Merged
merged 2 commits into from Jul 25, 2018
Merged

Update show.html.erb to hint at LRA #1527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3465fdf
Update show.html.erb to hint at LRA
caseyedavis12 Jul 17, 2018
cdb36de
Fixes tests
jasoncorum Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions app/views/catalog/show.html.erb
View file
Open in desktop
Expand Up @@ -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,
<a href="/on-location">click here</a>.
<% 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 <a href="/contact-us">contact us</a> for more information.
<% elsif @pbcore.private? %>
Please note: This content is only available at
the Library of Congress. For information about on location research,
<a href="/on-location">click here</a>.
Please note: This content is not currently available in the Online Reading Room. If you are a scholar engaged in research, please <a href="/contact-us">contact us</a> 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 <a href="/contact-us">contact us</a> 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? %>
Expand Down
4 changes: 2 additions & 2 deletions spec/features/catalog_spec.rb
View file
Open in desktop
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion spec/support/link-check-ignore.txt
View file
Open in desktop
Expand Up @@ -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