Merge branch 'main' into test

paragonn · Jul 5, 2024 · 64da08f · 64da08f
2 parents 90c938f + dbfef75
commit 64da08f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/config/project/entryTypes/jurisdictions--bac5974c-f86b-4ef2-a13c-d4e61c2883b7.yaml b/config/project/entryTypes/jurisdictions--bac5974c-f86b-4ef2-a13c-d4e61c2883b7.yaml
@@ -247,6 +247,21 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 100
+          -
+            elementCondition: null
+            fieldUid: f3d1f10a-2e4d-40dc-9dc4-d6aea55b51d7 # Buttons
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 87ab7838-69ae-4cbe-9f7b-0f73acaa556d
+            userCondition: null
+            warning: null
+            width: 100
           -
             elementCondition: null
             heading: Settings

diff --git a/config/project/project.yaml b/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1720155567
+dateModified: 1720163236
 email:
   fromEmail: [email protected]
   fromName: 'IJM Program Tracker'

diff --git a/templates/_pages/jurisdictions/entry.twig b/templates/_pages/jurisdictions/entry.twig
@@ -8,6 +8,7 @@
 {% set stageValue = entry.stage.getValue()|default(null) %}
 {% set country = entry.country.level(1).one() %}
 {% set jurisdictionsCaseTypes = entry.jurisdictionsCaseTypes %}
+{% set buttons = entry.buttons.all() %}
 
 {% set perRowLimit = entry.perRowLimit.getValue()|default('2') %}
 {% set imagePosition = entry.imagePosition.getValue()|default('right') %}
@@ -184,6 +185,18 @@
                     {% endif %}
                 </div>
                 {% endif %}
+
+                {% if buttons|length %}
+                <div class="mt-8">
+                    {{ render.basicContents({
+                        buttons: buttons,
+                        defaultButtonType: 'link',
+                        backgroundColorLabel: backgroundColorLabel,
+                        opacity: overlayOpacity,
+                        contentAlignment: 'left'
+                    }) }}
+                </div>
+                {% endif %}
             </div>
 
             {% if heroImage|length %}