Merge branch 'master' of git.library.upei.ca:code/lmmi_journal_theme

composer.json

@@ -0,0 +1,25 @@
+{
+  "name": "roblib/lmmi_journal_theme",
+  "description": "Journal of LM Montgomery Studies theme, sub-theme of MagazinePlus",
+  "type": "drupal-custom-theme",
+  "keywords": [
+    "Drupal"
+  ],
+  "homepage": "https://library.upei.ca/",
+  "repositories": [
+    {
+      "type": "composer",
+      "url": "https://packages.drupal.org/8"
+    }
+  ],
+  "require": {
+    "roblib/magazineplus_lmmi_journal": "dev-master"
+  },
+  "license": "GPL-2.0-or-later",
+  "authors": [
+    {
+      "name": "Rob Drew",
+      "role": "Owner"
+    }
+  ]
+}

css_overrides.css

@@ -30,5 +30,45 @@ p.hangingindent {
 span.citeproc-container-title {
     font-style: italic;
 }
+.page-node-173 .article-info {
+  display: none;
 
+}
+.page-node-173 .node__container {
+    display: block !important;
+  }
+
+.masonry-item {
+        width: 30.5%;
+    background-color: #f6f6f2;
+    border: 0;
+    margin: 0.5%;
+    padding: 0;
+}
+.paragraph--type--author-with-affiliation {
+	display: flex;
+}
+img.orcid_logo {
+	width: 22px;
+	margin-bottom: 9px;
+}
 
+.orcid-short-link {
+	margin-left: 12px;
+	font-weight: normal;
+	font-style: normal;
+	font-size: smaller;
+	line-height: 2;
+}
+.teaser-card__body .field--name-field-affiliation-string {
+	    display:none;
+}
+.field--name-field-journal-article-abstract {
+  background: #eee;
+  padding: .5em;
+  margin-bottom:1.5em;
+  p:last-child {
+
+    padding-bottom: 0;
+  }
+}

lmmi_journal.info.yml

@@ -1,7 +1,7 @@
 name: LMMI Journal
 type: theme
 description: Subtheme of Magazine Plus
-core: 8.x
+core_version_requirement: ^8 || ^9 || ^10
 # Defines the base theme
 base theme: magazineplus
 # Defines libraries group in which we can add css/js.
@@ -10,7 +10,7 @@ libraries:
   - lmmi_journal/global-scripts
   - lmmi_journal/fonts
 
-stylesheets-remove: 
+stylesheets-remove:
   - core/themes/stable/css/views/views.module.css
   - themes/custom/magazineplus_lmmi_journal/css/base/elements.css
   - core/assets/vendor/jquery.ui/themes/base/theme.css

package-lock.json

@@ -970,13 +970,6 @@
         "readdirp": "^2.0.0"
       }
     },
-    "chownr": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-      "dev": true,
-      "optional": true
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -1513,7 +1506,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "optional": true,
@@ -1774,7 +1767,7 @@
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "optional": true,
@@ -1854,7 +1847,7 @@
         },
         "readable-stream": {
           "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
           "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
           "dev": true,
           "optional": true,
@@ -2159,7 +2152,7 @@
           "dependencies": {
             "readable-stream": {
               "version": "1.0.34",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
               "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
               "dev": true,
               "optional": true,
@@ -3341,16 +3334,6 @@
         "universalify": "^0.1.0"
       }
     },
-    "fs-minipass": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
-      "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "minipass": "^2.6.0"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -3421,7 +3404,9 @@
         "chownr": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz",
-          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE="
+          "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=",
+          "dev": true,
+          "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
@@ -3486,6 +3471,8 @@
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
+          "dev": true,
+          "optional": true,
           "requires": {
             "minipass": "^2.2.1"
           }
@@ -3619,6 +3606,7 @@
           "version": "2.2.4",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz",
           "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==",
+          "dev": true,
           "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
@@ -3629,6 +3617,8 @@
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.1.0.tgz",
           "integrity": "sha512-4T6Ur/GctZ27nHfpt9THOdRZNgyJ9FZchYO1ceg5S8Q3DNLCKYy44nCZzgCJgcvx2UM8czmqak5BCxJMrq37lA==",
+          "dev": true,
+          "optional": true,
           "requires": {
             "minipass": "^2.2.1"
           }
@@ -3838,6 +3828,7 @@
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
           "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+          "dev": true,
           "optional": true
         },
         "safer-buffer": {
@@ -3914,6 +3905,22 @@
           "dev": true,
           "optional": true
         },
+        "tar": {
+          "version": "4.4.1",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz",
+          "integrity": "sha512-O+v1r9yN4tOsvl90p5HAP4AEqbYhx4036AGMm075fH9F8Qwi3oJ+v4u50FkT/KkvywNGtwkk0zRI+8eYm1X/xg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chownr": "^1.0.1",
+            "fs-minipass": "^1.2.5",
+            "minipass": "^2.2.4",
+            "minizlib": "^1.1.0",
+            "mkdirp": "^0.5.0",
+            "safe-buffer": "^5.1.1",
+            "yallist": "^3.0.2"
+          }
+        },
         "util-deprecate": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -3942,6 +3949,7 @@
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.2.tgz",
           "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=",
+          "dev": true,
           "optional": true
         }
       }
@@ -6093,36 +6101,6 @@
       "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
       "dev": true
     },
-    "minipass": {
-      "version": "2.9.0",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
-      "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.0"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "minizlib": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
-      "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "minipass": "^2.9.0"
-      }
-    },
     "mixin-deep": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
@@ -6277,31 +6255,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
           "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
           "dev": true
-        },
-        "tar": {
-          "version": "2.2.2",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
-          "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
-          "dev": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.12",
-            "inherits": "2"
-          },
-          "dependencies": {
-            "fstream": {
-              "version": "1.0.12",
-              "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
-              "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-              }
-            }
-          }
         }
       }
     },
@@ -8627,28 +8580,14 @@
       }
     },
     "tar": {
-      "version": "4.4.15",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz",
-      "integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
+      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
       "dev": true,
-      "optional": true,
       "requires": {
-        "chownr": "^1.1.1",
-        "fs-minipass": "^1.2.5",
-        "minipass": "^2.8.6",
-        "minizlib": "^1.2.1",
-        "mkdirp": "^0.5.0",
-        "safe-buffer": "^5.1.2",
-        "yallist": "^3.0.3"
-      },
-      "dependencies": {
-        "yallist": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "dev": true,
-          "optional": true
-        }
+        "block-stream": "*",
+        "fstream": "^1.0.2",
+        "inherits": "2"
       }
     },
     "tar-stream": {

templates/article_pages/article--hero.html.twig

@@ -1,4 +1,7 @@
-{% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
+{% set imageValue = content.field_article_highlight_image|field_target_entity.image.entity.uri.value %}
+{% if imageValue %}
+  {% set imagePath = file_url(imageValue) %}
+{% endif %}
 {% set articleType = content.field_article_type|field_value %}
 {% set pubDate = content.field_publication_date_electroni|field_value %}
 
@@ -35,7 +38,7 @@
 
 
 
-<header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
+<header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)){% if imagePath %}, url('{{ imagePath }}'){% endif %}" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
   <div  class="container article-info--wrapper">
 
         {% block title_area %}

templates/article_pages/entity-print.html.twig

@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="page">
-    {{ content }}
+     {{ content }} 
 </div>
 </body>
 </html>

templates/entity-print--node--page.html.twig

@@ -125,3 +125,4 @@
     </div>
   </div>
 </article>
+<h1>test</h1>

templates/field--paragraph--field-contributor-orcid--author-with-affiliation.html.twig

@@ -0,0 +1,32 @@
+{#
+/**
+ * @file
+ * Theme override for the ORCID field.
+ *
+ * This is an override of field.html.twig for the node title field. See that
+ * template for documentation about its details and overrides.
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing span element.
+ * - items: List of all the field items. Each item contains:
+ *   - attributes: List of HTML attributes for each item.
+ *   - content: The field item content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ * @see field.html.twig
+ */
+#}
+{%
+  set classes = [
+    'field',
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
+  'orcid-short-link',
+  ]
+%}
+<a href="https://orcid.org/{{ items.0 }}" {{ attributes.addClass(classes) }}><img class="orcid_logo" alt="ORCID logo" src="https://info.orcid.org/wp-content/uploads/2019/11/orcid_16x16.png" width="16" height="16" />
+{#{{ items }}#}</a>

templates/landing-page/page--node--113.html.twig

@@ -432,6 +432,9 @@
               {% if main_content_animations == "enabled" %}
                 data-animate-effect="{{ main_content_animation_effect }}"
               {% endif %}>
+              <hr>
+              <h2 class="text-center">L.M. Montgomery &amp; Vision Forum</h2>
+{{ drupal_view('recent_articles_masonry', 'vision') }}
               {% if page.content %}
                 {{ page.content }}
               {% endif %}

templates/news_articles/news--hero.html.twig

@@ -1,7 +1,10 @@
+{% if not (node.field_article_highlight_image.isEmpty == true) and content.field_article_highlight_image is defined %}
 {% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
 <header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
-  <div  class="container article-info--wrapper">
-
+{% else %}
+<header class="no_image article-title-banner node__header paragraph-responsive-typography-enabled article-header">
+{% endif %}
+  <div class="container article-info--wrapper">
         {% block title_area %}
           {{ title_prefix }}
             <h1{{ title_attributes.addClass('article--title title') }}>
@@ -13,19 +16,8 @@
           {{ title_suffix }}
         {% endblock %}
   <section class="article-header--metadata">
-    <div class="left">
-      {#<div class="article--contributor">#}
-        {#Robert N. Drew#}
-      {#</div>#}
-      {#<div class="article--contributor__affiliation">University of Prince Edward Island</div>#}
-    </div>
-    <div class="right">
-      {#<div class="article--type">Article</div>#}
-      {#<div class="article--date-published">#}
-     {#Published September 20, 2018 #}
-      {#</div>#}
-    </div>
+    <div class="left"> </div>
+    <div class="right"> </div>
   </section>
   </div>
-
 </header>

templates/news_articles/news--hero.html.twig.old

@@ -0,0 +1,19 @@
+{% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
+<header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
+  <div class="container article-info--wrapper">
+        {% block title_area %}
+          {{ title_prefix }}
+            <h1{{ title_attributes.addClass('article--title title') }}>
+              {{ label }}
+            </h1>
+            <h1{{ title_attributes.addClass('article--title title sr-only') }}>
+              {{ label }}
+            </h1>
+          {{ title_suffix }}
+        {% endblock %}
+  <section class="article-header--metadata">
+    <div class="left"> </div>
+    <div class="right"> </div>
+  </section>
+  </div>
+</header>

templates/views/views-view-fields--taxonomy-term.html.twig

@@ -0,0 +1,56 @@
+{#{% if fields.field_article_type.content|striptags|trim == "Article"  %}#}
+{#{{dump(fields.field_article_type.content|striptags|trim)}}#}
+
+{% if fields.field_article_type.content|striptags|trim == "Article"  %}
+    {% set _icon_ = 'fa-file-text-o' %}
+    {% set _color_ = 'blue' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Peer-reviewed article"  %}
+    {% set _icon_ = 'fa-users' %}
+    {% set _color_ = 'red' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Audio/visual art"  %}
+    {% set _icon_ = 'fa-volume-up' %}
+    {% set _color_ = 'red' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Blog post"  %}
+    {% set _icon_ = 'fa-rss' %}
+    {% set _color_ = 'green' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Creative writing"  %}
+    {% set _icon_ = 'fa-pencil-square-o' %}
+    {% set _color_ = 'teal' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "News"  %}
+    {% set _icon_ = 'fa-newspaper-o' %}
+    {% set _color_ = 'purple' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Note"  %}
+    {% set _icon_ = 'fa-envelope-open-o' %}
+    {% set _color_ = 'aqua' %}
+	{% elseif fields.field_article_type.content|striptags|trim == "Notice"  %}
+    {% set _icon_ = 'fa-exclamation-circle' %}
+    {% set _color_ = 'teal' %}
+  {% else %}
+    {% set _icon_ = '' %}
+    {% set _color_ = '' %}
+{% endif   %}
+
+<div class="{{_color_}} teaser-card card mb-4 shadow-sm">
+{{ fields.field_article_highlight_image.content }}
+  <span class="teaser-card__icon">
+    <i class="fa {{_icon_}}" aria-hidden="true"></i>
+  </span>
+    <div class="teaser-card__category">
+    {{ fields.field_article_type.content }}
+{#{% if  fields.field_article_peer_reviewed.content |striptags|trim == "Yes"  %}#}
+  {#<span class="peer-reviewed">#}
+  {#- peer reviewed#}
+  {#</span>#}
+{#{% endif   %}#}
+</div>
+  <div class="teaser-card__body card-body">
+    <p class="teaser-card__title"> {{ fields.title.content }} </p>
+    <p class="teaser-card__author"> {{ fields.field_authors_and_affiliations.content }} </p>
+
+    </div>
+    {#<i class="fa fa-camera-retro"></i>#}
+    {#<i class="fa fa-newspaper-o" aria-hidden="true"></i>#}
+    {#<i class="fa fa-video-camera" aria-hidden="true"></i>#}
+    {#<i class="fa fa-file-text-o" aria-hidden="true"></i>#}
+    {#<i class="fa fa-film" aria-hidden="true"></i>#}
+  </div>