From 778fd28877cc92674f8215ccecd7e68c89c21fbb Mon Sep 17 00:00:00 2001
From: Jeremy Bridson <jeremy@silverstripe.com>
Date: Wed, 11 Apr 2012 16:01:15 +1200
Subject: [PATCH] BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter
 panel with the designs.

---
 code/controllers/AssetAdmin.php | 6 +++---
 code/controllers/CMSMain.php    | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 2596e5cb..e6cab21e 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -311,9 +311,9 @@ JS
 
 		$fields = $context->getSearchFields();
 		$actions = new FieldList(
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.CLEAR', 'Clear'))
-				->addExtraClass('ss-ui-action-minor'),
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.SEARCH', 'Search'))
+			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
+			->addExtraClass('ss-ui-action-constructive'),
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
 		);
 		
 		$form = new Form($this, 'filter', $fields, $actions);
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
index 5ab2ae6c..5cef38bc 100644
--- a/code/controllers/CMSMain.php
+++ b/code/controllers/CMSMain.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * The main "content" area of the CMS.
@@ -177,6 +178,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$fields = new FieldList(
 			new TextField('Term', _t('CMSSearch.FILTERLABELTEXT', 'Content')),
 			$dateGroup = new FieldGroup(
+				new HeaderField('Date', _t('CMSSearch.FILTERDATEHEADING', 'Date'), 4),
 				$dateFrom = new DateField('LastEditedFrom', _t('CMSSearch.FILTERDATEFROM', 'From')),
 				$dateTo = new DateField('LastEditedTo', _t('CMSSearch.FILTERDATETO', 'To'))
 			),
@@ -200,9 +202,9 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		$dateTo->setConfig('showcalendar', true);
 
 		$actions = new FieldList(
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.CLEAR', 'Clear'))
-				->addExtraClass('ss-ui-action-minor'),
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.SEARCH', 'Search'))
+			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
+			->addExtraClass('ss-ui-action-constructive'),
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
 		);
 
 		// Use <button> to allow full jQuery UI styling