From d7783504f1d64e47cdd9676678e865bc09a590ac Mon Sep 17 00:00:00 2001
From: Tony Air <tony@twma.pro>
Date: Sun, 3 Jul 2022 15:19:00 +0200
Subject: [PATCH] IMPR: Remove unnecessary divs

---
 app/_config/app.yml                           |  1 +
 app/templates/Layout/Page.ss                  |  4 +-
 app/templates/Layout/PageController_search.ss | 82 +++++++++----------
 composer.json                                 | 16 +++-
 4 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/app/_config/app.yml b/app/_config/app.yml
index a2b671d..406c404 100644
--- a/app/_config/app.yml
+++ b/app/_config/app.yml
@@ -6,6 +6,7 @@ After:
   - elementalvirtual
   - elemental-basics
   - a2nt-cms-niceties-options-elements
+  - a2nt-cms-niceties-base-config
   - webapp-base-extensions
   - webapp-locale-fluent
 ---
diff --git a/app/templates/Layout/Page.ss b/app/templates/Layout/Page.ss
index db9500e..2a070fa 100644
--- a/app/templates/Layout/Page.ss
+++ b/app/templates/Layout/Page.ss
@@ -1,3 +1 @@
-<div id="PageContainer" class="page{$CSSClass} action{$Action}">
-	<% include Content %>
-</div>
+<% include Content %>
diff --git a/app/templates/Layout/PageController_search.ss b/app/templates/Layout/PageController_search.ss
index f66b2a5..8d88907 100644
--- a/app/templates/Layout/PageController_search.ss
+++ b/app/templates/Layout/PageController_search.ss
@@ -1,56 +1,48 @@
 <% with $SearchResults %>
-<div id="PageContainer" class="page{$CSSClass} pageSearch action{$Action}">
-    <div class="element">
-        <div class="element page-header-element d-block no-elements">
-            <div class="element-container {$Top.DefaultContainer}">
-                <h1 class="page-header">
-                    $Title
-                </h1>
-            </div>
+    <div class="element page-header-element d-block no-elements">
+        <div class="element-container {$Top.DefaultContainer}">
+            <h1 class="page-header">
+                $Title
+            </h1>
         </div>
     </div>
 
-    <div class="page-content page-content-main page-content-extra">
-        <div class="elemental-area">
-            <div class="element">
-                <div class="element-container {$Top.DefaultContainer}">
-                    <% if $Results %>
-                    <div id="SearchAccordion{$ID}">
-                        <% loop $Results %>
-                            <div class="card">
-                                <div class="card-header" id="Heading{$ID}{$Up.ID}">
-                                    <h3
-                                            class="mb-0 a"
-                                            data-bs-toggle="collapse"
-                                            data-bs-target="#Collapse{$ID}{$Up.ID}"
-                                            aria-expanded="false"
-                                            aria-controls="Collapse{$ID}{$Up.ID}"
-                                    >
-                                        $Title
-                                        <i class="fas fa-plus accordion-icon pull-right"></i>
-                                    </h3>
-                                </div>
+    <div class="element element-search-results">
+        <div class="element-container {$Top.DefaultContainer}">
+            <% if $Results %>
+            <div id="SearchAccordion{$ID}">
+                <% loop $Results %>
+                    <div class="card">
+                        <div class="card-header" id="Heading{$ID}{$Up.ID}">
+                            <h3
+                                    class="mb-0 a"
+                                    data-bs-toggle="collapse"
+                                    data-bs-target="#Collapse{$ID}{$Up.ID}"
+                                    aria-expanded="false"
+                                    aria-controls="Collapse{$ID}{$Up.ID}"
+                            >
+                                $Title
+                                <i class="fas fa-plus accordion-icon pull-right"></i>
+                            </h3>
+                        </div>
 
-                                <div
-                                        id="Collapse{$ID}{$Up.ID}"
-                                        class="collapse"
-                                        aria-labelledby="Heading{$ID}{$Up.ID}"
-                                        data-bs-parent="#SearchAccordion{$Up.ID}"
-                                >
-                                    <div class="card-body">
-                                        <p>$Summary(100)</p>
-                                        <a href="{$Link}">Learn More</a>
-                                    </div>
-                                </div>
+                        <div
+                                id="Collapse{$ID}{$Up.ID}"
+                                class="collapse"
+                                aria-labelledby="Heading{$ID}{$Up.ID}"
+                                data-bs-parent="#SearchAccordion{$Up.ID}"
+                        >
+                            <div class="card-body">
+                                <p>$Summary(100)</p>
+                                <a href="{$Link}">Learn More</a>
                             </div>
-                        <% end_loop %>
+                        </div>
                     </div>
-                    <% else %>
-                        <h3>Nothing was found.</h3>
-                    <% end_if %>
-                </div>
+                <% end_loop %>
             </div>
+            <% else %>
+                <h3>Nothing was found.</h3>
+            <% end_if %>
         </div>
     </div>
-</div>
 <% end_with %>
diff --git a/composer.json b/composer.json
index 50e7b4b..ecca4bb 100755
--- a/composer.json
+++ b/composer.json
@@ -38,16 +38,16 @@
         "a2nt/silverstripe-mapboxfield": "dev-master",
         "a2nt/silverstripe-progressivewebapp": "dev-master",
         "a2nt/silverstripe-elemental-basics": "*",
-        "a2nt/cms-niceties": "*",
+        "a2nt/cms-niceties": "dev-main",
         "bummzack/sortablefile": "*",
         "eluceo/ical": "^0.16.0",
         "ezyang/htmlpurifier": "^4.13",
-        "showpro/silverstripe-seo-images": "*",
         "endroid/qr-code": "^3.9",
         "jonom/focuspoint": "*",
         "symbiote/silverstripe-addressable": "dev-master",
         "silverstripe/login-forms": "*",
-        "webbuilders-group/silverstripe-image-cropper-field": "dev-master"
+        "webbuilders-group/silverstripe-image-cropper-field": "dev-master",
+        "dynamic/silverstripe-linkable": "dev-embedUpdate"
     },
     "require-dev": {
         "phpunit/phpunit": "*",
@@ -56,6 +56,10 @@
         "silverleague/ideannotator": "dev-master"
     },
     "repositories": [
+        {
+          "type": "vcs",
+          "url": "https://github.com/a2nt/silverstripe-linkable"
+        },
         {
             "type": "vcs",
             "url": "https://github.com/a2nt/silverstripe-font-awesome"
@@ -106,6 +110,12 @@
             "silverstripe/recipe-plugin": true
         }
     },
+    "autoload": {
+        "psr-4": {
+          "App\\": "app/src"
+        },
+        "exclude-from-classmap": ["vendor/dynamic/flexslider/src/Model/SlideImage.php"]
+    },
     "prefer-stable": true,
     "minimum-stability": "dev"
 }