From d24d954479320116bc01f332c28a8eaab28c3ccd Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 20 Jul 2009 18:51:36 +0000 Subject: [PATCH] - Patch #521474 by bangpound, JuliaKM et al: rename admin/site-building to admin/structure. --- INSTALL.txt | 4 +-- includes/actions.inc | 2 +- includes/common.inc | 2 +- includes/install.inc | 2 +- includes/path.inc | 2 +- modules/aggregator/aggregator.admin.inc | 4 +-- modules/aggregator/aggregator.module | 4 +-- modules/block/block.admin.inc | 18 +++++----- modules/block/block.module | 28 +++++++-------- modules/block/block.test | 40 ++++++++++----------- modules/blog/blog.module | 2 +- modules/blog/blog.test | 2 +- modules/book/book.module | 2 +- modules/book/book.test | 4 +-- modules/color/color.module | 2 +- modules/comment/comment.module | 4 +-- modules/comment/comment.test | 6 ++-- modules/contact/contact.admin.inc | 16 ++++----- modules/contact/contact.module | 14 ++++---- modules/contact/contact.pages.inc | 2 +- modules/contact/contact.test | 6 ++-- modules/field/field.api.php | 4 +-- modules/forum/forum.admin.inc | 12 +++---- modules/forum/forum.module | 32 ++++++++--------- modules/forum/forum.test | 12 +++---- modules/help/help.api.php | 2 +- modules/help/help.module | 4 +-- modules/locale/locale.module | 2 +- modules/locale/locale.test | 6 ++-- modules/menu/menu.admin.inc | 38 ++++++++++---------- modules/menu/menu.install | 2 +- modules/menu/menu.module | 42 +++++++++++----------- modules/menu/menu.test | 42 +++++++++++----------- modules/node/content_types.inc | 16 ++++----- modules/node/node.module | 18 +++++----- modules/node/node.test | 10 +++--- modules/poll/poll.test | 4 +-- modules/profile/profile.test | 4 +-- modules/search/search.test | 8 ++--- modules/simpletest/simpletest.module | 2 +- modules/statistics/statistics.module | 2 +- modules/system/system.admin.inc | 20 +++++------ modules/system/system.css | 4 +-- modules/system/system.install | 10 +++--- modules/system/system.module | 48 ++++++++++++------------- modules/system/system.test | 34 +++++++++--------- modules/taxonomy/taxonomy.admin.inc | 30 ++++++++-------- modules/taxonomy/taxonomy.module | 24 ++++++------- modules/taxonomy/taxonomy.test | 24 ++++++------- modules/translation/translation.module | 4 +-- modules/translation/translation.test | 4 +-- modules/trigger/trigger.admin.inc | 12 +++---- modules/trigger/trigger.module | 26 +++++++------- modules/trigger/trigger.test | 14 ++++---- modules/update/update.compare.inc | 2 +- modules/update/update.module | 6 ++-- modules/user/user.test | 2 +- profiles/default/default.profile | 2 +- scripts/run-tests.sh | 2 +- 59 files changed, 348 insertions(+), 348 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index d277edce903..44eca9c8c73 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -262,8 +262,8 @@ few active modules and minimal user access rights. Use your administration panel to enable and configure services. For example: General Settings Administer > Site configuration > Site information -Enable Modules Administer > Site building > Modules -Configure Themes Administer > Site building > Themes +Enable Modules Administer > Structure > Modules +Configure Themes Administer > Structure > Themes Set User Permissions Administer > User management > Permissions For more information on configuration options, read the instructions which diff --git a/includes/actions.inc b/includes/actions.inc index c1746747280..638dbb1fd75 100644 --- a/includes/actions.inc +++ b/includes/actions.inc @@ -169,7 +169,7 @@ function actions_list($reset = FALSE) { * * Compare with actions_list() which gathers actions by invoking * hook_action_info(). The two are synchronized by visiting - * /admin/build/actions (when actions.module is enabled) which runs + * /admin/structure/actions (when actions.module is enabled) which runs * actions_synchronize(). * * @return diff --git a/includes/common.inc b/includes/common.inc index 1ac613b732b..4f36a7d8df7 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -3145,7 +3145,7 @@ function drupal_get_library($module, $name) { * @endcode * * In a more complex case where there are several groups in one column (such as - * the block regions on the admin/build/block page), a separate subgroup class + * the block regions on the admin/structure/block page), a separate subgroup class * must also be added to differentiate the groups. * @code * $form['my_elements'][$region][$delta]['weight']['#attributes']['class'] = "my-elements-weight my-elements-weight-" . $region; diff --git a/includes/install.inc b/includes/install.inc index e3233946e56..0b5f0b8f942 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -506,7 +506,7 @@ function drupal_install_modules($module_list = array(), $disable_modules_install * * Used during installation to install modules one at a time and then * enable them, or to install a number of modules at one time - * from admin/build/modules. + * from admin/structure/modules. * * @param $module * The machine name of the module to install. diff --git a/includes/path.inc b/includes/path.inc index 4e4a62e6c25..2bba38f6f4b 100644 --- a/includes/path.inc +++ b/includes/path.inc @@ -223,7 +223,7 @@ function drupal_get_normal_path($path, $path_language = '') { /** * Return a component of the current Drupal path. * - * When viewing a page at the path "admin/build/types", for example, arg(0) + * When viewing a page at the path "admin/structure/types", for example, arg(0) * returns "admin", arg(1) returns "content", and arg(2) returns "types". * * Avoid use of this function where possible, as resulting code is hard to read. diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index cae8da61b51..8f8d4342441 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -86,7 +86,7 @@ function aggregator_form_feed(&$form_state, stdClass $feed = NULL) { '#title' => t('News items in block'), '#default_value' => isset($feed->block) ? $feed->block : 5, '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), - '#description' => t("Drupal can make a block with the most recent news items of this feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/build/block'))), + '#description' => t("Drupal can make a block with the most recent news items of this feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in this feed's block. If you choose '0' this feed's block will be disabled.", array('@block-admin' => url('admin/structure/block'))), ); // Handling of categories. @@ -255,7 +255,7 @@ function aggregator_form_opml(&$form_state) { '#title' => t('News items in block'), '#default_value' => 5, '#options' => drupal_map_assoc(array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)), - '#description' => t("Drupal can make a block with the most recent news items of a feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in a feed's block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/build/block'))), + '#description' => t("Drupal can make a block with the most recent news items of a feed. You can configure blocks to be displayed in the sidebar of your page. This setting lets you configure the number of news items to show in a feed's block. If you choose '0' these feeds' blocks will be disabled.", array('@block-admin' => url('admin/structure/block'))), ); // Handling of categories. diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index bd556ed5910..8b87a8c02be 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -18,12 +18,12 @@ function aggregator_help($path, $arg) { switch ($path) { case 'admin/help#aggregator': $output = '

' . t('The aggregator is a powerful on-site syndicator and news reader that gathers fresh content from RSS-, RDF-, and Atom-based feeds made available across the web. Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '

'; - $output .= '

' . t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the blocks administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/build/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) . '

'; + $output .= '

' . t('Feeds contain feed items, or individual posts published by the site providing the feed. Feeds may be grouped in categories, generally by topic. Users view feed items in the main aggregator display or by their source. Administrators can add, edit and delete feeds and choose how often to check each feed for newly updated items. The most recent items in either a feed or category can be displayed as a block through the blocks administration page. A machine-readable OPML file of all feeds is available. A correctly configured cron maintenance task is required to update feeds automatically.', array('@aggregator' => url('aggregator'), '@aggregator-sources' => url('aggregator/sources'), '@feededit' => url('admin/content/aggregator'), '@admin-block' => url('admin/structure/block'), '@aggregator-opml' => url('aggregator/opml'), '@cron' => url('admin/reports/status'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Aggregator module.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) . '

'; return $output; case 'admin/content/aggregator': $output = '

' . t('Thousands of sites (particularly news sites and blogs) publish their latest headlines and posts in feeds, using a number of standardized XML-based formats. Formats supported by the aggregator include RSS, RDF, and Atom.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '

'; - $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) . '

'; + $output .= '

' . t('Current feeds are listed below, and new feeds may be added. For each feed or feed category, the latest items block may be enabled at the blocks administration page.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/structure/block'))) . '

'; return $output; case 'admin/content/aggregator/add/feed': return '

' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '

'; diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc index 0f80a4b0027..cc97d522733 100644 --- a/modules/block/block.admin.inc +++ b/modules/block/block.admin.inc @@ -7,7 +7,7 @@ */ /** - * Menu callback for admin/build/block. + * Menu callback for admin/structure/block. */ function block_admin_display($theme = NULL) { global $custom_theme; @@ -43,7 +43,7 @@ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { // Build the form tree. $form = array( - '#action' => arg(4) ? url('admin/build/block/list/' . $theme_key) : url('admin/build/block'), + '#action' => arg(4) ? url('admin/structure/block/list/' . $theme_key) : url('admin/structure/block'), '#tree' => TRUE, ); @@ -76,12 +76,12 @@ function block_admin_display_form(&$form_state, $blocks, $theme = NULL) { ); $form[$key]['configure'] = array( '#markup' => l(t('configure'), - 'admin/build/block/configure/' . $block['module'] . '/' . $block['delta']), + 'admin/structure/block/configure/' . $block['module'] . '/' . $block['delta']), ); if ($block['module'] == 'block') { $form[$key]['delete'] = array( '#markup' => l(t('delete'), - 'admin/build/block/delete/' . $block['delta']), + 'admin/structure/block/delete/' . $block['delta']), ); } } @@ -119,7 +119,7 @@ function block_admin_display_form_submit($form, &$form_state) { } /** - * Helper function for sorting blocks on admin/build/block. + * Helper function for sorting blocks on admin/structure/block. * * Active blocks are sorted by region, then by weight. * Disabled blocks are sorted by name. @@ -354,7 +354,7 @@ function block_admin_configure_submit($form, &$form_state) { module_invoke($form_state['values']['module'], 'block_save', $form_state['values']['delta'], $form_state['values']); drupal_set_message(t('The block configuration has been saved.')); cache_clear_all(); - $form_state['redirect'] = 'admin/build/block'; + $form_state['redirect'] = 'admin/structure/block'; } } @@ -426,7 +426,7 @@ function block_add_block_form_submit($form, &$form_state) { drupal_set_message(t('The block has been created.')); cache_clear_all(); - $form_state['redirect'] = 'admin/build/block'; + $form_state['redirect'] = 'admin/structure/block'; } /** @@ -437,7 +437,7 @@ function block_box_delete(&$form_state, $bid = 0) { $form['info'] = array('#type' => 'hidden', '#value' => $box['info'] ? $box['info'] : $box['title']); $form['bid'] = array('#type' => 'hidden', '#value' => $bid); - return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $box['info'])), 'admin/build/block', '', t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete the block %name?', array('%name' => $box['info'])), 'admin/structure/block', '', t('Delete'), t('Cancel')); } /** @@ -453,7 +453,7 @@ function block_box_delete_submit($form, &$form_state) { ->execute(); drupal_set_message(t('The block %name has been removed.', array('%name' => $form_state['values']['info']))); cache_clear_all(); - $form_state['redirect'] = 'admin/build/block'; + $form_state['redirect'] = 'admin/structure/block'; return; } diff --git a/modules/block/block.module b/modules/block/block.module index f561685b97d..bdc511cc765 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -66,7 +66,7 @@ define('BLOCK_CACHE_GLOBAL', 0x0008); function block_help($path, $arg) { switch ($path) { case 'admin/help#block': - $output = '

' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/build/block'))) . '

'; + $output = '

' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Garland, for example, implements the regions "left sidebar", "right sidebar", "content", "header", and "footer", and a block may appear in any one of these areas. The blocks administration page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array('@blocks' => url('admin/structure/block'))) . '

'; $output .= '

' . t('Although blocks are usually generated automatically by modules (like the User login block, for example), administrators can also define custom blocks. Custom blocks have a title, description, and body. The body of the block can be as long as necessary, and can contain content supported by any available text format.', array('@text-format' => url('admin/settings/filter'))) . '

'; $output .= '

' . t('When working with blocks, remember that:') . '

'; $output .= ''; $output .= '

' . t('For more information, see the online handbook entry for Block module.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '

'; return $output; - case 'admin/build/block': + case 'admin/structure/block': $output = '

' . t('This page provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions. To change the region or order of a block, grab a drag-and-drop handle under the Block column and drag the block to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis. Remember that your changes will not be saved until you click the Save blocks button at the bottom of the page.') . '

'; - $output .= '

' . t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/build/block/add'))) . '

'; + $output .= '

' . t('Click the configure link next to each block to configure its specific title and visibility settings. Use the add block page to create a custom block.', array('@add-block' => url('admin/structure/block/add'))) . '

'; return $output; - case 'admin/build/block/add': - return '

' . t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/build/block'))) . '

'; + case 'admin/structure/block/add': + return '

' . t('Use this page to create a new custom block. New blocks are disabled by default, and must be moved to a region on the blocks administration page to be visible.', array('@blocks' => url('admin/structure/block'))) . '

'; } } @@ -120,38 +120,38 @@ function block_permission() { * Implement hook_menu(). */ function block_menu() { - $items['admin/build/block'] = array( + $items['admin/structure/block'] = array( 'title' => 'Blocks', 'description' => 'Configure what block content appears in your site\'s sidebars and other regions.', 'page callback' => 'block_admin_display', 'access arguments' => array('administer blocks'), ); - $items['admin/build/block/list'] = array( + $items['admin/structure/block/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/build/block/list/js'] = array( + $items['admin/structure/block/list/js'] = array( 'title' => 'JavaScript List Form', 'page callback' => 'block_admin_display_js', 'access arguments' => array('administer blocks'), 'type' => MENU_CALLBACK, ); - $items['admin/build/block/configure'] = array( + $items['admin/structure/block/configure'] = array( 'title' => 'Configure block', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_admin_configure'), 'access arguments' => array('administer blocks'), 'type' => MENU_CALLBACK, ); - $items['admin/build/block/delete'] = array( + $items['admin/structure/block/delete'] = array( 'title' => 'Delete block', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_box_delete'), 'access arguments' => array('administer blocks'), 'type' => MENU_CALLBACK, ); - $items['admin/build/block/add'] = array( + $items['admin/structure/block/add'] = array( 'title' => 'Add block', 'page callback' => 'drupal_get_form', 'page arguments' => array('block_add_block_form'), @@ -160,7 +160,7 @@ function block_menu() { ); $default = variable_get('theme_default', 'garland'); foreach (list_themes() as $key => $theme) { - $items['admin/build/block/list/' . $key] = array( + $items['admin/structure/block/list/' . $key] = array( 'title' => check_plain($theme->info['name']), 'page arguments' => array($key), 'type' => $key == $default ? MENU_DEFAULT_LOCAL_TASK : MENU_LOCAL_TASK, @@ -250,7 +250,7 @@ function block_page_alter($page) { // Append region description if we are rendering the block admin page. $item = menu_get_item(); - if ($item['path'] == 'admin/build/block' && isset($visible_regions[$region])) { + if ($item['path'] == 'admin/structure/block' && isset($visible_regions[$region])) { $description = '
' . $all_regions[$region] . '
'; $page[$region]['block_description'] = array( '#markup' => $description, @@ -384,7 +384,7 @@ function block_box_form($edit = array()) { '#title' => t('Block description'), '#default_value' => $edit['info'], '#maxlength' => 64, - '#description' => t('A brief description of your block. Used on the blocks administration page.', array('@overview' => url('admin/build/block'))), + '#description' => t('A brief description of your block. Used on the blocks administration page.', array('@overview' => url('admin/structure/block'))), '#required' => TRUE, '#weight' => -19, ); diff --git a/modules/block/block.test b/modules/block/block.test index 9996b6fa98d..6459fc6637c 100644 --- a/modules/block/block.test +++ b/modules/block/block.test @@ -37,12 +37,12 @@ class BlockTestCase extends DrupalWebTestCase { * Test creating custom block (i.e. box), moving it to a specific region and then deleting it. */ function testBox() { - // Add a new box by filling out the input form on the admin/build/block/add page. + // Add a new box by filling out the input form on the admin/structure/block/add page. $box = array(); $box['info'] = $this->randomName(8); $box['title'] = $this->randomName(8); $box['body'] = $this->randomName(32); - $this->drupalPost('admin/build/block/add', $box, t('Save block')); + $this->drupalPost('admin/structure/block/add', $box, t('Save block')); // Confirm that the box has been created, and then query the created bid. $this->assertText(t('The block has been created.'), t('Box successfully created.')); @@ -60,7 +60,7 @@ class BlockTestCase extends DrupalWebTestCase { // Delete the created box & verify that it's been deleted and no longer appearing on the page. $this->clickLink(t('delete')); - $this->drupalPost('admin/build/block/delete/' . $bid, array(), t('Delete')); + $this->drupalPost('admin/structure/block/delete/' . $bid, array(), t('Delete')); $this->assertRaw(t('The block %title has been removed.', array('%title' => $box['info'])), t('Box successfully deleted.')); $this->assertNoText(t($box['title']), t('Box no longer appears on page.')); } @@ -69,19 +69,19 @@ class BlockTestCase extends DrupalWebTestCase { * Test creating custom block (i.e. box) using Full HTML. */ function testBoxFormat() { - // Add a new box by filling out the input form on the admin/build/block/add page. + // Add a new box by filling out the input form on the admin/structure/block/add page. $box = array(); $box['info'] = $this->randomName(8); $box['title'] = $this->randomName(8); $box['body'] = '

Full HTML

'; $box['body_format'] = 2; - $this->drupalPost('admin/build/block/add', $box, t('Save block')); + $this->drupalPost('admin/structure/block/add', $box, t('Save block')); // Set the created box to a specific region. $bid = db_query("SELECT bid FROM {box} WHERE info = :info", array(':info' => $box['info']))->fetchField(); $edit = array(); $edit['block_' . $bid . '[region]'] = 'left'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); // Confirm that the box is being displayed using configured text format. $this->assertRaw('

Full HTML

', t('Box successfully being displayed using Full HTML.')); @@ -90,9 +90,9 @@ class BlockTestCase extends DrupalWebTestCase { // but can still submit the form without errors. $block_admin = $this->drupalCreateUser(array('administer blocks')); $this->drupalLogin($block_admin); - $this->drupalGet('admin/build/block/configure/block/' . $bid); + $this->drupalGet('admin/structure/block/configure/block/' . $bid); $this->assertNoText(t('Block body')); - $this->drupalPost('admin/build/block/configure/block/' . $bid, array(), t('Save block')); + $this->drupalPost('admin/structure/block/configure/block/' . $bid, array(), t('Save block')); $this->assertNoText(t('Please ensure that each block description is unique.')); // Confirm that the box is still being displayed using configured text format. @@ -113,7 +113,7 @@ class BlockTestCase extends DrupalWebTestCase { $edit = array(); $edit['pages'] = 'user*'; $edit['roles[2]'] = TRUE; - $this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], $edit, t('Save block')); + $this->drupalPost('admin/structure/block/configure/' . $block['module'] . '/' . $block['delta'], $edit, t('Save block')); // Move block to the left sidebar. $this->moveBlockToRegion($block, $this->regions[1]); @@ -141,7 +141,7 @@ class BlockTestCase extends DrupalWebTestCase { $block['title'] = $this->randomName(8); // Set block title to confirm that interface works and override any custom titles. - $this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => $block['title']), t('Save block')); + $this->drupalPost('admin/structure/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => $block['title']), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block title set.')); $bid = db_query("SELECT bid FROM {block} WHERE module = :module AND delta = :delta", array( ':module' => $block['module'], @@ -159,7 +159,7 @@ class BlockTestCase extends DrupalWebTestCase { // Set the block to the disabled region. $edit = array(); $edit[$block['module'] . '_' . $block['delta'] . '[region]'] = '-1'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); // Confirm that the block was moved to the proper region. $this->assertText(t('The block settings have been updated.'), t('Block successfully move to disabled region.')); @@ -172,10 +172,10 @@ class BlockTestCase extends DrupalWebTestCase { // For convenience of developers, put the navigation block back. $edit = array(); $edit[$block['module'] . '_' . $block['delta'] . '[region]'] = 'left'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to left region.')); - $this->drupalPost('admin/build/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => 'Navigation'), t('Save block')); + $this->drupalPost('admin/structure/block/configure/' . $block['module'] . '/' . $block['delta'], array('title' => 'Navigation'), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block title set.')); } @@ -188,7 +188,7 @@ class BlockTestCase extends DrupalWebTestCase { // Set the created block to a specific region. $edit = array(); $edit[$block['module'] . '_' . $block['delta'] . '[region]'] = $region['name']; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); // Confirm that the block was moved to the proper region. $this->assertText(t('The block settings have been updated.'), t('Block successfully moved to %region_name region.', array( '%region_name' => $region['name']))); @@ -217,8 +217,8 @@ class NonDefaultBlockAdmin extends DrupalWebTestCase { function testNonDefaultBlockAdmin() { $admin_user = $this->drupalCreateUser(array('administer blocks', 'administer site configuration')); $this->drupalLogin($admin_user); - $this->drupalPost('admin/build/themes', array('status[stark]' => 1), t('Save configuration')); - $this->drupalGet('admin/build/block/list/stark'); + $this->drupalPost('admin/structure/themes', array('status[stark]' => 1), t('Save configuration')); + $this->drupalGet('admin/structure/block/list/stark'); $this->assertRaw('stark/layout.css', t('Stark CSS found')); } } @@ -258,7 +258,7 @@ class NewDefaultThemeBlocks extends DrupalWebTestCase { // Turn on the Stark theme and ensure that it contains all of the blocks // that Garland did. - $this->drupalPost('admin/build/themes', array('theme_default' => 'stark'), t('Save configuration')); + $this->drupalPost('admin/structure/themes', array('theme_default' => 'stark'), t('Save configuration')); $result = db_query("SELECT * FROM {block} WHERE theme='stark'"); foreach ($result as $block) { unset($block->theme, $block->bid); @@ -288,13 +288,13 @@ class BlockAdminThemeTestCase extends DrupalWebTestCase { $this->drupalLogin($admin_user); // Ensure that access to block admin page is denied when theme is disabled. - $this->drupalGet('admin/build/block/list/stark'); + $this->drupalGet('admin/structure/block/list/stark'); $this->assertResponse(403, t('The block admin page for a disabled theme can not be accessed')); // Enable admin theme and confirm that tab is accessible. $edit['admin_theme'] = 'stark'; - $this->drupalPost('admin/build/themes', $edit, t('Save configuration')); - $this->drupalGet('admin/build/block/list/stark'); + $this->drupalPost('admin/structure/themes', $edit, t('Save configuration')); + $this->drupalGet('admin/structure/block/list/stark'); $this->assertResponse(200, t('The block admin page for the admin theme can be accessed')); } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index c45fcea1293..afd7ccb12fc 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -63,7 +63,7 @@ function blog_help($path, $arg) { case 'admin/help#blog': $output = '

' . t('The blog module allows registered users to maintain an online journal, or blog. Blogs are made up of individual blog entries, and the blog entries are most often displayed in descending order by creation time.') . '

'; $output .= '

' . t("There is an (optional) Blogs menu item added to the Navigation menu, which displays all blogs available on your site, and a My blog item displaying the current user's blog entries. The Blog entry menu item under Add new content allows new blog entries to be created.") . '

'; - $output .= '

' . t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/build/block'))) . '

'; + $output .= '

' . t('Each blog entry is displayed with an automatic link to other blogs created by the same user. By default, blog entries have comments enabled and are automatically promoted to the site front page. The blog module also creates a Recent blog posts block that may be enabled at the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Blog module.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) . '

'; return $output; } diff --git a/modules/blog/blog.test b/modules/blog/blog.test index bed45db63cc..9bb73cc2bff 100644 --- a/modules/blog/blog.test +++ b/modules/blog/blog.test @@ -63,7 +63,7 @@ class BlogTestCase extends DrupalWebTestCase { // Enable the recent blog block. $edit = array(); $edit['blog_recent[region]'] = 'right'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertResponse(200); // Do basic tests for each user. diff --git a/modules/book/book.module b/modules/book/book.module index b9aa9b64cbf..1c1682d953f 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -1113,7 +1113,7 @@ function book_help($path, $arg) { switch ($path) { case 'admin/help#book': $output = '

' . t('The book module is suited for creating structured, multi-page hypertexts such as site resource guides, manuals, and Frequently Asked Questions (FAQs). It permits a document to have chapters, sections, subsections, etc. Authors with suitable permissions can add pages to a collaborative book, placing them into the existing document by adding them to a table of contents menu.') . '

'; - $output .= '

' . t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the blocks administration page.', array('@admin-block' => url('admin/build/block'))) . '

'; + $output .= '

' . t('Pages in the book hierarchy have navigation elements at the bottom of the page for moving through the text. These links lead to the previous and next pages in the book, and to the level above the current page in the book\'s structure. More comprehensive navigation may be provided by enabling the book navigation block on the blocks administration page.', array('@admin-block' => url('admin/structure/block'))) . '

'; $output .= '

' . t('Users can select the printer-friendly version link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') . '

'; $output .= '

' . t("Users with the administer book outlines permission can add a post of any content type to a book, by selecting the appropriate book while editing the post or by using the interface available on the post's outline tab.") . '

'; $output .= '

' . t('Administrators can view a list of all books on the book administration page. The Outline page for each book allows section titles to be edited or rearranged.', array('@admin-node-book' => url('admin/content/book'))) . '

'; diff --git a/modules/book/book.test b/modules/book/book.test index e2a00fe67ac..8b699e344ff 100644 --- a/modules/book/book.test +++ b/modules/book/book.test @@ -214,13 +214,13 @@ class BookBlockTestCase extends DrupalWebTestCase { function testBookNavigationBlock() { // Set block title to confirm that the interface is availble. - $this->drupalPost('admin/build/block/configure/book/navigation', array('title' => $this->randomName(8)), t('Save block')); + $this->drupalPost('admin/structure/block/configure/book/navigation', array('title' => $this->randomName(8)), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.')); // Set the block to a region to confirm block is availble. $edit = array(); $edit['book_navigation[region]'] = 'footer'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.')); } } diff --git a/modules/color/color.module b/modules/color/color.module index 14410aa50c8..db7db484358 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -9,7 +9,7 @@ function color_help($path, $arg) { case 'admin/help#color': $output = '

' . t('The color module allows a site administrator to quickly and easily change the color scheme of certain themes. Although not all themes support color module, both Garland (the default theme) and Minnelli were designed to take advantage of its features. By using color module with a compatible theme, you can easily change the color of links, backgrounds, text, and other theme elements. Color module requires that your file download method be set to public.', array('@url' => url('admin/settings/file-system'))) . '

'; $output .= '

' . t("It is important to remember that color module saves a modified copy of the theme's specified stylesheets in the files directory. This means that if you make any manual changes to your theme's stylesheet, you must save your color settings again, even if they haven't changed. This causes the color module generated version of the stylesheets in the files directory to be recreated using the new version of the original file.") . '

'; - $output .= '

' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/build/themes'))) . '

'; + $output .= '

' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/structure/themes'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '

'; return $output; diff --git a/modules/comment/comment.module b/modules/comment/comment.module index c21bf819e95..2f153bda22e 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -86,9 +86,9 @@ define('COMMENT_PREVIEW_REQUIRED', 1); function comment_help($path, $arg) { switch ($path) { case 'admin/help#comment': - $output = '

' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Open to allow comments, Hidden to hide existing comments and prevent new comments or Closed to allow existing comments to be viewed but no new comments added. Comment display settings and other controls may also be customized for each content type.', array('@content-type' => url('admin/build/types'))) . '

'; + $output = '

' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any content type may have its Default comment setting set to Open to allow comments, Hidden to hide existing comments and prevent new comments or Closed to allow existing comments to be viewed but no new comments added. Comment display settings and other controls may also be customized for each content type.', array('@content-type' => url('admin/structure/types'))) . '

'; $output .= '

' . t('Comment permissions are assigned to user roles, and are used to determine whether anonymous users (or other roles) are allowed to comment on posts. If anonymous users are allowed to comment, their individual contact information may be retained in cookies stored on their local computer for use in later comment submissions. When a comment has no replies, it may be (optionally) edited by its author. The comment module uses the same text formats and HTML tags available when creating other forms of content.') . '

'; - $output .= '

' . t('Change comment settings on the content type\'s edit page.', array('@content-type' => url('admin/build/types'))) . '

'; + $output .= '

' . t('Change comment settings on the content type\'s edit page.', array('@content-type' => url('admin/structure/types'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Comment module.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) . '

'; return $output; diff --git a/modules/comment/comment.test b/modules/comment/comment.test index e346298b1a0..146a8538cd7 100644 --- a/modules/comment/comment.test +++ b/modules/comment/comment.test @@ -653,7 +653,7 @@ class CommentBlockFunctionalTest extends CommentHelperCase { $edit = array( 'comment_recent[region]' => 'left', ); - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block saved to left region.')); // Set block title and variables. @@ -661,7 +661,7 @@ class CommentBlockFunctionalTest extends CommentHelperCase { 'title' => $this->randomName(), 'comment_block_count' => 2, ); - $this->drupalPost('admin/build/block/configure/comment/recent', $block, t('Save block')); + $this->drupalPost('admin/structure/block/configure/comment/recent', $block, t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block saved.')); // Add some test comments, one without a subject. @@ -690,7 +690,7 @@ class CommentBlockFunctionalTest extends CommentHelperCase { $block = array( 'comment_block_count' => 10, ); - $this->drupalPost('admin/build/block/configure/comment/recent', $block, t('Save block')); + $this->drupalPost('admin/structure/block/configure/comment/recent', $block, t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block saved.')); // Post an additional comment. diff --git a/modules/contact/contact.admin.inc b/modules/contact/contact.admin.inc index 08aba882991..0218a5b4808 100644 --- a/modules/contact/contact.admin.inc +++ b/modules/contact/contact.admin.inc @@ -23,14 +23,14 @@ function contact_admin_categories() { $record->category, $record->recipients, ($record->selected ? t('Yes') : t('No')), - l(t('edit'), 'admin/build/contact/edit/' . $record->cid), - l(t('delete'), 'admin/build/contact/delete/' . $record->cid), + l(t('edit'), 'admin/structure/contact/edit/' . $record->cid), + l(t('delete'), 'admin/structure/contact/delete/' . $record->cid), ); } // If no categories were found, let the user know. if (empty($rows)) { - $rows[] = array(array('data' => t('No categories available. Add category.', array('@link' => url('admin/build/contact/add'))), 'colspan' => 5)); + $rows[] = array(array('data' => t('No categories available. Add category.', array('@link' => url('admin/structure/contact/add'))), 'colspan' => 5)); } return theme('table', $header, $rows); @@ -122,16 +122,16 @@ function contact_admin_edit_submit($form, &$form_state) { if (empty($form_state['values']['cid']) || $form_state['values']['contact_op'] == 'add') { drupal_write_record('contact', $form_state['values']); drupal_set_message(t('Category %category has been added.', array('%category' => $form_state['values']['category']))); - watchdog('mail', 'Contact form: category %category added.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); + watchdog('mail', 'Contact form: category %category added.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/structure/contact')); } else { drupal_write_record('contact', $form_state['values'], 'cid'); drupal_set_message(t('Category %category has been updated.', array('%category' => $form_state['values']['category']))); - watchdog('mail', 'Contact form: category %category updated.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/build/contact')); + watchdog('mail', 'Contact form: category %category updated.', array('%category' => $form_state['values']['category']), WATCHDOG_NOTICE, l(t('view'), 'admin/structure/contact')); } - $form_state['redirect'] = 'admin/build/contact'; + $form_state['redirect'] = 'admin/structure/contact'; return; } @@ -145,7 +145,7 @@ function contact_admin_delete(&$form_state, $contact) { '#value' => $contact, ); - return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), 'admin/build/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete %category?', array('%category' => $contact['category'])), 'admin/structure/contact', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } /** @@ -159,7 +159,7 @@ function contact_admin_delete_submit($form, &$form_state) { drupal_set_message(t('Category %category has been deleted.', array('%category' => $contact['category']))); watchdog('mail', 'Contact form: category %category deleted.', array('%category' => $contact['category']), WATCHDOG_NOTICE); - $form_state['redirect'] = 'admin/build/contact'; + $form_state['redirect'] = 'admin/structure/contact'; return; } diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 6d59ebc53ab..1cbbec70442 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -19,7 +19,7 @@ function contact_help($path, $arg) { $output .= '

' . t('Customize the contact page with additional information (like physical location, mailing address, and telephone number) using the contact form settings page. The settings page also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/settings/contact'), '@contact' => url('contact'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '

'; return $output; - case 'admin/build/contact': + case 'admin/structure/contact': $output = '

' . t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/settings/contact'), '@form' => url('contact'))) . '

'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/settings/modules'))); @@ -27,7 +27,7 @@ function contact_help($path, $arg) { else { $menu_note = ''; } - $output .= '

' . t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menu'))) . ' ' . $menu_note . '

'; + $output .= '

' . t('The contact module also adds a menu item (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/structure/menu'))) . ' ' . $menu_note . '

'; return $output; } } @@ -52,18 +52,18 @@ function contact_permission() { * Implement hook_menu(). */ function contact_menu() { - $items['admin/build/contact'] = array( + $items['admin/structure/contact'] = array( 'title' => 'Contact form', 'description' => 'Create a system contact form and set up categories for the form to use.', 'page callback' => 'contact_admin_categories', 'access arguments' => array('administer site-wide contact form'), ); - $items['admin/build/contact/list'] = array( + $items['admin/structure/contact/list'] = array( 'title' => 'List', 'page callback' => 'contact_admin_categories', 'type' => MENU_DEFAULT_LOCAL_TASK, ); - $items['admin/build/contact/add'] = array( + $items['admin/structure/contact/add'] = array( 'title' => 'Add category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit', 3), @@ -71,14 +71,14 @@ function contact_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 1, ); - $items['admin/build/contact/edit/%contact'] = array( + $items['admin/structure/contact/edit/%contact'] = array( 'title' => 'Edit contact category', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_edit', 3, 4), 'access arguments' => array('administer site-wide contact form'), 'type' => MENU_CALLBACK, ); - $items['admin/build/contact/delete/%contact'] = array( + $items['admin/structure/contact/delete/%contact'] = array( 'title' => 'Delete contact', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_delete', 4), diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc index 9f377fd098c..93b534ee715 100644 --- a/modules/contact/contact.pages.inc +++ b/modules/contact/contact.pages.inc @@ -16,7 +16,7 @@ function contact_site_page() { } elseif (!db_query("SELECT COUNT(cid) FROM {contact}")->fetchField()) { if (user_access('administer site-wide contact form')) { - $output = t('The contact form has not been configured. Add one or more categories to the form.', array('@add' => url('admin/build/contact/add'))); + $output = t('The contact form has not been configured. Add one or more categories to the form.', array('@add' => url('admin/structure/contact/add'))); } else { return drupal_not_found(); diff --git a/modules/contact/contact.test b/modules/contact/contact.test index dcd9a9a10cb..aa02bf7b862 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -207,7 +207,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $edit['recipients'] = $recipients; $edit['reply'] = $reply; $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/build/contact/add', $edit, t('Save')); + $this->drupalPost('admin/structure/contact/add', $edit, t('Save')); } /** @@ -225,7 +225,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $edit['recipients'] = $recipients; $edit['reply'] = $reply; $edit['selected'] = ($selected ? '1' : '0'); - $this->drupalPost('admin/build/contact/edit/' . $category_id, $edit, t('Save')); + $this->drupalPost('admin/structure/contact/edit/' . $category_id, $edit, t('Save')); return ($category_id); } @@ -255,7 +255,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $categories = $this->getCategories(); foreach ($categories as $category) { $category_name = db_query("SELECT category FROM {contact} WHERE cid = :cid", array(':cid' => $category))->fetchField(); - $this->drupalPost('admin/build/contact/delete/' . $category, array(), t('Delete')); + $this->drupalPost('admin/structure/contact/delete/' . $category, array(), t('Delete')); $this->assertRaw(t('Category %category has been deleted.', array('%category' => $category_name)), t('Category deleted sucessfully.')); } } diff --git a/modules/field/field.api.php b/modules/field/field.api.php index a9980118ccd..4257860935d 100644 --- a/modules/field/field.api.php +++ b/modules/field/field.api.php @@ -77,8 +77,8 @@ function hook_fieldable_info() { $return['taxonomy_term']['bundles'][$vocabulary->machine_name] = array( 'label' => $vocabulary->name, 'admin' => array( - 'path' => 'admin/build/taxonomy/%taxonomy_vocabulary', - 'real path' => 'admin/build/taxonomy/' . $vocabulary->vid, + 'path' => 'admin/structure/taxonomy/%taxonomy_vocabulary', + 'real path' => 'admin/structure/taxonomy/' . $vocabulary->vid, 'bundle argument' => 3, 'access arguments' => array('administer taxonomy'), ), diff --git a/modules/forum/forum.admin.inc b/modules/forum/forum.admin.inc index efd0944e3e6..ef7fc782322 100644 --- a/modules/forum/forum.admin.inc +++ b/modules/forum/forum.admin.inc @@ -94,7 +94,7 @@ function forum_form_submit($form, &$form_state) { drupal_set_message(t('The @type %term has been updated.', array('%term' => $form_state['values']['name'], '@type' => $type))); break; } - $form_state['redirect'] = 'admin/build/forum'; + $form_state['redirect'] = 'admin/structure/forum'; return; } @@ -166,7 +166,7 @@ function forum_confirm_delete(&$form_state, $tid) { $form['tid'] = array('#type' => 'value', '#value' => $tid); $form['name'] = array('#type' => 'value', '#value' => $term->name); - return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/build/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content/node'))), t('Delete'), t('Cancel')); + return confirm_form($form, t('Are you sure you want to delete the forum %name?', array('%name' => $term->name)), 'admin/structure/forum', t('Deleting a forum or container will also delete its sub-forums, if any. To delete posts in this forum, visit content administration first. This action cannot be undone.', array('@content' => url('admin/content/node'))), t('Delete'), t('Cancel')); } /** @@ -177,7 +177,7 @@ function forum_confirm_delete_submit($form, &$form_state) { drupal_set_message(t('The forum %term and all sub-forums have been deleted.', array('%term' => $form_state['values']['name']))); watchdog('content', 'forum: deleted %term and all its sub-forums.', array('%term' => $form_state['values']['name'])); - $form_state['redirect'] = 'admin/build/forum'; + $form_state['redirect'] = 'admin/structure/forum'; return; } @@ -227,10 +227,10 @@ function forum_overview(&$form_state) { $term = $form[$key]['#term']; $form[$key]['view']['#markup'] = l($term['name'], 'forum/' . $term['tid']); if (in_array($form[$key]['#term']['tid'], variable_get('forum_containers', array()))) { - $form[$key]['edit']['#markup'] = l(t('edit container'), 'admin/build/forum/edit/container/' . $term['tid']); + $form[$key]['edit']['#markup'] = l(t('edit container'), 'admin/structure/forum/edit/container/' . $term['tid']); } else { - $form[$key]['edit']['#markup'] = l(t('edit forum'), 'admin/build/forum/edit/forum/' . $term['tid']); + $form[$key]['edit']['#markup'] = l(t('edit forum'), 'admin/structure/forum/edit/forum/' . $term['tid']); } } } @@ -242,7 +242,7 @@ function forum_overview(&$form_state) { $form['#theme'] = 'taxonomy_overview_terms'; $form['#submit'] = array('taxonomy_overview_terms_submit'); // Use the existing taxonomy overview submit handler. $form['#validate'] = array('taxonomy_overview_terms_validate'); - $form['#empty_text'] = t('No containers or forums available. Add container or Add forum.', array('@container' => url('admin/build/forum/add/container'), '@forum' => url('admin/build/forum/add/forum'))); + $form['#empty_text'] = t('No containers or forums available. Add container or Add forum.', array('@container' => url('admin/structure/forum/add/container'), '@forum' => url('admin/structure/forum/add/forum'))); return $form; } diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 2ac52468a68..93abb925b43 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -21,14 +21,14 @@ function forum_help($path, $arg) { $output .= '
  • ' . t('selecting Disabled under Comment settings while editing a forum topic will hide all existing comments on the thread, and prevent new ones.') . '
    • '; $output .= '

    ' . t('For more information, see the online handbook entry for Forum module.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) . '

    '; return $output; - case 'admin/build/forum': + case 'admin/structure/forum': return '

    ' . t('This page displays a list of existing forums and containers. Containers (optionally) hold forums, and forums hold forum topics (a forum topic is the initial post to a threaded discussion). To provide structure, both containers and forums may be placed inside other containers and forums.') . '

    '; - case 'admin/build/forum/add/container': + case 'admin/structure/forum/add/container': return '

    ' . t('By grouping related or similar forums, containers help organize forums. For example, a container named "Food" may hold two forums named "Fruit" and "Vegetables", respectively.') . '

    '; - case 'admin/build/forum/add/forum': + case 'admin/structure/forum/add/forum': return '

    ' . t('A forum holds related or similar forum topics (a forum topic is the initial post to a threaded discussion). For example, a forum named "Fruit" may contain forum topics titled "Apples" and "Bananas", respectively.') . '

    '; - case 'admin/build/forum/settings': - return '

    ' . t('These settings allow you to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the Content types on the forum vocabulary page.', array('@forum-vocabulary' => url('admin/build/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '

    '; + case 'admin/structure/forum/settings': + return '

    ' . t('These settings allow you to adjust the display of your forum topics. The content types available for use within a forum may be selected by editing the Content types on the forum vocabulary page.', array('@forum-vocabulary' => url('admin/structure/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '

    '; } } @@ -92,56 +92,56 @@ function forum_menu() { 'page callback' => 'forum_page', 'access arguments' => array('access content'), ); - $items['admin/build/forum'] = array( + $items['admin/structure/forum'] = array( 'title' => 'Forums', 'description' => 'Control forums and their hierarchy and change forum settings.', 'page callback' => 'drupal_get_form', 'page arguments' => array('forum_overview'), 'access arguments' => array('administer forums'), ); - $items['admin/build/forum/list'] = array( + $items['admin/structure/forum/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/build/forum/add/container'] = array( + $items['admin/structure/forum/add/container'] = array( 'title' => 'Add container', 'page callback' => 'forum_form_main', 'page arguments' => array('container'), 'access arguments' => array('administer forums'), 'type' => MENU_LOCAL_TASK, - 'parent' => 'admin/build/forum', + 'parent' => 'admin/structure/forum', ); - $items['admin/build/forum/add/forum'] = array( + $items['admin/structure/forum/add/forum'] = array( 'title' => 'Add forum', 'page callback' => 'forum_form_main', 'page arguments' => array('forum'), 'access arguments' => array('administer forums'), 'type' => MENU_LOCAL_TASK, - 'parent' => 'admin/build/forum', + 'parent' => 'admin/structure/forum', ); - $items['admin/build/forum/settings'] = array( + $items['admin/structure/forum/settings'] = array( 'title' => 'Settings', 'page callback' => 'drupal_get_form', 'page arguments' => array('forum_admin_settings'), 'access arguments' => array('administer forums'), 'weight' => 5, 'type' => MENU_LOCAL_TASK, - 'parent' => 'admin/build/forum', + 'parent' => 'admin/structure/forum', ); - $items['admin/build/forum/edit/%forum_term'] = array( + $items['admin/structure/forum/edit/%forum_term'] = array( 'page callback' => 'forum_form_main', 'access arguments' => array('administer forums'), 'type' => MENU_CALLBACK, ); - $items['admin/build/forum/edit/container/%forum_term'] = array( + $items['admin/structure/forum/edit/container/%forum_term'] = array( 'title' => 'Edit container', 'page callback' => 'forum_form_main', 'page arguments' => array('container', 5), 'access arguments' => array('administer forums'), 'type' => MENU_CALLBACK, ); - $items['admin/build/forum/edit/forum/%forum_term'] = array( + $items['admin/structure/forum/edit/forum/%forum_term'] = array( 'title' => 'Edit forum', 'page callback' => 'forum_form_main', 'page arguments' => array('forum', 5), diff --git a/modules/forum/forum.test b/modules/forum/forum.test index df0d61d042a..142f076ebef 100644 --- a/modules/forum/forum.test +++ b/modules/forum/forum.test @@ -77,14 +77,14 @@ class ForumTestCase extends DrupalWebTestCase { // Enable the active forum block. $edit = array(); $edit['forum_active[region]'] = 'right'; - $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('[Active forum topics] Forum block was enabled')); // Enable the new forum block. $edit = array(); $edit['forum_new[region]'] = 'right'; - $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('[New forum topics] Forum block was enabled')); @@ -93,7 +93,7 @@ class ForumTestCase extends DrupalWebTestCase { // Add forum to navigation menu. $edit = array(); - $this->drupalPost('admin/build/menu-customize/navigation', $edit, t('Save configuration')); + $this->drupalPost('admin/structure/menu-customize/navigation', $edit, t('Save configuration')); $this->assertResponse(200); // Edit forum taxonomy. @@ -131,7 +131,7 @@ class ForumTestCase extends DrupalWebTestCase { ); // Edit the vocabulary. - $this->drupalPost('admin/build/taxonomy/' . $vid, $edit, t('Save')); + $this->drupalPost('admin/structure/taxonomy/' . $vid, $edit, t('Save')); $this->assertResponse(200); $this->assertRaw(t('Updated vocabulary %name.', array('%name' => $title)), t('Vocabulary was edited')); @@ -170,7 +170,7 @@ class ForumTestCase extends DrupalWebTestCase { ); // Create forum. - $this->drupalPost('admin/build/forum/add/' . $type, $edit, t('Save')); + $this->drupalPost('admin/structure/forum/add/' . $type, $edit, t('Save')); $this->assertResponse(200); $type = ($type == 'container') ? 'forum container' : 'forum'; $this->assertRaw(t('Created new @type %term.', array('%term' => $name, '@type' => t($type))), t(ucfirst($type) . ' was created')); @@ -194,7 +194,7 @@ class ForumTestCase extends DrupalWebTestCase { */ function deleteForum($tid) { // Delete the forum id. - $this->drupalPost('admin/build/forum/edit/forum/' . $tid, array(), t('Delete')); + $this->drupalPost('admin/structure/forum/edit/forum/' . $tid, array(), t('Delete')); $this->drupalPost(NULL, NULL, t('Delete')); // Assert that the forum no longer exists. diff --git a/modules/help/help.api.php b/modules/help/help.api.php index e1814591a4d..a8d5997b674 100644 --- a/modules/help/help.api.php +++ b/modules/help/help.api.php @@ -55,7 +55,7 @@ function hook_help($path, $arg) { case 'admin/help#block': return '

    ' . t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') . '

    '; - case 'admin/build/block': + case 'admin/structure/block': return t('

    Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.

    If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.

    You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.

    ', array('@throttle' => url('admin/settings/throttle'))); diff --git a/modules/help/help.module b/modules/help/help.module index 3cfa25952f8..6efc1e1b09e 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -39,8 +39,8 @@ function help_help($path, $arg) { $output = '

    ' . t('Please follow these steps to set up and start using your website:') . '

    '; $output .= '
      '; $output .= '
    1. ' . t('Configure your website Once logged in, visit the administration section, where you can customize and configure all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '
      2. '; - $output .= '
    2. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '
      3. '; - $output .= '
    3. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '
      4. '; + $output .= '
    4. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/structure/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '
      5. '; + $output .= '
    5. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/structure/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '
      6. '; $output .= '
    6. ' . t('Start posting content Finally, you can add new content for your website.', array('@content' => url('node/add'))) . '
      7. '; $output .= '
    '; $output .= '

    ' . t('For more information, please refer to the specific topics listed in the next section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '

    '; diff --git a/modules/locale/locale.module b/modules/locale/locale.module index cc558048ef5..0ece6958b34 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -57,7 +57,7 @@ function locale_help($path, $arg) { return '

    ' . t('This page exports the translated strings used by your site. An export file may be in Gettext Portable Object (.po) form, which includes both the original string and the translation (used to share translations with others), or in Gettext Portable Object Template (.pot) form, which includes the original strings only (used to create new translations with a Gettext translation editor).') . '

    '; case 'admin/international/translate/translate': return '

    ' . t('This page allows a translator to search for specific translated and untranslated strings, and is used when creating or editing translations. (Note: For translation tasks involving many strings, it may be more convenient to export strings for offline editing in a desktop Gettext translation editor.) Searches may be limited to strings found within a specific text group or in a specific language.', array('@export' => url('admin/international/translate/export'))) . '

    '; - case 'admin/build/block/configure': + case 'admin/structure/block/configure': if ($arg[4] == 'locale' && $arg[5] == 0) { return '

    ' . t('This block is only shown if at least two languages are enabled and language negotiation is set to something other than None.', array('@languages' => url('admin/international/language'), '@configuration' => url('admin/international/language/configure'))) . '

    '; } diff --git a/modules/locale/locale.test b/modules/locale/locale.test index c33322e1dc3..57605f1a5cf 100644 --- a/modules/locale/locale.test +++ b/modules/locale/locale.test @@ -1057,7 +1057,7 @@ class LanguageSwitchingFunctionalTest extends DrupalWebTestCase { $edit = array( 'locale_language-switcher[region]' => 'left', ); - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); // Add language. $edit = array( @@ -1364,12 +1364,12 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase { $this->drupalPost('admin/international/language/configure', $edit, t('Save settings')); // Set page content type to use multilingual support. - $this->drupalGet('admin/build/node-type/page'); + $this->drupalGet('admin/structure/node-type/page'); $this->assertText(t('Multilingual support'), t('Multilingual support fieldset present on content type configuration form.')); $edit = array( 'language_content_type' => 1, ); - $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type')); + $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type')); $this->assertRaw(t('The content type %type has been updated.', array('%type' => 'Page')), t('Page content type has been updated.')); $this->drupalLogout(); diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index deaa7bae231..153e7cf6652 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. Add link.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add'))); + $form['#empty_text'] = t('There are no menu links yet. Add link.', 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 .= '

    ' . format_plural($num_links, 'Warning: There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', 'Warning: There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu['title'])) . '

    '; } $caption .= '

    ' . t('This action cannot be undone.') . '

    '; - 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 ae1cfda20dc..1ff901a09b6 100644 --- a/modules/menu/menu.install +++ b/modules/menu/menu.install @@ -16,7 +16,7 @@ function menu_install() { $descriptions = array( 'navigation' => 'The Navigation 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 User menu contains links related to the user's account, as well as the 'Log out' link.", - 'management' => 'The Management menu contains links for content creation, site building, user management, and similar site activities.', + 'management' => 'The Management menu contains links for content creation, structure, user management, and similar site activities.', 'main-menu' => 'The Main menu 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 Secondary menu 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 46d47bf3954..f8916ec90b1 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 = '

    ' . 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: Navigation, Management, User menu, Main menu, and Secondary menu. The Management menu contains links for administration and content creation, while the Navigation 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 Main links and Secondary links, by displaying them in either the header or footer of each page. The Main menu is the default source for the Main links and the User menu is the default source for the Secondary links. By default, the User menu has links to take the current user to their account or allow them to log out, while the Main menu and Secondary menu 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.") . '

    '; - $output .= '

    ' . t('The menus page 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 add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) . '

    '; + $output .= '

    ' . t('The menus page 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 add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'), '@blocks' => url('admin/structure/block'))) . '

    '; $output .= '

    ' . t('For more information, see the online handbook entry for Menu module.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '

    '; return $output; - case 'admin/build/menu/add': - return '

    ' . t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/build/block'))) . '

    '; - case 'admin/build/menu/item/add': + case 'admin/structure/menu/add': + return '

    ' . t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '

    '; + case 'admin/structure/menu/item/add': return '

    ' . t('Enter the title and path for your new menu link.') . '

    '; } - if ($path == 'admin/build/menu' && module_exists('block')) { - return '

    ' . t('Each menu has a corresponding block that is managed on the blocks administration page.', array('@blocks' => url('admin/build/block'))) . '

    '; + if ($path == 'admin/structure/menu' && module_exists('block')) { + return '

    ' . t('Each menu has a corresponding block that is managed on the blocks administration page.', array('@blocks' => url('admin/structure/block'))) . '

    '; } } @@ -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 f3f44b0e4d4..6f2f2d32eb6 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 = '', $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')); diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc index 934ef0dd8aa..88bda07541b 100644 --- a/modules/node/content_types.inc +++ b/modules/node/content_types.inc @@ -21,11 +21,11 @@ function node_overview_types() { $type_url_str = str_replace('_', '-', $type->type); $row = array(theme('node_admin_overview', $name, $type)); // Set the edit column. - $row[] = array('data' => l(t('edit'), 'admin/build/node-type/' . $type_url_str)); + $row[] = array('data' => l(t('edit'), 'admin/structure/node-type/' . $type_url_str)); // Set the delete column. if ($type->custom) { - $row[] = array('data' => l(t('delete'), 'admin/build/node-type/' . $type_url_str . '/delete')); + $row[] = array('data' => l(t('delete'), 'admin/structure/node-type/' . $type_url_str . '/delete')); } else { $row[] = array('data' => ''); @@ -35,7 +35,7 @@ function node_overview_types() { } if (empty($rows)) { - $rows[] = array(array('data' => t('No content types available. Add content type.', array('@link' => url('admin/build/types/add'))), 'colspan' => '5', 'class' => 'message')); + $rows[] = array(array('data' => t('No content types available. Add content type.', array('@link' => url('admin/structure/types/add'))), 'colspan' => '5', 'class' => 'message')); } return theme('table', $header, $rows); @@ -304,7 +304,7 @@ function node_type_form_submit($form, &$form_state) { $type->locked = $form_state['values']['locked']; if ($op == t('Delete content type')) { - $form_state['redirect'] = 'admin/build/node-type/' . str_replace('_', '-', $type->old_type) . '/delete'; + $form_state['redirect'] = 'admin/structure/node-type/' . str_replace('_', '-', $type->old_type) . '/delete'; return; } @@ -345,10 +345,10 @@ function node_type_form_submit($form, &$form_state) { } elseif ($status == SAVED_NEW) { drupal_set_message(t('The content type %name has been added.', $t_args)); - watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/build/types')); + watchdog('node', 'Added content type %name.', $t_args, WATCHDOG_NOTICE, l(t('view'), 'admin/structure/types')); } - $form_state['redirect'] = 'admin/build/types'; + $form_state['redirect'] = 'admin/structure/types'; return; } @@ -403,7 +403,7 @@ function node_type_delete_confirm(&$form_state, $type) { $caption .= '

    ' . t('This action cannot be undone.') . '

    '; - return confirm_form($form, $message, 'admin/build/types', $caption, t('Delete')); + return confirm_form($form, $message, 'admin/structure/types', $caption, t('Delete')); } /** @@ -420,6 +420,6 @@ function node_type_delete_confirm_submit($form, &$form_state) { node_types_rebuild(); - $form_state['redirect'] = 'admin/build/types'; + $form_state['redirect'] = 'admin/structure/types'; return; } diff --git a/modules/node/node.module b/modules/node/node.module index e0cb8cd6df3..acbdbc0acd5 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -36,13 +36,13 @@ function node_help($path, $arg) { switch ($path) { case 'admin/help#node': $output = '

    ' . t('The node module manages content on your site, and stores all posts (regardless of type) as a "node" . In addition to basic publishing settings, including whether the post has been published, promoted to the site front page, or should remain present (or sticky) at the top of lists, the node module also records basic information about the author of a post. Optional revision control over edits is available. For additional functionality, the node module is often extended by other modules.') . '

    '; - $output .= '

    ' . t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/build/types'))) . '

    '; + $output .= '

    ' . t('Though each post on your site is a node, each post is also of a particular content type. Content types are used to define the characteristics of a post, including the title and description of the fields displayed on its add and edit pages. Each content type may have different default settings for Publishing options and other workflow controls. By default, the two content types in a standard Drupal installation are Page and Story. Use the content types page to add new or edit existing content types. Additional content types also become available as you enable additional core, contributed and custom modules.', array('@content-type' => url('admin/structure/types'))) . '

    '; $output .= '

    ' . t('The administrative content page allows you to review and manage your site content. The node module makes a number of permissions available for each content type, which may be set by role on the permissions page.', array('@content' => url('admin/content/node'), '@permissions' => url('admin/user/permissions'))) . '

    '; $output .= '

    ' . t('For more information, see the online handbook entry for Node module.', array('@node' => 'http://drupal.org/handbook/modules/node/')) . '

    '; return $output; case 'admin/content/node': return ' '; // Return a non-null value so that the 'more help' link is shown. - case 'admin/build/types/add': + case 'admin/structure/types/add': return '

    ' . t('To create a new content type, enter the human-readable name, the machine-readable name, and all other relevant fields that are on this page. Once created, users of your site will be able to create posts that are instances of this content type.') . '

    '; case 'node/%/revisions': return '

    ' . t('The revisions let you track differences between multiple versions of a post.') . '

    '; @@ -141,7 +141,7 @@ function node_fieldable_info() { $return['node']['bundles'][$type] = array( 'label' => $name, 'admin' => array( - 'path' => 'admin/build/node-type/' . str_replace('_', '-', $type), + 'path' => 'admin/structure/node-type/' . str_replace('_', '-', $type), 'access arguments' => array('administer content types'), ), ); @@ -1687,18 +1687,18 @@ function node_menu() { 'type' => MENU_CALLBACK, ); - $items['admin/build/types'] = array( + $items['admin/structure/types'] = array( 'title' => 'Content types', 'description' => 'Manage posts by content type, including default status, front page promotion, comment settings, etc.', 'page callback' => 'node_overview_types', 'access arguments' => array('administer content types'), ); - $items['admin/build/types/list'] = array( + $items['admin/structure/types/list'] = array( 'title' => 'List', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); - $items['admin/build/types/add'] = array( + $items['admin/structure/types/add'] = array( 'title' => 'Add content type', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form'), @@ -1737,18 +1737,18 @@ function node_menu() { 'access arguments' => array('create', $type->type), 'description' => $type->description, ); - $items['admin/build/node-type/' . $type_url_str] = array( + $items['admin/structure/node-type/' . $type_url_str] = array( 'title' => $type->name, 'page callback' => 'drupal_get_form', 'page arguments' => array('node_type_form', $type), 'access arguments' => array('administer content types'), 'type' => MENU_CALLBACK, ); - $items['admin/build/node-type/' . $type_url_str . '/edit'] = array( + $items['admin/structure/node-type/' . $type_url_str . '/edit'] = array( 'title' => 'Edit', 'type' => MENU_DEFAULT_LOCAL_TASK, ); - $items['admin/build/node-type/' . $type_url_str . '/delete'] = array( + $items['admin/structure/node-type/' . $type_url_str . '/delete'] = array( 'title' => 'Delete', 'page arguments' => array('node_type_delete_confirm', $type), 'access arguments' => array('administer content types'), diff --git a/modules/node/node.test b/modules/node/node.test index 91d71e5f2ee..a742083a40b 100644 --- a/modules/node/node.test +++ b/modules/node/node.test @@ -397,7 +397,7 @@ class SummaryLengthTestCase extends DrupalWebTestCase { $edit = array ( 'teaser_length' => 200, ); - $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type')); + $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type')); // Attempt to access the front page again and check if the summary is now only 200 characters in length. $this->drupalGet("node"); $this->assertNoRaw($expected, t('Check that the summary is not longer than 200 characters'), 'Node'); @@ -457,13 +457,13 @@ class NodeBlockTestCase extends DrupalWebTestCase { function testSearchFormBlock() { // Set block title to confirm that the interface is availble. - $this->drupalPost('admin/build/block/configure/node/syndicate', array('title' => $this->randomName(8)), t('Save block')); + $this->drupalPost('admin/structure/block/configure/node/syndicate', array('title' => $this->randomName(8)), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.')); // Set the block to a region to confirm block is availble. $edit = array(); $edit['node_syndicate[region]'] = 'footer'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.')); } } @@ -495,7 +495,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase { // Set page content type to display post information. $edit = array(); $edit['node_submitted'] = TRUE; - $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type')); + $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type')); // Create a node. $edit = array(); @@ -516,7 +516,7 @@ class NodePostSettingsTestCase extends DrupalWebTestCase { // Set page content type to display post information. $edit = array(); $edit['node_submitted'] = FALSE; - $this->drupalPost('admin/build/node-type/page', $edit, t('Save content type')); + $this->drupalPost('admin/structure/node-type/page', $edit, t('Save content type')); // Create a node. $edit = array(); diff --git a/modules/poll/poll.test b/modules/poll/poll.test index 355314c5f0f..f5b018095aa 100644 --- a/modules/poll/poll.test +++ b/modules/poll/poll.test @@ -259,13 +259,13 @@ class PollBlockTestCase extends PollTestCase { function testRecentBlock() { // Set block title to confirm that the interface is available. - $this->drupalPost('admin/build/block/configure/poll/recent', array('title' => $this->randomName(8)), t('Save block')); + $this->drupalPost('admin/structure/block/configure/poll/recent', array('title' => $this->randomName(8)), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.')); // Set the block to a region to confirm block is available. $edit = array(); $edit['poll_recent[region]'] = 'footer'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.')); // Create a poll which should appear in recent polls block. diff --git a/modules/profile/profile.test b/modules/profile/profile.test index 86bcbe86317..e60883d5932 100644 --- a/modules/profile/profile.test +++ b/modules/profile/profile.test @@ -314,13 +314,13 @@ class ProfileBlockTestCase extends DrupalWebTestCase { function testAuthorInformationBlock() { // Set block title to confirm that the interface is availble. - $this->drupalPost('admin/build/block/configure/profile/author-information', array('title' => $this->randomName(8)), t('Save block')); + $this->drupalPost('admin/structure/block/configure/profile/author-information', array('title' => $this->randomName(8)), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.')); // Set the block to a region to confirm block is availble. $edit = array(); $edit['profile_author-information[region]'] = 'footer'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.')); } } diff --git a/modules/search/search.test b/modules/search/search.test index 7475482a285..f893c10667a 100644 --- a/modules/search/search.test +++ b/modules/search/search.test @@ -394,13 +394,13 @@ class SearchBlockTestCase extends DrupalWebTestCase { function testSearchFormBlock() { // Set block title to confirm that the interface is availble. - $this->drupalPost('admin/build/block/configure/search/form', array('title' => $this->randomName(8)), t('Save block')); + $this->drupalPost('admin/structure/block/configure/search/form', array('title' => $this->randomName(8)), t('Save block')); $this->assertText(t('The block configuration has been saved.'), t('Block configuration set.')); // Set the block to a region to confirm block is availble. $edit = array(); $edit['search_form[region]'] = 'footer'; - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); $this->assertText(t('The block settings have been updated.'), t('Block successfully move to footer region.')); } @@ -411,7 +411,7 @@ class SearchBlockTestCase extends DrupalWebTestCase { // Enable the block, and place it in the 'content' region so that it isn't // hidden on 404 pages. $edit = array('search_form[region]' => 'content'); - $this->drupalPost('admin/build/block', $edit, t('Save blocks')); + $this->drupalPost('admin/structure/block', $edit, t('Save blocks')); // Test a normal search via the block form, from the front page. $terms = array('search_block_form' => 'test'); @@ -424,7 +424,7 @@ class SearchBlockTestCase extends DrupalWebTestCase { // Test a search from the block when it doesn't appear on the search page. $edit = array('pages' => 'search'); - $this->drupalPost('admin/build/block/configure/search/form', $edit, t('Save block')); + $this->drupalPost('admin/structure/block/configure/search/form', $edit, t('Save block')); $this->drupalPost('node', $terms, t('Search')); $this->assertText('Your search yielded no results'); } diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module index ae5fe60ab98..6735982f160 100644 --- a/modules/simpletest/simpletest.module +++ b/modules/simpletest/simpletest.module @@ -13,7 +13,7 @@ function simpletest_help($path, $arg) { switch ($path) { case 'admin/help#simpletest': $output = '

    ' . t('The SimpleTest module is a framework for running automated unit tests in Drupal. It can be used to verify a working state of Drupal before and after any code changes, or as a means for developers to write and execute tests for their modules.') . '

    '; - $output .= '

    ' . t('Visit Administer >> Site building >> SimpleTest to display a list of available tests. For comprehensive testing, select all tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.)', array('@admin-simpletest' => url('admin/development/testing'))) . '

    '; + $output .= '

    ' . t('Visit Administer >> Structure >> SimpleTest to display a list of available tests. For comprehensive testing, select all tests, or individually select tests for more targeted testing. Note that it might take several minutes for all tests to complete.)', array('@admin-simpletest' => url('admin/development/testing'))) . '

    '; $output .= '

    ' . t('After the tests have run, a message will be displayed next to each test group indicating whether tests within it passed, failed, or had exceptions. A pass means that a test returned the expected results, while fail means that it did not. An exception normally indicates an error outside of the test, such as a PHP warning or notice. If there were fails or exceptions, the results are expanded, and the tests that had issues will be indicated in red or pink rows. Use these results to refine your code and tests until all tests return a pass.') . '

    '; $output .= '

    ' . t('For more information on creating and modifying your own tests, see the SimpleTest API Documentation in the Drupal handbook.', array('@simpletest-api' => 'http://drupal.org/simpletest')) . '

    '; $output .= '

    ' . t('For more information, see the online handbook entry for SimpleTest module.', array('@simpletest' => 'http://drupal.org/handbook/modules/simpletest')) . '

    '; diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index fcf7220dd9c..20801cb12f7 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -19,7 +19,7 @@ function statistics_help($path, $arg) { $output .= '
  • ' . t('a top referrers log that displays the referring parties for your site visits (where your visitors came from).', array('@top-referrers' => url('admin/reports/referrers'))) . '
    • '; $output .= '
  • ' . t('a top pages log that displays site content in descending order by number of views.', array('@top-pages' => url('admin/reports/pages'))) . '
    • '; $output .= '
  • ' . t('a top visitors log that displays the most active users on your site.', array('@top-visitors' => url('admin/reports/visitors'))) . '
    • '; - $output .= '
  • ' . t('a Popular content block that displays the day\'s most viewed content, the all-time most viewed content, and the last content viewed. (Enable the Popular content block on the blocks administration page.)', array('@blocks' => url('admin/build/block'))) . '
    • '; + $output .= '
  • ' . t('a Popular content block that displays the day\'s most viewed content, the all-time most viewed content, and the last content viewed. (Enable the Popular content block on the blocks administration page.)', array('@blocks' => url('admin/structure/block'))) . '
    • '; $output .= '

    ' . t('Configuring the statistics module') . '

    '; $output .= '