Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…th the designs.
  • Loading branch information...
commit 778fd28877cc92674f8215ccecd7e68c89c21fbb 1 parent e55d8bc
Jeremy Bridson authored
Showing with 8 additions and 6 deletions.
  1. +3 −3 code/controllers/AssetAdmin.php
  2. +5 −3 code/controllers/CMSMain.php
View
6 code/controllers/AssetAdmin.php
@@ -311,9 +311,9 @@ public function SearchForm() {
$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);
View
8 code/controllers/CMSMain.php
@@ -1,3 +1,4 @@
+
<?php
/**
* The main "content" area of the CMS.
@@ -177,6 +178,7 @@ function SearchForm() {
$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 @@ function SearchForm() {
$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
Please sign in to comment.
Something went wrong with that request. Please try again.