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: updates to page layout templates

Browse Source
This commit is contained in:
Tony Air 2020-08-04 21:17:23 +07:00
parent 5102111100
commit a708199c2a
4 changed files with 59 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/src/js/app.js
View File

@ -19,6 +19,8 @@ import 'bootstrap/js/dist/collapse';
// conflicts with _components/_ui.hover.js (shows dropdown on hover) // conflicts with _components/_ui.hover.js (shows dropdown on hover)
//import 'bootstrap/js/dist/dropdown'; //import 'bootstrap/js/dist/dropdown';
import '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.shrink';
import '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.hover'; import '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.hover';
import '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.carousel'; import '@a2nt/ss-bootstrap-ui-webpack-boilerplate/src/js/_components/_ui.carousel';

55
app/templates/Includes/MainContent.ss Normal file
View File

@ -0,0 +1,55 @@
<div class="mainContent-page-{$CSSClass}">
<% if $HeroImageRecursive %>
<div class="element element__hero-image">
<div class="element-container">
<% include SlideItem Image=$HeroImageRecursive, SlideWidth='2140', SlideHeight='450' %>
</div>
</div>
<% end_if %>
<% if $ParentID %>
<div id="PageBreadcumbs">
$Breadcrumbs
</div>
<% else_if $URLSegment != 'home' %>
<div id="PageBreadcumbs">
<nav class="breadcrumbs $DefaultContainer" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="/">Home</a>
</li>
<li class="breadcrumb-item current active" aria-current="page">
<a href="$Link" class="breadcrumb-2">
$MenuTitle
</a>
</li>
</ol>
</nav>
</div>
<% end_if %>
<% if $SideBarContent || $SideBarView && $SideBarView.Widgets.Count %>
<div class="content-holder content-holder__sidebar">
<div class="{$DefaultContainer}">
<div class="row">
<div class="col-md-9 layout__col">
$Layout
</div>
<div class="col-md-3 sidebar__col">
<div class="page-content-sidebar page-content jsSidebarUI">
<div class="jsSidebarUI__inner">
$SideBarContent
$SideBarView
</div>
</div>
</div>
</div>
</div>
</div>
<% else %>
<div class="content-holder">
$Layout
</div>
<% end_if %>
</div>

47
app/templates/Page.ss
View File

@ -14,52 +14,7 @@
</header> </header>
<main id="MainContent" data-ajax-region="LayoutAjax"> <main id="MainContent" data-ajax-region="LayoutAjax">
<% if $ParentID %> <% include MainContent Layout=$Layout %>
<div id="PageBreadcumbs">
$Breadcrumbs
</div>
<% else_if $URLSegment != 'home' %>
<div id="PageBreadcumbs">
$URLSegment
<nav class="breadcrumbs $DefaultContainer" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">
<a href="/">Home</a>
</li>
<li class="breadcrumb-item current active" aria-current="page">
<a href="$Link" class="breadcrumb-2">
$MenuTitle
</a>
</li>
</ol>
</nav>
</div>
<% end_if %>
<% if $SideBarContent || $SideBarView && $SideBarView.Widgets.Count %>
<div class="content-holder content-holder__sidebar">
<div class="{$DefaultContainer}">
<div class="row">
<div class="col-md-9 layout__col">
$Layout
</div>
<div class="col-md-3 sidebar__col">
<div class="page-content-sidebar page-content jsSidebarUI">
<div class="jsSidebarUI__inner">
$SideBarContent
$SideBarView
</div>
</div>
</div>
</div>
</div>
</div>
<% else %>
<div class="content-holder">
$Layout
</div>
<% end_if %>
</main> </main>
</div> </div>

2
app/templates/Site/Elements/MapElement.ss
View File

@ -12,7 +12,7 @@
<div class="locations"> <div class="locations">
<div class="row"> <div class="row">
<% loop $Locations %> <% loop $Locations %>
<div class="col-sm-3"> <div class="col">
$forTemplate $forTemplate
</div> </div>
<% end_loop %> <% end_loop %>