From 140fae5d7ef009aaf955c8fd72171bb52e793dad Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sat, 21 Nov 2009 03:14:24 +0000
Subject: [PATCH] API CHANGE Removed AssetAdmin_right.ss template, using
 LeftAndMain_right.ss now

API CHANGE Removed CMSMain_right.ss template, moved one level up to LeftAndMain_right.ss to be inheritable by other LeftAndMain subclasses

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92692 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 templates/Includes/AssetAdmin_right.ss        | 30 -------------------
 ...{CMSMain_right.ss => LeftAndMain_right.ss} |  0
 2 files changed, 30 deletions(-)
 delete mode 100755 templates/Includes/AssetAdmin_right.ss
 rename templates/Includes/{CMSMain_right.ss => LeftAndMain_right.ss} (100%)

diff --git a/templates/Includes/AssetAdmin_right.ss b/templates/Includes/AssetAdmin_right.ss
deleted file mode 100755
index 022d2029..00000000
--- a/templates/Includes/AssetAdmin_right.ss
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="form_actions_right" class="ajaxActions">
-</div>
-
-<!--
-<form class="actionparams" id="action_movemarked_options" style="display:none" action="admin/assets/movemarked">
-	<fieldset>
-	<input type="hidden" name="ID" />
-	<div class="field">
-		<label class="left">Move files to</label>
-		$ChooseFolderField
-	</div>
-	</fieldset>
-	
-	<p class="actions">
-		<input type="submit" value="Move marked files" />
-	</p>
-</form>
--->
-
-<% if EditForm %>
-	$EditForm
-<% else %>
-	<form id="Form_EditForm" action="admin/assets/?executeForm=EditForm" method="post" enctype="multipart/form-data">
-		<h1>$ApplicationName</h1>
-
-		<p><% _t('WELCOME','Welcome to') %> $ApplicationName! <% _t('CHOOSEPAGE','Please choose a page from the left.') %></p>
-	</form>
-<% end_if %>
-
-<p id="statusMessage" style="visibility:hidden"></p>
diff --git a/templates/Includes/CMSMain_right.ss b/templates/Includes/LeftAndMain_right.ss
similarity index 100%
rename from templates/Includes/CMSMain_right.ss
rename to templates/Includes/LeftAndMain_right.ss