new ss4 updates, including - Content added back in, legacy mapping ad…

…ded, template location and composer updated

README.md

@@ -9,6 +9,9 @@ Manage site-wide modules (aka widgets) and select the pages on which they are to
 
 * SilverStripe 4
 
+For a Silverstripe CMS 4.x compatible version of this module, please see the 3.x or 4.x release line.
+
+For a Silverstripe CMS 3.x compatible version of this module, please see the 3 branch, or 2.x release line.
 
 ## Installation
 
@@ -60,7 +63,7 @@ Manage site-wide modules (aka widgets) and select the pages on which they are to
   }
   ```
 
-2. Create your template file `app/templates/Modules/MyModule.ss`:
+2. Create your template file `app/templates/{NameSpace}}/MyModule.ss`:
   ```
     <div class="module module_my-module">
 		<h3>$Title</h3>

_config/legacy.yml

@@ -0,0 +1,3 @@
+SilverStripe\ORM\DatabaseAdmin:
+  classname_value_remapping:
+    Module: PlasticStudio\ModuleManager\Module

composer.json

@@ -1,6 +1,6 @@
 {
 	"name": "plasticstudio/modulemanager",
-   	"type": "silverstripe-module",
+   	"type": "silverstripe-vendormodule",
 	"description": "Module Manager for SilverStripe - forked from jaedb/modulemanager",
 	"homepage": "http://plasticstudio.co.nz/",
 	"keywords": ["silverstripe"],
@@ -10,7 +10,11 @@
 			"name": "James Barnsley",
 			"homepage": "https://jamesbarnsley.co.nz",
 			"email": "james@barnsley.nz"
-		}
+		},
+        {
+            "name": "Joseph Lewis",
+            "email": "joe@psdigital.co.nz"
+        }
 	],
 	"support": {
 		"issues": "https://github.com/PlasticStudio/ModuleManager"

src/Module.php

@@ -19,6 +19,7 @@ class Module extends DataObject {
 
 	private static $db = [
 		'Title' => 'Varchar(255)',
+		'Content' => 'HTMLText',
 		'Position' => 'Varchar(255)'
 	];
 
@@ -70,11 +71,11 @@ public function Type(){
 
 	/**
 	 * Render this module
-	 * This is auto-overwritten by creating a Modules/{ClassName} template in your templates directory
+	 * This is auto-overwritten by creating a {ClassName} template in your templates directory
 	 *
 	 * @return HTMLText
 	 **/
 	public function Layout(){
-		return $this->renderWith(['Modules/'.$this->Type(), 'Module']);
+		return $this->renderWith([$this->Type(), 'Module']);
 	}	
 }

templates/Module.ss

@@ -1,4 +1,4 @@
-<div class="module module--{$ClassName}" data-id="{$ID}" data-classname="{$ClassName}">
+<div class="module module--{$ClassName.ShortName}" data-id="{$ID}" data-classname="{$ClassName.ShortName}">
 	<h3 class="module__title">$Title</h3>
 	<div class="module__content">
 		This is the base-level module