? tax-content-ui.patch
Index: modules/node/content_types.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/content_types.inc,v
retrieving revision 1.53
diff -u -p -r1.53 content_types.inc
--- modules/node/content_types.inc	13 May 2008 17:37:58 -0000	1.53
+++ modules/node/content_types.inc	10 Jun 2008 13:44:08 -0000
@@ -12,7 +12,7 @@
 function node_overview_types() {
   $types = node_get_types();
   $names = node_get_types('names');
-  $header = array(t('Name'), t('Type'), t('Description'), array('data' => t('Operations'), 'colspan' => '2'));
+  $header = array(t('Name'), t('Type'), t('Description'), t('Operations'));
   $rows = array();
 
   foreach ($names as $key => $name) {
@@ -24,8 +24,6 @@ function node_overview_types() {
         check_plain($type->type),
         filter_xss_admin($type->description),
       );
-      // Set the edit column.
-      $row[] = array('data' => l(t('edit'), 'admin/build/node-type/' . $type_url_str));
 
       // Set the delete column.
       if ($type->custom) {
Index: modules/taxonomy/taxonomy.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.admin.inc,v
retrieving revision 1.25
diff -u -p -r1.25 taxonomy.admin.inc
--- modules/taxonomy/taxonomy.admin.inc	14 Apr 2008 17:48:42 -0000	1.25
+++ modules/taxonomy/taxonomy.admin.inc	10 Jun 2008 13:44:09 -0000
@@ -23,10 +23,9 @@ function taxonomy_overview_vocabularies(
       $types[] = $node_type ? check_plain($node_type) : check_plain($type);
     }
     $form[$vocabulary->vid]['#vocabulary'] = (array)$vocabulary;
-    $form[$vocabulary->vid]['name'] = array('#value' => check_plain($vocabulary->name));
+    $form[$vocabulary->vid]['name'] = array('#value' => l($vocabulary->name, "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid"));
     $form[$vocabulary->vid]['types'] = array('#value' => implode(', ', $types));
     $form[$vocabulary->vid]['weight'] = array('#type' => 'weight', '#delta' => 10, '#default_value' => $vocabulary->weight);
-    $form[$vocabulary->vid]['edit'] = array('#value' => l(t('edit vocabulary'), "admin/content/taxonomy/edit/vocabulary/$vocabulary->vid"));
     $form[$vocabulary->vid]['list'] = array('#value' => l(t('list terms'), "admin/content/taxonomy/$vocabulary->vid"));
     $form[$vocabulary->vid]['add'] = array('#value' => l(t('add terms'), "admin/content/taxonomy/$vocabulary->vid/add/term"));
   }
@@ -75,22 +74,21 @@ function theme_taxonomy_overview_vocabul
         $vocabulary['weight']['#attributes']['class'] = 'vocabulary-weight';
         $row[] = drupal_render($vocabulary['weight']);
       }
-      $row[] = drupal_render($vocabulary['edit']);
       $row[] = drupal_render($vocabulary['list']);
       $row[] = drupal_render($vocabulary['add']);
       $rows[] = array('data' => $row, 'class' => 'draggable');
     }
   }
   if (empty($rows)) {
-    $rows[] = array(array('data' => t('No vocabularies available.'), 'colspan' => '5'));
+    $rows[] = array(array('data' => t('No vocabularies available.'), 'colspan' => '4'));
   }
 
-  $header = array(t('Name'), t('Type'));
+  $header = array(t('Vocabulary name'), t('Content types'));
   if (isset($form['submit'])) {
     $header[] = t('Weight');
     drupal_add_tabledrag('taxonomy', 'order', 'sibling', 'vocabulary-weight');
   }
-  $header[] = array('data' => t('Operations'), 'colspan' => '3');
+  $header[] = array('data' => t('Operations'), 'colspan' => '2');
   return theme('table', $header, $rows, array('id' => 'taxonomy')) . drupal_render($form);
 }