From 48cfb85902c1ecde59670c8441d4ef37375c850c Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 28 Jul 2004 07:18:59 +0000
Subject: [PATCH] Menu re-org

git-svn-id: http://svn.automattic.com/wordpress/trunk@1494 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/categories.php    | 13 ++++++++++++-
 wp-admin/edit-comments.php |  5 +++--
 wp-admin/edit.php          | 14 ++++++++------
 wp-admin/menu.php          |  4 ++--
 wp-admin/moderation.php    |  7 ++++---
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/wp-admin/categories.php b/wp-admin/categories.php
index 59e3bc064..4187e7e83 100644
--- a/wp-admin/categories.php
+++ b/wp-admin/categories.php
@@ -91,7 +91,12 @@ case 'edit':
     $category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$cat_ID'");
     $cat_name = $category->cat_name;
     ?>
-
+<ul id="adminmenu2"> 
+  <li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+  <li><a href="categories.php" class="current"><?php _e('Categories') ?></a></li>
+  <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 
+  <li class="last"><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li> 
+</ul> 
 <div class="wrap">
     <h2><?php _e('Edit Category') ?></h2>
     <form name="editcat" action="categories.php" method="post">
@@ -146,6 +151,12 @@ $messages[1] = __('Category added.');
 $messages[2] = __('Category deleted.');
 $messages[3] = __('Category updated.');
 ?>
+<ul id="adminmenu2"> 
+	<li><a href="edit.php"><?php _e('Posts') ?></a></li> 
+	<li><a class="current"><?php _e('Categories') ?></a></li>
+	<li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 
+	<li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li> 
+</ul> 
 <?php if (isset($_GET['message'])) : ?>
 <div class="updated"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php
index 7bbaaafef..b8580539b 100644
--- a/wp-admin/edit-comments.php
+++ b/wp-admin/edit-comments.php
@@ -9,8 +9,9 @@ else $mode = $_GET['mode'];
 ?>
 <ul id="adminmenu2">
 	<li><a href="edit.php"><?php _e('Posts') ?></a></li>
-    <li><a href="edit-comments.php" class="current"><?php _e('Comments') ?></a></li>
-    <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
+	<li><a href="categories.php"><?php _e('Categories') ?></a></li>
+	<li><a href="edit-comments.php" class="current"><?php _e('Comments') ?></a></li>
+	<li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li>
 </ul>
 <script type="text/javascript">
 <!--
diff --git a/wp-admin/edit.php b/wp-admin/edit.php
index 22924efda..eb9b9cb1f 100644
--- a/wp-admin/edit.php
+++ b/wp-admin/edit.php
@@ -7,8 +7,9 @@ require_once('admin-header.php');
 ?>
  <ul id="adminmenu2"> 
   <li><a href="edit.php" class="current"><?php _e('Posts') ?></a></li> 
+  <li><a href="categories.php"><?php _e('Categories') ?></a></li>
   <li><a href="edit-comments.php"><?php _e('Comments') ?></a></li> 
-  <li class="last"><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li> 
+  <li><a href="moderation.php"><?php _e('Awaiting Moderation') ?></a></li> 
 </ul> 
 <?php
 get_currentuserinfo();
@@ -84,8 +85,9 @@ if( isset( $_GET['m'] ) )
     <th scope="col"><?php _e('Categories') ?></th> 
     <th scope="col"><?php _e('Comments') ?></th> 
     <th scope="col"><?php _e('Author') ?></th> 
-    <th scope="col"><?php _e('Edit') ?></th> 
-    <th scope="col"><?php _e('Delete') ?></th> 
+	<th scope="col"></th> 
+    <th scope="col"></th> 
+    <th scope="col"></th> 
   </tr> 
 <?php
 if (empty($m)) $showposts = 15;
@@ -99,15 +101,15 @@ $class = ('alternate' == $class) ? '' : 'alternate';
   <tr class='<?php echo $class; ?>'> 
     <th scope="row"><?php echo $id ?></th> 
     <td><?php the_time('Y-m-d \<\b\r \/\> g:i:s a'); ?></td> 
-    <td><a href="<?php the_permalink(); ?>" rel="permalink"> 
+    <td>
       <?php the_title() ?> 
-      </a> 
     <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?></td> 
     <td><?php the_category(','); ?></td> 
     <td><a href="edit.php?p=<?php echo $id ?>&amp;c=1"> 
-      <?php comments_number(__('no comments'), __('1 comment'), __("% comments")) ?> 
+      <?php comments_number(__('0'), __('1'), __('%')) ?> 
       </a></td> 
     <td><?php the_author() ?></td> 
+	<td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit">View</a></td>
     <td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
     <td><?php if (($user_level > $authordata->user_level) or ($user_login == $authordata->user_login)) { echo "<a href='post.php?action=delete&amp;post=$id' class='delete' onclick=\"return confirm('" . sprintf(__("You are about to delete this post \'%s\'\\n  \'OK\' to delete, \'Cancel\' to stop."), the_title('','',0)) . "')\">" . __('Delete') . "</a>"; } ?></td> 
   </tr> 
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index ff3cf725a..3d991bdb4 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -6,9 +6,9 @@
 // Menu item name
 // The minimum level the user needs to access the item: between 0 and 10
 // The URL of the item's file
+$menu[0] = array(__('Dashboard'), 0, 'index.php');
 $menu[5] = array(__('Write'), 1, 'post.php');
-$menu[10] = array(__('Edit'), 1, 'edit.php');
-$menu[15] = array(__('Categories'), 3, 'categories.php');
+$menu[10] = array(__('Manage'), 1, 'edit.php');
 $menu[20] = array(__('Links'), 5, 'link-manager.php');
 $menu[25] = array(__('Users'), 3, 'users.php');
 $menu[30] = array(__('Options'), 6, 'options-general.php');
diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php
index f3e610345..a67d0ead4 100644
--- a/wp-admin/moderation.php
+++ b/wp-admin/moderation.php
@@ -98,9 +98,10 @@ default:
 	}
 ?>
 <ul id="adminmenu2">
-       <li><a href="edit.php"> <?php _e('Posts') ?></a></li>
-        <li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>
-	<li class="last"><a href="moderation.php" class="current"><?php _e('Awaiting Moderation') ?></a></li>
+	<li><a href="edit.php"> <?php _e('Posts') ?></a></li>
+	<li><a href="categories.php"><?php _e('Categories') ?></a></li>
+	<li><a href="edit-comments.php"> <?php _e('Comments') ?></a></li>
+	<li><a href="moderation.php" class="current"><?php _e('Awaiting Moderation') ?></a></li>
 </ul>
 <?php