From e28bfb2730d157f7621ad7aeb937c8bbec71b188 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 10 Nov 2008 04:07:03 +0000
Subject: [PATCH] Merged branches/2.2

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@65524 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/AssetTableField.php           |  2 ++
 code/CommentAdmin.php              |  2 +-
 templates/Includes/CMSMain_left.ss | 32 +-----------------------------
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/code/AssetTableField.php b/code/AssetTableField.php
index 833e47d1..6c4887a5 100755
--- a/code/AssetTableField.php
+++ b/code/AssetTableField.php
@@ -153,6 +153,8 @@ class AssetTableField extends ComplexTableField {
 		// the ID field confuses the Controller-logic in finding the right view for ReferencedField
 		$detailFormFields->removeByName('ID');
 		
+		if($childData) $childData->extend('updateCMSFields', $detailFormFields);
+		
 		return $detailFormFields;
 	}
 
diff --git a/code/CommentAdmin.php b/code/CommentAdmin.php
index c5ed523e..1242b28a 100644
--- a/code/CommentAdmin.php
+++ b/code/CommentAdmin.php
@@ -241,7 +241,7 @@ JS;
 JS;
 	}
 	
-	function approvemarked() {
+	function acceptmarked() {
 			$numComments = 0;
 			$folderID = 0;
 			$deleteList = '';
diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss
index 8ca1aa9c..78e8ded7 100755
--- a/templates/Includes/CMSMain_left.ss
+++ b/templates/Includes/CMSMain_left.ss
@@ -106,26 +106,6 @@
 		</div>
 		-->
 
-		<% if EnterpriseCMS %>
-		<h2 id="heading_tasklist">
-			<img id="tasklist_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
-			<img id="tasklist_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
-			<% _t('TASKLIST','Tasklist') %>
-		</h2>
-		<div class="listpane" id="tasklist_holder" style="display:none">	
-			<div class="unitBody">
-			</div>
-		</div>
-		<h2 id="heading_waitingon">
-			<img id="waitingon_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
-			<img id="waitingon_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
-			<% _t('WAITINGON','Waiting on') %>
-		</h2>
-		<div class="listpane" id="waitingon_holder" style="display:none">	
-			<div class="unitBody">
-			</div>
-		</div>
-		<% end_if %>
 		<h2 id="heading_versions">
 			<img id="versions_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
 			<img id="versions_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
@@ -142,17 +122,7 @@
 			<div class="unitBody">
 			</div>
 		</div>
-		<% if EnterpriseCMS %>
-		<h2 id="heading_comments">
-			<img id="comments_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
-			<img id="comments_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" /> 
-			<% _t('COMMENTS','Comments') %>
-		</h2>
-		<div class="listpane" id="comments_holder" style="display:none">	
-			<div class="unitBody">
-			</div>
-		</div>
-		<% end_if %>
+
 		<h2 id="heading_reports">
 			<img id="reports_toggle_closed" src="sapphire/images/toggle-closed.gif" alt="+" title="<% _t('OPENBOX') %>" />
 			<img id="reports_toggle_open" src="sapphire/images/toggle-open.gif" alt="-" style="display:none;" title="<% _t('CLOSEBOX') %>" />