Merge pull request Andycko#7 from fortytwostudio/master

CMS & Code Tidy
fortytwostudio · Nov 3, 2022 · 1330ff8 · 1330ff8
2 parents 1b8911f + ab9e806
commit 1330ff8
Show file tree

Hide file tree

Showing 15 changed files with 86 additions and 130 deletions.
diff --git a/config/general.php b/config/general.php
@@ -43,7 +43,7 @@
         // Setup @webroot alias
         'aliases' => [
             '@web' => App::env('PRIMARY_SITE_URL')
-        ],
+        ]
     ],
 
     'dev' => [

diff --git a/config/project/entryTypes/about--f6901440-dc45-4323-a125-0a7d3d90f06c.yaml b/config/project/entryTypes/about--f6901440-dc45-4323-a125-0a7d3d90f06c.yaml
@@ -26,15 +26,6 @@ fieldLayouts:
             type: craft\fieldlayoutelements\EntryTitleField
             warning: null
             width: 100
-          -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
           -
             fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
             instructions: null

diff --git a/config/project/entryTypes/contact--76ee93ec-459e-4fa9-967f-aa9b48f7b9e1.yaml b/config/project/entryTypes/contact--76ee93ec-459e-4fa9-967f-aa9b48f7b9e1.yaml
@@ -26,15 +26,6 @@ fieldLayouts:
             type: craft\fieldlayoutelements\EntryTitleField
             warning: null
             width: 100
-          -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
           -
             fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
             instructions: null
@@ -44,6 +35,10 @@ fieldLayouts:
             type: craft\fieldlayoutelements\CustomField
             warning: null
             width: 100
+          -
+            style: warning
+            tip: 'Any content blocks you add here will appear below the enquiry form'
+            type: craft\fieldlayoutelements\Tip
           -
             fieldUid: 1d1d5665-5674-4388-8d46-9b87e4dc65d3 # Content Builder
             instructions: null

diff --git a/config/project/entryTypes/default--ed9d2994-c74c-40fe-9f3f-280fe7a5360a.yaml b/config/project/entryTypes/default--ed9d2994-c74c-40fe-9f3f-280fe7a5360a.yaml
@@ -26,15 +26,6 @@ fieldLayouts:
             type: craft\fieldlayoutelements\EntryTitleField
             warning: null
             width: 100
-          -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
           -
             fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
             instructions: null
@@ -58,7 +49,7 @@ fieldLayouts:
       -
         elements:
           -
-            fieldUid: 4184d945-e90d-4433-b1f3-727edf65107e # Summary Image
+            fieldUid: 39237593-ff51-4bd3-851a-a9dfac329c0b # Page Summary
             instructions: null
             label: null
             required: false
@@ -67,7 +58,7 @@ fieldLayouts:
             warning: null
             width: 100
           -
-            fieldUid: 39237593-ff51-4bd3-851a-a9dfac329c0b # Page Summary
+            fieldUid: 4184d945-e90d-4433-b1f3-727edf65107e # Summary Image
             instructions: null
             label: null
             required: false

diff --git a/config/project/entryTypes/homepage--369ea60f-6259-4683-adcc-23418cf8285e.yaml b/config/project/entryTypes/homepage--369ea60f-6259-4683-adcc-23418cf8285e.yaml
@@ -26,15 +26,6 @@ fieldLayouts:
             type: craft\fieldlayoutelements\EntryTitleField
             warning: null
             width: 100
-          -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
           -
             fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
             instructions: null

diff --git a/config/project/entryTypes/latest--d305657a-b071-42af-960e-aa7b81715a02.yaml b/config/project/entryTypes/latest--d305657a-b071-42af-960e-aa7b81715a02.yaml
@@ -26,24 +26,6 @@ fieldLayouts:
             type: craft\fieldlayoutelements\EntryTitleField
             warning: null
             width: 100
-          -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
-          -
-            fieldUid: 2f64efd3-101a-4ed1-a31e-96657d6dc6e5 # Header
-            instructions: null
-            label: null
-            required: false
-            tip: null
-            type: craft\fieldlayoutelements\CustomField
-            warning: null
-            width: 100
           -
             fieldUid: 1d1c9f28-39de-4df6-b077-856d16c001ca # Copy
             instructions: null

diff --git a/config/project/entryTypes/latestIndex--714a1c4f-39d2-4a93-b0fc-1d7089a16ff2.yaml b/config/project/entryTypes/latestIndex--714a1c4f-39d2-4a93-b0fc-1d7089a16ff2.yaml
@@ -27,7 +27,7 @@ fieldLayouts:
             warning: null
             width: 100
           -
-            fieldUid: 8d7e4ca7-1762-4215-b1e0-3022ed0176b3 # Transparent Nav
+            fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
             instructions: null
             label: null
             required: false
@@ -36,7 +36,11 @@ fieldLayouts:
             warning: null
             width: 100
           -
-            fieldUid: d783368e-a494-4457-9e99-5a027ae72a18 # Page Header
+            style: warning
+            tip: 'Any content blocks you add here will appear below the articles'
+            type: craft\fieldlayoutelements\Tip
+          -
+            fieldUid: 1d1d5665-5674-4388-8d46-9b87e4dc65d3 # Content Builder
             instructions: null
             label: null
             required: false

diff --git a/config/project/project.yaml b/config/project/project.yaml
@@ -1,4 +1,4 @@
-dateModified: 1667316143
+dateModified: 1667484997
 email:
   fromEmail: $ADMIN_EMAIL
   fromName: $SITE_NAME
@@ -146,6 +146,7 @@ plugins:
   freeform:
     edition: lite
     enabled: true
+    licenseKey: K6IIQSJNRK5VJ92Y9GNE6CTK
     schemaVersion: 3.6.4
     settings:
       ajaxByDefault: true
@@ -216,10 +217,12 @@ plugins:
   navigation:
     edition: standard
     enabled: true
+    licenseKey: Z9SM7RIIEEH0EBHEWCC835VA
     schemaVersion: 1.0.21
   neo:
     edition: standard
     enabled: true
+    licenseKey: GLCZR55H2CE18QT7Y5WC2G3L
     schemaVersion: 2.13.0
   oembed:
     edition: standard

diff --git a/public/.htaccess b/public/.htaccess
@@ -6,8 +6,8 @@
     # RewriteRule ^(.*)$ https://www.websitedomain.com/$1 [L,R=301,NC]
 
     # Redirect www to non www
-#    RewriteCond %{HTTP_HOST} ^www.websitedomain.com [NC]
-#    RewriteRule ^(.*)$ https://websitedomain.com/$1 [L,R=301]
+    # RewriteCond %{HTTP_HOST} ^www.websitedomain.com [NC]
+    # RewriteRule ^(.*)$ https://websitedomain.com/$1 [L,R=301]
 
     # Send would-be 404 requests to Craft
     RewriteCond %{REQUEST_FILENAME} !-f
@@ -16,9 +16,9 @@
     RewriteRule (.+) index.php?p=$1 [QSA,L]
 
     # Remove trailing slash from URL
-#    RewriteCond %{REQUEST_FILENAME} !-d
-#    RewriteCond %{REQUEST_URI} (.+)/$
-#    RewriteRule ^ %1 [R=301,L]
+    # RewriteCond %{REQUEST_FILENAME} !-d
+    # RewriteCond %{REQUEST_URI} (.+)/$
+    # RewriteRule ^ %1 [R=301,L]
 </IfModule>
 
 <IfModule mod_headers.c>
@@ -216,5 +216,4 @@ FileETag None
 
     ExpiresByType text/x-cross-domain-policy            "access plus 1 week"
 
-</IfModule>
-
+</IfModule>
diff --git a/storage/setup-boilerplate/default_db.sql b/storage/setup-boilerplate/default_db.sql
diff --git a/templates/_includes/_content-builder/_blocks/video.twig b/templates/_includes/_content-builder/_blocks/video.twig
@@ -13,16 +13,16 @@
                         {% if vid.video.media.type == 'video' %}
                             {{ vid.video.render({
                                 params: {
-                                    autoplay: 1,
-                                    controls: 0,
-                                    loop: 1,
-                                    mute: 1,
+                                    autoplay: 0,
+                                    controls: 1,
+                                    loop: 0,
+                                    mute: 0,
                                 }
                             }) }}
                         {% endif %}
                     {% else %}
                         {% if vid.video.one %}
-                            <video src="{{ vid.video.url }}" alt="{{ vid.video }}"></video>
+                            <video src="{{ vid.video.url }}" alt="{{ vid.video }}" controls playsinline></video>
                         {% else %}
                             <video autoplay loop>
                                 <source src="./img/video_placeholder.mp4">

diff --git a/templates/_layout.twig b/templates/_layout.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en-GB">
 <head>
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta charset="utf-8" />

diff --git a/templates/contact/index.twig b/templates/contact/index.twig
@@ -7,12 +7,6 @@
         {% include '_includes/_page-headers/_' ~ header.type.handle %}
     {% endif %}
 
-    {% if entry.contentBuilder %}
-        {% for block in entry.contentBuilder.all() %}
-            {% include '_includes/_content-builder/_blocks/' ~ block.type.handle %}
-        {% endfor %}
-    {% endif %}
-
     <div class="container contact-form">
         <div class="row">
             <div class="col-8">
@@ -23,4 +17,10 @@
         </div>
     </div>
 
+    {% if entry.contentBuilder %}
+        {% for block in entry.contentBuilder.all() %}
+            {% include '_includes/_content-builder/_blocks/' ~ block.type.handle %}
+        {% endfor %}
+    {% endif %}
+
 {% endblock %}
diff --git a/templates/latest/_entry.twig b/templates/latest/_entry.twig
@@ -9,7 +9,6 @@
                 </h1>
             </div>
             <div class="col-12">
-                <h2>{{ entry.header }}</h2>
                 <div class="copy">{{ entry.copy }}</div>
             </div>
         </div>

diff --git a/templates/latest/index.twig b/templates/latest/index.twig
@@ -38,7 +38,7 @@
         {% if pageInfo.totalPages > 1 %}
             <div class="row justify-content-center pagination-links pb-5">
                 {% if craft.app.request.absoluteUrl == pageInfo.firstUrl %}
-                    <span class="px-2 text-grey">First page</span>
+                    <span class="px-2">First page</span>
                 {% else %}
                     <a href="{{ pageInfo.firstUrl }}" class="px-2">First Page</a>
                 {% endif %}
@@ -49,7 +49,7 @@
                     <a href="{{ url }}" class="px-2">{{ page }}</a>
                 {% endfor %}
 
-                <span class="current text-grey px-2">{{ pageInfo.currentPage }}</span>
+                <span class="current px-2">{{ pageInfo.currentPage }}</span>
 
                 {% for page, url in pageInfo.getNextUrls(5) %}
                     <a href="{{ url }}" class="px-2">{{ page }}</a>
@@ -58,9 +58,9 @@
                 {% if pageInfo.nextUrl %}<a href="{{ pageInfo.nextUrl }}" class="px-2">Next Page</a>{% endif %}
 
                 {% if craft.app.request.absoluteUrl == pageInfo.lastUrl %}
-                    <span class="px-2 text-grey">Last page</span>
+                    <span class="px-2">Last page</span>
                 {% else %}
-                    <a href="{{ pageInfo.lastUrl }}" class="px-2 text-navy">Last Page</a>
+                    <a href="{{ pageInfo.lastUrl }}" class="px-2">Last Page</a>
                 {% endif %}
             </div>
         {% endif %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
                     </h1>
                 </div>
                 <div class="col-12">
-                    <h2>{{ entry.header }}</h2>
                     <div class="copy">{{ entry.copy }}</div>
                 </div>
             </div>
@@ Expand Down @@