From 9714ec7f0670ab1152768ccdae7b3b7a4353562f Mon Sep 17 00:00:00 2001 From: granta03 Date: Fri, 30 Jan 2026 09:27:45 -0500 Subject: [PATCH 1/4] initial commit, upgraded gems --- Gemfile | 4 ++-- Gemfile.lock | 31 +++++++++++++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 85b8fc3..5a2be46 100644 --- a/Gemfile +++ b/Gemfile @@ -5,8 +5,8 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby '3.4.1' -gem 'blacklight', '~> 7.38' -gem 'blacklight_oai_provider' +gem 'blacklight', '~> 8.12.3' +gem 'blacklight_oai_provider', github: 'projectblacklight/blacklight_oai_provider', ref: '69795b0' gem 'bootsnap', require: false gem 'bootstrap', '~> 4.0' gem 'bot_challenge_page', '~> 0.3.0' diff --git a/Gemfile.lock b/Gemfile.lock index da6e8de..dbd7a19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,13 @@ +GIT + remote: https://github.com/projectblacklight/blacklight_oai_provider.git + revision: 69795b06cc37150386b6d9732be027d200412598 + ref: 69795b0 + specs: + blacklight_oai_provider (7.0.2) + blacklight (>= 7.0, < 9) + oai (~> 1.2) + rexml + GEM remote: https://rubygems.org/ specs: @@ -91,21 +101,15 @@ GEM smart_properties bigdecimal (3.3.1) bindex (0.8.1) - blacklight (7.40.0) - deprecation + blacklight (8.12.3) globalid - hashdiff i18n (>= 1.7.0) jbuilder (~> 2.7) kaminari (>= 0.15) ostruct (>= 0.3.2) - rails (>= 6.1, < 7.3) - view_component (>= 2.74, < 4) + rails (>= 6.1, < 9) + view_component (>= 2.74, < 5) zeitwerk - blacklight_oai_provider (7.0.2) - blacklight (~> 7.0) - oai (~> 1.2) - rexml bootsnap (1.18.4) msgpack (~> 1.2) bootstrap (4.6.2.1) @@ -137,8 +141,6 @@ GEM rexml crass (1.0.6) date (3.5.1) - deprecation (1.1.0) - activesupport devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -275,10 +277,11 @@ GEM racc (~> 1.4) nokogiri (1.18.10-x86_64-linux-gnu) racc (~> 1.4) - oai (1.2.1) + oai (1.3.0) builder (>= 3.1.0) faraday (< 3) faraday-follow_redirects (>= 0.3.0, < 2) + rexml okcomputer (1.19.0) orm_adapter (0.5.0) ostruct (0.6.1) @@ -527,8 +530,8 @@ PLATFORMS x86_64-linux DEPENDENCIES - blacklight (~> 7.38) - blacklight_oai_provider + blacklight (~> 8.12.3) + blacklight_oai_provider! bootsnap bootstrap (~> 4.0) bot_challenge_page (~> 0.3.0) From e9276a7e8ec2bf3f469035ac81b7f0fd7fee7738 Mon Sep 17 00:00:00 2001 From: granta03 Date: Tue, 3 Feb 2026 09:09:16 -0500 Subject: [PATCH 2/4] upgrading bootstrap first, added to manifest to get site to load --- Gemfile | 2 +- Gemfile.lock | 9 +++++---- app/assets/config/manifest.js | 12 +++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 5a2be46..0d23045 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ ruby '3.4.1' gem 'blacklight', '~> 8.12.3' gem 'blacklight_oai_provider', github: 'projectblacklight/blacklight_oai_provider', ref: '69795b0' gem 'bootsnap', require: false -gem 'bootstrap', '~> 4.0' +gem 'bootstrap', '~> 5.1.3' gem 'bot_challenge_page', '~> 0.3.0' gem 'cancancan' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index dbd7a19..b12ecf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,9 +112,10 @@ GEM zeitwerk bootsnap (1.18.4) msgpack (~> 1.2) - bootstrap (4.6.2.1) + bootstrap (5.1.3) autoprefixer-rails (>= 9.1.0) - popper_js (>= 1.16.1, < 2) + popper_js (>= 2.9.3, < 3) + sassc-rails (>= 2.0.0) bot_challenge_page (0.3.0) http (~> 5.2) rack-attack (~> 6.7) @@ -289,7 +290,7 @@ GEM parser (3.3.10.0) ast (~> 2.4.1) racc - popper_js (1.16.1) + popper_js (2.11.8) pp (0.6.3) prettyprint prettyprint (0.2.0) @@ -533,7 +534,7 @@ DEPENDENCIES blacklight (~> 8.12.3) blacklight_oai_provider! bootsnap - bootstrap (~> 4.0) + bootstrap (~> 5.1.3) bot_challenge_page (~> 0.3.0) byebug cancancan diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 2261605..19c5f10 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -3,4 +3,14 @@ //= link_tree ../../javascript .js //= link_tree ../../../vendor/javascript .js -//= link application.js \ No newline at end of file +//= link application.js +//= link blacklight/bookmark_toggle.js +//= link blacklight/button_focus.js +//= link blacklight/checkbox_submit.js +//= link blacklight/core.js +//= link blacklight/debounce.js +//= link blacklight/facet_suggest.js +//= link blacklight/index.js +//= link blacklight/modal.js +//= link blacklight/modalForm.js +//= link blacklight/search_context.js \ No newline at end of file From 06db2b56d21288498dbd853d9c86753ea655f649 Mon Sep 17 00:00:00 2001 From: granta03 Date: Wed, 4 Feb 2026 11:08:35 -0500 Subject: [PATCH 3/4] fixing some formatting and css --- app/assets/stylesheets/custom.scss | 23 +++++++++++++++++++ .../errors/_error_contact_links.html.erb | 2 +- app/views/shared/_footer.html.erb | 10 ++++---- app/views/shared/_header_navbar.html.erb | 8 +++---- 4 files changed, 33 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/custom.scss b/app/assets/stylesheets/custom.scss index 717c1e8..4d9920f 100644 --- a/app/assets/stylesheets/custom.scss +++ b/app/assets/stylesheets/custom.scss @@ -18,6 +18,7 @@ $theme-colors: ( margin-left: 30px; padding-left: 1rem; padding-right: 0; + text-decoration: none; &:hover { text-decoration: none; @@ -45,3 +46,25 @@ $theme-colors: ( text-decoration: none; } } + +.container { + max-width: 1140px; +} + +a { + text-decoration: none; + + &:hover, + &:focus { + text-decoration: underline; + } +} + +.btn { + &:hover, + &:focus { + text-decoration: none; + } +} + + diff --git a/app/views/errors/_error_contact_links.html.erb b/app/views/errors/_error_contact_links.html.erb index f1c36bb..f539995 100644 --- a/app/views/errors/_error_contact_links.html.erb +++ b/app/views/errors/_error_contact_links.html.erb @@ -1,4 +1,4 @@ <%= link_to 'reporting this errors', I18n.t('libraries_help_link'), target: '_blank' %> - this link will open in a new tab + diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb index 1b073cc..2676a4d 100644 --- a/app/views/shared/_footer.html.erb +++ b/app/views/shared/_footer.html.erb @@ -1,9 +1,9 @@
- <%= link_to 'The University Libraries', 'https://libraries.psu.edu/', class: 'text-white pr-3', target: '_blank' %> link opens in a new tab - <%= link_to "#{current_partner.name}", EtdaUtilities::Hosts.workflow_url, class: 'text-white pr-3', target: '_blank' %> link opens in a new tab - <%= link_to "© #{Time.now.year} The Pennsylvania State University", 'http://www.psu.edu/copyright-information/', class: 'text-white pr-3', target: '_blank' %> link opens in a new tab - <%= link_to 'Accessibility', 'https://libraries.psu.edu/about/accessibility/request-accommodation-accessibility-help', class: 'text-white pr-3', target: '_blank' %> link opens in a new tab - <%= link_to 'Support', 'https://libraries.psu.edu/website-feedback', class: 'text-white pr-3', target: '_blank' %> link opens in a new tab + <%= link_to 'The University Libraries', 'https://libraries.psu.edu/', class: 'text-white pe-3', target: '_blank' %> + <%= link_to "#{current_partner.name}", EtdaUtilities::Hosts.workflow_url, class: 'text-white pe-3', target: '_blank' %> + <%= link_to "© #{Time.now.year} The Pennsylvania State University", 'http://www.psu.edu/copyright-information/', class: 'text-white pe-3', target: '_blank' %> + <%= link_to 'Accessibility', 'https://libraries.psu.edu/about/accessibility/request-accommodation-accessibility-help', class: 'text-white pe-3', target: '_blank' %> + <%= link_to 'Support', 'https://libraries.psu.edu/website-feedback', class: 'text-white pe-3', target: '_blank' %>
diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb index c7e4dda..887ed0f 100644 --- a/app/views/shared/_header_navbar.html.erb +++ b/app/views/shared/_header_navbar.html.erb @@ -1,12 +1,12 @@