Merge branch 'umich_develop' into DCP2-233-using-these-materials

mlibrary · Nov 3, 2022 · f3cf9cc · f3cf9cc
2 parents fcf4639 + a14035f
commit f3cf9cc
Show file tree

Hide file tree

Showing 13 changed files with 506 additions and 163 deletions.
diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,6 @@ gem 'devise'
 gem 'devise-guests', '~> 0.6'
 gem 'font-awesome-sass', '~> 5.12.0'
 gem 'jquery-rails'
-gem 'mini_racer', platforms: :ruby
 gem 'pg'
 gem 'puma'
 gem 'rails', '~> 5.2.3'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -197,7 +197,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    libv8 (7.3.492.27.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -216,8 +215,6 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     mini_portile2 (2.8.0)
-    mini_racer (0.2.8)
-      libv8 (>= 6.9.411)
     minitest (5.16.2)
     mono_logger (1.1.0)
     multi_json (1.14.1)
@@ -447,7 +444,6 @@ DEPENDENCIES
   font-awesome-sass (~> 5.12.0)
   jquery-rails
   listen (>= 3.0.5, < 3.2)
-  mini_racer
   pg
   puma
   rails (~> 5.2.3)
@@ -467,4 +463,4 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 BUNDLED WITH
-   2.2.21
+   2.2.33
diff --git a/app/assets/stylesheets/umich-arclight/_footer.scss b/app/assets/stylesheets/umich-arclight/_footer.scss
@@ -1,16 +1,19 @@
 .footer {
   background: var(--color-blue-400);
 }
+
 .footer ul {
   list-style: none;
   margin: 0;
   padding: 0;
 }
+
 .footer ul a {
-  display: inline-block;
   padding: var(--space-x-small) 0;
   text-decoration: none;
   text-decoration-thickness: 0px;
+  display: flex;
+  align-items: center;
 }
 
 .footer ul a span:hover {
@@ -59,12 +62,15 @@
   color: var(--color-blue-200);
   padding: var(--space-medium) 0;
 }
+
 .footer__disclaimer a {
   color: var(--color-blue-200);
 }
+
 .footer__disclaimer p {
   margin: 0;
 }
+
 @media screen and (min-width: 820px) {
   .footer__disclaimer p {
     display: inline-block;

diff --git a/app/assets/stylesheets/umich-arclight/_utilities.scss b/app/assets/stylesheets/umich-arclight/_utilities.scss
@@ -21,3 +21,7 @@
 .needs-changed {
   border: 2px solid red;
 }
+
+.display-none {
+  display: none;
+}
diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
@@ -35,9 +35,9 @@
     <meta property="og:title" content="<%= render_page_title %>"/>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons"
       rel="stylesheet">
-    <link href="https://unpkg.com/@umich-lib/web@1/umich-lib.css" rel="stylesheet"/>
-    <script type="module" src="https://unpkg.com/@umich-lib/web@1/dist/umich-lib/umich-lib.esm.js"></script>
-    <script nomodule src="https://unpkg.com/@umich-lib/web@1/dist/umich-lib/umich-lib.js"></script>
+      <link href="https://cdn.jsdelivr.net/npm/@umich-lib/web@1.3.0/umich-lib.css" rel="stylesheet"/>
+      <script type="module" src="https://cdn.jsdelivr.net/npm/@umich-lib/web@1.3.0/dist/umich-lib/umich-lib.esm.js"></script>
+      <script nomodule src="https://cdn.jsdelivr.net/npm/@umich-lib/[email protected]/dist/umich-lib/umich-lib.js"></script>
 
   </head>
   <body class="<%= render_body_class %>">

diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
@@ -2,65 +2,33 @@
 <%# Last checked for updates: Blacklight v7.9 %>
 <%# https://github.com/projectblacklight/blacklight/blob/master/app/views/shared/_footer.html.erb #%>
 
-<footer class="[ footer ]">
+<footer class="footer">
 <div class="viewport-container">
-  <div class="[ footer__content ]">
+  <div class="footer__content">
     <section>
       <h2>University of Michigan Library</h2>
       <ul>
         <li>
-          <a href="#">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
+          <a href="https://lib.umich.edu/">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false" role="img">
               <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
             </svg>
-            <span> U-M Library</span></a
-          >
+            <span> U-M Library</span></a>
         </li>
         <li>
-          <a href="#">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              height="16"
-              viewBox="0 0 24 24"
-              width="16"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
+          <a href="https://www.lib.umich.edu/about-us/about-library/diversity-equity-inclusion-and-accessibility/accessibility">
+            <svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 0 24 24" width="16" fill="currentColor" aria-hidden="true" focusable="false" role="img">
               <path d="M0 0h24v24H0z" fill="none" />
               <circle cx="17" cy="4.54" r="2" />
-              <path
-                d="M14 17h-2c0 1.65-1.35 3-3 3s-3-1.35-3-3 1.35-3 3-3v-2c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5zm3-3.5h-1.86l1.67-3.67C17.42 8.5 16.44 7 14.96 7h-5.2c-.81 0-1.54.47-1.87 1.2L7.22 10l1.92.53L9.79 9H12l-1.83 4.1c-.6 1.33.39 2.9 1.85 2.9H17v5h2v-5.5c0-1.1-.9-2-2-2z"
-              />
+              <path d="M14 17h-2c0 1.65-1.35 3-3 3s-3-1.35-3-3 1.35-3 3-3v-2c-2.76 0-5 2.24-5 5s2.24 5 5 5 5-2.24 5-5zm3-3.5h-1.86l1.67-3.67C17.42 8.5 16.44 7 14.96 7h-5.2c-.81 0-1.54.47-1.87 1.2L7.22 10l1.92.53L9.79 9H12l-1.83 4.1c-.6 1.33.39 2.9 1.85 2.9H17v5h2v-5.5c0-1.1-.9-2-2-2z" />
             </svg>
             <span>Accessibility</span></a
           >
         </li>
         <li>
-          <a href="#"
-            ><svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path
-                d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"
-              />
+          <a href="https://www.lib.umich.edu/about-us/policies/library-privacy-statement">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false" role="img">
+              <path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" />
             </svg>
             <span>Library Privacy Statement</span></a
           >
@@ -69,139 +37,54 @@
     </section>
 
     <section>
-      <h2>Digital Collections</h2>
+      <h2>Finding Aids</h2>
       <ul>
         <li>
-          <a href="#"
-            ><svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path
-                d="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z"
-              />
-            </svg>
-            <span>Browse all digital collections</span></a
-          >
+          <a href="/collections">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false" role="img">
+          <path d="M3 13h8V3H3v10zm0 8h8v-6H3v6zm10 0h8V11h-8v10zm0-18v6h8V3h-8z"></path></svg>
+            <span>Browse all finding aids</span></a>
         </li>
         <li>
-          <a href="#"
-            ><svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path
-                d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z"
-              />
-            </svg>
-            <span>About these digital collections</span></a
-          >
-        </li>
-        <li>
-          <a href="#"
-            ><svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path
-                d="M20 0H4v2h16V0zM4 24h16v-2H4v2zM20 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-8 2.75c1.24 0 2.25 1.01 2.25 2.25s-1.01 2.25-2.25 2.25S9.75 10.24 9.75 9 10.76 6.75 12 6.75zM17 17H7v-1.5c0-1.67 3.33-2.5 5-2.5s5 .83 5 2.5V17z"
-              />
-            </svg>
+          <a href="https://www.lib.umich.edu/about-us/our-divisions-and-departments/library-information-technology/digital-content-and">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false" role="img">
+          <path d="M20 0H4v2h16V0zM4 24h16v-2H4v2zM20 4H4c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-8 2.75c1.24 0 2.25 1.01 2.25 2.25s-1.01 2.25-2.25 2.25S9.75 10.24 9.75 9 10.76 6.75 12 6.75zM17 17H7v-1.5c0-1.67 3.33-2.5 5-2.5s5 .83 5 2.5V17z" />
+          </svg>
             <span>About Digital Content and Collections</span>
           </a>
         </li>
-        <li>
-          <a href="#">
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path d="M0 0h24v24H0z" fill="none" />
-              <path
-                d="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1.9-2 2-2s2 .9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z"
-              />
-            </svg>
-
-            <span>How to use this site</span></a
-          >
+        <li class="display-none"> <a href="#">
+          <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" focusable="false" role="img" >
+          <path d="M0 0h24v24H0z" fill="none" />
+          <path d="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1.9-2 2-2s2 .9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z" />
+          </svg>
+          <span>How to use this site</span></a>
         </li>
       </ul>
     </section>
 
-    <section class="[ footer__policies ]">
+    <section class="footer__policies">
       <h2>Policies and Copyright</h2>
       <p>
-        Copyright permissions may be different for each digital
-        collection. Please check the
-        <a href="">Rights and Permissions</a> section on a specific
-        collection for information.
-      </p>
-      <p>
-        <a href="#"
-          >Takedown Policy for Sensitive Information in U-M Digital
-          Collections</a
-        >
+      Copyright permissions may be different for each collection described in a finding aid. Please check the Use & Permissions section on a specific collection for information.
       </p>
     </section>
     <section>
       <h2>Contact Us</h2>
       <ul>
         <li>
-          <a href="#"
-            ><svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="16"
-              height="16"
-              viewBox="0 0 24 24"
-              fill="currentColor"
-              aria-hidden="true"
-              focusable="false"
-              role="img"
-            >
-              <path
-                d="M19 2H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h4l3 3 3-3h4c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zm-6 16h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 11.9 13 12.5 13 14h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"
-              />
-            </svg>
-            <span>Ask about this content</span></a
-          >
+          <a href="mailto:[email protected]">
+            <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" role="img" focusable="false" aria-hidden="true" fill="currentColor"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/></svg>
+            <span>Report problems using this site</span></a>
         </li>
       </ul>
     </section>
   </div>
 </div>
-<div class="[ footer__disclaimer ]">
+<div class="footer__disclaimer">
   <div class="viewport-container">
     <p>&copy; <%= Date.today.year %>, Regents of the University of Michigan</p>
-    <p>
-      Built with the
-      <a href="https://design-system.lib.umich.edu/"
-        >U-M Library Design System</a
-      >
-    </p>
+    <p>Built with <a href="https://github.com/projectblacklight/arclight">ArcLight</a> and the <a href="https://design-system.lib.umich.edu/">U-M Library Design System</a></p>
   </div>
 </div>
 </footer>
diff --git a/doc/diagrams/.gitignore b/doc/diagrams/.gitignore
@@ -0,0 +1,2 @@
+.structurizr/
+
diff --git a/doc/diagrams/README.md b/doc/diagrams/README.md
@@ -0,0 +1,23 @@
+# Architecture Diagrams
+
+This directory has the source for C4 / Structurizr diagrams for ArcLight.
+
+## Contents
+
+ - `docker-compose.yml` - Compose file for running Structurizr Lite
+ - `workspace.dsl` - the workspace model, in Structurizr DSL
+ - `workspace.json` - the Structurizr workspace layout
+
+## Usage
+
+Run Structurizr Lite with Docker Compose and visit the app in a browser. By
+default, it listens on localhost, port 9000.
+
+```
+docker compose up
+```
+
+## References
+
+ - [C4 Model](https://c4model.com/)
+ - [Structurizr DSL](https://structurizr.com/help/dsl)
diff --git a/doc/diagrams/docker-compose.yml b/doc/diagrams/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '3'
+
+services:
+  web:
+    image: structurizr/lite
+    ports:
+    - "9000:8080"
+    volumes:
+    - .:/usr/local/structurizr