Merge branch 'develop'

client/src/styles/bundle.scss

@@ -35,3 +35,4 @@
 // Import Model Styles:
 
 @import "model/Link";
+@import "model/Slide";

client/src/styles/model/Slide.scss

@@ -0,0 +1,14 @@
+/* Slide Styles
+===================================================================================================================== */
+
+.component.slide {
+
+  .slide-caption.title-after {
+
+    > h1, > h2, > h3, > h4, > h5, > h6 {
+        margin-bottom: 0;
+    }
+
+  }
+
+}

src/Lists/ListSourceSlide.php

@@ -161,7 +161,8 @@ protected function createSlide(ViewableData $item)
             'ParentID' => $this->ParentID,
             'HideImage' => $this->HideImage,
             'HideTitle' => $this->HideTitle,
-            'HideCaption' => $this->HideCaption
+            'HideCaption' => $this->HideCaption,
+            'TitleAfterCaption' => $this->TitleAfterCaption
         ]);
 
         // Define Slide Link:

src/Model/Slide.php

@@ -100,7 +100,8 @@ class Slide extends Component
         'HideImage' => 'Boolean',
         'HideTitle' => 'Boolean',
         'HideCaption' => 'Boolean',
-        'LinkDisabled' => 'Boolean'
+        'LinkDisabled' => 'Boolean',
+        'TitleAfterCaption' => 'Boolean'
     ];
 
     /**
@@ -143,7 +144,8 @@ class Slide extends Component
         'HideImage' => 0,
         'HideTitle' => 1,
         'HideCaption' => 0,
-        'LinkDisabled' => 0
+        'LinkDisabled' => 0,
+        'TitleAfterCaption' => 0
     ];
 
     /**
@@ -226,6 +228,10 @@ public function getCMSFields()
             CheckboxField::create(
                 'LinkDisabled',
                 $this->fieldLabel('LinkDisabled')
+            ),
+            CheckboxField::create(
+                'TitleAfterCaption',
+                $this->fieldLabel('TitleAfterCaption')
             )
         ]);
 
@@ -260,6 +266,7 @@ public function fieldLabels($includerelations = true)
         $labels['HideTitle'] = _t(__CLASS__ . '.HIDETITLE', 'Hide title');
         $labels['HideCaption'] = _t(__CLASS__ . '.HIDECAPTION', 'Hide caption');
         $labels['LinkDisabled'] = _t(__CLASS__ . '.LINKDISABLED', 'Link disabled');
+        $labels['TitleAfterCaption'] = _t(__CLASS__ . '.SHOWTITLEAFTERCAPTION', 'Show title after caption');
 
         // Define Relation Labels:
 
@@ -371,7 +378,7 @@ public function getSlideClass($isFirst = false, $isMiddle = false, $isLast = fal
      */
     public function getSlideClassNames($isFirst = false, $isMiddle = false, $isLast = false)
     {
-        $classes = ViewTools::singleton()->getAncestorClassNames($this, self::class);
+        $classes = parent::getClassNames();
 
         $classes[] = $this->ImageShown ? 'has-image' : 'no-image';
 
@@ -425,6 +432,10 @@ public function getCaptionClassNames()
             $classes = array_merge($classes, $this->getParent()->getCaptionClassNames($this));
         }
 
+        if ($this->TitleAfterCaption) {
+            $classes[] = 'title-after';
+        }
+
         $this->extend('updateCaptionClassNames', $classes);
 
         return $classes;
@@ -562,6 +573,26 @@ public function getTitleShown()
         return ($this->Title && !$this->HideTitle);
     }
 
+    /**
+     * Answers true if the slide title is to be shown before the caption.
+     *
+     * @return boolean
+     */
+    public function getTitleShownBeforeCaption()
+    {
+        return ($this->TitleShown && !$this->TitleAfterCaption);
+    }
+
+    /**
+     * Answers true if the slide title is to be shown after the caption.
+     *
+     * @return boolean
+     */
+    public function getTitleShownAfterCaption()
+    {
+        return ($this->TitleShown && $this->TitleAfterCaption);
+    }
+
     /**
      * Answers true if the slide caption is to be shown.
      *

templates/SilverWare/Model/Slide.ss

@@ -5,12 +5,15 @@
   <% end_if %>
   <% if $TitleOrCaptionShown %>
     <div class="$CaptionClass">
-      <% if $TitleShown %>
+      <% if $TitleShownBeforeCaption %>
         <{$HeadingTag}>{$FontIconTag}<span class="text">{$Title}</span></{$HeadingTag}>
       <% end_if %>
       <% if $CaptionShown %>
         $Caption
       <% end_if %>
+      <% if $TitleShownAfterCaption %>
+        <{$HeadingTag}>{$FontIconTag}<span class="text">{$Title}</span></{$HeadingTag}>
+      <% end_if %>
     </div>
   <% end_if %>
   <% if $LinkShown %></a><% end_if %>