- #49405: Minor advanced search UI/code tweaks

3 files changed, 104 insertions, 19 deletions

diff --git a/misc/drupal.css b/misc/drupal.css
index 9b21676cd..cc2b4816a 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -434,11 +434,12 @@ img.screenshot {
 .search-results .search-info {
   font-size: 0.85em;
 }
-.search-advanced .criterium {
+.search-advanced .criterion {
   float: left;
   margin-right: 2em;
 }
 .search-advanced .action {
+  float: left;
   clear: left;
 }
 #tracker td.replies {
diff --git a/modules/node.module b/modules/node.module
index 0199432a5..5f6e61a9d 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -736,22 +736,64 @@ function node_search($op = 'search', $keys = null) {
       $form = array();
 
       // Keyword boxes
-      $form['advanced'] = array('#type' => 'fieldset', '#title' => t('Advanced search'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#attributes' => array('class' => 'search-advanced'));
-
-      $form['advanced']['keywords'] = array('#type' => 'markup', '#prefix' => '<div class="criterium">', '#suffix' => '</div>');
-      $form['advanced']['keywords']['or'] = array('#type' => 'textfield', '#title' => t('Containing any of the words'), '#size' => 30, '#maxlength' => 255);
-      $form['advanced']['keywords']['phrase'] = array('#type' => 'textfield', '#title' => t('Containing the phrase'), '#size' => 30, '#maxlength' => 255);
-      $form['advanced']['keywords']['negative'] = array('#type' => 'textfield', '#title' => t('Containing none of the words'), '#size' => 30, '#maxlength' => 255);
+      $form['advanced'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Advanced search'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#attributes' => array('class' => 'search-advanced'),
+      );
+      $form['advanced']['keywords'] = array(
+        '#prefix' => '<div class="criterion">',
+        '#suffix' => '</div>',
+      );
+      $form['advanced']['keywords']['or'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing any of the words'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
+      $form['advanced']['keywords']['phrase'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing the phrase'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
+      $form['advanced']['keywords']['negative'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing none of the words'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
 
       // Taxonomy box
       if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) {
-        $form['advanced']['category'] = array('#type' => 'select', '#title' => t('Only in the category'), '#prefix' => '<div class="criterium">', '#suffix' => '</div>', '#options' => $taxonomy, '#extra' => 'size="10"', '#multiple' => true);
+        $form['advanced']['category'] = array(
+          '#type' => 'select',
+          '#title' => t('Only in the category(s)'),
+          '#prefix' => '<div class="criterion">',
+          '#size' => 10,
+          '#suffix' => '</div>',
+          '#options' => $taxonomy,
+          '#multiple' => TRUE,
+        );
       }
 
       // Node types
       $types = node_get_types();
-      $form['advanced']['type'] = array('#type' => 'checkboxes', '#title' => t('Only of the type'), '#prefix' => '<div class="criterium">', '#suffix' => '</div>', '#options' => $types);
-      $form['advanced']['submit'] = array('#type' => 'submit', '#value' => t('Advanced Search'), '#prefix' => '<div class="action">', '#suffix' => '</div>');
+      $form['advanced']['type'] = array(
+        '#type' => 'checkboxes',
+        '#title' => t('Only of the type(s)'),
+        '#prefix' => '<div class="criterion">',
+        '#suffix' => '</div>',
+        '#options' => $types,
+      );
+      $form['advanced']['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Advanced search'),
+        '#prefix' => '<div class="action">',
+        '#suffix' => '</div><br clear="all" />',
+      );
       return $form;
 
     case 'post':
diff --git a/modules/node/node.module b/modules/node/node.module
index 0199432a5..5f6e61a9d 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -736,22 +736,64 @@ function node_search($op = 'search', $keys = null) {
       $form = array();
 
       // Keyword boxes
-      $form['advanced'] = array('#type' => 'fieldset', '#title' => t('Advanced search'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#attributes' => array('class' => 'search-advanced'));
-
-      $form['advanced']['keywords'] = array('#type' => 'markup', '#prefix' => '<div class="criterium">', '#suffix' => '</div>');
-      $form['advanced']['keywords']['or'] = array('#type' => 'textfield', '#title' => t('Containing any of the words'), '#size' => 30, '#maxlength' => 255);
-      $form['advanced']['keywords']['phrase'] = array('#type' => 'textfield', '#title' => t('Containing the phrase'), '#size' => 30, '#maxlength' => 255);
-      $form['advanced']['keywords']['negative'] = array('#type' => 'textfield', '#title' => t('Containing none of the words'), '#size' => 30, '#maxlength' => 255);
+      $form['advanced'] = array(
+        '#type' => 'fieldset',
+        '#title' => t('Advanced search'),
+        '#collapsible' => TRUE,
+        '#collapsed' => TRUE,
+        '#attributes' => array('class' => 'search-advanced'),
+      );
+      $form['advanced']['keywords'] = array(
+        '#prefix' => '<div class="criterion">',
+        '#suffix' => '</div>',
+      );
+      $form['advanced']['keywords']['or'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing any of the words'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
+      $form['advanced']['keywords']['phrase'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing the phrase'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
+      $form['advanced']['keywords']['negative'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Containing none of the words'),
+        '#size' => 30,
+        '#maxlength' => 255,
+      );
 
       // Taxonomy box
       if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) {
-        $form['advanced']['category'] = array('#type' => 'select', '#title' => t('Only in the category'), '#prefix' => '<div class="criterium">', '#suffix' => '</div>', '#options' => $taxonomy, '#extra' => 'size="10"', '#multiple' => true);
+        $form['advanced']['category'] = array(
+          '#type' => 'select',
+          '#title' => t('Only in the category(s)'),
+          '#prefix' => '<div class="criterion">',
+          '#size' => 10,
+          '#suffix' => '</div>',
+          '#options' => $taxonomy,
+          '#multiple' => TRUE,
+        );
       }
 
       // Node types
       $types = node_get_types();
-      $form['advanced']['type'] = array('#type' => 'checkboxes', '#title' => t('Only of the type'), '#prefix' => '<div class="criterium">', '#suffix' => '</div>', '#options' => $types);
-      $form['advanced']['submit'] = array('#type' => 'submit', '#value' => t('Advanced Search'), '#prefix' => '<div class="action">', '#suffix' => '</div>');
+      $form['advanced']['type'] = array(
+        '#type' => 'checkboxes',
+        '#title' => t('Only of the type(s)'),
+        '#prefix' => '<div class="criterion">',
+        '#suffix' => '</div>',
+        '#options' => $types,
+      );
+      $form['advanced']['submit'] = array(
+        '#type' => 'submit',
+        '#value' => t('Advanced search'),
+        '#prefix' => '<div class="action">',
+        '#suffix' => '</div><br clear="all" />',
+      );
       return $form;
 
     case 'post':