From c397ae61cc82120fcf3455fb44b1094cab0c8ee3 Mon Sep 17 00:00:00 2001
From: matt <matt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 4 Jan 2008 20:18:55 +0000
Subject: [PATCH] Some link manager juggling, still need to have submenu
 highlight when on sub-sub pages.

git-svn-id: http://svn.automattic.com/wordpress/trunk@6555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-link-categories.php | 4 ++--
 wp-admin/link-add.php             | 2 +-
 wp-admin/link-import.php          | 3 +--
 wp-admin/link-manager.php         | 7 ++++---
 wp-admin/menu.php                 | 6 +-----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php
index a036fa6aa..b0a1f0e9c 100644
--- a/wp-admin/edit-link-categories.php
+++ b/wp-admin/edit-link-categories.php
@@ -1,8 +1,8 @@
 <?php
 require_once('admin.php');
 
-$title = __('Categories');
-$parent_file = 'link-manager.php';
+$title = __('Link Categories');
+$parent_file = 'edit.php';
 
 wp_enqueue_script( 'admin-categories' );
 require_once ('admin-header.php');
diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php
index 89a838171..b751a14b9 100644
--- a/wp-admin/link-add.php
+++ b/wp-admin/link-add.php
@@ -3,7 +3,7 @@ require_once('admin.php');
 
 $title = __('Add Link');
 $this_file = 'link-manager.php';
-$parent_file = 'link-manager.php';
+$parent_file = 'post-new.php';
 
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
diff --git a/wp-admin/link-import.php b/wp-admin/link-import.php
index d9bd5f686..89d2988b6 100644
--- a/wp-admin/link-import.php
+++ b/wp-admin/link-import.php
@@ -3,9 +3,8 @@
 // Copyright (C) 2002 Mike Little -- mike@zed1.com
 
 require_once('admin.php');
-$parent_file = 'link-manager.php';
+$parent_file = 'edit.php';
 $title = __('Import Blogroll');
-$this_file = 'link-import.php';
 
 $step = $_POST['step'];
 if (!$step) $step = 0;
diff --git a/wp-admin/link-manager.php b/wp-admin/link-manager.php
index d9240decc..db8a383e4 100644
--- a/wp-admin/link-manager.php
+++ b/wp-admin/link-manager.php
@@ -16,8 +16,8 @@ if (empty ($cat_id))
 if (empty ($order_by))
 	$order_by = 'order_name';
 
-$title = __('Manage Blogroll');
-$this_file = $parent_file = 'link-manager.php';
+$title = __('Manage Links');
+$this_file = $parent_file = 'edit.php';
 include_once ("./admin-header.php");
 
 if (!current_user_can('manage_links'))
@@ -75,7 +75,8 @@ if ( isset($_GET['deleted']) ) {
 
 <div class="wrap">
 
-<h2><?php _e('Blogroll Management'); ?></h2>
+<h2><?php _e('Manage Links'); ?></h2>
+<p><a href="link-add.php"><?php _e('Add Link'); ?></a> | <a href="edit-link-categories.php"><?php _e('Link Categories'); ?></a> | <a href="link-import.php"><?php _e('Import Links'); ?></a></p>
 <p><?php _e('Here you <a href="link-add.php">add links</a> to sites that you visit often and share them on your blog. When you have a list of links in your sidebar to other blogs, it&#8217;s called a &#8220;blogroll.&#8221;'); ?></p>
 <form id="cats" method="get" action="">
 <p><?php
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index 7b3502978..2da772416 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -31,6 +31,7 @@ $menu[40] = array(__('Settings'), 'manage_options', 'options-general.php');
 $_wp_real_parent_file['post.php'] = 'post-new.php'; // Back-compat
 $submenu['post-new.php'][5] = array(__('Post'), 'edit_posts', 'post-new.php');
 $submenu['post-new.php'][10] = array(__('Page'), 'edit_pages', 'page-new.php');
+$submenu['post-new.php'][15] = array(__('Link'), 'manage_links', 'link-add.php');
 
 $submenu['edit-comments.php'][5] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
 $awaiting_mod = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'");
@@ -45,11 +46,6 @@ $submenu['edit.php'][25] = array(__('Media Library'), 'upload_files', 'upload.ph
 $submenu['edit.php'][30] = array(__('Import'), 'import', 'import.php');
 $submenu['edit.php'][35] = array(__('Export'), 'import', 'export.php');
 
-
-$submenu['edit.php'][50] = array(__('Add Link'), 'manage_links', 'link-add.php'); // todo: axe
-$submenu['edit.php'][55] = array(__('Import Links'), 'manage_links', 'link-import.php'); // todo: axe
-$submenu['edit.php'][60] = array(__('Categories'), 'manage_links', 'edit-link-categories.php'); // todo: axe
-
 if ( current_user_can('edit_users') ) {
 	$_wp_real_parent_file['profile.php'] = 'users.php'; // Back-compat for plugins adding submenus to profile.php.
 	$submenu['users.php'][5] = array(__('Authors &amp; Users'), 'edit_users', 'users.php');