EMMR-107 Final adjustments

unb-libraries · Dec 1, 2023 · 4be9fdf · 4be9fdf
1 parent a529a86
commit 4be9fdf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/configuration/field.field.paragraph.emmr_annotation.field_annotation_body.yml b/configuration/field.field.paragraph.emmr_annotation.field_annotation_body.yml
@@ -9,7 +9,7 @@ id: paragraph.emmr_annotation.field_annotation_body
 field_name: field_annotation_body
 entity_type: paragraph
 bundle: emmr_annotation
-label: Annotation
+label: 'Annotation Description'
 description: ''
 required: false
 translatable: false

diff --git a/configuration/filter.format.unb_libraries.yml b/configuration/filter.format.unb_libraries.yml
@@ -35,6 +35,6 @@ filters:
     status: true
     weight: 0
     settings:
-      allowed_html: '<br> <p> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <blockquote> <a href class id> <ul> <ol start> <li> <hr> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption> <img src alt height width data-caption data-align> <trxnin> <trxnrep> <trxnmar> <span class="trxn-caret trxn-text trxn-replace trxn-retext trxn-margin trxn-number"><trxn>'
+      allowed_html: '<br> <p> <h2> <h3> <h4> <h5> <h6> <strong> <em> <s> <sub> <sup> <blockquote> <a href class id> <ul> <ol start> <li> <hr> <table> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption> <img src alt height width data-caption data-align> <trxnin> <trxnrep> <trxnmar> <span class="trxn-caret trxn-text trxn-replace trxn-retext trxn-margin trxn-number"> <trxn>'
       filter_html_help: '0'
       filter_html_nofollow: '0'
diff --git a/custom/modules/emmr_core/emmr_core.module b/custom/modules/emmr_core/emmr_core.module
@@ -124,7 +124,8 @@ function emmr_core_preprocess_node(&$variables) {
       }
 
       // Highlight alternative spellings.
-      foreach ($annos_alt as $val) {
+      dump($annos_alt);
+      foreach ($annos_alt as $i => $val) {
         $pattern = '/(\b\Q' . $val[1] . '\E\b)/mi';
         $anno_id = 'top-' . $val[0];
 

diff --git a/custom/modules/emmr_core/templates/node--emmr-recipe--full.html.twig b/custom/modules/emmr_core/templates/node--emmr-recipe--full.html.twig
@@ -194,12 +194,9 @@
       <div class="col-md-8" id="recipe-trans">
         {{ content.field_recipe_transcription }}
       </div>
-
-      {% if content.field_annotations['0'] %}
-        <div class="col-md-2" id="recipe-anno">
-          {{ content.field_annotations }}
-        </div>
-      {% endif %}
+      <div class="col-md-2" id="recipe-anno">
+        {{ content.field_annotations }}
+      </div>
     </div>
   </div>
 

diff --git a/custom/themes/emmr_lib_unb_ca/src/scss/style.scss b/custom/themes/emmr_lib_unb_ca/src/scss/style.scss
@@ -622,9 +622,13 @@ body > div.dialog-off-canvas-main-canvas > div > div > div > div > nav > ul
     font-weight: 500;
 }
 
-#recipe-anno {
+#recipe-anno:has(div) {
   border-left: 2px solid #e5e5e5;
 
+  trxnmar {
+    display: block;
+  }
+
   .field--items {
     padding-top: 1em;
   }