diff --git a/bean.module b/bean.module index 9cc42d4..2368d22 100644 --- a/bean.module +++ b/bean.module @@ -53,18 +53,17 @@ function bean_entity_info() { function bean_menu() { $items = array(); - - - $items['block/add'] = array( - 'title' => 'Add Block', + $items['admin/structure/block/bean-add'] = array( + 'title' => 'Add Bean', 'page callback' => 'bean_add_page', 'access arguments' => array('add'), 'access callback' => 'bean_access', + 'type' => MENU_LOCAL_ACTION, 'file' => 'includes/bean.pages.inc', ); foreach (bean_get_types() as $type) { - $items['block/add/' . $type->buildURL()] = array( + $items['admin/structure/block/bean-add/' . $type->buildURL()] = array( 'title' => $type->getLabel(), 'title callback' => 'check_plain', 'page callback' => 'bean_add', @@ -90,7 +89,6 @@ function bean_menu() { 'weight' => -20, ); - $items['block/%bean/edit'] = array( 'title' => 'Edit', 'type' => MENU_LOCAL_TASK, @@ -135,8 +133,8 @@ function bean_admin_paths() { 'block/*/revisions' => TRUE, 'block/*/revisions/*/revert' => TRUE, 'block/*/revisions/*/delete' => TRUE, - 'block/add' => TRUE, - 'block/add/*' => TRUE, + 'admin/structure/block/bean-add' => TRUE, + 'admin/structure/block/bean-add/*' => TRUE, ); return $paths; } diff --git a/includes/bean.pages.inc b/includes/bean.pages.inc index f644749..5e93b73 100644 --- a/includes/bean.pages.inc +++ b/includes/bean.pages.inc @@ -35,10 +35,10 @@ function bean_add($type) { function bean_add_page() { $bean_types = bean_get_types(); - // Bypass the block/add listing if only one block type is available. + // Bypass the admin/structure/block/bean-add listing if only one block type is available. if (count($bean_types) == 1) { $bean_type = array_shift($bean_types); - drupal_goto('block/add/' . $bean_type->buildURL()); + drupal_goto('admin/structure/block/bean-add/' . $bean_type->buildURL()); } return theme('bean_add_list', array('content' => $bean_types)); @@ -81,7 +81,7 @@ function theme_bean_add_list($variables) { if ($content) { $output = '