Commit 0741d8e3 authored by Dries's avatar Dries

- Patch #550742 by douggreen | Zarabadoo: remove Search box from theme system,...

- Patch #550742 by douggreen | Zarabadoo: remove Search box from theme system, default to block system instead.
parent a7527fec
...@@ -2208,7 +2208,6 @@ function template_preprocess_page(&$variables) { ...@@ -2208,7 +2208,6 @@ function template_preprocess_page(&$variables) {
$variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
$variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
$variables['action_links'] = menu_local_actions(); $variables['action_links'] = menu_local_actions();
$variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_render(drupal_get_form('search_theme_form')) : '');
$variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : ''); $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : '');
$variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : '');
$variables['tabs'] = theme('menu_local_tasks'); $variables['tabs'] = theme('menu_local_tasks');
...@@ -2357,7 +2356,6 @@ function template_preprocess_maintenance_page(&$variables) { ...@@ -2357,7 +2356,6 @@ function template_preprocess_maintenance_page(&$variables) {
$variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : '';
$variables['main_menu'] = array(); $variables['main_menu'] = array();
$variables['secondary_menu'] = array(); $variables['secondary_menu'] = array();
$variables['search_box'] = '';
$variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
$variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
$variables['css'] = drupal_add_css(); $variables['css'] = drupal_add_css();
......
<?php
// $Id$
/**
* @file
* Default theme implementation for displaying a search form directly into the
* theme layout. Not to be confused with the search block or the search page.
*
* Available variables:
* - $search_form: The complete search form ready for print.
* - $search: Array of keyed search elements. Can be used to print each form
* element separately.
*
* Default keys within $search:
* - $search['search_theme_form']: Text input area wrapped in a div.
* - $search['submit']: Form submit button.
* - $search['hidden']: Hidden form elements. Used to validate forms when submitted.
*
* Since $search is keyed, a direct print of the form element is possible.
* Modules can add to the search form so it is recommended to check for their
* existence before printing. The default keys will always exist.
*
* <?php if (isset($search['extra_field'])): ?>
* <div class="extra-field">
* <?php print $search['extra_field']; ?>
* </div>
* <?php endif; ?>
*
* To check for all available data within $search, use the code below.
*
* <?php print '<pre>'. check_plain(print_r($search, 1)) .'</pre>'; ?>
*
* @see template_preprocess_search_theme_form()
*/
?>
<div id="search" class="container-inline">
<?php print $search_form; ?>
</div>
...@@ -15,6 +15,13 @@ function search_uninstall() { ...@@ -15,6 +15,13 @@ function search_uninstall() {
variable_del('search_cron_limit'); variable_del('search_cron_limit');
} }
/**
* Implement hook_install().
*/
function search_install() {
drupal_set_message(t('You can <a href="@url">add the search block</a> now.', array('@url' => url('admin/structure/block'))));
}
/** /**
* Implement hook_schema(). * Implement hook_schema().
*/ */
......
...@@ -117,10 +117,6 @@ function search_help($path, $arg) { ...@@ -117,10 +117,6 @@ function search_help($path, $arg) {
*/ */
function search_theme() { function search_theme() {
return array( return array(
'search_theme_form' => array(
'arguments' => array('form' => NULL),
'template' => 'search-theme-form',
),
'search_block_form' => array( 'search_block_form' => array(
'arguments' => array('form' => NULL), 'arguments' => array('form' => NULL),
'template' => 'search-block-form', 'template' => 'search-block-form',
...@@ -892,7 +888,7 @@ function search_form($form, &$form_state, $action = '', $keys = '', $type = NULL ...@@ -892,7 +888,7 @@ function search_form($form, &$form_state, $action = '', $keys = '', $type = NULL
} }
/** /**
* Form builder; Output a search form for the search block and the theme's search box. * Form builder; Output a search form for the search block's search box.
* *
* @ingroup forms * @ingroup forms
* @see search_box_form_submit() * @see search_box_form_submit()
...@@ -929,33 +925,6 @@ function search_box_form_submit($form, &$form_state) { ...@@ -929,33 +925,6 @@ function search_box_form_submit($form, &$form_state) {
$form_state['redirect'] = 'search/node/' . trim($form_state['values'][$form_id]); $form_state['redirect'] = 'search/node/' . trim($form_state['values'][$form_id]);
} }
/**
* Process variables for search-theme-form.tpl.php.
*
* The $variables array contains the following arguments:
* - $form
*
* @see search-theme-form.tpl.php
*/
function template_preprocess_search_theme_form(&$variables) {
$variables['search'] = array();
$hidden = array();
// Provide variables named after form keys so themers can print each element independently.
foreach (element_children($variables['form']) as $key) {
$type = $variables['form'][$key]['#type'];
if ($type == 'hidden' || $type == 'token') {
$hidden[] = drupal_render($variables['form'][$key]);
}
else {
$variables['search'][$key] = drupal_render($variables['form'][$key]);
}
}
// Hidden form elements have no value to themers. No need for separation.
$variables['search']['hidden'] = implode($hidden);
// Collect all form elements to make it easier to print the whole form.
$variables['search_form'] = implode($variables['search']);
}
/** /**
* Process variables for search-block-form.tpl.php. * Process variables for search-block-form.tpl.php.
* *
...@@ -1127,10 +1096,6 @@ function _search_excerpt_replace(&$text) { ...@@ -1127,10 +1096,6 @@ function _search_excerpt_replace(&$text) {
} }
function search_forms() { function search_forms() {
$forms['search_theme_form']= array(
'callback' => 'search_box',
'callback arguments' => array('search_theme_form'),
);
$forms['search_block_form']= array( $forms['search_block_form']= array(
'callback' => 'search_box', 'callback' => 'search_box',
'callback arguments' => array('search_block_form'), 'callback arguments' => array('search_block_form'),
......
...@@ -503,7 +503,7 @@ class SearchCommentTestCase extends DrupalWebTestCase { ...@@ -503,7 +503,7 @@ class SearchCommentTestCase extends DrupalWebTestCase {
// Search for $title. // Search for $title.
$edit = array( $edit = array(
'search_theme_form' => $comment_body, 'search_block_form' => $comment_body,
); );
$this->drupalPost('', $edit, t('Search')); $this->drupalPost('', $edit, t('Search'));
$this->assertText($node->title, t('Node found in search results.')); $this->assertText($node->title, t('Node found in search results.'));
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
* in theme settings. * in theme settings.
* *
* Navigation: * Navigation:
* - $search_box: HTML to display the search box, empty if search has been disabled.
* - $main_menu (array): An array containing the Main menu links for the * - $main_menu (array): An array containing the Main menu links for the
* site, if they have been configured. * site, if they have been configured.
* - $secondary_menu (array): An array containing the Secondary menu links for * - $secondary_menu (array): An array containing the Secondary menu links for
...@@ -87,10 +86,6 @@ ...@@ -87,10 +86,6 @@
</div> <!-- /#name-and-slogan --> </div> <!-- /#name-and-slogan -->
<?php endif; ?> <?php endif; ?>
<?php if ($search_box): ?>
<div id="search-box"><?php print $search_box; ?></div>
<?php endif; ?>
<?php if ($page['header']): ?> <?php if ($page['header']): ?>
<div id="header-region" class="region"> <div id="header-region" class="region">
<?php print render($page['header']); ?> <?php print render($page['header']); ?>
......
...@@ -20,6 +20,16 @@ function default_install() { ...@@ -20,6 +20,16 @@ function default_install() {
'pages' => '', 'pages' => '',
'cache' => -1, 'cache' => -1,
), ),
array(
'module' => 'search',
'delta' => 'form',
'theme' => 'garland',
'status' => 1,
'weight' => -1,
'region' => 'sidebar_first',
'pages' => '',
'cache' => -1,
),
array( array(
'module' => 'user', 'module' => 'user',
'delta' => 'login', 'delta' => 'login',
......
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
<?php if ($sidebar_first): ?> <?php if ($sidebar_first): ?>
<div id="sidebar-first" class="sidebar"> <div id="sidebar-first" class="sidebar">
<?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
<?php print $sidebar_first ?> <?php print $sidebar_first ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
<?php if ($page['sidebar_first']): ?> <?php if ($page['sidebar_first']): ?>
<div id="sidebar-first" class="sidebar"> <div id="sidebar-first" class="sidebar">
<?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
<?php print render($page['sidebar_first']); ?> <?php print render($page['sidebar_first']); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
...@@ -48,7 +47,6 @@ ...@@ -48,7 +47,6 @@
<?php if ($page['sidebar_second']): ?> <?php if ($page['sidebar_second']): ?>
<div id="sidebar-second" class="sidebar"> <div id="sidebar-second" class="sidebar">
<?php if (!$page['sidebar_first'] && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
<?php print render($page['sidebar_second']); ?> <?php print render($page['sidebar_second']); ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment