summaryrefslogtreecommitdiff
path: root/modules/menu
diff options
context:
space:
mode:
Diffstat (limited to 'modules/menu')
-rw-r--r--modules/menu/menu.admin.inc38
-rw-r--r--modules/menu/menu.install2
-rw-r--r--modules/menu/menu.module42
-rw-r--r--modules/menu/menu.test42
4 files changed, 62 insertions, 62 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index deaa7bae2..153e7cf66 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -15,9 +15,9 @@ function menu_overview_page() {
$rows = array();
foreach ($result as $menu) {
$row = array(theme('menu_admin_overview', $menu['title'], $menu['menu_name'], $menu['description']));
- $row[] = array('data' => l(t('list links'), 'admin/build/menu-customize/' . $menu['menu_name']));
- $row[] = array('data' => l(t('edit menu'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/edit'));
- $row[] = array('data' => l(t('add link'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/add'));
+ $row[] = array('data' => l(t('list links'), 'admin/structure/menu-customize/' . $menu['menu_name']));
+ $row[] = array('data' => l(t('edit menu'), 'admin/structure/menu-customize/' . $menu['menu_name'] . '/edit'));
+ $row[] = array('data' => l(t('add link'), 'admin/structure/menu-customize/' . $menu['menu_name'] . '/add'));
$rows[] = $row;
}
@@ -65,7 +65,7 @@ function menu_overview_form(&$form_state, $menu) {
);
}
else {
- $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
+ $form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/structure/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
}
return $form;
}
@@ -108,14 +108,14 @@ function _menu_overview_tree_form($tree) {
);
// Build a list of operations.
$operations = array();
- $operations['edit'] = l(t('edit'), 'admin/build/menu/item/' . $item['mlid'] . '/edit');
+ $operations['edit'] = l(t('edit'), 'admin/structure/menu/item/' . $item['mlid'] . '/edit');
// Only items created by the menu module can be deleted.
if ($item['module'] == 'menu' || $item['updated'] == 1) {
- $operations['delete'] = l(t('delete'), 'admin/build/menu/item/' . $item['mlid'] . '/delete');
+ $operations['delete'] = l(t('delete'), 'admin/structure/menu/item/' . $item['mlid'] . '/delete');
}
// Set the reset column.
elseif ($item['module'] == 'system' && $item['customized']) {
- $operations['reset'] = l(t('reset'), 'admin/build/menu/item/' . $item['mlid'] . '/reset');
+ $operations['reset'] = l(t('reset'), 'admin/structure/menu/item/' . $item['mlid'] . '/reset');
}
$form[$mlid]['operations'] = array();
@@ -375,7 +375,7 @@ function menu_edit_item_validate($form, &$form_state) {
* Submit function for the delete button on the menu item editing form.
*/
function menu_item_delete_submit($form, &$form_state) {
- $form_state['redirect'] = 'admin/build/menu/item/' . $form_state['values']['menu']['mlid'] . '/delete';
+ $form_state['redirect'] = 'admin/structure/menu/item/' . $form_state['values']['menu']['mlid'] . '/delete';
}
/**
@@ -394,7 +394,7 @@ function menu_edit_item_submit($form, &$form_state) {
if (!menu_link_save($item)) {
drupal_set_message(t('There was an error saving the menu link.'), 'error');
}
- $form_state['redirect'] = 'admin/build/menu-customize/' . $item['menu_name'];
+ $form_state['redirect'] = 'admin/structure/menu-customize/' . $item['menu_name'];
}
/**
@@ -456,7 +456,7 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) {
* Submit function for the 'Delete' button on the menu editing form.
*/
function menu_custom_delete_submit($form, &$form_state) {
- $form_state['redirect'] = 'admin/build/menu-customize/' . $form_state['values']['menu_name'] . '/delete';
+ $form_state['redirect'] = 'admin/structure/menu-customize/' . $form_state['values']['menu_name'] . '/delete';
}
/**
@@ -483,7 +483,7 @@ function menu_delete_menu_confirm(&$form_state, $menu) {
$caption .= '<p>' . format_plural($num_links, '<strong>Warning:</strong> There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu['title'])) . '</p>';
}
$caption .= '<p>' . t('This action cannot be undone.') . '</p>';
- return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu-customize/' . $menu['menu_name'], $caption, t('Delete'));
+ return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/structure/menu-customize/' . $menu['menu_name'], $caption, t('Delete'));
}
/**
@@ -491,7 +491,7 @@ function menu_delete_menu_confirm(&$form_state, $menu) {
*/
function menu_delete_menu_confirm_submit($form, &$form_state) {
$menu = $form['#menu'];
- $form_state['redirect'] = 'admin/build/menu';
+ $form_state['redirect'] = 'admin/structure/menu';
// System-defined menus may not be deleted - only menus defined by this module.
$system_menus = menu_list_system_menus();
if (isset($system_menus[$menu['menu_name']]) || !(db_query("SELECT 1 FROM {menu_custom} WHERE menu_name = :menu", array(':menu' => $menu['menu_name']))->fetchField())) {
@@ -503,7 +503,7 @@ function menu_delete_menu_confirm_submit($form, &$form_state) {
menu_reset_item($item);
}
// Delete all links to the overview page for this menu.
- $result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = :link", array(':link' => 'admin/build/menu-customize/' . $menu['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
+ $result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = :link", array(':link' => 'admin/structure/menu-customize/' . $menu['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $m) {
menu_link_delete($m['mlid']);
}
@@ -560,7 +560,7 @@ function menu_edit_menu_validate($form, &$form_state) {
*/
function menu_edit_menu_submit($form, &$form_state) {
$menu = $form_state['values'];
- $path = 'admin/build/menu-customize/';
+ $path = 'admin/structure/menu-customize/';
if ($form['#insert']) {
// Add 'menu-' to the menu name to help avoid name-space conflicts.
$menu['menu_name'] = 'menu-' . $menu['menu_name'];
@@ -569,7 +569,7 @@ function menu_edit_menu_submit($form, &$form_state) {
$link['router_path'] = $path . '%';
$link['module'] = 'menu';
$link['plid'] = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :link AND module = :module", array(
- ':link' => 'admin/build/menu',
+ ':link' => 'admin/structure/menu',
':module' => 'system'
))
->fetchField();
@@ -619,7 +619,7 @@ function menu_item_delete_page($item) {
*/
function menu_item_delete_form(&$form_state, $item) {
$form['#item'] = $item;
- return confirm_form($form, t('Are you sure you want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/' . $item['menu_name']);
+ return confirm_form($form, t('Are you sure you want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name']);
}
/**
@@ -631,7 +631,7 @@ function menu_item_delete_form_submit($form, &$form_state) {
$t_args = array('%title' => $item['link_title']);
drupal_set_message(t('The menu link %title has been deleted.', $t_args));
watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
- $form_state['redirect'] = 'admin/build/menu-customize/' . $item['menu_name'];
+ $form_state['redirect'] = 'admin/structure/menu-customize/' . $item['menu_name'];
}
/**
@@ -639,7 +639,7 @@ function menu_item_delete_form_submit($form, &$form_state) {
*/
function menu_reset_item_confirm(&$form_state, $item) {
$form['item'] = array('#type' => 'value', '#value' => $item);
- return confirm_form($form, t('Are you sure you want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
+ return confirm_form($form, t('Are you sure you want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
}
/**
@@ -649,7 +649,7 @@ function menu_reset_item_confirm_submit($form, &$form_state) {
$item = $form_state['values']['item'];
$new_item = menu_reset_item($item);
drupal_set_message(t('The menu link was reset to its default settings.'));
- $form_state['redirect'] = 'admin/build/menu-customize/' . $new_item['menu_name'];
+ $form_state['redirect'] = 'admin/structure/menu-customize/' . $new_item['menu_name'];
}
/**
diff --git a/modules/menu/menu.install b/modules/menu/menu.install
index ae1cfda20..1ff901a09 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -16,7 +16,7 @@ function menu_install() {
$descriptions = array(
'navigation' => 'The <em>Navigation</em> menu contains links such as Recent posts (if the Tracker module is enabled). Non-administrative links are added to this menu by default by modules.',
'user-menu' => "The <em>User menu</em> contains links related to the user's account, as well as the 'Log out' link.",
- 'management' => 'The <em>Management</em> menu contains links for content creation, site building, user management, and similar site activities.',
+ 'management' => 'The <em>Management</em> menu contains links for content creation, structure, user management, and similar site activities.',
'main-menu' => 'The <em>Main menu</em> is the default source for the Main links which are often used by themes to show the major sections of a site.',
'secondary-menu' => 'The <em>Secondary menu</em> is the default source for the Secondary links which are often used for legal notices, contact details, and other navigation items that play a lesser role than the Main links.',
);
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 46d47bf39..f8916ec90 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -19,16 +19,16 @@ function menu_help($path, $arg) {
switch ($path) {
case 'admin/help#menu':
$output = '<p>' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: <em>Navigation</em>, <em>Management</em>, <em>User menu</em>, <em>Main menu</em>, and <em>Secondary menu</em>. The <em>Management</em> menu contains links for administration and content creation, while the <em>Navigation</em> menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the <em>Main links</em> and <em>Secondary links</em>, by displaying them in either the header or footer of each page. The <em>Main menu</em> is the default source for the <em>Main links</em> and the <em>User menu</em> is the default source for the <em>Secondary links</em>. By default, the <em>User menu</em> has links to take the current user to their account or allow them to log out, while the <em>Main menu</em> and <em>Secondary menu</em> contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '</p>';
- $output .= '<p>' . t('The <a href="@menu">menus page</a> displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the <a href="@add-menu">add menu page</a> (the block containing a new menu must also be enabled on the <a href="@blocks">blocks administration page</a>).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) . '</p>';
+ $output .= '<p>' . t('The <a href="@menu">menus page</a> displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the <a href="@add-menu">add menu page</a> (the block containing a new menu must also be enabled on the <a href="@blocks">blocks administration page</a>).', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'), '@blocks' => url('admin/structure/block'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@menu">Menu module</a>.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '</p>';
return $output;
- case 'admin/build/menu/add':
- return '<p>' . t('Enter the name for your new menu. Remember to enable the newly created block in the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
- case 'admin/build/menu/item/add':
+ case 'admin/structure/menu/add':
+ return '<p>' . t('Enter the name for your new menu. Remember to enable the newly created block in the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
+ case 'admin/structure/menu/item/add':
return '<p>' . t('Enter the title and path for your new menu link.') . '</p>';
}
- if ($path == 'admin/build/menu' && module_exists('block')) {
- return '<p>' . t('Each menu has a corresponding block that is managed on the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
+ if ($path == 'admin/structure/menu' && module_exists('block')) {
+ return '<p>' . t('Each menu has a corresponding block that is managed on the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
}
}
@@ -48,26 +48,26 @@ function menu_permission() {
* Implement hook_menu().
*/
function menu_menu() {
- $items['admin/build/menu'] = array(
+ $items['admin/structure/menu'] = array(
'title' => 'Menus',
'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.',
'page callback' => 'menu_overview_page',
'access callback' => 'user_access',
'access arguments' => array('administer menu'),
);
- $items['admin/build/menu/list'] = array(
+ $items['admin/structure/menu/list'] = array(
'title' => 'List menus',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
- $items['admin/build/menu/add'] = array(
+ $items['admin/structure/menu/add'] = array(
'title' => 'Add menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_menu', 'add'),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/build/menu/settings'] = array(
+ $items['admin/structure/menu/settings'] = array(
'title' => 'Settings',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_configure'),
@@ -75,7 +75,7 @@ function menu_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 5,
);
- $items['admin/build/menu-customize/%menu'] = array(
+ $items['admin/structure/menu-customize/%menu'] = array(
'title' => 'Customize menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_overview_form', 3),
@@ -84,47 +84,47 @@ function menu_menu() {
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
- $items['admin/build/menu-customize/%menu/list'] = array(
+ $items['admin/structure/menu-customize/%menu/list'] = array(
'title' => 'List links',
'weight' => -10,
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items['admin/build/menu-customize/%menu/add'] = array(
+ $items['admin/structure/menu-customize/%menu/add'] = array(
'title' => 'Add link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_item', 'add', NULL, 3),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/build/menu-customize/%menu/edit'] = array(
+ $items['admin/structure/menu-customize/%menu/edit'] = array(
'title' => 'Edit menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_menu', 'edit', 3),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
- $items['admin/build/menu-customize/%menu/delete'] = array(
+ $items['admin/structure/menu-customize/%menu/delete'] = array(
'title' => 'Delete menu',
'page callback' => 'menu_delete_menu_page',
'page arguments' => array(3),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
- $items['admin/build/menu/item/%menu_link/edit'] = array(
+ $items['admin/structure/menu/item/%menu_link/edit'] = array(
'title' => 'Edit menu link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_item', 'edit', 4, NULL),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
- $items['admin/build/menu/item/%menu_link/reset'] = array(
+ $items['admin/structure/menu/item/%menu_link/reset'] = array(
'title' => 'Reset menu link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_reset_item_confirm', 4),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
- $items['admin/build/menu/item/%menu_link/delete'] = array(
+ $items['admin/structure/menu/item/%menu_link/delete'] = array(
'title' => 'Delete menu link',
'page callback' => 'menu_item_delete_page',
'page arguments' => array(4),
@@ -157,8 +157,8 @@ function menu_theme() {
*/
function menu_enable() {
menu_rebuild();
- $base_link = db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'")->fetchAssoc();
- $base_link['router_path'] = 'admin/build/menu-customize/%';
+ $base_link = db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc();
+ $base_link['router_path'] = 'admin/structure/menu-customize/%';
$base_link['module'] = 'menu';
$result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $menu) {
@@ -166,7 +166,7 @@ function menu_enable() {
$link = $base_link;
$link['mlid'] = 0;
$link['link_title'] = $menu['title'];
- $link['link_path'] = 'admin/build/menu-customize/' . $menu['menu_name'];
+ $link['link_path'] = 'admin/structure/menu-customize/' . $menu['menu_name'];
$menu_link = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND plid = :plid", array(
':path' => $link['link_path'],
':plid' => $link['plid']
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index f3f44b0e4..6f2f2d32e 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -97,7 +97,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Add custom menu.
// Try adding a menu using a menu_name that is too long.
- $this->drupalGet('admin/build/menu/add');
+ $this->drupalGet('admin/structure/menu/add');
$menu_name = substr(md5($this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI + 1);
$title = $this->randomName(16);
$edit = array(
@@ -105,7 +105,7 @@ class MenuTestCase extends DrupalWebTestCase {
'description' => '',
'title' => $title,
);
- $this->drupalPost('admin/build/menu/add', $edit, t('Save'));
+ $this->drupalPost('admin/structure/menu/add', $edit, t('Save'));
// Verify that using a menu_name that is too long results in a validation message.
$this->assertText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
@@ -113,20 +113,20 @@ class MenuTestCase extends DrupalWebTestCase {
// Change the menu_name so it no longer exceeds the maximum length.
$menu_name = substr(md5($this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
$edit['menu_name'] = $menu_name;
- $this->drupalPost('admin/build/menu/add', $edit, t('Save'));
+ $this->drupalPost('admin/structure/menu/add', $edit, t('Save'));
// Verify that no validation error is given for menu_name length.
$this->assertNoText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
// Unlike most other modules, there is no confirmation message displayed.
- $this->drupalGet('admin/build/menu');
+ $this->drupalGet('admin/structure/menu');
$this->assertText($title, 'Menu created');
// Enable the custom menu block.
$menu_name = 'menu-' . $menu_name; // Drupal prepends the name with 'menu-'.
$edit = array();
$edit['menu_' . $menu_name . '[region]'] = 'left';
- $this->drupalPost('admin/build/block', $edit, t('Save blocks'));
+ $this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
$this->assertResponse(200);
$this->assertText(t('The block settings have been updated.'), t('Custom menu block was enabled'));
@@ -143,7 +143,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $this->menu['title'];
// Delete custom menu.
- $this->drupalPost("admin/build/menu-customize/$menu_name/delete", array(), t('Delete'));
+ $this->drupalPost("admin/structure/menu-customize/$menu_name/delete", array(), t('Delete'));
$this->assertResponse(200);
$this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)), t('Custom menu was deleted'));
$this->assertFalse(menu_load($menu_name), 'Custom menu was deleted');
@@ -181,7 +181,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Note in the UI the 'mlid:x[hidden]' form element maps to enabled, or
// NOT hidden.
$edit['mlid:' . $item1['mlid'] . '[hidden]'] = TRUE;
- $this->drupalPost('admin/build/menu-customize/' . $item1['menu_name'], $edit, t('Save configuration'));
+ $this->drupalPost('admin/structure/menu-customize/' . $item1['menu_name'], $edit, t('Save configuration'));
// Verify in the database.
$hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $item1['mlid']))->fetchField();
@@ -202,7 +202,7 @@ class MenuTestCase extends DrupalWebTestCase {
*/
function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'navigation') {
// View add menu link page.
- $this->drupalGet("admin/build/menu-customize/$menu_name/add");
+ $this->drupalGet("admin/structure/menu-customize/$menu_name/add");
$this->assertResponse(200);
$title = '!link_' . $this->randomName(16);
@@ -217,7 +217,7 @@ class MenuTestCase extends DrupalWebTestCase {
);
// Add menu link.
- $this->drupalPost("admin/build/menu-customize/$menu_name/add", $edit, t('Save'));
+ $this->drupalPost("admin/structure/menu-customize/$menu_name/add", $edit, t('Save'));
$this->assertResponse(200);
// Unlike most other modules, there is no confirmation message displayed.
@@ -254,7 +254,7 @@ class MenuTestCase extends DrupalWebTestCase {
'menu[link_path]' => $link_path,
'menu[link_title]' => 'title',
);
- $this->drupalPost("admin/build/menu-customize/$menu_name/add", $edit, t('Save'));
+ $this->drupalPost("admin/structure/menu-customize/$menu_name/add", $edit, t('Save'));
$this->assertRaw(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $link_path)), 'Menu link was not created');
}
}
@@ -308,12 +308,12 @@ class MenuTestCase extends DrupalWebTestCase {
// Edit menu link.
$edit = array();
$edit['menu[link_title]'] = $title;
- $this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
+ $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
$this->assertResponse(200);
// Unlike most other modules, there is no confirmation message displayed.
// Verify menu link.
- $this->drupalGet('admin/build/menu-customize/' . $item['menu_name']);
+ $this->drupalGet('admin/structure/menu-customize/' . $item['menu_name']);
$this->assertText($title, 'Menu link was edited');
}
@@ -328,7 +328,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $item['link_title'];
// Reset menu link.
- $this->drupalPost("admin/build/menu/item/$mlid/reset", array(), t('Reset'));
+ $this->drupalPost("admin/structure/menu/item/$mlid/reset", array(), t('Reset'));
$this->assertResponse(200);
$this->assertRaw(t('The menu link was reset to its default settings.'), t('Menu link was reset'));
@@ -351,7 +351,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $item['link_title'];
// Delete menu link.
- $this->drupalPost("admin/build/menu/item/$mlid/delete", array(), t('Confirm'));
+ $this->drupalPost("admin/structure/menu/item/$mlid/delete", array(), t('Confirm'));
$this->assertResponse(200);
$this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), t('Menu link was deleted'));
@@ -388,7 +388,7 @@ class MenuTestCase extends DrupalWebTestCase {
function disableMenuLink($item) {
$mlid = $item['mlid'];
$edit['menu[enabled]'] = FALSE;
- $this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
+ $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
// Unlike most other modules, there is no confirmation message displayed.
// Verify in the database.
@@ -405,7 +405,7 @@ class MenuTestCase extends DrupalWebTestCase {
function enableMenuLink($item) {
$mlid = $item['mlid'];
$edit['menu[enabled]'] = TRUE;
- $this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
+ $this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
// Verify in the database.
$hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $mlid))->fetchField();
@@ -440,14 +440,14 @@ class MenuTestCase extends DrupalWebTestCase {
}
// View menu build overview node.
- $this->drupalGet('admin/build/menu');
+ $this->drupalGet('admin/structure/menu');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Menu build overview node was displayed'));
}
// View navigation menu customization node.
- $this->drupalGet('admin/build/menu-customize/navigation');
+ $this->drupalGet('admin/structure/menu-customize/navigation');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Navigation'), t('Navigation menu node was displayed'));
@@ -455,21 +455,21 @@ class MenuTestCase extends DrupalWebTestCase {
// View menu edit node.
$item = $this->getStandardMenuLink();
- $this->drupalGet('admin/build/menu/item/' . $item['mlid'] . '/edit');
+ $this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Edit menu item'), t('Menu edit node was displayed'));
}
// View menu settings node.
- $this->drupalGet('admin/build/menu/settings');
+ $this->drupalGet('admin/structure/menu/settings');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Menu settings node was displayed'));
}
// View add menu node.
- $this->drupalGet('admin/build/menu/add');
+ $this->drupalGet('admin/structure/menu/add');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Add menu node was displayed'));
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 08:10:52 +0000