Upgraded subsites module to work with 2.2.2

code/LeftAndMainSubsites.php

@@ -4,6 +4,11 @@
  * Decorator designed to add subsites support to LeftAndMain
  */
 class LeftAndMainSubsites extends Extension {
+	static $allowed_actions = array(
+		'addsubsite',
+		'changesubsite',
+	);
+	
 	function augmentInit() {
 		Requirements::css('subsites/css/LeftAndMain_Subsites.css');
 		Requirements::javascript('subsites/javascript/LeftAndMain_Subsites.js');
@@ -62,7 +67,7 @@ class LeftAndMainSubsites extends Extension {
 			$siteList->push(new ArrayData(array('Title' => 'Main site', 'ID' => 0)));
 		
 		if($subsites)
-			$siteList->append($subsites);
+			$siteList->merge($subsites);
 			
 		return $siteList;
 	}

css/LeftAndMain_Subsites.css

@@ -40,4 +40,14 @@
 	display: block;
 	font-size: 80%;
 	margin-left: 3px;
-}
+}
+
+#Form_AddSubsiteForm .field {
+	margin-left: 100px;
+}
+
+#Form_AddSubsiteForm label.left {
+	float: left;
+	width: 100px;
+	margin-left: -100px;
+}

templates/Includes/SubsiteAdmin_left.ss

@@ -1,8 +1,3 @@
-<div class="title">
-<div style="background-image : url(cms/images/panels/MySite.png)">My
-Site</div>
-</div>
-
 <div id="LeftPane">
 <h2>Create Intranet</h2>
 <div id="AddIntranetForm_holder" style="overflow:auto">

templates/Includes/SubsiteAdmin_right.ss

@@ -1,8 +1,5 @@
-<div class="title">
-<div style="background-image : url(cms/images/panels/EditPage.png)">Edit
-Page</div>
-</div>
-<% include Editor_toolbar %> <% if EditForm %> $EditForm <% else %>
+<!--<% xinclude Editor_toolbar %>-->
+<% if EditForm %> $EditForm <% else %>
 <form id="Form_EditForm" action="{$Link}?executeForm=EditForm"
 	method="post" enctype="multipart/form-data">
 <h1>$ApplicationName</h1>
@@ -13,5 +10,4 @@ entries on the left pane.</p>
 </form>
 <% end_if %>
 
-
 <p id="statusMessage" style="visibility:hidden"></p>