From 53f75e957de3c16f252f23bfec4c5a6556901f9e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 18 Oct 2007 01:05:52 +0000
Subject: [PATCH] ENHANCEMENT: allowing empty children ENHANCEMENT: added
 Fields() ENHANCEMENT: added linebreaks for html

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43558 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/CompositeField.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/forms/CompositeField.php b/forms/CompositeField.php
index 4f11865e0..d6678f68d 100755
--- a/forms/CompositeField.php
+++ b/forms/CompositeField.php
@@ -45,6 +45,10 @@ class CompositeField extends FormField {
 	public function setID($id) {
 		$this->id = $id;
 	}
+	
+	public function Field() {
+		return $this->FieldHolder();
+	}
 
 	/**
 	 * Returns the fields nested inside another DIV
@@ -53,18 +57,18 @@ class CompositeField extends FormField {
 		$fs = $this->FieldSet();
 		$idAtt = isset($this->id) ? " id=\"{$this->id}\"" : '';
 		$className = ($this->columnCount) ? "field CompositeField {$this->extraClass()} multicolumn" : "field CompositeField {$this->extraClass()}";
-		$content = "<div class=\"$className\"$idAtt>";
+		$content = "<div class=\"$className\"$idAtt>\n";
 		
 		foreach($fs as $subfield) {
 			if($this->columnCount) {
 				$className = "column{$this->columnCount}";
 				if(!next($fs)) $className .= " lastcolumn";
-				$content .= "<div class=\"{$className}\">" . $subfield->FieldHolder() . "</div>";
+				$content .= "\n<div class=\"{$className}\">\n" . $subfield->FieldHolder() . "\n</div>\n";
 			} else if($subfield){
-				$content .= $subfield->FieldHolder() . " ";
+				$content .= "\n" . $subfield->FieldHolder() . "\n";
 			}
 		}
-		$content .= "</div>";
+		$content .= "</div>\n";
 				
 		return $content;
 	}