Merge branch 'master' into ruby-2.7

* master:
  Update 6-identity-and-culture.md (#2494)
  Use prettier 404 page for missing catalog pages (#2501)
  Exclude Notes Pages From 'Records in Exhibit' (#2519)
  'add hms times to clip message on share a segment' (#2509)
  🧪 Split CI tests into specs and formatter (#2512)
  ✖️ Remove AMS dependant specs (#2520)
  Cleaner Embed Iframe (#2481)
  'add rows option for snippet solr search' (#2514)
  Fix template names to display titles correct (#2513)
  Fix syntax for new issue templates (#2511)
  Use new Issue template forms (#2510)
  Primary source tweaks (#2507)
  'fix css for featured banner using spritesheet' (#2504)
  'replace busing guid with correct record in prim sets' (#2503)
  Redirects /educator_resources to /primary_source_sets (#2502)
  Remove target for primary source carousel links (#2500)
  Fixes links to primary source sets in homepage carousel (#2499)
  Primary source links (#2498)

.github/ISSUE_TEMPLATE/Because_Done.yml

@@ -0,0 +1,26 @@
+name: 📋 Because / Done when
+description: Standard issue template, neither a bug nor a feature.
+body:
+  - type: textarea
+    id: because
+    attributes:
+      label: Because
+      description: ❔ Briefly describe the issue.
+      placeholder: |
+        As a [user]
+        when I [action]
+        [result]
+
+  - type: textarea
+    id: done
+    attributes:
+      label: Done when
+      description: ☑️ What does "Done" look like?
+      placeholder: It will be done when it's finished!
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: 💁 Add any other relevant context here.
+      placeholder: Due date, required for, blocked by ...

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,80 @@
+name: 🐛 Bug Report
+description: Report a bug to help us improve
+labels: Bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        :bug: Thanks for taking the time to fill out this bug report!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: ':lady_beetle: Please provide a clear and concise description of what the bug is.'
+      placeholder: When I __________ it should  __________ but instead it __________
+    validations:
+      required: true
+
+  - type: textarea
+    id: reprod
+    attributes:
+      label: Reproduction steps
+      description: ':clipboard: Please enter an explicit description of your issue.'
+      value: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: ':interrobang: A clear and concise description of what you expected to happen'
+      placeholder: It should ...
+
+  - type: textarea
+    id: screenshot
+    attributes:
+      label: Screenshots
+      description: ':camera_flash: If applicable, add screenshots to help explain your problem.'
+      value: |
+        ![DESCRIPTION](LINK.png)
+      render: bash
+
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Browsers
+      description: ':computer: What browsers are you seeing the problem on?'
+      multiple: true
+      options:
+        - Chrome
+        - Firefox
+        - Microsoft Edge
+        - Safari
+        - Opera
+        - Other
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: OS
+      description: ':iphone: What is the impacted environment?'
+      multiple: true
+      options:
+        - Android
+        - iOS
+        - Linux
+        - Mac
+        - Windows
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional context
+      description: ':information_desk_person: Add any other context here.'
+      placeholder: Any other relevant information

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,40 @@
+name: 💡 Feature Request
+description: Suggest an idea for this project
+body:
+  - type: markdown
+    attributes:
+      value: |
+        :building_construction: Thanks for taking the time to suggest a new feature!
+
+        Please provide as much relevant detail as possible.
+
+  - type: textarea
+    id: summary
+    attributes:
+      description: ':pencil2: Briefly summarize your feature request'
+      label: Summary
+      placeholder: |
+        As a [user]
+        when I [action] 
+        [result]
+
+  - type: textarea
+    id: related
+    attributes:
+      description: ':grey_question: Is this issue related to other existing issues? Please link them below'
+      label: Related
+      placeholder: Fixes [link to existing issue]
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      description: ':part_alternation_mark: Describe alternatives you have considered'
+      label: Alternatives
+      placeholder: We could also ...
+
+  - type: textarea
+    id: context
+    attributes:
+      description: ':information_desk_person: Add any other context or screenshots about the feature request here.'
+      label: Additional context
+      placeholder: Due date, required for, blocked by ...

.github/workflows/aapb-ci.yml

@@ -1,32 +1,12 @@
-name: CI RSpec Tests
+name: 🧪 CI Tests
 
 on: [push, pull_request]
 
 jobs:
-  tests:
-    name: CI
-    runs-on: ubuntu-latest
+  specs:
+    name: 📋 Specs
+    uses: ./.github/workflows/specs.yml
 
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install libcurl4-openssl-dev for Curb Gem
-        run: |
-          sudo apt-get update
-          sudo apt-get install libcurl4-openssl-dev
-
-      - name: Setup Ruby and install RubyGems
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-
-      - name: Start Rails
-        run: nohup bundle exec rails server &
-
-      - name: Run Rspec specs using CI config
-        run: bundle exec rake ci_specs
-
-      - name: Run Rubocop code analyzer and Formatter
-        run: bundle exec rubocop -D
+  format:
+    name: 👮 Formatter
+    uses: ./.github/workflows/rubocop.yml

.github/workflows/rubocop.yml

@@ -0,0 +1,26 @@
+name: 🚓 Rubocop
+on:
+  workflow_call:
+
+jobs:
+  rubocop:
+    name: 🤖 Check code style with Rubocop
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 📰 Checkout code
+        uses: actions/checkout@v3
+
+      - name: 💪 Install libcurl4-openssl-dev for Curb Gem
+        run: |
+          sudo apt-get update
+          sudo apt-get install libcurl4-openssl-dev
+
+      - name: 💎 Setup Ruby and install RubyGems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: 👮 Run Rubocop code analyzer and Formatter
+        run: bundle exec rubocop -D

.github/workflows/specs.yml

@@ -0,0 +1,29 @@
+name: 📋 Specs
+on:
+  workflow_call:
+
+jobs:
+  specs:
+    name: 📋 Run Specs
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 📰 Checkout code
+        uses: actions/checkout@v3
+
+      - name: 💪 Install libcurl4-openssl-dev for Curb Gem
+        run: |
+          sudo apt-get update
+          sudo apt-get install libcurl4-openssl-dev
+
+      - name: 💎 Setup Ruby and install RubyGems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+          bundler-cache: true
+
+      - name: 🛤️ Start Rails
+        run: nohup bundle exec rails server &
+
+      - name: ✔️ Run Rspec specs using CI config
+        run: bundle exec rake ci_specs

app/assets/javascripts/player.js

@@ -427,4 +427,19 @@ $(function() {
     $('#timecode-share').val(getShareUrl());
   });
 
+  // check for this empty element to show modal
+  if($("#legal-modal").length > 0){
+    let modalMsg = document.createElement("div")
+    modalMsg.innerHTML = "By accessing this content you agree to the AAPB's <a href='/legal/orr-rules'>Online Reading Room Rules of Use</a>. Click this message to continue."
+
+    // add modal dialog for legal language...
+    videojs.getPlayer('#player_media_html5_api').ready(function() {
+      var myPlayer = this;
+      var modal = myPlayer.createModal(modalMsg);
+
+      $(".lite-videocontent").click(function() {
+        modal.close()
+      })
+    });
+  }
 });

app/assets/stylesheets/globals/videojs.css.scss

@@ -23,12 +23,34 @@ span.vjs-current-time-display {
 }
 
 
-/*disallow play/pause clicks on whole video element*/
-.vjs-tech {
+/*disallow play/pause clicks on EXHIBIT video element*/
+div.exgal-player-container .vjs-tech {
   pointer-events: none;
 }
 
 /*
 div.vjs-duration {
   display: none !important;
-}*/
+}*/
+
+
+.lite-videocontent .video-js .vjs-modal-dialog {
+  background: linear-gradient(180deg, rgba(0, 0, 0, 0.8), rgba(74, 35, 120, 255));
+/*  background-color: #4A2378;*/
+}
+
+.lite-videocontent .video-js .vjs-modal-dialog .vjs-modal-dialog-content {
+  font-size: 2.8em;
+  vertical-align: middle;
+  text-align: center;
+/*  line-height: 26em;*/
+  padding-top: 25%;
+}
+
+.lite-videocontent .video-js .vjs-modal-dialog .vjs-modal-dialog-content a {
+  color: #BB42E0;
+}
+
+.lite-videocontent .video-js button.vjs-control.vjs-close-button {
+  display: none;
+}