@@ -28,7 +28,7 @@ ClassLoader::addClasses(array

 	'eSM_slick\ContentSlickSliderStop'        => 'system/modules/eSM_slick/elements/ContentSlickSliderStop.php',

 	'eSM_slick\ContentSlickSliderSlideStart'  => 'system/modules/eSM_slick/elements/ContentSlickSliderSlideStart.php',

 	'eSM_slick\ContentSlickSliderSlideStop'   => 'system/modules/eSM_slick/elements/ContentSlickSliderSlideStop.php',

-	'eSM_slick\ContentSlickSliderWallpaper'   => 'system/modules/eSM_slick/elements/ContentSlickSliderWallpaper.php',

+	'eSM_slick\ContentSlickSliderImage'       => 'system/modules/eSM_slick/elements/ContentSlickSliderImage.php',

 ));

@@ -42,5 +42,5 @@ TemplateLoader::addFiles(array

 	'ce_slick_slider_stop'       => 'system/modules/eSM_slick/templates/elements',

 	'slide_start_default'        => 'system/modules/eSM_slick/templates/slides',

 	'slide_stop_default'         => 'system/modules/eSM_slick/templates/slides',

-	'ce_slick_slider_wallpaper'  => 'system/modules/eSM_slick/templates/elements',

+	'ce_slick_slider_image'      => 'system/modules/eSM_slick/templates/elements',

 ));

@@ -23,7 +23,7 @@ $GLOBALS['TL_CTE']['slickSlider'] = array

   'slickSliderStop'      => 'ContentSlickSliderStop',

   'slickSliderSlideStart'=> 'ContentSlickSliderSlideStart',

   'slickSliderSlideStop' => 'ContentSlickSliderSlideStop',

-  'slickSliderWallpaper' => 'ContentSlickSliderWallpaper'

+  'slickSliderImage'     => 'ContentSlickSliderImage'

 );

 /**

@@ -23,14 +23,16 @@ $GLOBALS['TL_DCA']['tl_content']['config']['onsubmit_callback'][] = array('tl_co

  * Add palettes to tl_content

  */

 $GLOBALS['TL_DCA']['tl_content']['palettes']['__selector__'][] = 'eSM_addImage';

+$GLOBALS['TL_DCA']['tl_content']['palettes']['__selector__'][] = 'eSM_addText';

 $GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderStart'] = '{type_legend},type;{slickSlider_legend},eSM_slick_autoPlaySpeed,eSM_slick_speed,eSM_slick_initialSlide,eSM_slick_lazyLoad,eSM_slick_slidesToShow,eSM_slick_slidesToScroll,eSM_slick_infinite,eSM_slick_arrows,eSM_slick_pagination,eSM_slick_pause,eSM_slick_fade,eSM_slick_adaptiveHeight;{image_legend},eSM_addImage;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';

 $GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderStop'] = '{type_legend},type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests;{invisible_legend:hide},invisible,start,stop';

 $GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderSlideStart'] = '{type_legend},type;{slickSlider_legend},eSM_addImage;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';

 $GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderSlideStop'] = '{type_legend},type;{protected_legend:hide},protected;{expert_legend:hide},guests;{invisible_legend:hide},invisible,start,stop';

-$GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderWallpaper'] = '{type_legend},type;{slickSlider_legend},eSM_slick_text,eSM_slick_url,singleSRC,size;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';

+$GLOBALS['TL_DCA']['tl_content']['palettes']['slickSliderImage'] = '{type_legend},type;{slickSlider_legend},singleSRC,size,eSM_slick_bgSize,eSM_slick_bgPosition,eSM_slick_minHeight,eSM_slick_bgOpacity,eSM_slick_bgRepeat,eSM_addText;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space;{invisible_legend:hide},invisible,start,stop';

 $GLOBALS['TL_DCA']['tl_content']['subpalettes']['eSM_addImage'] = 'singleSRC,size,eSM_slick_bgSize,eSM_slick_bgPosition,eSM_slick_minHeight,eSM_slick_bgOpacity,eSM_slick_bgRepeat';

+$GLOBALS['TL_DCA']['tl_content']['subpalettes']['eSM_addText'] = 'eSM_slick_text,eSM_slick_url';

 /**

  * Add fields to tl_content

@@ -179,6 +181,15 @@ $GLOBALS['TL_DCA']['tl_content']['fields']['eSM_addImage'] = array

   'sql'                     => "char(1) NOT NULL default ''"

 );

+$GLOBALS['TL_DCA']['tl_content']['fields']['eSM_addText'] = array

+(

+  'label'                   => &$GLOBALS['TL_LANG']['tl_content']['eSM_addText'],

+  'exclude'                 => true,

+  'inputType'               => 'checkbox',

+  'eval'                    => array('tl_class'=>'clr m12', 'submitOnChange'=>true),

+  'sql'                     => "char(1) NOT NULL default ''"

+);

+

 $GLOBALS['TL_DCA']['tl_content']['fields']['eSM_slick_minHeight'] = array

 (

   'label'                   => &$GLOBALS['TL_LANG']['tl_content']['eSM_slick_minHeight'],

new file mode 100644

@@ -0,0 +1,88 @@

+<?php

+

+/**

+ * Slick slider for Contao

+ *

+ * Copyright (c) 2016 Benjamin Roth

+ *

+ * @license LGPL-3.0+

+ */

+

+namespace eSM_slick;

+

+

+/**

+ * Front end content element slick slider start.

+ */

+class ContentSlickSliderImage extends \ContentElement

+{

+

+	/**

+	 * Template

+	 * @var string

+	 */

+	protected $strTemplate = 'ce_slick_slider_image';

+

+  /**

+   * Generate the content element

+   */

+  protected function compile()

+  {

+    if (TL_MODE == 'BE')

+    {

+      $this->strTemplate = 'be_wildcard';

+

+      /** @var \BackendTemplate|object $objTemplate */

+      $objTemplate = new \BackendTemplate($this->strTemplate);

+

+      $this->Template = $objTemplate;

+    }

+

+    if ($this->singleSRC)

+    {

+

+      $objFile = \FilesModel::findByUuid($this->singleSRC);

+

+      if ($objFile !== null && is_file(TL_ROOT . '/' . $objFile->path))

+      {

+        $this->singleSRC = $objFile->path;

+

+        $this->addImageToTemplate($this->Template, array('singleSRC'=>$this->singleSRC, 'size'=>$this->size));

+

+        if ($this->eSM_slick_minHeight) {

+          if ($this->eSM_slick_bgSize && $this->eSM_slick_bgSize == 'auto auto') {

+            $this->Template->minHeight = $this->Template->picture['img']['height'] . 'px';

+          } else

+          {

+            $this->Template->minHeight = round($this->Template->picture['img']['height'] / $this->Template->picture['img']['width'] * 100) . '%';

+          }

+        }

+      }

+

+      $backgroundStyle = 'background-image: url(\''.$this->Template->src.'\');';

+

+      if ($this->eSM_slick_bgSize) {

+        $backgroundStyle .= 'background-size: ' . $this->eSM_slick_bgSize . ';';

+      } else {

+        $backgroundStyle .= 'background-size: cover;';

+      }

+      if ($this->eSM_slick_bgPosition) {

+        $backgroundStyle .= 'background-position: ' . $this->eSM_slick_bgPosition . ';';

+      } else {

+        $backgroundStyle .= 'background-position: 0 0;';

+      }

+      if ($this->eSM_slick_bgOpacity) {

+        $backgroundStyle .= 'opacity:' . $this->eSM_slick_bgOpacity/100 . ';';

+      }

+      if ($this->eSM_slick_bgRepeat) {

+        $backgroundStyle .= 'background-repeat: ' . $this->eSM_slick_bgRepeat . ';';

+      }

+

+      $this->Template->backgroundStyle = $backgroundStyle;

+    }

+

+    $this->Template->text = nl2br($this->eSM_slick_text);

+

+  }

+

+}

deleted file mode 100644

@@ -1,77 +0,0 @@

-<?php

-

-/**

- * Slick slider for Contao

- *

- * Copyright (c) 2016 Benjamin Roth

- *

- * @license LGPL-3.0+

- */

-

-namespace eSM_slick;

-

-

-/**

- * Front end content element slick slider start.

- */

-class ContentSlickSliderWallpaper extends \ContentElement

-{

-

-	/**

-	 * Template

-	 * @var string

-	 */

-	protected $strTemplate = 'ce_slick_slider_wallpaper';

-

-

-	public function generate()

-	{

-		if ($this->singleSRC == '')

-		{

-			return '';

-		}

-

-		$objFile = \FilesModel::findByUuid($this->singleSRC);

-

-		if ($objFile === null)

-		{

-			if (!\Validator::isUuid($this->singleSRC))

-			{

-				return '<p class="error">'.$GLOBALS['TL_LANG']['ERR']['version2format'].'</p>';

-			}

-

-			return '';

-		}

-

-		if (!is_file(TL_ROOT . '/' . $objFile->path))

-		{

-			return '';

-		}

-

-		$this->singleSRC = $objFile->path;

-

-		return parent::generate();

-	}

-

-

-	/**

-	 * Generate the content element

-	 */

-	protected function compile()

-	{

-		if (TL_MODE == 'BE')

-		{

-			$this->strTemplate = 'ce_image';

-

-			/** @var \BackendTemplate|object $objTemplate */

-			$objTemplate = new \BackendTemplate($this->strTemplate);

-

-			$this->Template = $objTemplate;

-		}

-

-		$GLOBALS['TL_CSS'][] = '/system/modules/eSM_slick/assets/css/slick-wallpaper.css';

-

-		$this->addImageToTemplate($this->Template, $this->arrData);

-		$this->Template->text = nl2br($this->eSM_slick_text);

-	}

-}

@@ -18,8 +18,8 @@ $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStart'][0] = "Slide Anfang";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStart'][1] = "Beginn eines Slides über mehrere Inhaltselemente.";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStop'][0] = "Slide Ende";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStop'][1] = "Ende eines Slides über mehrere Inhaltselemente.";

-$GLOBALS['TL_LANG']['CTE']['slickSliderWallpaper'][0] = "Wallpaper-Slide";

-$GLOBALS['TL_LANG']['CTE']['slickSliderWallpaper'][1] = "Ein Slide mit einer Wallpapergrafik im Hintergrund und der Möglichkeit einen Text zu platzieren.";

+$GLOBALS['TL_LANG']['CTE']['slickSliderImage'][0] = "Bild-Slide";

+$GLOBALS['TL_LANG']['CTE']['slickSliderImage'][1] = "Ein Slide mit einem Bild und der Möglichkeit einen Text zu platzieren.";

 $GLOBALS['TL_LANG']['MSC']['slick_lazyLoad']['ondemand'] = 'Bei Bedarf';

 $GLOBALS['TL_LANG']['MSC']['slick_lazyLoad']['progressive'] = 'Fortlaufend';

\ No newline at end of file

@@ -48,6 +48,8 @@ $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgOpacity'][0]      = "Hintergrundb

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgOpacity'][1]      = "Die Transparenz des Hintergrundbildes.";

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgRepeat'][0]       = "Hintergrundbildwiederholung";

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgRepeat'][1]       = "Legt fest ob das Hintergrundbild wiederholt werden soll.";

+$GLOBALS['TL_LANG']['tl_content']['eSM_addText'][0]              = "Ein Text hinzufügen";

+$GLOBALS['TL_LANG']['tl_content']['eSM_addText'][1]              = "Dem Bild-Slide ein Text hinzufügen.";

 /**

  * Legends

  */

@@ -18,8 +18,8 @@ $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStart'][0] = "Slide start";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStart'][1] = "Beginning of a single slide.";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStop'][0] = "Slide stop";

 $GLOBALS['TL_LANG']['CTE']['slickSliderSlideStop'][1] = "Ending of a single slide.";

-$GLOBALS['TL_LANG']['CTE']['slickSliderWallpaper'][0] = "Wallpaper slide";

-$GLOBALS['TL_LANG']['CTE']['slickSliderWallpaper'][1] = "Special type of slide with background image and the option to place a text on it.";

+$GLOBALS['TL_LANG']['CTE']['slickSliderImage'][0] = "Image slide";

+$GLOBALS['TL_LANG']['CTE']['slickSliderImage'][1] = "Image slide with the option to place a text on it.";

 $GLOBALS['TL_LANG']['MSC']['slick_lazyLoad']['ondemand'] = 'On demand';

 $GLOBALS['TL_LANG']['MSC']['slick_lazyLoad']['progressive'] = 'Progressive';

\ No newline at end of file

@@ -48,6 +48,8 @@ $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgOpacity'][0]      = "Background i

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgOpacity'][1]      = "The opacity of the background image.";

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgRepeat'][0]       = "Background image repetition.";

 $GLOBALS['TL_LANG']['tl_content']['eSM_slick_bgRepeat'][1]       = "Defines if the background image is meant to be repeated.";

+$GLOBALS['TL_LANG']['tl_content']['eSM_addText'][0]              = "Add text";

+$GLOBALS['TL_LANG']['tl_content']['eSM_addText'][1]              = "Add a text to the image slide.";

 /**

  * Legends

  */

new file mode 100644

@@ -0,0 +1,20 @@

+

+<?php $this->block('content'); ?>

+

+<div class="slick-slider-slide slide_<?= $this->id ?>">

+  <?php if ($this->src): ?>

+    <div class="slick-slider-slide-image" style="<?= $this->backgroundStyle ?>"></div>

+    <?php if ($this->minHeight): ?>

+      <style>.slide_<?= $this->id ?>:before { content: ""; display: block; padding-top: <?= $this->minHeight ?>; float: left; }</style>

+    <?php endif; ?>

+  <?php endif; ?>

+  <div class="slide-content">

+

+  <?php if ($this->text): ?>

+    <span class="slide-text"><?= $this->text ?></span>

+  <?php endif; ?>

+

+  </div>

+</div>

+

+<?php $this->endblock(); ?>

deleted file mode 100644

@@ -1,8 +0,0 @@

-

-<div class="<?= $this->class ?> wallpaper-slide block"<?= $this->cssID ?> style="<?php if ($this->style): ?><?= $this->style ?> <?php endif; ?>background-image: url('<?= $this->picture['img']['src'] ?>');">

-

-  <?php if ($this->text): ?>

-    <span class="wallpaper-text"><?= $this->text ?></span>

-  <?php endif; ?>

-

-</div>