MINOR Code formatting fixes for default Page pagetype

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/branches/2.4@100734 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
sharvey 2010-03-09 22:00:00 +00:00 committed by Sam Minnee
parent 745816f612
commit af105fc9ed

View File

@ -1,5 +1,4 @@
<?php <?php
class Page extends SiteTree { class Page extends SiteTree {
public static $db = array( public static $db = array(
@ -9,7 +8,6 @@ class Page extends SiteTree {
); );
} }
class Page_Controller extends ContentController { class Page_Controller extends ContentController {
/** /**
@ -37,9 +35,9 @@ class Page_Controller extends ContentController {
// Note: you should use SS template require tags inside your templates // Note: you should use SS template require tags inside your templates
// instead of putting Requirements calls here. However these are // instead of putting Requirements calls here. However these are
// included so that our older themes still work // included so that our older themes still work
Requirements::themedCSS("layout"); Requirements::themedCSS('layout');
Requirements::themedCSS("typography"); Requirements::themedCSS('typography');
Requirements::themedCSS("form"); Requirements::themedCSS('form');
} }
/** /**
@ -48,28 +46,28 @@ class Page_Controller extends ContentController {
function SearchForm() { function SearchForm() {
$searchText = isset($_REQUEST['Search']) ? $_REQUEST['Search'] : 'Search'; $searchText = isset($_REQUEST['Search']) ? $_REQUEST['Search'] : 'Search';
$fields = new FieldSet( $fields = new FieldSet(
new TextField("Search", "", $searchText) new TextField('Search', '', $searchText)
); );
$actions = new FieldSet( $actions = new FieldSet(
new FormAction('results', 'Search') new FormAction('results', 'Search')
); );
return new SearchForm($this, 'SearchForm', $fields, $actions);
return new SearchForm($this, "SearchForm", $fields, $actions);
} }
/** /**
* Process and render search results * Process and render search results.
*
* @param array $data The raw request data generated from post
* @param SearchForm $form The form instance that was submitted
* @param SS_HTTPRequest $request Request generated for this action
*/ */
function results($data, $form){ function results($data, $form, $request) {
$data = array( $data = array(
'Results' => $form->getResults(), 'Results' => $form->getResults(),
'Query' => $form->getSearchQuery(), 'Query' => $form->getSearchQuery(),
'Title' => 'Search Results' 'Title' => 'Search Results'
); );
return $this->customise($data)->renderWith(array('Page_results', 'Page'));
return $this->customise($data)->renderWith(array('Page_results', 'Page'));
} }
} }
?>