Index: modules/block/block.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.admin.inc,v
retrieving revision 1.35
diff -u -p -r1.35 block.admin.inc
--- modules/block/block.admin.inc	11 Feb 2009 03:38:46 -0000	1.35
+++ modules/block/block.admin.inc	20 Mar 2009 10:19:12 -0000
@@ -301,6 +301,7 @@ function block_add_block_form(&$form_sta
 }
 
 function block_add_block_form_validate($form, &$form_state) {
+  $test = 'test';
   if (empty($form_state['values']['info']) || db_result(db_query("SELECT COUNT(*) FROM {box} WHERE info = '%s'", $form_state['values']['info']))) {
     form_set_error('info', t('Please ensure that each block description is unique.'));
   }
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.41
diff -u -p -r1.41 menu.admin.inc
--- modules/menu/menu.admin.inc	16 Mar 2009 20:31:11 -0000	1.41
+++ modules/menu/menu.admin.inc	20 Mar 2009 10:19:12 -0000
@@ -11,13 +11,24 @@
  */
 function menu_overview_page() {
   $result = db_query("SELECT * FROM {menu_custom} ORDER BY title");
-  $content = array();
-  while ($menu = db_fetch_array($result)) {
-    $menu['href'] = 'admin/build/menu-customize/' . $menu['menu_name'];
-    $menu['localized_options'] = array();
-    $content[] = $menu;
+  $header = array(t('Title'), array('data' => t('Operations'), 'colspan' => '3'));
+  $rows = array();
+  foreach ($result as $menu) {
+    $row = array(theme('menu_admin_overview', $menu->title, $menu->menu_name, $menu->description));
+    $row[] = array('data' => l(t('list items'), 'admin/build/menu-customize/'. $menu->menu_name));
+    $row[] = array('data' => l(t('edit menu'), 'admin/build/menu-customize/'. $menu->menu_name .'/edit'));
+    $row[] = array('data' => l(t('add item'), 'admin/build/menu-customize/'. $menu->menu_name .'/add'));
+    $rows[] = $row;
   }
-  return theme('admin_block_content', $content);
+
+  return theme('table', $header, $rows);
+}
+
+function theme_menu_admin_overview($title, $name, $description) {
+  $output = check_plain($title);
+  $output .= ' <small> (Machine name: ' . check_plain($name) . ')</small>';
+  $output .= '<div class="description">'. filter_xss_admin($description) .'</div>';
+  return $output;
 }
 
 /**
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.179
diff -u -p -r1.179 menu.module
--- modules/menu/menu.module	8 Mar 2009 04:25:04 -0000	1.179
+++ modules/menu/menu.module	20 Mar 2009 10:19:12 -0000
@@ -144,6 +144,10 @@ function menu_theme() {
       'file' => 'menu.admin.inc',
       'arguments' => array('form' => NULL),
     ),
+    'menu_admin_overview' => array(
+      'file' => 'menu.admin.inc',
+      'arguments' => array('title' => NULL, 'name' => NULL, 'description' => NULL),
+    ),
   );
 }