ensure all elements use holder template from module folder

README.md

@@ -11,10 +11,6 @@ Useful elemental building blocks.
 * jellygnite/silverstripe-elemental-style ^4.0
 
 ## Installation
-Add some installation instructions here, having a 1 line composer copy and paste is useful. 
-Here is a composer command to create a new module project. Ensure you read the
-['publishing a module'](https://docs.silverstripe.org/en/developer_guides/extending/how_tos/publish_a_module/) guide
-and update your module's composer.json to designate your code as a SilverStripe module. 
 
 ```
 composer require jellygnite/silverstripe-elements

_config/config.yml

@@ -10,5 +10,7 @@ DNADesign\Elemental\Models\BaseElement:
 Jellygnite\Elements\Model\BaseElementObject:
   extensions:
     - Jellygnite\ElementalStyle\Extensions\DynamicStyleExtension
+DNADesign\Elemental\Models\ContentElement:
+  controller_class: Jellygnite\Elements\Controllers\CustomElementController
 
 

src/Extensions/BaseElementExtension.php

@@ -2,6 +2,8 @@
 
 namespace Jellygnite\Elements\Extensions;
 
+use Exception;
+use SilverStripe\Core\Injector\Injector;
 use SilverStripe\ORM\DataExtension;
 use DNADesign\Elemental\Models\BaseElement;
 use SilverStripe\Dev\Debug;

src/Model/ElementAccordion.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\AccordionObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
@@ -47,6 +48,9 @@ class ElementAccordion extends BaseElement {
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
 
     /**
      * @var array

src/Model/ElementCarousel.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\BaseElementObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
@@ -48,6 +49,10 @@ class ElementCarousel extends BaseElement {
      */
     private static $styles = [];
 
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
+
 	/**
      * @var array
      */

src/Model/ElementFeature.php

@@ -37,7 +37,7 @@ class ElementFeature extends BaseElement
     private static $table_name = 'ElementFeature';
 
 	private static $styles = [];
-
+	
 	private static $extra_styles = [
 		'ImageOrder' => [
 			'Title' => 'Image Stacking',
@@ -63,7 +63,8 @@ class ElementFeature extends BaseElement
 		],	
 	];
 
-    private static $controller_class = CustomElementController::class;  // allows us to store templates in this module folder
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;
 
     private static $controller_template = "ElementHolder";
 

src/Model/ElementFileList.php

@@ -4,6 +4,7 @@
 
 use Colymba\BulkUpload\BulkUploader;
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\FileListObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
@@ -42,6 +43,10 @@ class ElementFileList extends BaseElement
      */
     private static $inline_editable = false;
 
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
     /**
      * @param bool $includerelations
      * @return array

src/Model/ElementGallery.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\GalleryObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\LiteralField;
@@ -51,6 +52,10 @@ class ElementGallery extends BaseElement {
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
 
     /**
      * @var array

src/Model/ElementImageGallery.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use SilverStripe\Assets\Image;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\ORM\FieldType\DBField;
@@ -48,6 +49,10 @@ class ElementImageGallery extends BaseElement {
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
 
     /**
      * @var array

src/Model/ElementLinks.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Sheadawson\Linkable\Models\Link;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\LiteralField;
@@ -53,6 +54,10 @@ class ElementLinks extends BaseElement {
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
 
     /**
      * @var array

src/Model/ElementPersons.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\PersonObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
@@ -47,6 +48,10 @@ class ElementPersons extends BaseElement {
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
 
     /**
      * @var array

src/Model/ElementPopups.php

@@ -46,14 +46,16 @@ class ElementPopups extends BaseElement {
      */
     private static $table_name = 'ElementPopups';
 
-    private static $controller_class = CustomElementController::class;  // allows us to store templates in this module folder
 
     private static $controller_template = 'ElementHolder_Popups';
 
     /**
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
 
     /**
      * @var array

src/Model/ElementPromos.php

@@ -45,14 +45,16 @@ class ElementPromos extends BaseElement {
      */
     private static $table_name = 'ElementPromos';
 
-    private static $controller_class = CustomElementController::class;  // allows us to store templates in this module folder
-
-    private static $controller_template = 'ElementHolder';
 
     /**
      * @var array
      */
     private static $styles = [];
+
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
+    private static $controller_template = 'ElementHolder';
 
     /**
      * @var array

src/Model/ElementSponsors.php

@@ -3,6 +3,7 @@
 namespace Jellygnite\Elements\Model;
 
 use DNADesign\Elemental\Models\BaseElement;
+use Jellygnite\Elements\Controllers\CustomElementController;
 use Jellygnite\Elements\Model\SponsorObject;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
@@ -48,6 +49,10 @@ class ElementSponsors extends BaseElement {
      */
     private static $styles = [];
 
+	// allows us to store templates in this module folder
+	private static $controller_class = CustomElementController::class;  
+
+
 	/**
      * @var array
      */

src/Model/GalleryObject.php

@@ -211,7 +211,7 @@ public function getEmbedURL($params = null) {
 				return 'https://player.vimeo.com/video/'.$this->Code;
 				break;
 			default:
-				return false;
+				return $this->VideoURL;
 		}
 	}
 
@@ -278,7 +278,7 @@ public function getMediaType($params = null) {
 						return 'video';
 						break;
 					default:
-						return false;
+						return 'video';
 				}
 				break;
 		}