tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-29 12:49:00 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91 from silverstripe-big-o/silverstripe-cms

Browse Source 
---

...the designs.

Conflicts:
	code/controllers/AssetAdmin.php
	code/controllers/CMSMain.php
This commit is contained in:
Ingo Schommer 2012-04-11 16:17:51 +02:00
commit 57d7655f80
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/AssetAdmin.php
View File

@ -311,9 +311,9 @@ JS
$fields = $context->getSearchFields(); $fields = $context->getSearchFields();
$actions = new FieldList( $actions = new FieldList(
ResetFormAction::create('clear', _t('CMSMain_left.ss.CLEAR', 'Clear')) FormAction::create('doSearch', _t('CMSMain_left.ss.APPLY FILTER', 'Apply Filter'))
->addExtraClass('ss-ui-action-minor'), ->addExtraClass('ss-ui-action-constructive'),
FormAction::create('doSearch', _t('CMSMain_left.ss.SEARCH', 'Search')) Object::create('ResetFormAction', 'clear', _t('CMSMain_left.ss.RESET', 'Reset'))
); );
$form = new Form($this, 'filter', $fields, $actions); $form = new Form($this, 'filter', $fields, $actions);

8
code/controllers/CMSMain.php
View File

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