Index: contributions/modules/taxonomy_batch_operations/taxonomy_batch_operations.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_batch_operations/taxonomy_batch_operations.module,v
retrieving revision 1.1.2.4
diff -u -r1.1.2.4 taxonomy_batch_operations.module
--- contributions/modules/taxonomy_batch_operations/taxonomy_batch_operations.module	30 Jan 2007 19:12:26 -0000	1.1.2.4
+++ contributions/modules/taxonomy_batch_operations/taxonomy_batch_operations.module	31 Jan 2007 15:31:12 -0000
@@ -126,7 +126,7 @@
       '#default_value' => $term->weight,
     );
     $form['multiedit'][$term->tid]['operations'] = array(
-      '#value' => l(t('edit'), "admin/taxonomy/edit/term/$term->tid", array(), $destination) . ' | ' .
+      '#value' => l(t('edit'), "admin/taxonomy/edit/term/$term->tid", array(), $destination) . ' ' .
                   l(t('delete'), "admin/taxonomy/delete/term/$term->tid", array(), $destination),
     );
     $form['multiedit'][$term->tid]['check'] = array(
@@ -137,14 +137,15 @@
     $displayed_count++; // we're counting tids displayed
   }
 
+  $form['options'] = array(
+    '#type' => 'fieldset', '#title' => t('Update options'),
+    '#prefix' => '<div class="container-inline">', '#suffix' => '</div>'
+  );
+
   if (count($tree) > 0) {
     // we don't need the buttons if the vocabulary is empty
-    $form['save'] = array('#type' => 'submit', '#value' => t('Save'));
-    $form['delete'] = array('#type' => 'submit', '#value' => t('Delete Selected'));
-  }
-  else {
-    // if the vocab is empty, we stuff the 'no terms available' text into where the pager would go
-    $form['pager'] = array('#value' => t('No terms available.'));
+    $form['options']['delete'] = array('#type' => 'submit', '#value' => t('Delete selected'));
+    $form['options']['save'] = array('#type' => 'submit', '#value' => t('Save changes'));
   }
 
   $GLOBALS['pager_page_array'][] = $start_from;  // FIXME
@@ -164,7 +165,8 @@
 function theme_batch_operations_form($form) {
 
   $header = array(
-              array("data" => t('Name'),
+              t(''),
+              array("data" => t('Term name'),
                     "sort" => '',
                     "field" => '',
               ),
@@ -177,25 +179,21 @@
                     "field" => '',
               ),
               t('Operations'),
-              t(''),
             );
 
   foreach(element_children($form['multiedit']) as $i) {
     $rows[] = array(
+      form_render($form['multiedit'][$i]['check']),
       form_render($form['multiedit'][$i]['name']),
       form_render($form['multiedit'][$i]['count']),
       form_render($form['multiedit'][$i]['weight']),
       form_render($form['multiedit'][$i]['operations']),
-      form_render($form['multiedit'][$i]['check'])
     );
   }
 
-  $rows[] = array(array('data' => form_render($form['pager']), 'colspan' => 2),
-                  array('data' => form_render($form['save']), 'colspan' => 1),
-                  array('data' => form_render($form['delete']), 'colspan' => 2)
-            );
+  $output = form_render($form['options']);
+  $output .= theme_table($header, $rows, array('id' => 'taxonomy'));
 
-  $output = theme_table($header, $rows, array('id' => 'taxonomy'));
   $output .= form_render($form);
 
   return $output;
@@ -241,7 +239,7 @@
 
 function batch_operations_form_submit($form_id, $form_values) {
   switch ($_POST[op]) {
-    case 'Save':
+    case 'Save changes':
       foreach ($form_values[multiedit] as $key => $tid) {
         $term = taxonomy_get_term($key);
         unset($tid['check']);
@@ -257,13 +255,12 @@
       }
       drupal_set_message(t('Updated term weights'));
       break;
-    case 'Delete Selected':
+    case 'Delete selected':
       foreach ($form_values[multiedit] as $key => $tid) {
         if ($tid['check'] == 1)
           $tids[] = $key;
       }
-      print_r($tids);
-      return "admin/taxonomy/delete/terms/".implode($tids, ',');       
+      return "admin/taxonomy/delete/terms/".implode($tids, ',');
       break;
   }