Merge branch 'static_site_generation' into static_site_preview-site

Had to add back the "get-vol" template which was needed by
template_editorial_article.xsl.

articles/000742/000742.xhtml

@@ -70,8 +70,8 @@
                      for ethical approaches to sensitive visual 
                      materials. The EyCon (Early Conflict Photography and Visual AI) project assembled
                      a large database of sensitive visual materials from 
-                     colonial conflicts and developed an experimental multi-modal computer vision tool
-                     with which to analyze it. Though this tool has not yet 
+                     colonial conflicts and developed experimental multi-modal computer vision tools with
+                     which to analyze it. Though this tool has not yet 
                      been applied at scale or quantitatively compared with other approaches, we are able
                      to propose modes of inquiry for other researchers to 
                      explore as they create new research tools. On a more hypothetical or theoretical level,
@@ -164,7 +164,7 @@
 
                      newspapers in order to automatically detect variables such as the changing medium
                      of illustrations over time (engravings vs. halftones), the
-                     styles of illustrated advertising, and the most common visual forms in the press <span class="error"><a class="ref" href="#smit_wevers_2021">#smit_wevers_2021</a></span>. By “multimodal” 
+                     styles of illustrated advertising, and the most common visual forms in the press [<a class="ref" href="#smits_wevers_2021">Smits and Wevers 2021</a>]. By “multimodal” 
                      ML, we mean the use of an ML model that performs different kinds of operations on
                      different input data, combining or “stacking” these 
                      different operations to produce more robust results. Our proposed model's network
@@ -1020,11 +1020,14 @@
                      has organized two workshops to discuss how 
                      archivists currently define and approach “sensitive” pictures. Professionals from various institutions and backgrounds selected 
                      problematic photographs, and the discussions made clear that the restrictive typology
-                     used by corporations to classify sensitive content had to be rethought. For this reason,
-                     EyCon has been working with team members and paid interns to identify sensitive images.
-                     By combining these annotations with already-annotated databases of historical images
-                     such as the Valois collection held at   <span class="hi italic">La Bibliothèque de Documentation International Contemporaine</span> (BDIC), we suggest it would be possible to train a CNN to identify instances of sensitive
-                     images in other online databases with a higher degree of accuracy. </div>
+                     used by corporations to classify sensitive content 
+                     had to be rethought. For this reason, EyCon has been working with team members and
+                     paid interns to identify sensitive images. By combining 
+                     these annotations with already-annotated databases of historical images such as the
+                     Valois collection held at La Bibliothèque de 
+                     Documentation International Contemporaine (BDIC), we suggest it would be possible to train a CNN to identify instances 
+                     of sensitive images in other online databases with a higher degree of accuracy.
+                     </div>
 
                   <div class="figure">
 

build-properties.xml

@@ -12,6 +12,15 @@
     (but not the compressed site). -->
   <context>dhq</context>
 
+  <!-- A regular expression mapping individual HTML pages in the repository to their 
+    static site equivalents. You can add directories to the first group, or adjust 
+    the file extensions in the second group. Note, however, that any file matched by 
+    this regex will be transformed with XSLT, and so, should be XHTML. -->
+  <staticPages>
+    <from>^(about|contact|explore|news|people|submissions)/(.+\.html)</from>
+    <to>\1/\2</to>
+  </staticPages>
+
   <toDir>
     <!-- The base directory for storing static site content. The directory will be 
       placed at the same level as the git repository. -->

build.xml

@@ -247,9 +247,10 @@ compressStatic
              location="${toDir.base.path}${file.separator}xhtml1-strict.dtd"/>
       </xmlcatalog>
       <mapper>
-        <regexpmapper
-          from="^(about|contact|news|people|submissions)/(.+\.html)"
-          to="\1/\2" handledirsep="yes"/>
+        <!-- You can find the regular expression for the XHTML pages to be 
+          transformed in build-properties.xml . -->
+        <regexpmapper from="${staticPages.from}" to="${staticPages.to}" 
+          handledirsep="yes"/>
       </mapper>
       <factory name="${processor.name}"/>
       <param name="assets-path" expression="..${file.separator}"/>

common/css/dhq_screen.css

@@ -257,7 +257,7 @@ h1.volumeIssue {
     color: #333333;
     margin-top: -10px;
 }
-#abstract, div.revisionNote {
+#abstract,  div.revisionNote {
     border: 1px solid black;
     margin: 1em;
     margin-bottom: 4em;
@@ -274,6 +274,19 @@ h1.volumeIssue {
     font-size: .8em;
     padding: 1em 2em;
 }
+#recommendations {
+    border: 1px solid black;
+    margin: 1em;
+    width: 85%;
+    background-color: #f7f7f7;
+    font-size: .95em;
+    padding: 1em 2em;
+}
+/* Using a darker blue for the recommendation links improves contrast */
+#recommendations a:link {
+    color: #005199;
+}
+
 input {
     border: 1px solid black;
 }