Skip to content
This repository
Browse code

BUGFIX:Trac #6854 / #7115 - aligned action buttons in filter panel wi…

…th the designs.
  • Loading branch information...
commit 778fd28877cc92674f8215ccecd7e68c89c21fbb 1 parent e55d8bc
authored April 11, 2012
6  code/controllers/AssetAdmin.php
@@ -311,9 +311,9 @@ public function SearchForm() {
311 311
 
312 312
 		$fields = $context->getSearchFields();
313 313
 		$actions = new FieldList(
314  
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.CLEAR', 'Clear'))
315  
-				->addExtraClass('ss-ui-action-minor'),
316  
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.SEARCH', 'Search'))
  314
+			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
  315
+			->addExtraClass('ss-ui-action-constructive'),
  316
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
317 317
 		);
318 318
 		
319 319
 		$form = new Form($this, 'filter', $fields, $actions);
8  code/controllers/CMSMain.php
... ...
@@ -1,3 +1,4 @@
  1
+
1 2
 <?php
2 3
 /**
3 4
  * The main "content" area of the CMS.
@@ -177,6 +178,7 @@ function SearchForm() {
177 178
 		$fields = new FieldList(
178 179
 			new TextField('Term', _t('CMSSearch.FILTERLABELTEXT', 'Content')),
179 180
 			$dateGroup = new FieldGroup(
  181
+				new HeaderField('Date', _t('CMSSearch.FILTERDATEHEADING', 'Date'), 4),
180 182
 				$dateFrom = new DateField('LastEditedFrom', _t('CMSSearch.FILTERDATEFROM', 'From')),
181 183
 				$dateTo = new DateField('LastEditedTo', _t('CMSSearch.FILTERDATETO', 'To'))
182 184
 			),
@@ -200,9 +202,9 @@ function SearchForm() {
200 202
 		$dateTo->setConfig('showcalendar', true);
201 203
 
202 204
 		$actions = new FieldList(
203  
-			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.CLEAR', 'Clear'))
204  
-				->addExtraClass('ss-ui-action-minor'),
205  
-			FormAction::create('doSearch',  _t('CMSMain_left.ss.SEARCH', 'Search'))
  205
+			FormAction::create('doSearch',  _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
  206
+			->addExtraClass('ss-ui-action-constructive'),
  207
+			Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
206 208
 		);
207 209
 
208 210
 		// Use <button> to allow full jQuery UI styling

0 notes on commit 778fd28

Please sign in to comment.
Something went wrong with that request. Please try again.