From 454b89f2bb6b4a4b4e0abd966e002fa299e4c444 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 16 Feb 2012 19:54:09 +0100
Subject: [PATCH] BUGFIX Fixed FormAction.ss template when used with <button>
 tag

---
 forms/FormAction.php          | 31 +++++++++++++++++++------------
 templates/forms/FormAction.ss |  4 +++-
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/forms/FormAction.php b/forms/FormAction.php
index 34224b6be..a0ec912af 100644
--- a/forms/FormAction.php
+++ b/forms/FormAction.php
@@ -32,16 +32,7 @@ class FormAction extends FormField {
 	 */
 	public $useButtonTag = false;
 	
-	private $buttonContent = null;
-	
-	/**
-	 * Add content inside a button field.
-	 */
-	function setButtonContent($content) {
-		$this->buttonContent = (string) $content;
-		return $this;
-	}
-	
+	protected $buttonContent = null;
 	
 	/**
 	 * Create a new action button.
@@ -76,7 +67,7 @@ class FormAction extends FormField {
 			$properties,
 			array(
 				'Name' => $this->action,
-				'Title' => ($this->description) ? $this->description : $this->Title(),
+				'Title' => ($this->description && !$this->useButtonTag) ? $this->description : $this->Title(),
 				'UseButtonTag' => $this->useButtonTag
 			)
 		);
@@ -93,11 +84,27 @@ class FormAction extends FormField {
 			array(
 				'disabled' => ($this->isReadonly() || $this->isDisabled()),
 				'value' => $this->Title(),
-				'type' => ($this->useButtonTag) ? null : 'submit'
+				'type' => ($this->useButtonTag) ? null : 'submit',
+				'title' => ($this->useButtonTag) ? $this->description : null,
 			)
 		);
 	}
 
+	/**
+	 * Add content inside a button field.
+	 */
+	function setButtonContent($content) {
+		$this->buttonContent = (string) $content;
+		return $this;
+	}
+
+	/**
+	 * @return String
+	 */
+	function getButtonContent() {
+		return $this->buttonContent;
+	}
+
 	function extraClass() {
 		return 'action ' . parent::extraClass();
 	}
diff --git a/templates/forms/FormAction.ss b/templates/forms/FormAction.ss
index f0adec070..eaa2fe53e 100644
--- a/templates/forms/FormAction.ss
+++ b/templates/forms/FormAction.ss
@@ -1,5 +1,7 @@
 <% if UseButtonTag %>
-	<button $AttributesHTML></button>
+	<button $AttributesHTML>
+		<% if ButtonContent %>$ButtonContent<% else %>$Title<% end_if %>
+	</button>
 <% else %>
 	<input $AttributesHTML>
 <% end_if %>
\ No newline at end of file