From ab891c67ecf0275c1ed00b3f009813307f39dafa Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Oct 2008 13:22:36 +0000
Subject: [PATCH] API CHANGE Removed LabelledLiteralField, use LiteralField API
 CHANGE Removed NamedLabelField, use LabelField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64420 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/LabelledLiteralField.php | 30 ------------------------------
 forms/NamedLabelField.php      | 34 ----------------------------------
 2 files changed, 64 deletions(-)
 delete mode 100644 forms/LabelledLiteralField.php
 delete mode 100755 forms/NamedLabelField.php

diff --git a/forms/LabelledLiteralField.php b/forms/LabelledLiteralField.php
deleted file mode 100644
index a3930a1be..000000000
--- a/forms/LabelledLiteralField.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * It's a LiteralField ... with a Label
- * 
- * @package forms
- * @subpackage fields-dataless
- * 
- * @deprecated If you need to have a label for your literal field, just put the
- * HTML into a LiteralField, or use a custom form template to separate your
- * presentation/content from the data fields.
- * 
- * @see http://doc.silverstripe.com/doku.php?id=form#using_a_custom_template
- */
-class LabelledLiteralField extends LiteralField {
-	
-	function __construct( $name, $title, $content ) {
-		parent::__construct($name, $content);
-		user_error('LabelledLiteralField is deprecated. Please see the @deprecated note in LabelledLiteralField.php', E_USER_NOTICE);
-		$this->setTitle( $title );
-	}
-	
-	function FieldHolder() {
-		return FormField::FieldHolder();
-	}
-	
-	function Field() {
-		return is_object($this->content) ? $this->content->forTemplate() : $this->content; 
-	}
-}
-?>
\ No newline at end of file
diff --git a/forms/NamedLabelField.php b/forms/NamedLabelField.php
deleted file mode 100755
index e9f78b391..000000000
--- a/forms/NamedLabelField.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * A {@link LabelField} that lets you give it a name; makes it easier to delete ;)
- * @package forms
- * @subpackage fields-dataless
- */
-class NamedLabelField extends LabelField {
-	protected $className;
-	protected $allowHTML;
-	protected $labelName;
-	
-	/**
-	 * Create a new label.
-	 * @param title The label itslef
-	 * @param class An HTML class to apply to the label.
-	 */
-	function __construct($name, $title, $className = "", $allowHTML = false, $form = null) {
-		$this->labelName = $name;
-		parent::__construct($title, $className, $allowHTML, $form);
-	}
-	
-	/**
-	 * Returns a label containing the title, and an HTML class if given.
-	 */
-	function Field() {
-		if($this->className) $classClause = " class=\"$this->className\"";
-		return "<label id=\"" . $this->id() . "\"$classClause>" . ($this->allowHTML ? $this->title : htmlentities($this->title)) . "</label>";
-	}
-	
-	function id() {
-		return parent::id() . $this->labelName;
-	}
-}
-?>
\ No newline at end of file