From 6cbb094363b20565d01e57e56dcd4efba53042d8 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 20 Apr 2009 03:06:29 +0000
Subject: [PATCH] MINOR: removed dulicate template, adjusted form field to show
 icon location

---
 code/EditableSpamProtectionField.php     | 11 +++++++----
 templates/EditableSpamProtectionField.ss | 20 --------------------
 2 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 templates/EditableSpamProtectionField.ss

diff --git a/code/EditableSpamProtectionField.php b/code/EditableSpamProtectionField.php
index f663b64..6c77d98 100644
--- a/code/EditableSpamProtectionField.php
+++ b/code/EditableSpamProtectionField.php
@@ -77,8 +77,11 @@ class EditableSpamProtectionField extends EditableFormField {
 		return "";
 	}
 	
-	function EditSegment() {
-		return $this->renderWith( $this->class );
+	/**
+	 * @return string
+	 */
+	public function Icon() {
+		return 'spamprotection/images/' . strtolower($this->class) . '.png';
 	}
-}
-?>
\ No newline at end of file
+	
+}
\ No newline at end of file
diff --git a/templates/EditableSpamProtectionField.ss b/templates/EditableSpamProtectionField.ss
deleted file mode 100644
index 8ab357d..0000000
--- a/templates/EditableSpamProtectionField.ss
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="EditableSpamProtectionField EditableFormField" id="$Name.Attr">
-	<div class="FieldInfo">
-		<img class="handle" src="sapphire/images/drag.gif" alt="<% _t('DRAG', 'Drag to rearrange order of fields') %>" />
-		<img class="icon" src="spamprotection/images/editablespamprotectionfield.png" alt="<% _t('SPAMPROTECTIONFIELD', 'Spam Protection Field') %>" />
-		$TitleField
-		<a class="toggler" href="#" title="<% _t('MORE', 'More options') %>"><img src="cms/images/edit.gif" alt="<% _t('MORE', 'More options') %>" /></a>
-		<a class="delete" href="#" title="<% _t('DELETE', 'Delete this field') %>"><img src="cms/images/delete.gif" alt="<% _t('DELETE', 'Delete this field') %>" /></a>
-	</div>
-	<div class="ExtraOptions" id="$Name.Attr-extraOptions">
-		<div class="FieldDefault" id="$Name.Attr-fieldDefault">
-			$DefaultField
-		</div>
-		<% control ExtraOptions %>
-		$FieldHolder
-		<% end_control %>
-	</div>
-    <input type="hidden" name="$Name.Attr[CustomParameter]" value="$CustomParameter" />
-    <input type="hidden" name="$Name.Attr[Type]" value="EditableSpamProtectionField" />
-	<input type="hidden" name="$Name.Attr[Sort]" value="-1" />
-</div>
\ No newline at end of file