tonyair/silverstripe-webpack
1
1
Fork 0
mirror of https://github.com/a2nt/silverstripe-webpack.git synced 2024-10-22 17:05:31 +02:00
Code Issues Projects Releases Wiki Activity

IMPR: Remove unnecessary divs

Browse Source
This commit is contained in:
Tony Air 2022-07-03 15:19:00 +02:00
parent 9d7c555af0
commit d7783504f1
4 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/_config/app.yml
View File

@ -6,6 +6,7 @@ After:
- elementalvirtual - elementalvirtual
- elemental-basics - elemental-basics
- a2nt-cms-niceties-options-elements - a2nt-cms-niceties-options-elements
- a2nt-cms-niceties-base-config
- webapp-base-extensions - webapp-base-extensions
- webapp-locale-fluent - webapp-locale-fluent
--- ---

4
app/templates/Layout/Page.ss
View File

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

82
app/templates/Layout/PageController_search.ss
View File

@ -1,56 +1,48 @@
<% with $SearchResults %> <% with $SearchResults %>
<div id="PageContainer" class="page{$CSSClass} pageSearch action{$Action}"> <div class="element page-header-element d-block no-elements">
<div class="element"> <div class="element-container {$Top.DefaultContainer}">
<div class="element page-header-element d-block no-elements"> <h1 class="page-header">
<div class="element-container {$Top.DefaultContainer}"> $Title
<h1 class="page-header"> </h1>
$Title
</h1>
</div>
</div> </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-container {$Top.DefaultContainer}">
<div class="element"> <% if $Results %>
<div class="element-container {$Top.DefaultContainer}"> <div id="SearchAccordion{$ID}">
<% if $Results %> <% loop $Results %>
<div id="SearchAccordion{$ID}"> <div class="card">
<% loop $Results %> <div class="card-header" id="Heading{$ID}{$Up.ID}">
<div class="card"> <h3
<div class="card-header" id="Heading{$ID}{$Up.ID}"> class="mb-0 a"
<h3 data-bs-toggle="collapse"
class="mb-0 a" data-bs-target="#Collapse{$ID}{$Up.ID}"
data-bs-toggle="collapse" aria-expanded="false"
data-bs-target="#Collapse{$ID}{$Up.ID}" aria-controls="Collapse{$ID}{$Up.ID}"
aria-expanded="false" >
aria-controls="Collapse{$ID}{$Up.ID}" $Title
> <i class="fas fa-plus accordion-icon pull-right"></i>
$Title </h3>
<i class="fas fa-plus accordion-icon pull-right"></i> </div>
</h3>
</div>
<div <div
id="Collapse{$ID}{$Up.ID}" id="Collapse{$ID}{$Up.ID}"
class="collapse" class="collapse"
aria-labelledby="Heading{$ID}{$Up.ID}" aria-labelledby="Heading{$ID}{$Up.ID}"
data-bs-parent="#SearchAccordion{$Up.ID}" data-bs-parent="#SearchAccordion{$Up.ID}"
> >
<div class="card-body"> <div class="card-body">
<p>$Summary(100)</p> <p>$Summary(100)</p>
<a href="{$Link}">Learn More</a> <a href="{$Link}">Learn More</a>
</div>
</div>
</div> </div>
<% end_loop %> </div>
</div> </div>
<% else %> <% end_loop %>
<h3>Nothing was found.</h3>
<% end_if %>
</div>
</div> </div>
<% else %>
<h3>Nothing was found.</h3>
<% end_if %>
</div> </div>
</div> </div>
</div>
<% end_with %> <% end_with %>

16
composer.json
View File

@ -38,16 +38,16 @@
"a2nt/silverstripe-mapboxfield": "dev-master", "a2nt/silverstripe-mapboxfield": "dev-master",
"a2nt/silverstripe-progressivewebapp": "dev-master", "a2nt/silverstripe-progressivewebapp": "dev-master",
"a2nt/silverstripe-elemental-basics": "*", "a2nt/silverstripe-elemental-basics": "*",
"a2nt/cms-niceties": "*", "a2nt/cms-niceties": "dev-main",
"bummzack/sortablefile": "*", "bummzack/sortablefile": "*",
"eluceo/ical": "^0.16.0", "eluceo/ical": "^0.16.0",
"ezyang/htmlpurifier": "^4.13", "ezyang/htmlpurifier": "^4.13",
"showpro/silverstripe-seo-images": "*",
"endroid/qr-code": "^3.9", "endroid/qr-code": "^3.9",
"jonom/focuspoint": "*", "jonom/focuspoint": "*",
"symbiote/silverstripe-addressable": "dev-master", "symbiote/silverstripe-addressable": "dev-master",
"silverstripe/login-forms": "*", "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": { "require-dev": {
"phpunit/phpunit": "*", "phpunit/phpunit": "*",
@ -56,6 +56,10 @@
"silverleague/ideannotator": "dev-master" "silverleague/ideannotator": "dev-master"
}, },
"repositories": [ "repositories": [
{
"type": "vcs",
"url": "https://github.com/a2nt/silverstripe-linkable"
},
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/a2nt/silverstripe-font-awesome" "url": "https://github.com/a2nt/silverstripe-font-awesome"
@ -106,6 +110,12 @@
"silverstripe/recipe-plugin": true "silverstripe/recipe-plugin": true
} }
}, },
"autoload": {
"psr-4": {
"App\\": "app/src"
},
"exclude-from-classmap": ["vendor/dynamic/flexslider/src/Model/SlideImage.php"]
},
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }