Merge branch 'master' of https://github.com/NobrainerWeb/Silverstripe…

…-Content-Blocks
thomasbnielsen · Oct 7, 2016 · 1536e65 · 1536e65
2 parents 8e61973 + 7d7eefe
commit 1536e65
Show file tree

Hide file tree

Showing 10 changed files with 487 additions and 349 deletions.
diff --git a/code/dataobjects/Block.php b/code/dataobjects/Block.php
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 	"require": {
         "silverstripe/framework": "3.*",
 		"silverstripe/cms": "3.*",
-		"bummzack/sortablefile": "1.2.*"
+		"bummzack/sortablefile": "~1.2"
 	},
 	"suggest": {
 		"unisolutions/silverstripe-copybutton": "Adds the option to duplicate dataobjects and their relations",

diff --git a/templates/BlockTemplates/Block.ss b/templates/BlockTemplates/Block.ss
@@ -1,9 +1,11 @@
-<div class="row">
+<div class="row $ExtraClasses">
 	<div class="small-12 columns">
-	<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-
-	$Content
-
+	<div class="content-wrap">
+		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+		<div class="content">
+			$Content
+		</div>
+	</div>
 	<% if Images %>
 		<% loop Images.Sort('SortOrder') %>
         	<a class="fancybox cboxElement" href="$Me.SetWidth(700).URL">

diff --git a/templates/BlockTemplates/Full width image.ss b/templates/BlockTemplates/Full width image.ss
@@ -1,4 +1,4 @@
-<div class="row">
+<div class="row $ExtraClasses">
 	<div class="small-12 columns">
 	<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
 
@@ -9,6 +9,10 @@
             </a>
         <% end_loop %>
     <% end_if %>
-	$Content
+		<div class="content-wrap">
+			<div class="content">
+				$Content
+			</div>
+		</div>
 	</div>
 </div>
diff --git a/templates/BlockTemplates/MultiColumn.ss b/templates/BlockTemplates/MultiColumn.ss
@@ -1,18 +1,17 @@
-<div class="columns">
-	<div class="row block">
-		<% if $Header != "None" %>
-			<div class="small-12 columns">
-				<{$Header}>$Name</{$Header}>
-		</div>
-		<% end_if %>
 
-		<% loop $Blocks.Sort('SortOrder') %>
+<div class="row block $ExtraClasses">
+	<% if $Header != "None" %>
+		<div class="small-12 columns">
+			<{$Header}>$Name</{$Header}>
+	</div>
+	<% end_if %>
 
-			<div class="small-12 large-{$ColumnClass($TotalItems)} columns">
-				$Me
-			</div>
+	<% loop $Blocks.Sort('SortOrder') %>
 
-		<% end_loop %>
+		<div class="small-12 large-{$ColumnClass($TotalItems)} columns">
+			$Me
+		</div>
 
-	</div>
-</div>
+	<% end_loop %>
+
+</div>
diff --git a/templates/BlockTemplates/Pic-Text-Wrap.ss b/templates/BlockTemplates/Pic-Text-Wrap.ss
@@ -1,17 +1,19 @@
-<div class="row">
-	<div class="small-12 columns">
-		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-	</div>
+<div class="row $ExtraClasses">
 
 	<div class="small-12 columns">
         <% if Images %>
             <% loop Images.Sort('SortOrder') %>
                 <a class="small-12 medium-3 columns block-left block-wrap" href="$Me.SetWidth(700).URL">
-               		 $Me.CroppedFocusedImage(600,600)
+					$Top.FormattedBlockImage($ID, 600, 600)
                 </a>
             <% end_loop %>
         <% end_if %>
+		<div class="content-wrap">
+			<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+			<div class="content">
+				$Content
+			</div>
+		</div>
 
-		$Content
 	</div>
 </div>
diff --git a/templates/BlockTemplates/Pic2-Text2-Wrap.ss b/templates/BlockTemplates/Pic2-Text2-Wrap.ss
@@ -1,17 +1,17 @@
-<div class="row">
-	<div class="small-12 columns">
-		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-	</div>
-
+<div class="row $ExtraClasses">
 	<div class="small-12 columns">
         <% if Images %>
             <% loop Images.Sort('SortOrder') %>
                 <a class="small-12 medium-6 columns block-left block-wrap" href="$Me.SetWidth(700).URL">
-               		 $Me.CroppedFocusedImage(600,600)
+					$Top.FormattedBlockImage($ID, 600, 600)
                 </a>
             <% end_loop %>
         <% end_if %>
-
-		$Content
+		<div class="content-wrap">
+			<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+			<div class="content">
+				$Content
+			</div>
+		</div>
 	</div>
 </div>
diff --git a/templates/BlockTemplates/PictureList.ss b/templates/BlockTemplates/PictureList.ss
@@ -1,19 +1,23 @@
-<div class="row picturelist">
+<div class="row picturelist $ExtraClasses">
 
 	<div class="small-12 columns">
-		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-		$Content
+		<div class="content-wrap">
+			<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+			<div class="content">
+				$Content
+			</div>
+		</div>
+		<ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4">
+			<% if Images %>
+				<% loop Images.Sort('SortOrder') %>
+					<li>
+						<a href="$Me.CroppedFocusedImage(940,700).URL" class="th fancybox cboxElement">
+							$Top.FormattedBlockImage($ID, 300, 300)
+						</a>
+					</li>
+				<% end_loop %>
+			<% end_if %>
+		</ul>
 	</div>
 </div>		
-
-<ul class="small-block-grid-2 medium-block-grid-3 large-block-grid-4"> 
-	<% if Images %>
-	<% loop Images.Sort('SortOrder') %>
-		<li>
-			<a href="$Me.CroppedFocusedImage(940,700).URL" class="th fancybox cboxElement">
-				$Me.CroppedFocusedImage(300,300)
-			</a>
-		</li>
-	<% end_loop %>
-	<% end_if %>
-</ul>
+
diff --git a/templates/BlockTemplates/Text-Pic-Wrap.ss b/templates/BlockTemplates/Text-Pic-Wrap.ss
@@ -1,17 +1,18 @@
-<div class="row">
-	<div class="small-12 columns">
-		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-	</div>
+<div class="row $ExtraClasses">
 
 	<div class="small-12 columns">
         <% if Images %>
             <% loop Images.Sort('SortOrder') %>
                 <a class="small-12 medium-3 columns block-right block-wrap" href="$Me.SetWidth(700).URL">
-               		 $Me.CroppedFocusedImage(600,600)
+					$Top.FormattedBlockImage($ID, 600, 600)
                 </a>
             <% end_loop %>
         <% end_if %>
-
-		$Content
+		<div class="content-wrap">
+			<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+			<div class="content">
+				$Content
+			</div>
+		</div>
 	</div>
 </div>
diff --git a/templates/BlockTemplates/Text2-Pic2-Wrap.ss b/templates/BlockTemplates/Text2-Pic2-Wrap.ss
@@ -1,17 +1,18 @@
-<div class="row">
-	<div class="small-12 columns">
-		<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
-	</div>
+<div class="row $ExtraClasses">
 
 	<div class="small-12 columns">
-        <% if Images %>
-            <% loop Images.Sort('SortOrder') %>
-                <a class="small-12 medium-6 columns block-right block-wrap" href="$Me.SetWidth(700).URL">
-               		 $Me.CroppedFocusedImage(600,600)
+        <% if $Images %>
+            <% loop $Images.Sort('SortOrder') %>
+                <a class="small-12 medium-6 columns block-right block-wrap lightbox" href="$Me.SetWidth(700).URL">
+					$Top.FormattedBlockImage($ID, 600, 600)
                 </a>
             <% end_loop %>
         <% end_if %>
-
-		$Content
+		<div class="content-wrap">
+			<% if $Header != "None" %><{$Header}>$Name</{$Header}><% end_if %>
+			<div class="content">
+				$Content
+			</div>
+		</div>
 	</div>
 </div>