Merge pull request #2334 from creative-commoners/pulls/4.0/search-input-placeholder

FIX 'Search' text in default search form should be a placeholder
This commit is contained in:
Guy Marriott 2018-11-17 15:52:35 +13:00 committed by GitHub
commit 84510f1869
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,17 +26,18 @@ class ContentControllerSearchExtension extends Extension
*/ */
public function SearchForm() public function SearchForm()
{ {
$searchText = _t('SilverStripe\\CMS\\Search\\SearchForm.SEARCH', 'Search'); $searchText = '';
if ($this->owner->getRequest() && $this->owner->getRequest()->getVar('Search')) { if ($this->owner->getRequest() && $this->owner->getRequest()->getVar('Search')) {
$searchText = $this->owner->getRequest()->getVar('Search'); $searchText = $this->owner->getRequest()->getVar('Search');
} }
$fields = new FieldList( $placeholder = _t('SilverStripe\\CMS\\Search\\SearchForm.SEARCH', 'Search');
new TextField('Search', false, $searchText) $fields = FieldList::create(
TextField::create('Search', false, $searchText)
->setAttribute('placeholder', $placeholder)
); );
$actions = new FieldList( $actions = FieldList::create(
new FormAction('results', _t('SilverStripe\\CMS\\Search\\SearchForm.GO', 'Go')) FormAction::create('results', _t('SilverStripe\\CMS\\Search\\SearchForm.GO', 'Go'))
); );
/** @skipUpgrade */ /** @skipUpgrade */
$form = SearchForm::create($this->owner, 'SearchForm', $fields, $actions); $form = SearchForm::create($this->owner, 'SearchForm', $fields, $actions);