Merge branch 'main' into test

config/matrix-extended.php

@@ -23,6 +23,30 @@
                     'types' => ['twoColumns', 'container'],
                 ]
             ],
+        ],
+        'column' => [
+            'groups' => [
+                [
+                    'label' => \Craft::t('app', 'Basic'),
+                    'types' => ['basicContent', 'image'],
+                ],
+                [
+                    'label' => \Craft::t('app', 'Components'),
+                    'types' => ['infoBox', 'statsBox', 'checklist', 'stackedCards'],
+                ]
+            ],
+        ],
+        'container' => [
+            'groups' => [
+                [
+                    'label' => \Craft::t('app', 'Basic'),
+                    'types' => ['basicContent', 'image'],
+                ],
+                [
+                    'label' => \Craft::t('app', 'Components'),
+                    'types' => ['infoBox', 'cards', 'iconCards', 'stackedCards', 'statsBox', 'checklist', 'accordion', 'imageContent', 'twoColumns'],
+                ]
+            ],
         ]
     ]
 ];

config/project/entryTypes/container--a134d66d-e5d8-439a-bc68-e947c91e759b.yaml

@@ -364,7 +364,7 @@ fieldLayouts:
         userCondition: null
 handle: container
 hasTitleField: false
-icon: ''
+icon: toolbox
 name: Container
 showSlugField: false
 showStatusField: true

config/project/entryTypes/jurisdictions--bac5974c-f86b-4ef2-a13c-d4e61c2883b7.yaml

@@ -85,7 +85,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: null
+            label: 'Map Dot Popup Image'
             providesThumbs: false
             required: false
             tip: null
@@ -100,7 +100,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: null
+            label: 'Map Dot Location'
             providesThumbs: false
             required: true
             tip: null
@@ -109,30 +109,9 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 100
-        name: Filter
+        name: Metadata
         uid: ce7b5803-4685-40c3-b2e3-b9cfd246094d
         userCondition: null
-      -
-        elementCondition: null
-        elements:
-          -
-            elementCondition: null
-            fieldUid: c14150f6-d51e-480d-9575-1091c8b07cb1 # Content Builder
-            handle: null
-            includeInCards: false
-            instructions: null
-            label: null
-            providesThumbs: false
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            uid: 8c489406-84ef-45ec-955f-a089fa0f6eb7
-            userCondition: null
-            warning: null
-            width: 100
-        name: Content
-        uid: 2bc4a234-df5b-412b-87ab-e0a64dd2e9b7
-        userCondition: null
       -
         elementCondition: null
         elements:
@@ -163,7 +142,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: 'Background Vides'
+            label: 'Background Video'
             providesThumbs: false
             required: false
             tip: null
@@ -193,7 +172,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: null
+            label: 'Stage Description'
             providesThumbs: false
             required: false
             tip: null
@@ -208,7 +187,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: null
+            label: 'Jurisdiction Details'
             providesThumbs: false
             required: false
             tip: null
@@ -289,7 +268,7 @@ fieldLayouts:
             handle: null
             includeInCards: false
             instructions: null
-            label: 'Types Per Row Limit'
+            label: 'Details Per Row Limit'
             providesThumbs: false
             required: false
             tip: null
@@ -331,6 +310,27 @@ fieldLayouts:
         name: Hero
         uid: e32db86e-8a10-42dd-a30a-22a16fa17bca
         userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: c14150f6-d51e-480d-9575-1091c8b07cb1 # Content Builder
+            handle: null
+            includeInCards: false
+            instructions: null
+            label: null
+            providesThumbs: false
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 8c489406-84ef-45ec-955f-a089fa0f6eb7
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: 2bc4a234-df5b-412b-87ab-e0a64dd2e9b7
+        userCondition: null
       -
         elementCondition: null
         elements:

config/project/fields/accordion--a08b46e9-7b38-45d1-98d4-7b4a827012ac.yaml

@@ -4,7 +4,7 @@ instructions: null
 name: Accordion
 searchable: false
 settings:
-  createButtonLabel: Accordions
+  createButtonLabel: Accordion
   entryTypes:
     - 677ee826-6c97-4489-8594-51d62514994d # Accordions
   includeTableView: false

config/project/fields/container--9b1a133a-4d4f-4a24-bb40-e59834fea921.yaml

@@ -14,6 +14,7 @@ settings:
     - 7b26f9bb-9eda-45e3-878a-0530263e4d2b # Stacked Cards
     - 1cf2528d-1b25-4d76-be36-e58ac8a4d68b # Stats Box
     - 28ccf5ae-cf72-492b-94c0-edbbbd1f411e # Checklist
+    - 3d2181fb-3192-45b5-8817-c25be592f8e2 # Accordion
     - 0e63aa9f-6064-4094-ab28-0b9e7f6b8f09 # Image + Content
     - ec8cf3c5-a3d4-4c87-9c99-6807bee72059 # Two Columns
   includeTableView: false

config/project/project.yaml

@@ -1,4 +1,4 @@
-dateModified: 1720543522
+dateModified: 1720605712
 email:
   fromEmail: [email protected]
   fromName: 'IJM Program Tracker'
@@ -307,6 +307,53 @@ plugins:
     enabled: true
     licenseKey: MM9T4KW8F4JJN4FVAEDW37MZ
     schemaVersion: 3.0.12
+    settings:
+      addHrefLang: true
+      addPaginatedHreflang: true
+      addXDefaultHrefLang: true
+      alwaysIncludeCanonicalUrls: false
+      cpTitlePrefix: '⚙ '
+      cspNonce: ''
+      cspScriptSrcPolicies:
+        -
+          __assoc__:
+            -
+              - policy
+              - '''self'''
+      devModeCpTitlePrefix: '🚧⚙ '
+      devModeTitlePrefix: ''
+      displayAnalysisSidebar: true
+      displayPreviewSidebar: true
+      enableDebugToolbarPanel: true
+      enableJsonLdEndpoint: false
+      enableMetaContainerEndpoint: false
+      enableSeoFileLinkEndpoint: false
+      environment: live
+      excludeNonCanonicalUrls: false
+      generatorEnabled: true
+      headersEnabled: true
+      includeHomepageInBreadcrumbs: true
+      lowercaseCanonicalUrl: true
+      manuallySetEnvironment: false
+      maxDescriptionLength: 155
+      maxTitleLength: 70
+      metaCacheDuration: 0
+      pluginName: SEOmatic
+      regenerateSitemapsAutomatically: true
+      renderEnabled: true
+      separatorChar: '|'
+      sidebarDisplayPreviewTypes:
+        - google
+        - twitter
+        - facebook
+      siteGroupsSeparate: true
+      siteUrlOverride: ''
+      sitemapsEnabled: true
+      socialMediaPreviewTarget: true
+      submitSitemaps: true
+      truncateDescriptionTags: true
+      truncateTitleTags: true
+      xDefaultSite: 0
   simplemap:
     edition: lite
     enabled: true

templates/_/layouts/main.twig

@@ -11,6 +11,10 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
         {# Fav Icon #}
+        <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+        <link rel="manifest" href="/site.webmanifest">
 
         {% block seo %}{% endblock %}
         {# CSS #}

web/site.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}