Added bundle and resources for Contao 4

madeyourday · Jun 16, 2015 · efee75a · efee75a
1 parent 53ad5f4
commit efee75a
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/config/autoload.php b/config/autoload.php
@@ -23,6 +23,10 @@
 	'MadeYourDay\\Contao\\Model\\ContentModel' => 'system/modules/rocksolid-slider/src/MadeYourDay/Contao/Model/ContentModel.php',
 ));
 
+$templatesFolder = version_compare(VERSION, '4.0', '>=')
+	? 'vendor/madeyourday/contao-rocksolid-slider/templates'
+	: 'system/modules/rocksolid-slider/templates';
+
 TemplateLoader::addFiles(array(
-	'rsts_default' => 'system/modules/rocksolid-slider/templates',
+	'rsts_default' => $templatesFolder,
 ));
diff --git a/config/config.php b/config/config.php
@@ -24,7 +24,10 @@
 		'tl_content',
 		'tl_rocksolid_slider_license',
 	),
-	'icon' => 'system/modules/rocksolid-slider/assets/img/icon.png',
+	'icon' => (version_compare(VERSION, '4.0', '>=')
+		? 'bundles/rocksolidslider'
+		: 'system/modules/rocksolid-slider/assets'
+	) . '/img/icon.png',
 );
 
 array_insert($GLOBALS['FE_MOD'], 2, array(

diff --git a/src/MadeYourDay/Contao/Module/Slider.php b/src/MadeYourDay/Contao/Module/Slider.php
@@ -338,9 +338,13 @@ protected function compile()
 
 		$this->Template->options = $options;
 
-		$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/rocksolid-slider/assets/js/rocksolid-slider.min.js|static';
-		$GLOBALS['TL_CSS'][] = 'system/modules/rocksolid-slider/assets/css/rocksolid-slider.min.css||static';
-		$skinPath = 'system/modules/rocksolid-slider/assets/css/' . (empty($this->arrData['rsts_skin']) ? 'default' : $this->arrData['rsts_skin']) . '-skin.min.css';
+		$assetsDir = version_compare(VERSION, '4.0', '>=')
+			? 'web/bundles/rocksolidslider'
+			: 'system/modules/rocksolid-slider/assets';
+
+		$GLOBALS['TL_JAVASCRIPT'][] = $assetsDir . '/js/rocksolid-slider.min.js|static';
+		$GLOBALS['TL_CSS'][] = $assetsDir . '/css/rocksolid-slider.min.css||static';
+		$skinPath = $assetsDir . '/css/' . (empty($this->arrData['rsts_skin']) ? 'default' : $this->arrData['rsts_skin']) . '-skin.min.css';
 		if (file_exists(TL_ROOT . '/' . $skinPath)) {
 			$GLOBALS['TL_CSS'][] = $skinPath . '||static';
 		}

diff --git a/src/MadeYourDay/Contao/Resources/contao b/src/MadeYourDay/Contao/Resources/contao
@@ -0,0 +1 @@
+../../../..
diff --git a/src/MadeYourDay/Contao/Resources/public b/src/MadeYourDay/Contao/Resources/public
@@ -0,0 +1 @@
+../../../../assets
diff --git a/src/MadeYourDay/Contao/RockSolidSliderBundle.php b/src/MadeYourDay/Contao/RockSolidSliderBundle.php
@@ -0,0 +1,20 @@
+<?php
+/*
+ * Copyright MADE/YOUR/DAY OG <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MadeYourDay\Contao;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+/**
+ * Configures the RockSolid Slider bundle.
+ *
+ * @author Martin Auswöger <[email protected]>
+ */
+class RockSolidSliderBundle extends Bundle
+{
+}