Index: book_manager.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/book_manager/book_manager.module,v
retrieving revision 1.1.2.14.2.8
diff -u -p -r1.1.2.14.2.8 book_manager.module
--- book_manager.module	3 Dec 2010 06:56:45 -0000	1.1.2.14.2.8
+++ book_manager.module	3 Dec 2010 07:43:54 -0000
@@ -40,7 +40,7 @@ function book_manager_link($type, $node 
     if (_book_manager_outline_access($book)) {
       $links['book_manager_outline'] = array(
         'title' => t('Customize Book'),
-        'href' => "personal-outline/". $book->nid,
+        'href' => "node/" . $book->nid . "/personal-outline",
         'attributes' => array('title' => t('Customize this book by changing the order in which the pages appear.')),
       );
     }
@@ -170,13 +170,14 @@ function book_manager_menu() {
   );
 
   // we could adjust the access routine for books standard outline feature, but it is nested under admin
-  $items['personal-outline/%node'] = array(
-    'title' => 'Re-order personal book pages',
+  $items['node/%node/personal-outline'] = array(
+    'title' => 'Customize',
     'page callback' => 'book_manager_outline_edit',
     'page arguments' => array(1),
     'access callback' => '_book_manager_outline_access',
     'access arguments' => array(1),
-    'type' => MENU_CALLBACK,
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 3,
   );
 
   $items['admin/content/book-manager'] = array(
@@ -196,33 +197,6 @@ function book_manager_menu() {
 }
 
 /**
- * implementation of hook_menu_alter
- * Used to adjust the outline tab and remove node from book access callback functions
-*/
-function book_manager_menu_alter(&$callbacks) {
-  $callbacks['node/%node/outline']['access callback'] = '_book_manager_outline_access_menu_callback';
-  $callbacks['node/%node/outline/remove']['access callback'] = '_book_manager_outline_remove_access_menu_callback';
-}
-
-/**
- * This is a helper function used as a replacement callback for book's standard access to
- * 'node/%node/outline'
- * @see book_manager_menu_alter()
- */
-function _book_manager_outline_access_menu_callback($node) {
-  return !variable_get('book_manager_hide_outline_tab', 0) && (_book_manager_outline_access($node) || _book_outline_access($node));
-}
-
-/**
- * This is a helper function used as a replacement callback for book's standard access to
- * 'node/%node/outline/remove'
- * @see book_manager_menu_alter()
- */
-function _book_manager_outline_remove_access_menu_callback($node) {
-  return !variable_get('book_manager_hide_remove_tab', 0) && (_book_manager_outline_remove_access($node) || _book_outline_remove_access($node));
-}
-
-/**
  * Menu item access callback - determine if the user should be able to outline the book the node belongs to
  * @param $node object the node in question
  */
@@ -445,7 +419,7 @@ function book_manager_outline_edit($node
   }
   else if (_book_manager_is_in_personal_book($node)) {
     // redirect user to top-level of the book
-    drupal_goto('personal-outline/'. $node->book['bid']);
+    drupal_goto('node/' . $node->book['bid'] . '/personal-outline');
   }
   else {
     // book is not a personal book or in one (should we differentiate whether or not it is in A book?)
@@ -828,24 +802,6 @@ function book_manager_book_copy_goto_alt
 }
 
 /**
- * Since we overrode the book module's access control to /node/%/outline
- * we need to remove the help as it displays links specific to users
- * with 'administer book outlines'
- */
-function phptemplate_help() {
-  if ($help = menu_get_active_help()) {
-    if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'outline') {
-      if (user_access('administer book outlines')) {
-        return '<div class="help">'. $help .'</div>';
-      }
-    }
-    else {
-      return '<div class="help">'. $help .'</div>';
-    }
-  }
-}
-
-/**
  * Implementation of hook_block
  */
 function book_manager_block($op = 'list', $delta = 0, $edit = array()) {