IMPR: Remove unnecessary divs

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
 ---

app/templates/Layout/Page.ss

@@ -1,3 +1 @@
-<div id="PageContainer" class="page{$CSSClass} action{$Action}">
+<% include Content %>
-	<% include Content %>
-</div>

app/templates/Layout/PageController_search.ss

@@ -1,6 +1,4 @@
 <% 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">
@@ -8,11 +6,8 @@
             </h1>
         </div>
     </div>
-    </div>
 
-    <div class="page-content page-content-main page-content-extra">
+    <div class="element element-search-results">
-        <div class="elemental-area">
-            <div class="element">
         <div class="element-container {$Top.DefaultContainer}">
             <% if $Results %>
             <div id="SearchAccordion{$ID}">
@@ -50,7 +45,4 @@
             <% end_if %>
         </div>
     </div>
-        </div>
-    </div>
-</div>
 <% end_with %>

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"
 }