Skip to content

Commit

Permalink
adds noscript fallback and fixes rubocop complaints
Browse files Browse the repository at this point in the history
  • Loading branch information
sdellis committed Oct 1, 2018
1 parent 39519a4 commit 9ff3271
Show file tree
Hide file tree
Showing 6 changed files with 221 additions and 3 deletions.
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AllCops:
- 'vendor/**/*'
- 'bin/*'
- 'config/deploy.rb'
- 'node_modules/**/*'

Lint/UnusedBlockArgument:
Exclude:
Expand Down
1 change: 0 additions & 1 deletion app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ module ApplicationHelper
def site_sidebar?
can?(:manage, Spotlight::Site.instance) || can?(:create, Spotlight::Exhibit)
end

end
197 changes: 197 additions & 0 deletions app/views/shared/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,3 +1,200 @@
<footer class="lux">
<library-footer></library-footer>
</footer>
<noscript>
<footer class="l-footer row" role="contentinfo">
<div class="l-region l-region--footer pul-processed container">
<nav class="block block--menu block--menu-menu-find block--menu-menu-find col-sm-3" id="block-menu-menu-find">
<h2 class="block__title block__title"><a class="footer-link" href="http://library.princeton.edu/research">Research Tools</a></h2>
<ul class="menu">
<li class="first leaf">
<a class="footer-link" href=
"http://dss.princeton.edu">Data and Statistics</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/research/databases"
title="Browse Research Databases by Title or Subject">Databases</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"http://getit.princeton.edu/" title=
"Browse Electronic Journal Titles">E-journals</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/library-guides" title=
"Library Research Guides">Research Guides</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://catalog.princeton.edu" title=
"Access the library's main catalog">Main Catalog</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://pulsearch.princeton.edu" title=
"Access the library's new catalog">New Catalog</a>
</li>

<li class="leaf">
<a class="footer-link" href="http://library.princeton.edu/find/all">Search</a>
</li>

<li class="last leaf">
<a class="footer-link" href=
"https://library.princeton.edu/databases/subject/special-collections" title=
"Finding Aids for the Princeton University Archives and Special Collections">
Special Collections</a>
</li>
</ul>
</nav>

<nav class="block block--menu block--menu-menu-information-for block--menu-menu-information-for col-sm-3" id="block-menu-menu-information-for">
<h2 class="block__title block__title"><a class="footer-link"
href="http://library.princeton.edu/services">Library Services</a></h2>

<ul class="menu">
<li class="first leaf">
<a class="footer-link" href="https://library.princeton.edu/services/article-express"
title=
"Use our Interlibrary Loan and Article Express Services">
Article Express</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/borrowdirect">Borrow Direct</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/access/circulation-policies">Circulation</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/services/reserves">Course
Reserves</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/interlibrary-services" title=
"Interlibrary Loan Services, Article Express">Interlibrary
Loan (ILL)</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/access">Library Access</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/study-spaces">Study Spaces and Lockers</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/help/trace-materials" title="Trace an item not found on shelf">Trace a Book</a>
</li>

<li class="last leaf">
<a class="footer-link" href="https://library.princeton.edu/accounts">Your
Accounts</a>
</li>

</ul>
</nav>

<nav class="block block--menu block--menu-menu-about block--menu-menu-about col-sm-3" id="block-menu-menu-about">
<h2 class="block__title block__title"><a class="footer-link"
href="http://library.princeton.edu/about">About the Library</a></h2>

<ul class="menu">
<li class="first leaf">
<a class="footer-link" href=
"https://library.princeton.edu/collections-and-collection-development">Collections
and Collecting</a>
</li>

<li class="leaf">
<a class="footer-link" href=
"https://rbsc.princeton.edu/exhibitions">Exhibitions</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/about/locations">Library
Locations</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/alumni">For Alumni</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/staff">For Library
Staff</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/staff/directory">Staff
Directory</a>
</li>

<li class="leaf">
<a class="footer-link" href="https://library.princeton.edu/about/friends">Friends of
the Library</a>
</li>

<li class="last leaf">
<a class="footer-link" href=
"https://library.princeton.edu/services/technology/off-campus-access">Using the
Library Off-Campus</a>
</li>
</ul>
</nav>

<div class="block block--block block--block-1 block--block-1 col-sm-3" id="block-block-1">
<div class="block__content block__content">
<h2>Princeton University Library</h2>

<div class="footer--icons">
<a class="facebook-logo" href=
"https://www.facebook.com/PULibrary" title=
"Friend us on Facebook">
<%= image_tag 'facebook.png' %></a>
<a class="twitter-logo" href=
"https://twitter.com/PULibrary" title=
"Follow us on Twitter">
<%= image_tag 'twitter.png' %></a>
<a class="govdocs-logo" href=
"http://libguides.princeton.edu/govdocs" title=
"Government Documents Depository">
<%= image_tag 'govdocs.png' %></a>
<a class="friends-logo" href="http://library.princeton.edu/about/friends" title=
"Friends of the Library">
<%= image_tag 'friends.png' %></a>
</div>

<address>
One Washington Road<br>
Princeton, NJ 08544-2098 USA<br>
(609) 258-1470 Phone
</address>

<div class="pu">
<a class="pu-logo" href=
"https://www.princeton.edu" title="Princeton University">
<%= image_tag 'pu.png', width: '200' %></a>
</div>

<p class="footer--copyright">© <%= current_year %> The Trustees of
Princeton University. All rights reserved.</p>
</div>
</div>
</div>
<a href="#" class="back-to-top">Top</a>
</footer>
</noscript>
21 changes: 21 additions & 0 deletions app/views/shared/_header_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,24 @@
<% end %>
</library-header>
</header>
<noscript>
<header role="banner">
<div class="l-branding__pul">
<div class="container">
<div class="logo__pul col-xs-12 col-sm-6">
<a href="https://library.princeton.edu" title="Princeton University Library">
<%= image_tag("pul-logo-new.svg") %>
</a>
<% unless current_page?(root_path) %>
<%=link_to header_title, root_path, :class => "site-title" %>
<% end %>
</div>
<div class="pull-right menu--level-1 col-xs-12 col-sm-6">
<ul>
<%= render partial: '/user_util_links' %>
</ul>
</div>
</div>
</div>
</header>
</noscript>
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Rails.application.configure do
# Verifies that versions and hashed value of the package contents in the project's package.json
config.webpacker.check_yarn_integrity = true
config.webpacker.check_yarn_integrity = true

# Settings specified here will take precedence over those in config/application.rb.

Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Rails.application.configure do
# Verifies that versions and hashed value of the package contents in the project's package.json
config.webpacker.check_yarn_integrity = false
config.webpacker.check_yarn_integrity = false

# Settings specified here will take precedence over those in config/application.rb.

Expand Down

0 comments on commit 9ff3271

Please sign in to comment.