diff --git a/README.txt b/README.txt
index 57b659f..909333c 100644
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ Each Bean type is defined by a ctools plugin and are fieldable.
Currently Bean Types are only defined in hook_bean_plugins().
If you enable beans_admin_ui you can add/edit bean types at
-admin/structure/block/types
+admin/structure/block_types
Beans
-----
diff --git a/bean.install b/bean.install
index 12bc0b7..fd192a2 100644
--- a/bean.install
+++ b/bean.install
@@ -135,4 +135,11 @@ function bean_update_7003() {
function bean_update_7004() {
registry_rebuild();
return t('Registry has been rebuilt');
+}
+
+/**
+ * Rebuild the menus
+ */
+function bean_update_7005() {
+ menu_rebuild();
}
\ No newline at end of file
diff --git a/bean.module b/bean.module
index 71cfd60..785d0f3 100644
--- a/bean.module
+++ b/bean.module
@@ -45,9 +45,9 @@ function bean_entity_info() {
$return['bean']['bundles'][$type->type] = array(
'label' => $type->getLabel(),
'admin' => array(
- 'path' => 'admin/structure/block/types/manage/%bean_type',
- 'real path' => 'admin/structure/block/types/manage/' . $type->buildURL(),
- 'bundle argument' => 5,
+ 'path' => 'admin/structure/block_types/manage/%bean_type',
+ 'real path' => 'admin/structure/block_types/manage/' . $type->buildURL(),
+ 'bundle argument' => 4,
'access arguments' => array('administer bean types'),
)
);
diff --git a/bean_admin_ui/bean_admin_ui.admin.inc b/bean_admin_ui/bean_admin_ui.admin.inc
index f6081f1..0a76715 100644
--- a/bean_admin_ui/bean_admin_ui.admin.inc
+++ b/bean_admin_ui/bean_admin_ui.admin.inc
@@ -24,13 +24,13 @@ function bean_admin_ui_admin_page() {
$row[] = array('data' => $export_status);
// Edit and delete buttons
if ($bean_type->isEditable()) {
- $row[] = array('data' => l(t('Edit'), 'admin/structure/block/types/manage/' . $bean_type->buildURL() . '/edit'));
+ $row[] = array('data' => l(t('Edit'), 'admin/structure/block_types/manage/' . $bean_type->buildURL() . '/edit'));
switch ($export_status) {
case 'Normal':
- $row[] = array('data' => l(t('Delete'), 'admin/structure/block/types/manage/' . $bean_type->buildURL() . '/delete'));
+ $row[] = array('data' => l(t('Delete'), 'admin/structure/block_types/manage/' . $bean_type->buildURL() . '/delete'));
break;
case 'Overridden':
- $row[] = array('data' => l(t('Revert'), 'admin/structure/block/types/manage/' . $bean_type->buildURL() . '/delete'));
+ $row[] = array('data' => l(t('Revert'), 'admin/structure/block_types/manage/' . $bean_type->buildURL() . '/delete'));
break;
case 'Default':
$row[] = array();
@@ -40,10 +40,10 @@ function bean_admin_ui_admin_page() {
if ($field_ui) {
// Manage fields.
- $row[] = array('data' => l(t('manage fields'), 'admin/structure/block/types/manage/' . $bean_type->buildURL() . '/fields'));
+ $row[] = array('data' => l(t('manage fields'), 'admin/structure/block_types/manage/' . $bean_type->buildURL() . '/fields'));
// Display fields.
- $row[] = array('data' => l(t('manage display'), 'admin/structure/block/types/manage/' . $bean_type->buildURL() . '/display'));
+ $row[] = array('data' => l(t('manage display'), 'admin/structure/block_types/manage/' . $bean_type->buildURL() . '/display'));
}
$rows[] = $row;
}
@@ -144,7 +144,7 @@ function bean_admin_ui_type_form_submit(&$form, &$form_state) {
$bean_type->type = $form_state['values']['name'];
$bean_type->setLabel($form_state['values']['label']);
$bean_type->save($form_state['values']['new']);
- $form_state['redirect'] = 'admin/structure/block/types';
+ $form_state['redirect'] = 'admin/structure/block_types';
ctools_include('export');
}
@@ -152,7 +152,7 @@ function bean_admin_ui_type_form_submit(&$form, &$form_state) {
* Form API submit callback for the delete button.
*/
function bean_admin_ui_type_form_submit_delete(&$form, &$form_state) {
- $form_state['redirect'] = 'admin/structure/block/types/manage/' . $form_state['bean_type']->type . '/delete';
+ $form_state['redirect'] = 'admin/structure/block_types/manage/' . $form_state['bean_type']->type . '/delete';
}
/**
@@ -176,10 +176,10 @@ function bean_admin_ui_type_delete_confirm($form, &$form_state, $type) {
}
$caption .= '' . t('This action cannot be undone.') . '
';
- return confirm_form($form, $message, 'admin/structure/block/types', $caption, $action);
+ return confirm_form($form, $message, 'admin/structure/block_types', $caption, $action);
}
function bean_admin_ui_type_delete_confirm_submit($form, &$form_state) {
$form_state['values']['type']->delete();
- $form_state['redirect'] = 'admin/structure/block/types';
+ $form_state['redirect'] = 'admin/structure/block_types';
}
diff --git a/bean_admin_ui/bean_admin_ui.module b/bean_admin_ui/bean_admin_ui.module
index 6b1cbdc..ad713f9 100644
--- a/bean_admin_ui/bean_admin_ui.module
+++ b/bean_admin_ui/bean_admin_ui.module
@@ -11,7 +11,7 @@
function bean_admin_ui_menu() {
$items = array();
- $items['admin/structure/block/types'] = array(
+ $items['admin/structure/block_types'] = array(
'title' => 'Block Types',
'description' => 'Manage Block Types',
'page callback' => 'bean_admin_ui_admin_page',
@@ -19,13 +19,13 @@ function bean_admin_ui_menu() {
'file' => 'bean_admin_ui.admin.inc',
);
- $items['admin/structure/block/types/list'] = array(
+ $items['admin/structure/block_types/list'] = array(
'title' => 'List',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
- $items['admin/structure/block/types/add'] = array(
+ $items['admin/structure/block_types/add'] = array(
'title' => 'Add block type',
'page callback' => 'drupal_get_form',
'page arguments' => array('bean_admin_ui_type_form'),
@@ -34,21 +34,22 @@ function bean_admin_ui_menu() {
'file' => 'bean_admin_ui.admin.inc',
);
- $items['admin/structure/block/types/manage/%bean_type'] = array(
+ $items['admin/structure/block_types/manage/%bean_type'] = array(
'title' => 'Edit block type',
'title arguments' => array(4),
+ 'title callback' => 'bean_admin_ui_page_title',
'page callback' => 'drupal_get_form',
- 'page arguments' => array('bean_admin_ui_type_form', 5),
+ 'page arguments' => array('bean_admin_ui_type_form', 4),
'access arguments' => array('administer bean types'),
'file' => 'bean_admin_ui.admin.inc',
);
- $items['admin/structure/block/types/manage/%bean_type/edit'] = array(
+ $items['admin/structure/block_types/manage/%bean_type/edit'] = array(
'title' => 'Edit',
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items['admin/structure/block/types/manage/%bean_type/delete'] = array(
+ $items['admin/structure/block_types/manage/%bean_type/delete'] = array(
'title' => 'Delete',
- 'page arguments' => array('bean_admin_ui_type_delete_confirm', 5),
+ 'page arguments' => array('bean_admin_ui_type_delete_confirm', 4),
'access arguments' => array('administer bean types'),
'file' => 'bean_admin_ui.admin.inc',
);
@@ -57,6 +58,13 @@ function bean_admin_ui_menu() {
}
/**
+ * Page title for block types
+ */
+function bean_admin_ui_page_title($block_type) {
+ return $block_type->type;
+}
+
+/**
* Implements hook_bean_types_api_info().
*/
function bean_admin_ui_bean_types_api_info() {
diff --git a/includes/bean.pages.inc b/includes/bean.pages.inc
index 36cb60a..9649709 100644
--- a/includes/bean.pages.inc
+++ b/includes/bean.pages.inc
@@ -139,7 +139,7 @@ function theme_bean_add_list($variables) {
$output .= '';
}
else {
- //$output = '' . t('You have not created any block types yet. Go to the block type creation page to add a new bean type.', array('@create-content' => url('admin/structure/block/types/add'))) . '
';
+ //$output = '' . t('You have not created any block types yet. Go to the block type creation page to add a new bean type.', array('@create-content' => url('admin/structure/block_types/add'))) . '
';
$output = '' . t('You have not created any block types yet.') . '
';
}
return $output;