From 7e142062bfd7067cb0d15745b4f9f08eb86ef794 Mon Sep 17 00:00:00 2001 From: Benjamin Armintor Date: Sat, 9 Sep 2023 23:11:39 -0400 Subject: [PATCH] update to shakapacker v7 (DLC-933) - add babel-plugin-transform-react-remove-prop-types to shakapacker - update selenium and bigdecimal, spec ruby-3.0.4 - use a fork of active-triples to permit ruby-3 - use bootsnap ~> 1.9.3 to avoid iseq bug -- https://github.com/Shopify/bootsnap/issues/378 --- .browserslistrc | 1 - .github/workflows/ci.yml | 2 +- .ruby-version | 2 +- Gemfile | 14 +- Gemfile.lock | 353 +- app/assets/config/manifest.js | 21 + .../images/dcv/audio-poster.png | Bin .../images/dcv/columbia_crown_outline.png | Bin .../dcv/columbia_university_libraries.png | Bin .../images/signature}/signature-banner.png | Bin .../images/signature}/signature.svg | 0 .../images/signature}/stripes-white-10.png | Bin .../stylesheets}/application.scss | 0 .../packs => assets/stylesheets}/base.css | 0 app/assets/stylesheets/carnegie.scss | 1 + app/assets/stylesheets/catalog.scss | 2 + app/assets/stylesheets/dcv.scss | 16 + app/assets/stylesheets/durst.scss | 1 + app/assets/stylesheets/empty.scss | 3 + app/assets/stylesheets/gallery-blue.scss | 4 + .../stylesheets/gallery-monochrome.scss | 4 + .../stylesheets/gallery-monochromeDark.scss | 4 + app/assets/stylesheets/ifp.scss | 1 + app/assets/stylesheets/iiif.scss | 27 + .../packs => assets/stylesheets}/jay.scss | 0 .../packs => assets/stylesheets}/lcaaj.scss | 0 .../packs => assets/stylesheets}/nyre.scss | 0 app/assets/stylesheets/portrait-blue.scss | 4 + .../stylesheets/portrait-monochrome.scss | 4 + .../stylesheets/portrait-monochromeDark.scss | 4 + app/assets/stylesheets/print.scss | 1 + app/assets/stylesheets/signature-blue.scss | 4 + .../stylesheets/signature-monochrome.scss | 4 + .../stylesheets/signature-monochromeDark.scss | 4 + app/assets/stylesheets/sites.scss | 1 + .../stylesheets/MarkerCluster.Default.css | 0 .../stylesheets/MarkerCluster.css | 0 .../stylesheets/_base_layout.scss | 9 +- .../stylesheets}/stylesheets/_blacklight.scss | 0 .../stylesheets/_bootstrap_layout.scss | 0 .../stylesheets}/stylesheets/_brand_font.scss | 0 .../stylesheets/_brand_topnav.scss | 0 .../stylesheets/base_layout/_carousel.scss | 0 .../stylesheets/base_layout/_page_images.scss | 0 .../stylesheets/base_layout/_utilities.scss | 0 .../stylesheets/blacklight/_overrides.scss | 0 .../stylesheets/carnegie/carnegie.scss | 0 .../stylesheets}/stylesheets/catalog/.keep | 0 .../stylesheets/catalog/digital_projects.scss | 0 .../stylesheets/catalog/site_banner.scss | 0 .../stylesheets}/stylesheets/dcv/dcv.css.scss | 0 .../stylesheets}/stylesheets/durst/durst.scss | 0 .../stylesheets}/stylesheets/gallery.css.scss | 0 .../stylesheets/gallery/_base.scss | 0 .../stylesheets/gallery/_fonts.scss | 1 - .../stylesheets/gallery/_squares.scss | 0 .../stylesheets}/stylesheets/ifp/ifp.css.scss | 0 .../stylesheets}/stylesheets/jay/.keep | 0 .../stylesheets}/stylesheets/lcaaj/.keep | 0 .../stylesheets}/stylesheets/nyre/.keep | 0 .../stylesheets/palettes/_base.scss | 0 .../stylesheets/palettes/_blue.scss | 0 .../stylesheets/palettes/_monochrome.scss | 0 .../stylesheets/palettes/_monochromeDark.scss | 0 .../stylesheets/palettes/base/_functions.scss | 0 .../stylesheets/palettes/base/_post.scss | 0 .../stylesheets/palettes/base/_variables.scss | 0 .../stylesheets/portrait/_base.scss | 0 .../stylesheets/portrait/_carousel.scss | 0 .../stylesheets/portrait/_fonts.scss | 1 - .../stylesheets}/stylesheets/print/print.scss | 0 .../stylesheets/shared/filesystem.scss | 0 .../stylesheets/shared/ia-thumbnails.scss | 0 .../stylesheets}/stylesheets/shared/map.scss | 0 .../stylesheets/shared/modals.scss | 0 .../stylesheets/shared/openseadragon.scss | 0 .../stylesheets/shared/search-modes.scss | 0 .../stylesheets/shared/shared.css | 0 .../stylesheets/shared/synchronizer.scss | 0 .../stylesheets/shared/videojs.scss | 0 .../stylesheets/signature/_base.scss | 0 .../stylesheets/signature/_fonts.scss | 1 - .../stylesheets}/stylesheets/sites/_edit.scss | 0 .../stylesheets/universityseminars/.keep | 0 .../stylesheets/welcome/welcome.scss | 0 .../packs => assets/stylesheets}/theme.css | 0 .../stylesheets}/universityseminars.scss | 0 app/assets/stylesheets/welcome.scss | 1 + .../button_panel/default_component.html.erb | 2 +- .../ui/mods_modal_display_component.rb | 2 +- .../dcv/catalog/pivot_facet_data_behavior.rb | 2 +- .../concerns/dcv/sites/configured_layouts.rb | 4 +- app/helpers/dcv/catalog_helper_behavior.rb | 2 +- app/helpers/dcv/cdn_helper.rb | 2 +- app/helpers/dcv/media_element_helper.rb | 2 +- app/javascript/{packs => }/application.js | 6 +- app/javascript/{packs => }/carnegie.js | 0 app/javascript/{packs => }/catalog.js | 0 app/javascript/{packs => }/dcv.js.erb | 11 +- app/javascript/{packs => }/durst.js | 2 +- app/javascript/gallery.js | 0 app/javascript/{packs => }/ifp.js | 6 +- app/javascript/{packs => }/iiif.js | 0 app/javascript/jay.js | 0 app/javascript/{packs => }/lcaaj.js | 0 app/javascript/nyre.js | 0 app/javascript/ohsynchronizer.js | 3 + app/javascript/packs/carnegie.scss | 1 - app/javascript/packs/catalog.scss | 2 - app/javascript/packs/dcv.scss | 16 - app/javascript/packs/durst.scss | 1 - app/javascript/packs/empty.scss | 3 - app/javascript/packs/gallery-blue.scss | 4 - app/javascript/packs/gallery-monochrome.scss | 4 - .../packs/gallery-monochromeDark.scss | 4 - app/javascript/packs/gallery.js | 1 - app/javascript/packs/ifp.scss | 1 - app/javascript/packs/iiif.scss | 12 - app/javascript/packs/jay.js | 1 - app/javascript/packs/nyre.js | 1 - app/javascript/packs/ohsynchronizer.js | 3 - app/javascript/packs/portrait-blue.scss | 4 - app/javascript/packs/portrait-monochrome.scss | 4 - .../packs/portrait-monochromeDark.scss | 4 - app/javascript/packs/print.scss | 1 - app/javascript/packs/signature-blue.scss | 4 - .../packs/signature-monochrome.scss | 4 - .../packs/signature-monochromeDark.scss | 4 - app/javascript/packs/sites.scss | 1 - app/javascript/packs/universityseminars.js | 1 - app/javascript/packs/welcome.js | 3 - app/javascript/packs/welcome.scss | 1 - app/javascript/{packs => }/portrait.js | 2 +- app/javascript/{packs => }/signature.js | 2 +- app/javascript/{packs => }/sites.js | 2 +- .../src/ohsynchronizer/videoJsControls.js | 3 +- app/javascript/src/welcome/welcome.js.erb | 50 +- app/javascript/universityseminars.js | 0 app/javascript/welcome.js | 3 + app/views/details/embed.html.erb | 2 +- app/views/layouts/details.html.erb | 2 +- app/views/layouts/empty.html.erb | 2 +- app/views/layouts/gallery.html.erb | 2 +- app/views/layouts/minimal.html.erb | 4 +- app/views/layouts/portrait.html.erb | 2 +- app/views/layouts/preview.html.erb | 2 +- app/views/layouts/signature.html.erb | 2 +- app/views/layouts/sites.html.erb | 2 +- app/views/layouts/welcome.html.erb | 4 +- app/views/shared/_head_includes.html.erb | 6 +- app/views/welcome/home.html.erb | 4 +- babel.config.js | 93 +- bin/shakapacker | 13 + bin/shakapacker-dev-server | 13 + bin/webpack | 18 - bin/webpack-dev-server | 18 - bin/yarn | 15 +- config/initializers/assets.rb | 3 + config/{webpacker.yml => shakapacker.yml} | 34 +- config/webpack/base.js | 34 + config/webpack/development.js | 4 +- config/webpack/environment.js | 34 - config/webpack/loaders/erb.js | 22 +- config/webpack/loaders/expose.js | 20 +- config/webpack/loaders/resolve-url.js | 37 +- config/webpack/loaders/workers.js | 16 +- config/webpack/production.js | 4 +- config/webpack/test.js | 4 +- config/webpack/webpack.config.js | 17 + lib/tasks/ci.rake | 2 +- package.json | 41 +- spec/rails_helper.rb | 2 +- yarn.lock | 7715 +++++------------ 173 files changed, 3019 insertions(+), 5860 deletions(-) delete mode 100644 .browserslistrc rename app/{javascript => assets}/images/dcv/audio-poster.png (100%) rename app/{javascript => assets}/images/dcv/columbia_crown_outline.png (100%) rename app/{javascript => assets}/images/dcv/columbia_university_libraries.png (100%) rename app/{javascript/assets/signature/images => assets/images/signature}/signature-banner.png (100%) rename app/{javascript/assets/signature/images => assets/images/signature}/signature.svg (100%) rename app/{javascript/assets/signature/images => assets/images/signature}/stripes-white-10.png (100%) rename app/{javascript/packs => assets/stylesheets}/application.scss (100%) rename app/{javascript/packs => assets/stylesheets}/base.css (100%) create mode 100644 app/assets/stylesheets/carnegie.scss create mode 100644 app/assets/stylesheets/catalog.scss create mode 100644 app/assets/stylesheets/dcv.scss create mode 100644 app/assets/stylesheets/durst.scss create mode 100644 app/assets/stylesheets/empty.scss create mode 100644 app/assets/stylesheets/gallery-blue.scss create mode 100644 app/assets/stylesheets/gallery-monochrome.scss create mode 100644 app/assets/stylesheets/gallery-monochromeDark.scss create mode 100644 app/assets/stylesheets/ifp.scss create mode 100644 app/assets/stylesheets/iiif.scss rename app/{javascript/packs => assets/stylesheets}/jay.scss (100%) rename app/{javascript/packs => assets/stylesheets}/lcaaj.scss (100%) rename app/{javascript/packs => assets/stylesheets}/nyre.scss (100%) create mode 100644 app/assets/stylesheets/portrait-blue.scss create mode 100644 app/assets/stylesheets/portrait-monochrome.scss create mode 100644 app/assets/stylesheets/portrait-monochromeDark.scss create mode 100644 app/assets/stylesheets/print.scss create mode 100644 app/assets/stylesheets/signature-blue.scss create mode 100644 app/assets/stylesheets/signature-monochrome.scss create mode 100644 app/assets/stylesheets/signature-monochromeDark.scss create mode 100644 app/assets/stylesheets/sites.scss rename app/{javascript => assets/stylesheets}/stylesheets/MarkerCluster.Default.css (100%) rename app/{javascript => assets/stylesheets}/stylesheets/MarkerCluster.css (100%) rename app/{javascript => assets/stylesheets}/stylesheets/_base_layout.scss (99%) rename app/{javascript => assets/stylesheets}/stylesheets/_blacklight.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/_bootstrap_layout.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/_brand_font.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/_brand_topnav.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/base_layout/_carousel.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/base_layout/_page_images.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/base_layout/_utilities.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/blacklight/_overrides.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/carnegie/carnegie.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/catalog/.keep (100%) rename app/{javascript => assets/stylesheets}/stylesheets/catalog/digital_projects.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/catalog/site_banner.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/dcv/dcv.css.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/durst/durst.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/gallery.css.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/gallery/_base.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/gallery/_fonts.scss (89%) rename app/{javascript => assets/stylesheets}/stylesheets/gallery/_squares.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/ifp/ifp.css.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/jay/.keep (100%) rename app/{javascript => assets/stylesheets}/stylesheets/lcaaj/.keep (100%) rename app/{javascript => assets/stylesheets}/stylesheets/nyre/.keep (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/_base.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/_blue.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/_monochrome.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/_monochromeDark.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/base/_functions.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/base/_post.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/palettes/base/_variables.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/portrait/_base.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/portrait/_carousel.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/portrait/_fonts.scss (89%) rename app/{javascript => assets/stylesheets}/stylesheets/print/print.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/filesystem.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/ia-thumbnails.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/map.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/modals.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/openseadragon.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/search-modes.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/shared.css (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/synchronizer.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/shared/videojs.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/signature/_base.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/signature/_fonts.scss (91%) rename app/{javascript => assets/stylesheets}/stylesheets/sites/_edit.scss (100%) rename app/{javascript => assets/stylesheets}/stylesheets/universityseminars/.keep (100%) rename app/{javascript => assets/stylesheets}/stylesheets/welcome/welcome.scss (100%) rename app/{javascript/packs => assets/stylesheets}/theme.css (100%) rename app/{javascript/packs => assets/stylesheets}/universityseminars.scss (100%) create mode 100644 app/assets/stylesheets/welcome.scss rename app/javascript/{packs => }/application.js (88%) rename app/javascript/{packs => }/carnegie.js (100%) rename app/javascript/{packs => }/catalog.js (100%) rename app/javascript/{packs => }/dcv.js.erb (79%) rename app/javascript/{packs => }/durst.js (51%) create mode 100644 app/javascript/gallery.js rename app/javascript/{packs => }/ifp.js (84%) rename app/javascript/{packs => }/iiif.js (100%) create mode 100644 app/javascript/jay.js rename app/javascript/{packs => }/lcaaj.js (100%) create mode 100644 app/javascript/nyre.js create mode 100644 app/javascript/ohsynchronizer.js delete mode 100644 app/javascript/packs/carnegie.scss delete mode 100644 app/javascript/packs/catalog.scss delete mode 100644 app/javascript/packs/dcv.scss delete mode 100644 app/javascript/packs/durst.scss delete mode 100644 app/javascript/packs/empty.scss delete mode 100644 app/javascript/packs/gallery-blue.scss delete mode 100644 app/javascript/packs/gallery-monochrome.scss delete mode 100644 app/javascript/packs/gallery-monochromeDark.scss delete mode 100644 app/javascript/packs/gallery.js delete mode 100644 app/javascript/packs/ifp.scss delete mode 100644 app/javascript/packs/iiif.scss delete mode 100644 app/javascript/packs/jay.js delete mode 100644 app/javascript/packs/nyre.js delete mode 100644 app/javascript/packs/ohsynchronizer.js delete mode 100644 app/javascript/packs/portrait-blue.scss delete mode 100644 app/javascript/packs/portrait-monochrome.scss delete mode 100644 app/javascript/packs/portrait-monochromeDark.scss delete mode 100644 app/javascript/packs/print.scss delete mode 100644 app/javascript/packs/signature-blue.scss delete mode 100644 app/javascript/packs/signature-monochrome.scss delete mode 100644 app/javascript/packs/signature-monochromeDark.scss delete mode 100644 app/javascript/packs/sites.scss delete mode 100644 app/javascript/packs/universityseminars.js delete mode 100644 app/javascript/packs/welcome.js delete mode 100644 app/javascript/packs/welcome.scss rename app/javascript/{packs => }/portrait.js (93%) rename app/javascript/{packs => }/signature.js (93%) rename app/javascript/{packs => }/sites.js (95%) create mode 100644 app/javascript/universityseminars.js create mode 100644 app/javascript/welcome.js create mode 100755 bin/shakapacker create mode 100755 bin/shakapacker-dev-server delete mode 100755 bin/webpack delete mode 100755 bin/webpack-dev-server rename config/{webpacker.yml => shakapacker.yml} (69%) create mode 100644 config/webpack/base.js delete mode 100644 config/webpack/environment.js create mode 100644 config/webpack/webpack.config.js diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index e94f8140c..000000000 --- a/.browserslistrc +++ /dev/null @@ -1 +0,0 @@ -defaults diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c6d6180b..2e3a6b89c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['2.7.8'] + ruby-version: ['3.0.4'] node: ['14', '16'] env: RAILS_ENV: test diff --git a/.ruby-version b/.ruby-version index 849c0c47f..79bc2c7a9 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.7.5 +ruby-3.0.4 diff --git a/Gemfile b/Gemfile index 525d555eb..b61b62808 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,12 @@ source 'https://rubygems.org' -gem 'bigdecimal', '~>1.4.4' +gem 'bigdecimal', '~>3.0' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 6.1.0' -gem 'webpacker', '~> 5.2' -gem 'bootsnap' +gem 'shakapacker', '~> 7.0.0' +gem 'sassc' +gem 'font-awesome-sass' +gem 'bootsnap', '~> 1.9.3' gem 'actionpack-action_caching' # Hydra stack gem 'nokogiri', '~> 1.15.2' # update past 1.10 requires alma @@ -22,7 +24,7 @@ gem 'rubydora' gem 'cul_omniauth', '~> 0.7.0' gem 'cancancan' #gem 'cul_omniauth', git: 'https://github.com/cul/cul_omniauth', branch: '0.5.x' -gem 'active-triples', '~> 0.4.0' +gem 'active-triples', git: 'https://github.com/cul/ActiveTriples', branch: 'deprecation_update' # Use wowza token gem for generating tokens gem 'wowza-secure_token', '0.0.1' @@ -99,9 +101,7 @@ group :development, :test do gem 'rspec-json_expectations' gem 'capybara', '~> 3.32' # For testing with chromedriver for headless-browser JavaScript testing - gem 'selenium-webdriver', '~> 3.142' - # For automatically updating chromedriver - gem 'webdrivers', '~> 4.0', require: false + gem 'selenium-webdriver', '~> 4.11.0' gem 'database_cleaner' gem 'factory_bot_rails' gem 'jettywrapper', '>=2.0.5', git: 'https://github.com/samvera-deprecated/jettywrapper.git', branch: 'master' diff --git a/Gemfile.lock b/Gemfile.lock index 54dad71f8..468612184 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +GIT + remote: https://github.com/cul/ActiveTriples + revision: 252fd1b72ac1b5c5a54869554c088d637f5f9e94 + branch: deprecation_update + specs: + active-triples (0.4.2.dev) + activemodel (>= 3.0.0) + activesupport (>= 3.0.0) + deprecation (~> 1.1.0) + rdf (~> 1.1) + rdf-vocab (~> 0.8) + GIT remote: https://github.com/samvera-deprecated/jettywrapper.git revision: 6b03c21726a83dcecf09d9b20683bfcd63f106d1 @@ -12,42 +24,42 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (>= 2.7.1) - actionmailer (6.1.7.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) actionpack-action_caching (1.2.2) actionpack (>= 4.0.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) nokogiri (>= 1.8.5) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -61,40 +73,34 @@ GEM rdf-rdfxml (~> 1.1) rsolr (>= 1.0.11, < 3) rubydora (>= 1.8.0, < 3) - active-triples (0.4.1) - activemodel (>= 3.0.0) - activesupport (>= 3.0.0) - deprecation (~> 0.1) - rdf (~> 1.1) - rdf-vocab (~> 0.8) - activejob (6.1.7.2) - activesupport (= 6.1.7.2) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.2) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - airbrussh (1.4.0) + addressable (2.8.5) + public_suffix (>= 2.0.2, < 6.0) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) - bcrypt (3.1.16) - bigdecimal (1.4.4) + bcrypt (3.1.19) + bigdecimal (3.1.4) blacklight (7.33.1) deprecation globalid @@ -105,10 +111,10 @@ GEM ostruct (>= 0.3.2) rails (>= 5.1, < 7.1) view_component (~> 2.66) - bootsnap (1.9.1) + bootsnap (1.9.4) msgpack (~> 1.0) builder (3.2.4) - cancancan (3.4.0) + cancancan (3.5.0) capistrano (3.5.0) airbrussh (>= 1.0.0) capistrano-harrow @@ -120,13 +126,13 @@ GEM capistrano-harrow (0.5.3) capistrano-passenger (0.2.1) capistrano (~> 3.0) - capistrano-rails (1.6.1) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capybara (3.36.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -135,12 +141,12 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) - carrierwave (1.3.2) + carrierwave (1.3.3) activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - ssrf_filter (~> 1.0) - childprocess (3.0.0) + ssrf_filter (~> 1.0, < 1.1.0) + childprocess (4.1.0) coderay (1.1.3) coffee-rails (5.0.0) coffee-script (>= 2.2.0) @@ -149,7 +155,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) crass (1.0.6) cul_omniauth (0.7.0) cancancan (~> 3.0) @@ -157,16 +163,16 @@ GEM omniauth-cas rails (~> 6.0) daemons (1.4.1) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.3) - deprecation (0.99.0) + deprecation (1.1.0) activesupport - devise (4.8.0) + devise (4.9.2) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -180,19 +186,21 @@ GEM equivalent-xml (0.6.0) nokogiri (>= 1.4.3) erubi (1.12.0) - execjs (2.8.1) + execjs (2.9.0) factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (2.6.0) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (3.0.0) + faraday-net_http (3.0.2) ffi (1.15.5) - globalid (1.1.0) - activesupport (>= 5.0) + font-awesome-sass (6.4.2) + sassc (~> 2.0) + globalid (1.2.1) + activesupport (>= 6.1) haml (5.2.2) temple (>= 0.8.0) tilt @@ -204,7 +212,7 @@ GEM http-accept (1.7.0) http-cookie (1.0.5) domain_name (~> 0.5) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) jbuilder (2.11.5) actionview (>= 5.0.0) @@ -222,12 +230,12 @@ GEM kaminari-core (= 1.2.2) kaminari-core (1.2.2) link_header (0.0.8) - listen (3.7.1) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) + nokogiri (>= 1.12.0) mail (2.8.1) mini_mime (>= 0.1.1) net-imap @@ -236,33 +244,33 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2022.0105) - mini_mime (1.1.2) - mini_portile2 (2.8.2) - minitest (5.17.0) - mono_logger (1.1.1) - msgpack (1.4.2) + mime-types-data (3.2023.0808) + mini_mime (1.1.5) + mini_portile2 (2.8.4) + minitest (5.20.0) + mono_logger (1.1.2) + msgpack (1.7.2) multi_json (1.15.0) - mustermann (1.1.1) + mustermann (3.0.0) ruby2_keywords (~> 0.0.1) mysql2 (0.5.2) - net-imap (0.3.4) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) net-protocol net-protocol (0.2.1) timeout - net-scp (3.0.0) - net-ssh (>= 2.6.5, < 7.0.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (6.1.0) + net-ssh (7.2.0) netrc (0.11.0) - nio4r (2.5.8) - nokogiri (1.15.2) + nio4r (2.5.9) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) nom-xml (1.2.0) @@ -282,48 +290,53 @@ GEM omniauth (~> 1.2) orm_adapter (0.5.0) ostruct (0.5.5) - parallel (1.21.0) - parser (3.0.2.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc powerpack (0.1.3) - public_suffix (4.0.6) - puma (5.5.2) + psych (5.1.0) + stringio + public_suffix (5.0.3) + puma (5.6.7) nio4r (~> 2.0) - racc (1.6.2) - rack (2.2.6.2) - rack-protection (2.1.0) + racc (1.7.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + rack-proxy (0.7.7) rack - rack-proxy (0.7.0) - rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) bundler (>= 1.15.0) - railties (= 6.1.7.2) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.5.0) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source rake (>= 12.2) thor (~> 1.0) - rainbow (3.0.0) + rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) @@ -347,15 +360,16 @@ GEM rdf (~> 1.1, >= 1.1.10) rdf-xsd (1.99.0) rdf (~> 1.99) - rdoc (6.3.2) - redcarpet (3.5.1) + rdoc (6.5.0) + psych (>= 4.0.0) + redcarpet (3.6.0) redis (3.3.5) - redis-namespace (1.8.1) + redis-namespace (1.8.2) redis (>= 3.0.4) - regexp_parser (2.1.1) - responders (3.0.1) - actionpack (>= 5.0) - railties (>= 5.0) + regexp_parser (2.8.1) + responders (3.1.0) + actionpack (>= 5.2) + railties (>= 5.2) resque (1.26.0) mono_logger (~> 1.0) multi_json (~> 1.0) @@ -368,28 +382,28 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) retriable (2.1.0) - rexml (3.2.5) + rexml (3.2.6) rsolr (2.5.0) builder (>= 2.1.2) faraday (>= 0.9, < 3, != 2.0.0) - rspec-core (3.12.1) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-json_expectations (2.2.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rubocop (0.53.0) parallel (~> 1.10) parser (>= 2.5) @@ -402,9 +416,9 @@ GEM rubocop (~> 0.53) rubocop-rspec (1.26.0) rubocop (>= 0.53.0) - ruby-progressbar (1.11.0) + ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - rubydora (2.1.0) + rubydora (2.2.0) activemodel (>= 4.2.10) activesupport deprecation @@ -414,16 +428,24 @@ GEM nokogiri rest-client rubyzip (1.3.0) - sdoc (2.2.0) + sassc (2.4.0) + ffi (~> 1.9) + sdoc (2.6.1) rdoc (>= 5.0) - selenium-webdriver (3.142.7) - childprocess (>= 0.5, < 4.0) - rubyzip (>= 1.2.2) + selenium-webdriver (4.11.0) + rexml (~> 3.2, >= 3.2.5) + rubyzip (>= 1.2.2, < 3.0) + websocket (~> 1.0) semantic_range (3.0.0) - sinatra (2.1.0) - mustermann (~> 1.0) - rack (~> 2.2) - rack-protection (= 2.1.0) + shakapacker (7.0.3) + activesupport (>= 5.2) + rack-proxy (>= 0.6.1) + railties (>= 5.2) + semantic_range (>= 2.3.0) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) tilt (~> 2.0) solr_wrapper (2.2.0) faraday @@ -436,23 +458,25 @@ GEM nokogiri stomp xml-simple - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.4.4) - sshkit (1.21.2) + sqlite3 (1.6.5) + mini_portile2 (~> 2.8.0) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - ssrf_filter (1.0.7) + ssrf_filter (1.0.8) stomp (1.4.10) - temple (0.8.2) - thor (1.2.1) - tilt (2.0.11) - timeout (0.3.1) + stringio (3.0.8) + temple (0.10.2) + thor (1.2.2) + tilt (2.2.0) + timeout (0.4.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.0.15) @@ -470,16 +494,8 @@ GEM method_source (~> 1.0) warden (1.2.9) rack (>= 2.0.9) - webdrivers (4.7.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (> 3.141, < 5.0) - webpacker (5.4.3) - activesupport (>= 5.2) - rack-proxy (>= 0.6.1) - railties (>= 5.2) - semantic_range (>= 2.3.0) - websocket-driver (0.7.5) + websocket (1.2.9) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) wowza-secure_token (0.0.1) @@ -487,7 +503,7 @@ GEM rexml xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.7) + zeitwerk (2.6.11) PLATFORMS ruby @@ -495,11 +511,11 @@ PLATFORMS DEPENDENCIES actionpack-action_caching active-fedora (~> 8.7) - active-triples (~> 0.4.0) + active-triples! addressable (~> 2.8.0) - bigdecimal (~> 1.4.4) + bigdecimal (~> 3.0) blacklight (~> 7.33.1) - bootsnap + bootsnap (~> 1.9.3) cancancan capistrano (~> 3.5.0) capistrano-bundler (~> 1.1) @@ -515,6 +531,7 @@ DEPENDENCIES devise devise-guests (~> 0.3) factory_bot_rails + font-awesome-sass jbuilder jettywrapper (>= 2.0.5)! listen @@ -539,15 +556,15 @@ DEPENDENCIES rubocop-rspec (>= 1.20.1) rubydora rubyzip (>= 1.2.1) + sassc sdoc - selenium-webdriver (~> 3.142) + selenium-webdriver (~> 4.11.0) + shakapacker (~> 7.0.0) solr_wrapper (~> 2.0) sqlite3 (~> 1.4) uglifier (>= 1.3.0) view_component (~> 2.82.0) - webdrivers (~> 4.0) - webpacker (~> 5.2) wowza-secure_token (= 0.0.1) BUNDLED WITH - 2.3.9 + 2.3.25 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index ef63c4bb5..289fac3ad 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,2 +1,23 @@ //= link_tree ../images //= link_tree ../audio +//= link application.css +//= link dcv.css +//= link iiif.css +//= link gallery-blue.css +//= link gallery-monochrome.css +//= link gallery-monochromeDark.css +//= link portrait-blue.css +//= link portrait-monochrome.css +//= link portrait-monochromeDark.css +//= link signature-blue.css +//= link signature-monochrome.css +//= link signature-monochromeDark.css +//= link carnegie.css +//= link catalog.css +//= link durst.css +//= link ifp.css +//= link jay.css +//= link lcaaj.css +//= link nyre.css +//= link sites.css +//= link universityseminars.css diff --git a/app/javascript/images/dcv/audio-poster.png b/app/assets/images/dcv/audio-poster.png similarity index 100% rename from app/javascript/images/dcv/audio-poster.png rename to app/assets/images/dcv/audio-poster.png diff --git a/app/javascript/images/dcv/columbia_crown_outline.png b/app/assets/images/dcv/columbia_crown_outline.png similarity index 100% rename from app/javascript/images/dcv/columbia_crown_outline.png rename to app/assets/images/dcv/columbia_crown_outline.png diff --git a/app/javascript/images/dcv/columbia_university_libraries.png b/app/assets/images/dcv/columbia_university_libraries.png similarity index 100% rename from app/javascript/images/dcv/columbia_university_libraries.png rename to app/assets/images/dcv/columbia_university_libraries.png diff --git a/app/javascript/assets/signature/images/signature-banner.png b/app/assets/images/signature/signature-banner.png similarity index 100% rename from app/javascript/assets/signature/images/signature-banner.png rename to app/assets/images/signature/signature-banner.png diff --git a/app/javascript/assets/signature/images/signature.svg b/app/assets/images/signature/signature.svg similarity index 100% rename from app/javascript/assets/signature/images/signature.svg rename to app/assets/images/signature/signature.svg diff --git a/app/javascript/assets/signature/images/stripes-white-10.png b/app/assets/images/signature/stripes-white-10.png similarity index 100% rename from app/javascript/assets/signature/images/stripes-white-10.png rename to app/assets/images/signature/stripes-white-10.png diff --git a/app/javascript/packs/application.scss b/app/assets/stylesheets/application.scss similarity index 100% rename from app/javascript/packs/application.scss rename to app/assets/stylesheets/application.scss diff --git a/app/javascript/packs/base.css b/app/assets/stylesheets/base.css similarity index 100% rename from app/javascript/packs/base.css rename to app/assets/stylesheets/base.css diff --git a/app/assets/stylesheets/carnegie.scss b/app/assets/stylesheets/carnegie.scss new file mode 100644 index 000000000..beb74a4c2 --- /dev/null +++ b/app/assets/stylesheets/carnegie.scss @@ -0,0 +1 @@ +@import './stylesheets/carnegie/carnegie'; diff --git a/app/assets/stylesheets/catalog.scss b/app/assets/stylesheets/catalog.scss new file mode 100644 index 000000000..9b8fb011e --- /dev/null +++ b/app/assets/stylesheets/catalog.scss @@ -0,0 +1,2 @@ + @import './stylesheets/catalog/digital_projects'; + @import './stylesheets/catalog/site_banner'; diff --git a/app/assets/stylesheets/dcv.scss b/app/assets/stylesheets/dcv.scss new file mode 100644 index 000000000..a53baad27 --- /dev/null +++ b/app/assets/stylesheets/dcv.scss @@ -0,0 +1,16 @@ +//@import 'jquery-ui/themes/base/base'; +@import 'jquery-ui/themes/base/theme'; +@import 'jquery-ui/themes/base/all'; +@import 'jquery-ui/themes/base/accordion'; +@import 'leaflet/dist/leaflet'; +@import './stylesheets/MarkerCluster'; +@import './stylesheets/MarkerCluster.Default'; +@import './stylesheets/shared/filesystem'; +@import './stylesheets/shared/ia-thumbnails'; +@import './stylesheets/shared/map'; +@import './stylesheets/shared/modals'; +@import './stylesheets/shared/openseadragon'; +@import './stylesheets/shared/search-modes'; +@import './stylesheets/shared/shared'; +@import './stylesheets/shared/synchronizer'; +@import './stylesheets/shared/videojs'; diff --git a/app/assets/stylesheets/durst.scss b/app/assets/stylesheets/durst.scss new file mode 100644 index 000000000..5285f5738 --- /dev/null +++ b/app/assets/stylesheets/durst.scss @@ -0,0 +1 @@ + @import './stylesheets/durst/durst'; diff --git a/app/assets/stylesheets/empty.scss b/app/assets/stylesheets/empty.scss new file mode 100644 index 000000000..d99642967 --- /dev/null +++ b/app/assets/stylesheets/empty.scss @@ -0,0 +1,3 @@ +@import './stylesheets/palettes/monochrome'; +@import './stylesheets/gallery/fonts'; +@import './stylesheets/base_layout'; diff --git a/app/assets/stylesheets/gallery-blue.scss b/app/assets/stylesheets/gallery-blue.scss new file mode 100644 index 000000000..955e95363 --- /dev/null +++ b/app/assets/stylesheets/gallery-blue.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/blue'; +@import './stylesheets/gallery/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/gallery-monochrome.scss b/app/assets/stylesheets/gallery-monochrome.scss new file mode 100644 index 000000000..17189c580 --- /dev/null +++ b/app/assets/stylesheets/gallery-monochrome.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochrome'; +@import './stylesheets/gallery/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/gallery-monochromeDark.scss b/app/assets/stylesheets/gallery-monochromeDark.scss new file mode 100644 index 000000000..9e8749cdc --- /dev/null +++ b/app/assets/stylesheets/gallery-monochromeDark.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochromeDark'; +@import './stylesheets/gallery/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/ifp.scss b/app/assets/stylesheets/ifp.scss new file mode 100644 index 000000000..99053b29d --- /dev/null +++ b/app/assets/stylesheets/ifp.scss @@ -0,0 +1 @@ +@import "./stylesheets/ifp/ifp.css.scss"; \ No newline at end of file diff --git a/app/assets/stylesheets/iiif.scss b/app/assets/stylesheets/iiif.scss new file mode 100644 index 000000000..9f9621b53 --- /dev/null +++ b/app/assets/stylesheets/iiif.scss @@ -0,0 +1,27 @@ +@import "@archival-iiif/viewer-react/dist/css/App.css"; +@import "@archival-iiif/viewer-react/dist/css/modal.css"; +@import "@archival-iiif/viewer-react/dist/treeView/treeview.css"; +@import "@archival-iiif/viewer-react/dist/folder/item.css"; +@import "@archival-iiif/viewer-react/dist/splitter/splitter.css"; +@import "@archival-iiif/viewer-react/dist/infoBar/tabs/search.css"; +@import "@archival-iiif/viewer-react/dist/infoBar/tabs/download.css"; +@import "@archival-iiif/viewer-react/dist/infoBar/tabs/share.css"; +@import "@archival-iiif/viewer-react/dist/infoBar/infoBar.css"; +@import "@archival-iiif/viewer-react/dist/viewer/image/openSeadragon.css"; +@import "@archival-iiif/viewer-react/dist/viewer/image/imageButtons.css"; +@import "@archival-iiif/viewer-react/dist/viewer/spinner.css"; +@import "@archival-iiif/viewer-react/dist/viewer/viewer.css"; +@import "@archival-iiif/viewer-react/dist/viewer/media/media-player.css"; +@import "@archival-iiif/viewer-react/dist/viewer/media/vjsForest.css"; +@import "@archival-iiif/viewer-react/dist/viewer/media/transcription.css"; +@import "@archival-iiif/viewer-react/dist/topBar/fullscreen.css"; +@import "@archival-iiif/viewer-react/dist/topBar/topbar.css"; +#mirador { + height: 80vh; +} + +.aiiif-root { + p { + margin-top: initial; + } +} \ No newline at end of file diff --git a/app/javascript/packs/jay.scss b/app/assets/stylesheets/jay.scss similarity index 100% rename from app/javascript/packs/jay.scss rename to app/assets/stylesheets/jay.scss diff --git a/app/javascript/packs/lcaaj.scss b/app/assets/stylesheets/lcaaj.scss similarity index 100% rename from app/javascript/packs/lcaaj.scss rename to app/assets/stylesheets/lcaaj.scss diff --git a/app/javascript/packs/nyre.scss b/app/assets/stylesheets/nyre.scss similarity index 100% rename from app/javascript/packs/nyre.scss rename to app/assets/stylesheets/nyre.scss diff --git a/app/assets/stylesheets/portrait-blue.scss b/app/assets/stylesheets/portrait-blue.scss new file mode 100644 index 000000000..586b5ef0e --- /dev/null +++ b/app/assets/stylesheets/portrait-blue.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/blue'; +@import './stylesheets/portrait/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/portrait/base'; diff --git a/app/assets/stylesheets/portrait-monochrome.scss b/app/assets/stylesheets/portrait-monochrome.scss new file mode 100644 index 000000000..7b773dbfe --- /dev/null +++ b/app/assets/stylesheets/portrait-monochrome.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochrome'; +@import './stylesheets/portrait/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/portrait/base'; diff --git a/app/assets/stylesheets/portrait-monochromeDark.scss b/app/assets/stylesheets/portrait-monochromeDark.scss new file mode 100644 index 000000000..4e57391b8 --- /dev/null +++ b/app/assets/stylesheets/portrait-monochromeDark.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochromeDark'; +@import './stylesheets/portrait/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/portrait/base'; diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss new file mode 100644 index 000000000..0aac31e3b --- /dev/null +++ b/app/assets/stylesheets/print.scss @@ -0,0 +1 @@ +@import './stylesheets/print/print'; diff --git a/app/assets/stylesheets/signature-blue.scss b/app/assets/stylesheets/signature-blue.scss new file mode 100644 index 000000000..402c8094b --- /dev/null +++ b/app/assets/stylesheets/signature-blue.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/blue'; +@import './stylesheets/signature/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/signature/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/signature-monochrome.scss b/app/assets/stylesheets/signature-monochrome.scss new file mode 100644 index 000000000..c9a40b97c --- /dev/null +++ b/app/assets/stylesheets/signature-monochrome.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochrome'; +@import './stylesheets/signature/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/signature/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/signature-monochromeDark.scss b/app/assets/stylesheets/signature-monochromeDark.scss new file mode 100644 index 000000000..38cb10a06 --- /dev/null +++ b/app/assets/stylesheets/signature-monochromeDark.scss @@ -0,0 +1,4 @@ +@import './stylesheets/palettes/monochromeDark'; +@import './stylesheets/signature/fonts'; +@import './stylesheets/base_layout'; +@import './stylesheets/signature/base'; \ No newline at end of file diff --git a/app/assets/stylesheets/sites.scss b/app/assets/stylesheets/sites.scss new file mode 100644 index 000000000..f616936be --- /dev/null +++ b/app/assets/stylesheets/sites.scss @@ -0,0 +1 @@ +@import './stylesheets/sites/edit'; diff --git a/app/javascript/stylesheets/MarkerCluster.Default.css b/app/assets/stylesheets/stylesheets/MarkerCluster.Default.css similarity index 100% rename from app/javascript/stylesheets/MarkerCluster.Default.css rename to app/assets/stylesheets/stylesheets/MarkerCluster.Default.css diff --git a/app/javascript/stylesheets/MarkerCluster.css b/app/assets/stylesheets/stylesheets/MarkerCluster.css similarity index 100% rename from app/javascript/stylesheets/MarkerCluster.css rename to app/assets/stylesheets/stylesheets/MarkerCluster.css diff --git a/app/javascript/stylesheets/_base_layout.scss b/app/assets/stylesheets/stylesheets/_base_layout.scss similarity index 99% rename from app/javascript/stylesheets/_base_layout.scss rename to app/assets/stylesheets/stylesheets/_base_layout.scss index 2e75d4368..a48f09f03 100644 --- a/app/javascript/stylesheets/_base_layout.scss +++ b/app/assets/stylesheets/stylesheets/_base_layout.scss @@ -1,13 +1,11 @@ -$fa-font-path: "~font-awesome/fonts"; -@import 'font-awesome/scss/font-awesome'; +@import "font-awesome"; @import './bootstrap_layout'; @import './blacklight'; @import './brand_topnav'; @import './base_layout/page_images'; @import './base_layout/utilities'; @import './base_layout/carousel'; - //fonts -$font_glyphs: FontAwesome; +@import 'video.js/dist/video-js.css'; /* mixin for multiline */ @mixin multiLineEllipsis($lineHeight: 1.2em, $lineCount: 1, $bgColor: white){ @@ -759,9 +757,8 @@ h2[itemprop="name"] { padding-right: 3px; margin-left: -5px; font-size: .7em; - font-family: $font_glyphs; color: map-get($theme-border-colors, 'body'); - content: "\f105"; + @extend .fa, .fa-angle-right; } &:last-child .facet-label { padding-bottom: 0; diff --git a/app/javascript/stylesheets/_blacklight.scss b/app/assets/stylesheets/stylesheets/_blacklight.scss similarity index 100% rename from app/javascript/stylesheets/_blacklight.scss rename to app/assets/stylesheets/stylesheets/_blacklight.scss diff --git a/app/javascript/stylesheets/_bootstrap_layout.scss b/app/assets/stylesheets/stylesheets/_bootstrap_layout.scss similarity index 100% rename from app/javascript/stylesheets/_bootstrap_layout.scss rename to app/assets/stylesheets/stylesheets/_bootstrap_layout.scss diff --git a/app/javascript/stylesheets/_brand_font.scss b/app/assets/stylesheets/stylesheets/_brand_font.scss similarity index 100% rename from app/javascript/stylesheets/_brand_font.scss rename to app/assets/stylesheets/stylesheets/_brand_font.scss diff --git a/app/javascript/stylesheets/_brand_topnav.scss b/app/assets/stylesheets/stylesheets/_brand_topnav.scss similarity index 100% rename from app/javascript/stylesheets/_brand_topnav.scss rename to app/assets/stylesheets/stylesheets/_brand_topnav.scss diff --git a/app/javascript/stylesheets/base_layout/_carousel.scss b/app/assets/stylesheets/stylesheets/base_layout/_carousel.scss similarity index 100% rename from app/javascript/stylesheets/base_layout/_carousel.scss rename to app/assets/stylesheets/stylesheets/base_layout/_carousel.scss diff --git a/app/javascript/stylesheets/base_layout/_page_images.scss b/app/assets/stylesheets/stylesheets/base_layout/_page_images.scss similarity index 100% rename from app/javascript/stylesheets/base_layout/_page_images.scss rename to app/assets/stylesheets/stylesheets/base_layout/_page_images.scss diff --git a/app/javascript/stylesheets/base_layout/_utilities.scss b/app/assets/stylesheets/stylesheets/base_layout/_utilities.scss similarity index 100% rename from app/javascript/stylesheets/base_layout/_utilities.scss rename to app/assets/stylesheets/stylesheets/base_layout/_utilities.scss diff --git a/app/javascript/stylesheets/blacklight/_overrides.scss b/app/assets/stylesheets/stylesheets/blacklight/_overrides.scss similarity index 100% rename from app/javascript/stylesheets/blacklight/_overrides.scss rename to app/assets/stylesheets/stylesheets/blacklight/_overrides.scss diff --git a/app/javascript/stylesheets/carnegie/carnegie.scss b/app/assets/stylesheets/stylesheets/carnegie/carnegie.scss similarity index 100% rename from app/javascript/stylesheets/carnegie/carnegie.scss rename to app/assets/stylesheets/stylesheets/carnegie/carnegie.scss diff --git a/app/javascript/stylesheets/catalog/.keep b/app/assets/stylesheets/stylesheets/catalog/.keep similarity index 100% rename from app/javascript/stylesheets/catalog/.keep rename to app/assets/stylesheets/stylesheets/catalog/.keep diff --git a/app/javascript/stylesheets/catalog/digital_projects.scss b/app/assets/stylesheets/stylesheets/catalog/digital_projects.scss similarity index 100% rename from app/javascript/stylesheets/catalog/digital_projects.scss rename to app/assets/stylesheets/stylesheets/catalog/digital_projects.scss diff --git a/app/javascript/stylesheets/catalog/site_banner.scss b/app/assets/stylesheets/stylesheets/catalog/site_banner.scss similarity index 100% rename from app/javascript/stylesheets/catalog/site_banner.scss rename to app/assets/stylesheets/stylesheets/catalog/site_banner.scss diff --git a/app/javascript/stylesheets/dcv/dcv.css.scss b/app/assets/stylesheets/stylesheets/dcv/dcv.css.scss similarity index 100% rename from app/javascript/stylesheets/dcv/dcv.css.scss rename to app/assets/stylesheets/stylesheets/dcv/dcv.css.scss diff --git a/app/javascript/stylesheets/durst/durst.scss b/app/assets/stylesheets/stylesheets/durst/durst.scss similarity index 100% rename from app/javascript/stylesheets/durst/durst.scss rename to app/assets/stylesheets/stylesheets/durst/durst.scss diff --git a/app/javascript/stylesheets/gallery.css.scss b/app/assets/stylesheets/stylesheets/gallery.css.scss similarity index 100% rename from app/javascript/stylesheets/gallery.css.scss rename to app/assets/stylesheets/stylesheets/gallery.css.scss diff --git a/app/javascript/stylesheets/gallery/_base.scss b/app/assets/stylesheets/stylesheets/gallery/_base.scss similarity index 100% rename from app/javascript/stylesheets/gallery/_base.scss rename to app/assets/stylesheets/stylesheets/gallery/_base.scss diff --git a/app/javascript/stylesheets/gallery/_fonts.scss b/app/assets/stylesheets/stylesheets/gallery/_fonts.scss similarity index 89% rename from app/javascript/stylesheets/gallery/_fonts.scss rename to app/assets/stylesheets/stylesheets/gallery/_fonts.scss index d5f4f1067..23552f35b 100644 --- a/app/javascript/stylesheets/gallery/_fonts.scss +++ b/app/assets/stylesheets/stylesheets/gallery/_fonts.scss @@ -5,6 +5,5 @@ $font_2: serif; $font_3: trajan pro; $font_4: georgia; $font_6: serif; -$font_glyphs: FontAwesome; $font_b: "Helvetica Neue", Helvetica, Arial, sans-serif; $font_c: "Helvetica Rounded", Arial, sans-serif; diff --git a/app/javascript/stylesheets/gallery/_squares.scss b/app/assets/stylesheets/stylesheets/gallery/_squares.scss similarity index 100% rename from app/javascript/stylesheets/gallery/_squares.scss rename to app/assets/stylesheets/stylesheets/gallery/_squares.scss diff --git a/app/javascript/stylesheets/ifp/ifp.css.scss b/app/assets/stylesheets/stylesheets/ifp/ifp.css.scss similarity index 100% rename from app/javascript/stylesheets/ifp/ifp.css.scss rename to app/assets/stylesheets/stylesheets/ifp/ifp.css.scss diff --git a/app/javascript/stylesheets/jay/.keep b/app/assets/stylesheets/stylesheets/jay/.keep similarity index 100% rename from app/javascript/stylesheets/jay/.keep rename to app/assets/stylesheets/stylesheets/jay/.keep diff --git a/app/javascript/stylesheets/lcaaj/.keep b/app/assets/stylesheets/stylesheets/lcaaj/.keep similarity index 100% rename from app/javascript/stylesheets/lcaaj/.keep rename to app/assets/stylesheets/stylesheets/lcaaj/.keep diff --git a/app/javascript/stylesheets/nyre/.keep b/app/assets/stylesheets/stylesheets/nyre/.keep similarity index 100% rename from app/javascript/stylesheets/nyre/.keep rename to app/assets/stylesheets/stylesheets/nyre/.keep diff --git a/app/javascript/stylesheets/palettes/_base.scss b/app/assets/stylesheets/stylesheets/palettes/_base.scss similarity index 100% rename from app/javascript/stylesheets/palettes/_base.scss rename to app/assets/stylesheets/stylesheets/palettes/_base.scss diff --git a/app/javascript/stylesheets/palettes/_blue.scss b/app/assets/stylesheets/stylesheets/palettes/_blue.scss similarity index 100% rename from app/javascript/stylesheets/palettes/_blue.scss rename to app/assets/stylesheets/stylesheets/palettes/_blue.scss diff --git a/app/javascript/stylesheets/palettes/_monochrome.scss b/app/assets/stylesheets/stylesheets/palettes/_monochrome.scss similarity index 100% rename from app/javascript/stylesheets/palettes/_monochrome.scss rename to app/assets/stylesheets/stylesheets/palettes/_monochrome.scss diff --git a/app/javascript/stylesheets/palettes/_monochromeDark.scss b/app/assets/stylesheets/stylesheets/palettes/_monochromeDark.scss similarity index 100% rename from app/javascript/stylesheets/palettes/_monochromeDark.scss rename to app/assets/stylesheets/stylesheets/palettes/_monochromeDark.scss diff --git a/app/javascript/stylesheets/palettes/base/_functions.scss b/app/assets/stylesheets/stylesheets/palettes/base/_functions.scss similarity index 100% rename from app/javascript/stylesheets/palettes/base/_functions.scss rename to app/assets/stylesheets/stylesheets/palettes/base/_functions.scss diff --git a/app/javascript/stylesheets/palettes/base/_post.scss b/app/assets/stylesheets/stylesheets/palettes/base/_post.scss similarity index 100% rename from app/javascript/stylesheets/palettes/base/_post.scss rename to app/assets/stylesheets/stylesheets/palettes/base/_post.scss diff --git a/app/javascript/stylesheets/palettes/base/_variables.scss b/app/assets/stylesheets/stylesheets/palettes/base/_variables.scss similarity index 100% rename from app/javascript/stylesheets/palettes/base/_variables.scss rename to app/assets/stylesheets/stylesheets/palettes/base/_variables.scss diff --git a/app/javascript/stylesheets/portrait/_base.scss b/app/assets/stylesheets/stylesheets/portrait/_base.scss similarity index 100% rename from app/javascript/stylesheets/portrait/_base.scss rename to app/assets/stylesheets/stylesheets/portrait/_base.scss diff --git a/app/javascript/stylesheets/portrait/_carousel.scss b/app/assets/stylesheets/stylesheets/portrait/_carousel.scss similarity index 100% rename from app/javascript/stylesheets/portrait/_carousel.scss rename to app/assets/stylesheets/stylesheets/portrait/_carousel.scss diff --git a/app/javascript/stylesheets/portrait/_fonts.scss b/app/assets/stylesheets/stylesheets/portrait/_fonts.scss similarity index 89% rename from app/javascript/stylesheets/portrait/_fonts.scss rename to app/assets/stylesheets/stylesheets/portrait/_fonts.scss index d5f4f1067..23552f35b 100644 --- a/app/javascript/stylesheets/portrait/_fonts.scss +++ b/app/assets/stylesheets/stylesheets/portrait/_fonts.scss @@ -5,6 +5,5 @@ $font_2: serif; $font_3: trajan pro; $font_4: georgia; $font_6: serif; -$font_glyphs: FontAwesome; $font_b: "Helvetica Neue", Helvetica, Arial, sans-serif; $font_c: "Helvetica Rounded", Arial, sans-serif; diff --git a/app/javascript/stylesheets/print/print.scss b/app/assets/stylesheets/stylesheets/print/print.scss similarity index 100% rename from app/javascript/stylesheets/print/print.scss rename to app/assets/stylesheets/stylesheets/print/print.scss diff --git a/app/javascript/stylesheets/shared/filesystem.scss b/app/assets/stylesheets/stylesheets/shared/filesystem.scss similarity index 100% rename from app/javascript/stylesheets/shared/filesystem.scss rename to app/assets/stylesheets/stylesheets/shared/filesystem.scss diff --git a/app/javascript/stylesheets/shared/ia-thumbnails.scss b/app/assets/stylesheets/stylesheets/shared/ia-thumbnails.scss similarity index 100% rename from app/javascript/stylesheets/shared/ia-thumbnails.scss rename to app/assets/stylesheets/stylesheets/shared/ia-thumbnails.scss diff --git a/app/javascript/stylesheets/shared/map.scss b/app/assets/stylesheets/stylesheets/shared/map.scss similarity index 100% rename from app/javascript/stylesheets/shared/map.scss rename to app/assets/stylesheets/stylesheets/shared/map.scss diff --git a/app/javascript/stylesheets/shared/modals.scss b/app/assets/stylesheets/stylesheets/shared/modals.scss similarity index 100% rename from app/javascript/stylesheets/shared/modals.scss rename to app/assets/stylesheets/stylesheets/shared/modals.scss diff --git a/app/javascript/stylesheets/shared/openseadragon.scss b/app/assets/stylesheets/stylesheets/shared/openseadragon.scss similarity index 100% rename from app/javascript/stylesheets/shared/openseadragon.scss rename to app/assets/stylesheets/stylesheets/shared/openseadragon.scss diff --git a/app/javascript/stylesheets/shared/search-modes.scss b/app/assets/stylesheets/stylesheets/shared/search-modes.scss similarity index 100% rename from app/javascript/stylesheets/shared/search-modes.scss rename to app/assets/stylesheets/stylesheets/shared/search-modes.scss diff --git a/app/javascript/stylesheets/shared/shared.css b/app/assets/stylesheets/stylesheets/shared/shared.css similarity index 100% rename from app/javascript/stylesheets/shared/shared.css rename to app/assets/stylesheets/stylesheets/shared/shared.css diff --git a/app/javascript/stylesheets/shared/synchronizer.scss b/app/assets/stylesheets/stylesheets/shared/synchronizer.scss similarity index 100% rename from app/javascript/stylesheets/shared/synchronizer.scss rename to app/assets/stylesheets/stylesheets/shared/synchronizer.scss diff --git a/app/javascript/stylesheets/shared/videojs.scss b/app/assets/stylesheets/stylesheets/shared/videojs.scss similarity index 100% rename from app/javascript/stylesheets/shared/videojs.scss rename to app/assets/stylesheets/stylesheets/shared/videojs.scss diff --git a/app/javascript/stylesheets/signature/_base.scss b/app/assets/stylesheets/stylesheets/signature/_base.scss similarity index 100% rename from app/javascript/stylesheets/signature/_base.scss rename to app/assets/stylesheets/stylesheets/signature/_base.scss diff --git a/app/javascript/stylesheets/signature/_fonts.scss b/app/assets/stylesheets/stylesheets/signature/_fonts.scss similarity index 91% rename from app/javascript/stylesheets/signature/_fonts.scss rename to app/assets/stylesheets/stylesheets/signature/_fonts.scss index cf61c036d..8915fd042 100644 --- a/app/javascript/stylesheets/signature/_fonts.scss +++ b/app/assets/stylesheets/stylesheets/signature/_fonts.scss @@ -6,6 +6,5 @@ $font_3: TrajanProRegular; $font_4: trajan pro; $font_5: trajan; $font_6: serif; -$font_glyphs: FontAwesome; $font_b: "Arial Rounded MT Bold", "Helvetica Rounded", Arial, sans-serif; $font_c: "Helvetica Rounded", Arial, sans-serif; diff --git a/app/javascript/stylesheets/sites/_edit.scss b/app/assets/stylesheets/stylesheets/sites/_edit.scss similarity index 100% rename from app/javascript/stylesheets/sites/_edit.scss rename to app/assets/stylesheets/stylesheets/sites/_edit.scss diff --git a/app/javascript/stylesheets/universityseminars/.keep b/app/assets/stylesheets/stylesheets/universityseminars/.keep similarity index 100% rename from app/javascript/stylesheets/universityseminars/.keep rename to app/assets/stylesheets/stylesheets/universityseminars/.keep diff --git a/app/javascript/stylesheets/welcome/welcome.scss b/app/assets/stylesheets/stylesheets/welcome/welcome.scss similarity index 100% rename from app/javascript/stylesheets/welcome/welcome.scss rename to app/assets/stylesheets/stylesheets/welcome/welcome.scss diff --git a/app/javascript/packs/theme.css b/app/assets/stylesheets/theme.css similarity index 100% rename from app/javascript/packs/theme.css rename to app/assets/stylesheets/theme.css diff --git a/app/javascript/packs/universityseminars.scss b/app/assets/stylesheets/universityseminars.scss similarity index 100% rename from app/javascript/packs/universityseminars.scss rename to app/assets/stylesheets/universityseminars.scss diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss new file mode 100644 index 000000000..141970667 --- /dev/null +++ b/app/assets/stylesheets/welcome.scss @@ -0,0 +1 @@ +@import './stylesheets/welcome/welcome'; diff --git a/app/components/dcv/content_aggregator/child_viewer/button_panel/default_component.html.erb b/app/components/dcv/content_aggregator/child_viewer/button_panel/default_component.html.erb index 65d59e3f1..feaf8a7c1 100644 --- a/app/components/dcv/content_aggregator/child_viewer/button_panel/default_component.html.erb +++ b/app/components/dcv/content_aggregator/child_viewer/button_panel/default_component.html.erb @@ -17,7 +17,7 @@ <% end %> <% if has_synch? %> <%= link_to({controller: controller_path, action: 'synchronizer', id: child[:pid], mode: 'synchronized_transcript'}, class: 'btn btn-sm btn-primary', target: '_blank', aria: { label: 'View with synchronized transcript' }) do %> - + <%- end -%> <% end %> diff --git a/app/components/dcv/document/ui/mods_modal_display_component.rb b/app/components/dcv/document/ui/mods_modal_display_component.rb index 79629e7fb..6b4d26f31 100644 --- a/app/components/dcv/document/ui/mods_modal_display_component.rb +++ b/app/components/dcv/document/ui/mods_modal_display_component.rb @@ -26,7 +26,7 @@ def call }, aria: { label: 'Display XML Metadata' }, class: 'btn btn-outline-secondary btn-sm') do - content_tag :i, '', class: "fa fa-file-code-o", data: { toggle: 'tooltip' }, title: 'Display XML Metadata' + content_tag :i, '', class: "fa fa-file-code", data: { toggle: 'tooltip' }, title: 'Display XML Metadata' end end end diff --git a/app/controllers/concerns/dcv/catalog/pivot_facet_data_behavior.rb b/app/controllers/concerns/dcv/catalog/pivot_facet_data_behavior.rb index b9387c8fa..b6f5a257e 100644 --- a/app/controllers/concerns/dcv/catalog/pivot_facet_data_behavior.rb +++ b/app/controllers/concerns/dcv/catalog/pivot_facet_data_behavior.rb @@ -12,7 +12,7 @@ def get_pivot_facet_data if facets_to_pivot_on && facets_to_pivot_on.split(',').length < 2 json_response['error'] = 'Pivot facet requires at least two fields.' else - rsolr = RSolr.connect :url => YAML.load_file('config/solr.yml')[Rails.env]['url'] + rsolr = RSolr.connect :url => YAML.load_file('config/blacklight.yml')[Rails.env]['url'] first_facet = facets_to_pivot_on.split(',')[0] top_level_field_name = blacklight_config.facet_fields[first_facet] if (top_level_field_name) diff --git a/app/controllers/concerns/dcv/sites/configured_layouts.rb b/app/controllers/concerns/dcv/sites/configured_layouts.rb index a53143fda..901e9f69d 100644 --- a/app/controllers/concerns/dcv/sites/configured_layouts.rb +++ b/app/controllers/concerns/dcv/sites/configured_layouts.rb @@ -22,12 +22,12 @@ def subsite_styles def signature_image_path path = File.join("", "images", "sites", load_subsite&.slug, "signature.svg") - File.exists?(File.join(Rails.root, "public", path)) ? path : view_context.asset_pack_path("media/assets/signature/images/signature.svg") + File.exists?(File.join(Rails.root, "public", path)) ? path : view_context.asset_path("signature/signature.svg") end def signature_banner_image_path path = File.join("", "images", "sites", load_subsite&.slug, "signature-banner.png") - File.exists?(File.join(Rails.root, "public", path)) ? path : view_context.asset_pack_path("media/assets/signature/images/signature-banner.png") + File.exists?(File.join(Rails.root, "public", path)) ? path : view_context.asset_path("signature/signature-banner.png") end # this method is stubbed here for configured sites and overridden in custom sites diff --git a/app/helpers/dcv/catalog_helper_behavior.rb b/app/helpers/dcv/catalog_helper_behavior.rb index 3532cf650..ab337fe20 100644 --- a/app/helpers/dcv/catalog_helper_behavior.rb +++ b/app/helpers/dcv/catalog_helper_behavior.rb @@ -144,7 +144,7 @@ def mods_display_modal_trigger(document) }, aria: { label: 'Display XML Metadata' }, class: 'btn btn-secondary btn-sm') do - content_tag :i, '', class: "fa fa-file-code-o", data: { toggle: 'tooltip' }, title: 'Display XML Metadata' + content_tag :i, '', class: "fa fa-file-code", data: { toggle: 'tooltip' }, title: 'Display XML Metadata' end end end diff --git a/app/helpers/dcv/cdn_helper.rb b/app/helpers/dcv/cdn_helper.rb index 2267ae860..9fee072d5 100644 --- a/app/helpers/dcv/cdn_helper.rb +++ b/app/helpers/dcv/cdn_helper.rb @@ -135,7 +135,7 @@ def thumbnail_for_site(site) if id get_asset_url(id: id, size: 256, type: 'featured', format: 'jpg') else - asset_pack_path('media/images/dcv/columbia_crown_outline.png') + asset_path('dcv/columbia_crown_outline.png') end end diff --git a/app/helpers/dcv/media_element_helper.rb b/app/helpers/dcv/media_element_helper.rb index 94c2561f6..bb7bed1c7 100644 --- a/app/helpers/dcv/media_element_helper.rb +++ b/app/helpers/dcv/media_element_helper.rb @@ -11,7 +11,7 @@ def render_media_element_streaming_audio_player(url, poster_path, captions_path: track_element = '' end if poster_path.nil? - poster_path = asset_pack_path('media/images/dcv/audio-poster.png') + poster_path = asset_path('dcv/audio-poster.png') end logo_attr = "player-logo=\"#{logo_path}\"" if logo_path return %( diff --git a/app/javascript/packs/application.js b/app/javascript/application.js similarity index 88% rename from app/javascript/packs/application.js rename to app/javascript/application.js index 1edfbabed..4a435c292 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/application.js @@ -14,10 +14,8 @@ // // const images = require.context('../images', true) // const imagePath = (name) => images(name, true) -require.context('../assets', true) -require.context('../images', true) -import "./application.scss"; // prompts webpack to include css packs -import 'font-awesome/css/font-awesome.css'; +require.context('./assets', true) +require.context('./images', true) import "jquery-ui/ui/widgets/draggable"; import "jquery-ui/ui/widgets/sortable"; diff --git a/app/javascript/packs/carnegie.js b/app/javascript/carnegie.js similarity index 100% rename from app/javascript/packs/carnegie.js rename to app/javascript/carnegie.js diff --git a/app/javascript/packs/catalog.js b/app/javascript/catalog.js similarity index 100% rename from app/javascript/packs/catalog.js rename to app/javascript/catalog.js diff --git a/app/javascript/packs/dcv.js.erb b/app/javascript/dcv.js.erb similarity index 79% rename from app/javascript/packs/dcv.js.erb rename to app/javascript/dcv.js.erb index 7d1c2fa61..e883adff2 100644 --- a/app/javascript/packs/dcv.js.erb +++ b/app/javascript/dcv.js.erb @@ -1,9 +1,8 @@ -import 'video.js/dist/video-js.css'; -import clipboardFromElement from "../src/dcv/clipboard"; -import DcvModals from "../src/dcv/dcv.modals"; -import { zoomingImageNewWindow } from "../src/dcv/modals/zoomingImage"; -import { initTiles } from '../src/dcv/dcv.show.zooming_viewer'; -import readyHandlers from '../src/dcv/dcv.general'; +import clipboardFromElement from "./src/dcv/clipboard"; +import DcvModals from "./src/dcv/dcv.modals"; +import { zoomingImageNewWindow } from "./src/dcv/modals/zoomingImage"; +import { initTiles } from './src/dcv/dcv.show.zooming_viewer'; +import readyHandlers from './src/dcv/dcv.general'; window.clipboardFromElement = clipboardFromElement; window.initTiles = initTiles; window.zoomingImageNewWindow = zoomingImageNewWindow; diff --git a/app/javascript/packs/durst.js b/app/javascript/durst.js similarity index 51% rename from app/javascript/packs/durst.js rename to app/javascript/durst.js index bf5f55b75..c2a7991df 100644 --- a/app/javascript/packs/durst.js +++ b/app/javascript/durst.js @@ -1,4 +1,4 @@ -import { durstReady, scrollToBottomOfPage } from '../src/durst/durst.general'; +import { durstReady, scrollToBottomOfPage } from './src/durst/durst.general'; window.scrollToBottomOfPage = scrollToBottomOfPage; diff --git a/app/javascript/gallery.js b/app/javascript/gallery.js new file mode 100644 index 000000000..e69de29bb diff --git a/app/javascript/packs/ifp.js b/app/javascript/ifp.js similarity index 84% rename from app/javascript/packs/ifp.js rename to app/javascript/ifp.js index 2bca542d0..d8f45129e 100644 --- a/app/javascript/packs/ifp.js +++ b/app/javascript/ifp.js @@ -16,10 +16,10 @@ // const imagePath = (name) => images(name, true) // Vendor -import * as StupidTable from '../src/ifp/stupidtable'; +import * as StupidTable from './src/ifp/stupidtable'; -import { fileSystemReady } from '../src/ifp/dcv.filesystem'; -import { ifpReady } from '../src/ifp/ifp.general'; +import { fileSystemReady } from './src/ifp/dcv.filesystem'; +import { ifpReady } from './src/ifp/ifp.general'; $(document).ready(fileSystemReady); $(document).ready(ifpReady); diff --git a/app/javascript/packs/iiif.js b/app/javascript/iiif.js similarity index 100% rename from app/javascript/packs/iiif.js rename to app/javascript/iiif.js diff --git a/app/javascript/jay.js b/app/javascript/jay.js new file mode 100644 index 000000000..e69de29bb diff --git a/app/javascript/packs/lcaaj.js b/app/javascript/lcaaj.js similarity index 100% rename from app/javascript/packs/lcaaj.js rename to app/javascript/lcaaj.js diff --git a/app/javascript/nyre.js b/app/javascript/nyre.js new file mode 100644 index 000000000..e69de29bb diff --git a/app/javascript/ohsynchronizer.js b/app/javascript/ohsynchronizer.js new file mode 100644 index 000000000..34bff8562 --- /dev/null +++ b/app/javascript/ohsynchronizer.js @@ -0,0 +1,3 @@ +import OHSynchronizer from './src/ohsynchronizer/widget'; + +window.OHSynchronizer = OHSynchronizer; \ No newline at end of file diff --git a/app/javascript/packs/carnegie.scss b/app/javascript/packs/carnegie.scss deleted file mode 100644 index e922060ee..000000000 --- a/app/javascript/packs/carnegie.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../stylesheets/carnegie/carnegie'; diff --git a/app/javascript/packs/catalog.scss b/app/javascript/packs/catalog.scss deleted file mode 100644 index fb38d595f..000000000 --- a/app/javascript/packs/catalog.scss +++ /dev/null @@ -1,2 +0,0 @@ - @import '../stylesheets/catalog/digital_projects'; - @import '../stylesheets/catalog/site_banner'; diff --git a/app/javascript/packs/dcv.scss b/app/javascript/packs/dcv.scss deleted file mode 100644 index de3f794f4..000000000 --- a/app/javascript/packs/dcv.scss +++ /dev/null @@ -1,16 +0,0 @@ -//@import 'jquery-ui/themes/base/base'; -@import 'jquery-ui/themes/base/theme'; -@import 'jquery-ui/themes/base/all'; -@import 'jquery-ui/themes/base/accordion'; -@import 'leaflet/dist/leaflet'; -@import '../stylesheets/MarkerCluster'; -@import '../stylesheets/MarkerCluster.Default'; -@import '../stylesheets/shared/filesystem'; -@import '../stylesheets/shared/ia-thumbnails'; -@import '../stylesheets/shared/map'; -@import '../stylesheets/shared/modals'; -@import '../stylesheets/shared/openseadragon'; -@import '../stylesheets/shared/search-modes'; -@import '../stylesheets/shared/shared'; -@import '../stylesheets/shared/synchronizer'; -@import '../stylesheets/shared/videojs'; diff --git a/app/javascript/packs/durst.scss b/app/javascript/packs/durst.scss deleted file mode 100644 index 7acbb5467..000000000 --- a/app/javascript/packs/durst.scss +++ /dev/null @@ -1 +0,0 @@ - @import '../stylesheets/durst/durst'; diff --git a/app/javascript/packs/empty.scss b/app/javascript/packs/empty.scss deleted file mode 100644 index c05b14ae2..000000000 --- a/app/javascript/packs/empty.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import '../stylesheets/palettes/monochrome'; -@import '../stylesheets/gallery/fonts'; -@import '../stylesheets/base_layout'; diff --git a/app/javascript/packs/gallery-blue.scss b/app/javascript/packs/gallery-blue.scss deleted file mode 100644 index 37efa883e..000000000 --- a/app/javascript/packs/gallery-blue.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/blue'; -@import '../stylesheets/gallery/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/javascript/packs/gallery-monochrome.scss b/app/javascript/packs/gallery-monochrome.scss deleted file mode 100644 index 0e900e7ba..000000000 --- a/app/javascript/packs/gallery-monochrome.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochrome'; -@import '../stylesheets/gallery/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/javascript/packs/gallery-monochromeDark.scss b/app/javascript/packs/gallery-monochromeDark.scss deleted file mode 100644 index fb520559a..000000000 --- a/app/javascript/packs/gallery-monochromeDark.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochromeDark'; -@import '../stylesheets/gallery/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/gallery/base'; \ No newline at end of file diff --git a/app/javascript/packs/gallery.js b/app/javascript/packs/gallery.js deleted file mode 100644 index 67f69f80d..000000000 --- a/app/javascript/packs/gallery.js +++ /dev/null @@ -1 +0,0 @@ -//.keep diff --git a/app/javascript/packs/ifp.scss b/app/javascript/packs/ifp.scss deleted file mode 100644 index 9b1f3e805..000000000 --- a/app/javascript/packs/ifp.scss +++ /dev/null @@ -1 +0,0 @@ -@import "../stylesheets/ifp/ifp.css.scss"; \ No newline at end of file diff --git a/app/javascript/packs/iiif.scss b/app/javascript/packs/iiif.scss deleted file mode 100644 index 6b64544e8..000000000 --- a/app/javascript/packs/iiif.scss +++ /dev/null @@ -1,12 +0,0 @@ -@import "@archival-iiif/viewer-react/dist/css/App.css"; -@import "@archival-iiif/viewer-react/dist/css/modal.css"; - -#mirador { - height: 80vh; -} - -.aiiif-root { - p { - margin-top: initial; - } -} \ No newline at end of file diff --git a/app/javascript/packs/jay.js b/app/javascript/packs/jay.js deleted file mode 100644 index 4afa8217b..000000000 --- a/app/javascript/packs/jay.js +++ /dev/null @@ -1 +0,0 @@ -//.keep \ No newline at end of file diff --git a/app/javascript/packs/nyre.js b/app/javascript/packs/nyre.js deleted file mode 100644 index 4afa8217b..000000000 --- a/app/javascript/packs/nyre.js +++ /dev/null @@ -1 +0,0 @@ -//.keep \ No newline at end of file diff --git a/app/javascript/packs/ohsynchronizer.js b/app/javascript/packs/ohsynchronizer.js deleted file mode 100644 index 543cef096..000000000 --- a/app/javascript/packs/ohsynchronizer.js +++ /dev/null @@ -1,3 +0,0 @@ -import OHSynchronizer from '../src/ohsynchronizer/widget'; - -window.OHSynchronizer = OHSynchronizer; \ No newline at end of file diff --git a/app/javascript/packs/portrait-blue.scss b/app/javascript/packs/portrait-blue.scss deleted file mode 100644 index 6a363382c..000000000 --- a/app/javascript/packs/portrait-blue.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/blue'; -@import '../stylesheets/portrait/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/portrait/base'; diff --git a/app/javascript/packs/portrait-monochrome.scss b/app/javascript/packs/portrait-monochrome.scss deleted file mode 100644 index dedcbb24f..000000000 --- a/app/javascript/packs/portrait-monochrome.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochrome'; -@import '../stylesheets/portrait/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/portrait/base'; diff --git a/app/javascript/packs/portrait-monochromeDark.scss b/app/javascript/packs/portrait-monochromeDark.scss deleted file mode 100644 index fccbba605..000000000 --- a/app/javascript/packs/portrait-monochromeDark.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochromeDark'; -@import '../stylesheets/portrait/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/portrait/base'; diff --git a/app/javascript/packs/print.scss b/app/javascript/packs/print.scss deleted file mode 100644 index 3bec799dd..000000000 --- a/app/javascript/packs/print.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../stylesheets/print/print'; diff --git a/app/javascript/packs/signature-blue.scss b/app/javascript/packs/signature-blue.scss deleted file mode 100644 index dee5e3112..000000000 --- a/app/javascript/packs/signature-blue.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/blue'; -@import '../stylesheets/signature/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/signature/base'; \ No newline at end of file diff --git a/app/javascript/packs/signature-monochrome.scss b/app/javascript/packs/signature-monochrome.scss deleted file mode 100644 index b86bc5dc8..000000000 --- a/app/javascript/packs/signature-monochrome.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochrome'; -@import '../stylesheets/signature/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/signature/base'; \ No newline at end of file diff --git a/app/javascript/packs/signature-monochromeDark.scss b/app/javascript/packs/signature-monochromeDark.scss deleted file mode 100644 index e5394830e..000000000 --- a/app/javascript/packs/signature-monochromeDark.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import '../stylesheets/palettes/monochromeDark'; -@import '../stylesheets/signature/fonts'; -@import '../stylesheets/base_layout'; -@import '../stylesheets/signature/base'; \ No newline at end of file diff --git a/app/javascript/packs/sites.scss b/app/javascript/packs/sites.scss deleted file mode 100644 index 4274eb9e8..000000000 --- a/app/javascript/packs/sites.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../stylesheets/sites/edit'; diff --git a/app/javascript/packs/universityseminars.js b/app/javascript/packs/universityseminars.js deleted file mode 100644 index 4afa8217b..000000000 --- a/app/javascript/packs/universityseminars.js +++ /dev/null @@ -1 +0,0 @@ -//.keep \ No newline at end of file diff --git a/app/javascript/packs/welcome.js b/app/javascript/packs/welcome.js deleted file mode 100644 index b300768d1..000000000 --- a/app/javascript/packs/welcome.js +++ /dev/null @@ -1,3 +0,0 @@ -require('d3'); -require('../src/welcome/d3'); -require('../src/welcome/welcome.js.erb'); \ No newline at end of file diff --git a/app/javascript/packs/welcome.scss b/app/javascript/packs/welcome.scss deleted file mode 100644 index 5b36bd7e3..000000000 --- a/app/javascript/packs/welcome.scss +++ /dev/null @@ -1 +0,0 @@ -@import '../stylesheets/welcome/welcome'; diff --git a/app/javascript/packs/portrait.js b/app/javascript/portrait.js similarity index 93% rename from app/javascript/packs/portrait.js rename to app/javascript/portrait.js index 0c6a2ea8d..3aff67c17 100644 --- a/app/javascript/packs/portrait.js +++ b/app/javascript/portrait.js @@ -16,6 +16,6 @@ // const imagePath = (name) => images(name, true) // Vendor -import { portraitReady } from '../src/portrait/portrait'; +import { portraitReady } from './src/portrait/portrait'; $(document).ready(portraitReady); diff --git a/app/javascript/packs/signature.js b/app/javascript/signature.js similarity index 93% rename from app/javascript/packs/signature.js rename to app/javascript/signature.js index 36c36df52..480e71e98 100644 --- a/app/javascript/packs/signature.js +++ b/app/javascript/signature.js @@ -16,6 +16,6 @@ // const imagePath = (name) => images(name, true) // Vendor -import { signatureReady } from '../src/signature/signature'; +import { signatureReady } from './src/signature/signature'; $(document).ready(signatureReady); diff --git a/app/javascript/packs/sites.js b/app/javascript/sites.js similarity index 95% rename from app/javascript/packs/sites.js rename to app/javascript/sites.js index 887cf29f8..4b9a3c7e8 100644 --- a/app/javascript/packs/sites.js +++ b/app/javascript/sites.js @@ -9,7 +9,7 @@ import { removeNavLink, removeTextBlock, onReady, -} from '../src/sites/edit'; +} from './src/sites/edit'; window.addNavMenu = addNavMenu; window.addNavLink = addNavLink; diff --git a/app/javascript/src/ohsynchronizer/videoJsControls.js b/app/javascript/src/ohsynchronizer/videoJsControls.js index 0230825ba..29c55bd51 100644 --- a/app/javascript/src/ohsynchronizer/videoJsControls.js +++ b/app/javascript/src/ohsynchronizer/videoJsControls.js @@ -1,7 +1,6 @@ import videojs from 'video.js'; import PlayerControls from './playerControls'; import { secondsAsTimestamp } from './timeStamps'; -import audioPoster from '../../images/dcv/audio-poster'; export default class VideoJsControls extends PlayerControls { videoPlayer = null; @@ -24,7 +23,7 @@ export default class VideoJsControls extends PlayerControls { if ($("#audio").is(':visible')) { element = $("#audio audio")[0]; - options.poster = audioPoster; + options.poster = element.attr('poster'); // picture-in-picture doesn't apply to audio, so we won't show the button options.controlBar.pictureInPictureToggle = false; } else if ($("#video").is(':visible')) { diff --git a/app/javascript/src/welcome/welcome.js.erb b/app/javascript/src/welcome/welcome.js.erb index b4ae3ce6b..220e53c04 100644 --- a/app/javascript/src/welcome/welcome.js.erb +++ b/app/javascript/src/welcome/welcome.js.erb @@ -1,4 +1,6 @@ -<% helpers = Class.new { include Rails.application.routes.url_helpers; include ActionView::Helpers::AssetUrlHelper }.new %> +<% routes = Class.new { include Rails.application.routes.url_helpers; include ActionView::Helpers::AssetUrlHelper }.new %> +<% assets = ActionController::Base.helpers %> + // proj is a map of title, thumb, link (search) and blurb function mosaicDemo(container, proj) { var width = Math.max($(container).parent().width(),$(container).width()); @@ -13,7 +15,7 @@ function mosaicDemo(container, proj) { var projlink = proj.attr('data-link'); var randomItems = projlink.replace('catalog','catalog/random.json') + '&per_page=' + total; - var fill = "<%= helpers.image_path('media/images/dcv/columbia_crown_outline.png') %>"; + var fill = "<%= assets.asset_path('dcv/columbia_crown_outline.png') %>"; var style = 'width:12%;height:fit-content;' for (var i=0; i< total; i++) { $(container).append('
\ @@ -76,7 +78,7 @@ $(window).on('load', function() { } var bubbles = new DCV.Bubbles("div#bubbles"); - bubbles.chart("<%= helpers.flare_data_path(format: 'json', fields: 'lib_format_sim,lib_repo_short_ssim,lib_collection_sim')%>"); + bubbles.chart("<%= routes.flare_data_path(format: 'json', fields: 'lib_format_sim,lib_repo_short_ssim,lib_collection_sim')%>"); $(window).on('resize', function() { @@ -93,53 +95,53 @@ $(document).ready(function() { /* home bg carousel */ var $bgimgs = [ { - 'image' : "<%= helpers.image_path('dcv/ldpd_113670.jpg')%>", + 'image' : "<%= assets.asset_path("dcv/ldpd_113670.jpg") %>", 'title' : 'Autograph album', 'project' : 'Jewels in her Crown', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:113670') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Jewels in her Crown') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:113670') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Jewels in her Crown') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_134685.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_134685.jpg')%>", 'title' : 'Footbridge over Little White River, Rosebud Reservation, South Dakota', 'project' : 'G.E.E. Lindquist Native American Photographs', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:134685') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'G.E.E. Lindquist Native American Photographs') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:134685') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'G.E.E. Lindquist Native American Photographs') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_85504.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_85504.jpg')%>", 'title' : 'Document, 1821 June 29', 'project' : 'The Papers of John Jay', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:85504') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'John Jay Papers') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:85504') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'John Jay Papers') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_114725.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_114725.jpg')%>", 'title' : 'Zhong Kui', 'project' : 'Chinese Paper Gods', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:114725') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Chinese paper gods') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:114725') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Chinese paper gods') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_111727.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_111727.jpg')%>", 'title' : 'Drawing of an air battle', 'project' : 'Children's Drawings of the Spanish Civil War', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:111727') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Spanish Civil War') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:111727') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Spanish Civil War') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_113939.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_113939.jpg')%>", 'title' : 'Coronation. Photograph, Ceremonial Departure', 'project' : 'Russian Imperial Corps of Pages', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:113939') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Russian Corps of Pages') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:113939') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Russian Corps of Pages') %>" }, { - 'image' : "<%= helpers.image_path('dcv/ldpd_136160.jpg')%>", + 'image' : "<%= assets.asset_path('dcv/ldpd_136160.jpg')%>", 'title' : 'Boys Playing in Open Fire Hydrants, Lower East Side', 'project' : 'Community Service Society Photographs', - 'item-link' : "<%= helpers.catalog_show_path(id: 'ldpd:136160') %>", - 'project-link' : "<%= helpers.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Community Service Society Photographs') %>" + 'item-link' : "<%= routes.catalog_show_path(id: 'ldpd:136160') %>", + 'project-link' : "<%= routes.search_catalog_path(:'f[lib_project_short_ssim][]'=> 'Community Service Society Photographs') %>" }, ]; diff --git a/app/javascript/universityseminars.js b/app/javascript/universityseminars.js new file mode 100644 index 000000000..e69de29bb diff --git a/app/javascript/welcome.js b/app/javascript/welcome.js new file mode 100644 index 000000000..0967046bc --- /dev/null +++ b/app/javascript/welcome.js @@ -0,0 +1,3 @@ +import * as d3 from 'd3'; +require('./src/welcome/d3'); +require('./src/welcome/welcome.js.erb'); diff --git a/app/views/details/embed.html.erb b/app/views/details/embed.html.erb index c8e238216..8ebcfff32 100644 --- a/app/views/details/embed.html.erb +++ b/app/views/details/embed.html.erb @@ -1,7 +1,7 @@
- <%= render_document_partial @document, 'show', logo_path: asset_pack_path('media/images/dcv/columbia_university_libraries.png') %> + <%= render_document_partial @document, 'show', logo_path: asset_path('dcv/columbia_university_libraries.png') %>
diff --git a/app/views/layouts/details.html.erb b/app/views/layouts/details.html.erb index 5dc51cefd..a6be9f155 100644 --- a/app/views/layouts/details.html.erb +++ b/app/views/layouts/details.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag "gallery-#{Dcv::Sites::Constants.default_palette}", :media => 'all' %> + <%= stylesheet_link_tag "gallery-#{Dcv::Sites::Constants.default_palette}", :media => 'all' %> diff --git a/app/views/layouts/empty.html.erb b/app/views/layouts/empty.html.erb index 826ca97d4..9a73c7331 100644 --- a/app/views/layouts/empty.html.erb +++ b/app/views/layouts/empty.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag 'empty', :media => 'all' %> + <%= stylesheet_link_tag 'empty', :media => 'all' %> diff --git a/app/views/layouts/gallery.html.erb b/app/views/layouts/gallery.html.erb index ac8a92cdd..aea5e1028 100644 --- a/app/views/layouts/gallery.html.erb +++ b/app/views/layouts/gallery.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag *Array(subsite_styles) %> + <%= stylesheet_link_tag *Array(subsite_styles) %> diff --git a/app/views/layouts/minimal.html.erb b/app/views/layouts/minimal.html.erb index 80cdddc9c..4eb022142 100644 --- a/app/views/layouts/minimal.html.erb +++ b/app/views/layouts/minimal.html.erb @@ -3,9 +3,9 @@ <%= render partial: 'shared/head_includes' %> <%- if ['gallery', 'portrait', 'signature'].include?(subsite_layout) -%> - <%= stylesheet_pack_tag *Array(subsite_styles) %> + <%= stylesheet_link_tag *Array(subsite_styles) %> <%- else -%> - <%= stylesheet_pack_tag *["gallery-#{Dcv::Sites::Constants.default_palette}", subsite_layout].except('dcv') %> + <%= stylesheet_link_tag *["gallery-#{Dcv::Sites::Constants.default_palette}", subsite_layout].except('dcv') %> <%- end -%> diff --git a/app/views/layouts/portrait.html.erb b/app/views/layouts/portrait.html.erb index 18f95b152..b8176a2a3 100644 --- a/app/views/layouts/portrait.html.erb +++ b/app/views/layouts/portrait.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag *Array(subsite_styles) %> + <%= stylesheet_link_tag *Array(subsite_styles) %> diff --git a/app/views/layouts/preview.html.erb b/app/views/layouts/preview.html.erb index b66786ec1..017739858 100644 --- a/app/views/layouts/preview.html.erb +++ b/app/views/layouts/preview.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag "gallery-#{Dcv::Sites::Constants.default_palette}", :media => 'all' %> + <%= stylesheet_link_tag "gallery-#{Dcv::Sites::Constants.default_palette}", :media => 'all' %> diff --git a/app/views/layouts/signature.html.erb b/app/views/layouts/signature.html.erb index ffa2d73d4..91b1dad76 100644 --- a/app/views/layouts/signature.html.erb +++ b/app/views/layouts/signature.html.erb @@ -2,7 +2,7 @@ <%= render partial: 'shared/head_includes' %> - <%= stylesheet_pack_tag *Array(subsite_styles) %> + <%= stylesheet_link_tag *Array(subsite_styles) %>