Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #521474 by bangpound, JuliaKM et al: rename admin/site-building to admin/structure.

merge-requests/26/head
Dries Buytaert 2009-07-20 18:51:36 +00:00
parent 999d76e7aa
commit d24d954479
59 changed files with 348 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.txt
View File

@ -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

2
includes/actions.inc
View File

@ -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

2
includes/common.inc
View File

@ -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;

2
includes/install.inc
View File

@ -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.

2
includes/path.inc
View File

@ -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.

4
modules/aggregator/aggregator.admin.inc
View File

@ -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 <a href=\"@block-admin\">configure blocks</a> 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 <a href=\"@block-admin\">configure blocks</a> 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 <a href=\"@block-admin\">configure blocks</a> 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 <a href=\"@block-admin\">configure blocks</a> 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.

4
modules/aggregator/aggregator.module
View File

@ -18,12 +18,12 @@ function aggregator_help($path, $arg) {
switch ($path) {
case 'admin/help#aggregator':
$output = '<p>' . 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 <a href="@rss">RSS</a>, <a href="@rdf">RDF</a>, and <a href="@atom">Atom</a>.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '</p>';
$output .= '<p>' . 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 <a href="@aggregator">main aggregator display</a> or by <a href="@aggregator-sources">their source</a>. Administrators can <a href="@feededit">add, edit and delete feeds</a> 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 <a href="@admin-block">blocks administration page</a>. A <a href="@aggregator-opml">machine-readable OPML file</a> of all feeds is available. A correctly configured <a href="@cron">cron maintenance task</a> 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'))) . '</p>';
$output .= '<p>' . 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 <a href="@aggregator">main aggregator display</a> or by <a href="@aggregator-sources">their source</a>. Administrators can <a href="@feededit">add, edit and delete feeds</a> 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 <a href="@admin-block">blocks administration page</a>. A <a href="@aggregator-opml">machine-readable OPML file</a> of all feeds is available. A correctly configured <a href="@cron">cron maintenance task</a> 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'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@aggregator">Aggregator module</a>.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) . '</p>';
return $output;
case 'admin/content/aggregator':
$output = '<p>' . 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 <a href="@rss">RSS</a>, <a href="@rdf">RDF</a>, and <a href="@atom">Atom</a>.', array('@rss' => 'http://cyber.law.harvard.edu/rss/', '@rdf' => 'http://www.w3.org/RDF/', '@atom' => 'http://www.atomenabled.org')) . '</p>';
$output .= '<p>' . t('Current feeds are listed below, and <a href="@addfeed">new feeds may be added</a>. For each feed or feed category, the <em>latest items</em> block may be enabled at the <a href="@block">blocks administration page</a>.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . t('Current feeds are listed below, and <a href="@addfeed">new feeds may be added</a>. For each feed or feed category, the <em>latest items</em> block may be enabled at the <a href="@block">blocks administration page</a>.', array('@addfeed' => url('admin/content/aggregator/add/feed'), '@block' => url('admin/structure/block'))) . '</p>';
return $output;
case 'admin/content/aggregator/add/feed':
return '<p>' . t('Add a feed in RSS, RDF or Atom format. A feed may only have one entry.') . '</p>';

18
modules/block/block.admin.inc
View File

@ -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;
}

28
modules/block/block.module
View File

@ -66,7 +66,7 @@ define('BLOCK_CACHE_GLOBAL', 0x0008);
function block_help($path, $arg) {
switch ($path) {
case 'admin/help#block':
$output = '<p>' . 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 <a href="@blocks">blocks administration page</a> 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'))) . '</p>';
$output = '<p>' . 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 <a href="@blocks">blocks administration page</a> 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'))) . '</p>';
$output .= '<p>' . t('Although blocks are usually generated automatically by modules (like the <em>User login</em> 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 <a href="@text-format">text format</a>.', array('@text-format' => url('admin/settings/filter'))) . '</p>';
$output .= '<p>' . t('When working with blocks, remember that:') . '</p>';
$output .= '<ul><li>' . t('since not all themes implement the same regions, or display regions in the same way, blocks are positioned on a per-theme basis.') . '</li>';
@ -78,12 +78,12 @@ function block_help($path, $arg) {
$output .= '<li>' . t('some dynamic blocks, such as those generated by modules, will be displayed only on certain pages.') . '</li></ul>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@block">Block module</a>.', array('@block' => 'http://drupal.org/handbook/modules/block/')) . '</p>';
return $output;
case 'admin/build/block':
case 'admin/structure/block':
$output = '<p>' . 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 <em>Block</em> 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 <em>Save blocks</em> button at the bottom of the page.') . '</p>';
$output .= '<p>' . t('Click the <em>configure</em> link next to each block to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/build/block/add'))) . '</p>';
$output .= '<p>' . t('Click the <em>configure</em> link next to each block to configure its specific title and visibility settings. Use the <a href="@add-block">add block page</a> to create a custom block.', array('@add-block' => url('admin/structure/block/add'))) . '</p>';
return $output;
case 'admin/build/block/add':
return '<p>' . 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 <a href="@blocks">blocks administration page</a> to be visible.', array('@blocks' => url('admin/build/block'))) . '</p>';
case 'admin/structure/block/add':
return '<p>' . 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 <a href="@blocks">blocks administration page</a> to be visible.', array('@blocks' => url('admin/structure/block'))) . '</p>';
}
}
@ -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 = '<div class="block-region">' . $all_regions[$region] . '</div>';
$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 <a href="@overview">blocks administration page</a>.', array('@overview' => url('admin/build/block'))),
'#description' => t('A brief description of your block. Used on the <a href="@overview">blocks administration page</a>.', array('@overview' => url('admin/structure/block'))),
'#required' => TRUE,
'#weight' => -19,
);

40
modules/block/block.test
View File

@ -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'] = '<h1>Full HTML</h1>';
$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('<h1>Full HTML</h1>', 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'));
}
}

2
modules/blog/blog.module
View File

@ -63,7 +63,7 @@ function blog_help($path, $arg) {
case 'admin/help#blog':
$output = '<p>' . t('The blog module allows registered users to maintain an online journal, or <em>blog</em>. Blogs are made up of individual <em>blog entries</em>, and the blog entries are most often displayed in descending order by creation time.') . '</p>';
$output .= '<p>' . t("There is an (optional) <em>Blogs</em> menu item added to the Navigation menu, which displays all blogs available on your site, and a <em>My blog</em> item displaying the current user's blog entries. The <em>Blog entry</em> menu item under <em>Add new content</em> allows new blog entries to be created.") . '</p>';
$output .= '<p>' . 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 <em>Recent blog posts</em> block that may be enabled at the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . 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 <em>Recent blog posts</em> block that may be enabled at the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@blog">Blog module</a>.', array('@blog' => 'http://drupal.org/handbook/modules/blog/')) . '</p>';
return $output;
}

2
modules/blog/blog.test
View File

@ -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.

2
modules/book/book.module
View File

@ -1113,7 +1113,7 @@ function book_help($path, $arg) {
switch ($path) {
case 'admin/help#book':
$output = '<p>' . 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.') . '</p>';
$output .= '<p>' . 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 <em>book navigation block</em> on the <a href="@admin-block">blocks administration page</a>.', array('@admin-block' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . 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 <em>book navigation block</em> on the <a href="@admin-block">blocks administration page</a>.', array('@admin-block' => url('admin/structure/block'))) . '</p>';
$output .= '<p>' . t('Users can select the <em>printer-friendly version</em> link visible at the bottom of a book page to generate a printer-friendly display of the page and all of its subsections. ') . '</p>';
$output .= '<p>' . t("Users with the <em>administer book outlines</em> 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 <em>outline</em> tab.") . '</p>';
$output .= '<p>' . t('Administrators can view a list of all books on the <a href="@admin-node-book">book administration page</a>. The <em>Outline</em> page for each book allows section titles to be edited or rearranged.', array('@admin-node-book' => url('admin/content/book'))) . '</p>';

4
modules/book/book.test
View File

@ -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.'));
}
}

2
modules/color/color.module
View File

@ -9,7 +9,7 @@ function color_help($path, $arg) {
case 'admin/help#color':
$output = '<p>' . 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 <a href="@url">file download method</a> be set to public.', array('@url' => url('admin/settings/file-system'))) . '</p>';
$output .= '<p>' . 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.") . '</p>';
$output .= '<p>' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the <a href="@themes">themes administration page</a>.', array('@themes' => url('admin/build/themes'))) . '</p>';
$output .= '<p>' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the <a href="@themes">themes administration page</a>.', array('@themes' => url('admin/structure/themes'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@color">Color module</a>.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '</p>';
return $output;

4
modules/comment/comment.module
View File

@ -86,9 +86,9 @@ define('COMMENT_PREVIEW_REQUIRED', 1);
function comment_help($path, $arg) {
switch ($path) {
case 'admin/help#comment':
$output = '<p>' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any <a href="@content-type">content type</a> may have its <em>Default comment setting</em> set to <em>Open</em> to allow comments, <em>Hidden</em> to hide existing comments and prevent new comments or <em>Closed</em> 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'))) . '</p>';
$output = '<p>' . t('The comment module allows visitors to comment on your posts, creating ad hoc discussion boards. Any <a href="@content-type">content type</a> may have its <em>Default comment setting</em> set to <em>Open</em> to allow comments, <em>Hidden</em> to hide existing comments and prevent new comments or <em>Closed</em> 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'))) . '</p>';
$output .= '<p>' . 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.') . '</p>';
$output .= '<p>' . t('Change comment settings on the content type\'s <a href="@content-type">edit page</a>.', array('@content-type' => url('admin/build/types'))) . '</p>';
$output .= '<p>' . t('Change comment settings on the content type\'s <a href="@content-type">edit page</a>.', array('@content-type' => url('admin/structure/types'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@comment">Comment module</a>.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) . '</p>';
return $output;

6
modules/comment/comment.test
View File

@ -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.

16
modules/contact/contact.admin.inc
View File

@ -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. <a href="@link">Add category</a>.', array('@link' => url('admin/build/contact/add'))), 'colspan' => 5));
$rows[] = array(array('data' => t('No categories available. <a href="@link">Add category</a>.', 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;
}

14
modules/contact/contact.module
View File

@ -19,7 +19,7 @@ function contact_help($path, $arg) {
$output .= '<p>' . t('Customize the <a href="@contact">contact page</a> with additional information (like physical location, mailing address, and telephone number) using the <a href="@contact-settings">contact form settings page</a>. The <a href="@contact-settings">settings page</a> 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'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@contact">Contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '</p>';
return $output;
case 'admin/build/contact':
case 'admin/structure/contact':
$output = '<p>' . t('This page lets you set up <a href="@form">your site-wide contact form</a>. 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 <a href="@settings">settings page</a>, 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'))) . '</p>';
if (!module_exists('menu')) {
$menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules')));
@ -27,7 +27,7 @@ function contact_help($path, $arg) {
else {
$menu_note = '';
}
$output .= '<p>' . t('The contact module also adds a <a href="@menu-settings">menu item</a> (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/build/menu'))) . ' ' . $menu_note . '</p>';
$output .= '<p>' . t('The contact module also adds a <a href="@menu-settings">menu item</a> (disabled by default) to the navigation block.', array('@menu-settings' => url('admin/structure/menu'))) . ' ' . $menu_note . '</p>';
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),

2
modules/contact/contact.pages.inc
View File

@ -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. <a href="@add">Add one or more categories</a> to the form.', array('@add' => url('admin/build/contact/add')));
$output = t('The contact form has not been configured. <a href="@add">Add one or more categories</a> to the form.', array('@add' => url('admin/structure/contact/add')));
}
else {
return drupal_not_found();

6
modules/contact/contact.test
View File

@ -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.'));
}
}

4
modules/field/field.api.php
View File

@ -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'),
),

12
modules/forum/forum.admin.inc
View File

@ -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 <a href="@content">content administration</a> 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 <a href="@content">content administration</a> 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. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array('@container' => url('admin/build/forum/add/container'), '@forum' => url('admin/build/forum/add/forum')));
$form['#empty_text'] = t('No containers or forums available. <a href="@container">Add container</a> or <a href="@forum">Add forum</a>.', array('@container' => url('admin/structure/forum/add/container'), '@forum' => url('admin/structure/forum/add/forum')));
return $form;
}

32
modules/forum/forum.module
View File

@ -21,14 +21,14 @@ function forum_help($path, $arg) {
$output .= '<li>' . t('selecting <em>Disabled</em> under <em>Comment settings</em> while editing a forum topic will hide all existing comments on the thread, and prevent new ones.') . '</li></ul>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@forum">Forum module</a>.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) . '</p>';
return $output;
case 'admin/build/forum':
case 'admin/structure/forum':
return '<p>' . 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.') . '</p>';
case 'admin/build/forum/add/container':
case 'admin/structure/forum/add/container':
return '<p>' . 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.') . '</p>';
case 'admin/build/forum/add/forum':
case 'admin/structure/forum/add/forum':
return '<p>' . 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.') . '</p>';
case 'admin/build/forum/settings':
return '<p>' . 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 <em>Content types</em> on the <a href="@forum-vocabulary">forum vocabulary page</a>.', array('@forum-vocabulary' => url('admin/build/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '</p>';
case 'admin/structure/forum/settings':
return '<p>' . 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 <em>Content types</em> on the <a href="@forum-vocabulary">forum vocabulary page</a>.', array('@forum-vocabulary' => url('admin/structure/taxonomy/edit/vocabulary/' . variable_get('forum_nav_vocabulary', 0)))) . '</p>';
}
}
@ -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),

12
modules/forum/forum.test
View File

@ -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.

2
modules/help/help.api.php
View File

@ -55,7 +55,7 @@ function hook_help($path, $arg) {
case 'admin/help#block':
return '<p>' . 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.') . '</p>';
case 'admin/build/block':
case 'admin/structure/block':
return t('<p>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.</p>
<p>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 <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.</p>
<p>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.</p>', array('@throttle' => url('admin/settings/throttle')));

4
modules/help/help.module
View File

@ -39,8 +39,8 @@ function help_help($path, $arg) {
$output = '<p>' . t('Please follow these steps to set up and start using your website:') . '</p>';
$output .= '<ol>';
$output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '</li>';
$output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '</li>';
$output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '</li>';
$output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/structure/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '</li>';
$output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/structure/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '</li>';
$output .= '<li>' . t('<strong>Start posting content</strong> Finally, you can <a href="@content">add new content</a> for your website.', array('@content' => url('node/add'))) . '</li>';
$output .= '</ol>';
$output .= '<p>' . t('For more information, please refer to the specific topics listed in the next section, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '</p>';

2
modules/locale/locale.module
View File

@ -57,7 +57,7 @@ function locale_help($path, $arg) {
return '<p>' . t('This page exports the translated strings used by your site. An export file may be in Gettext Portable Object (<em>.po</em>) form, which includes both the original string and the translation (used to share translations with others), or in Gettext Portable Object Template (<em>.pot</em>) form, which includes the original strings only (used to create new translations with a Gettext translation editor).') . '</p>';
case 'admin/international/translate/translate':
return '<p>' . 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 <a href="@export">export</a> 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'))) . '</p>';
case 'admin/build/block/configure':
case 'admin/structure/block/configure':
if ($arg[4] == 'locale' && $arg[5] == 0) {
return '<p>' . t('This block is only shown if <a href="@languages">at least two languages are enabled</a> and <a href="@configuration">language negotiation</a> is set to something other than <em>None</em>.', array('@languages' => url('admin/international/language'), '@configuration' => url('admin/international/language/configure'))) . '</p>';
}

6
modules/locale/locale.test
View File

@ -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();

38
modules/menu/menu.admin.inc
View File

@ -15,9 +15,9 @@ function menu_overview_page() {
$rows = array();
foreach ($result as $menu) {
$row = array(theme('menu_admin_overview', $menu['title'], $menu['menu_name'], $menu['description']));
$row[] = array('data' => l(t('list links'), 'admin/build/menu-customize/' . $menu['menu_name']));
$row[] = array('data' => l(t('edit menu'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/edit'));
$row[] = array('data' => l(t('add link'), 'admin/build/menu-customize/' . $menu['menu_name'] . '/add'));
$row[] = array('data' => l(t('list links'), 'admin/structure/menu-customize/' . $menu['menu_name']));
$row[] = array('data' => l(t('edit menu'), 'admin/structure/menu-customize/' . $menu['menu_name'] . '/edit'));
$row[] = array('data' => l(t('add link'), 'admin/structure/menu-customize/' . $menu['menu_name'] . '/add'));
$rows[] = $row;
}
@ -65,7 +65,7 @@ function menu_overview_form(&$form_state, $menu) {
);
}
else {
$form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/build/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
$form['#empty_text'] = t('There are no menu links yet. <a href="@link">Add link</a>.', array('@link' => url('admin/structure/menu-customize/'. $form['#menu']['menu_name'] .'/add')));
}
return $form;
}
@ -108,14 +108,14 @@ function _menu_overview_tree_form($tree) {
);
// Build a list of operations.
$operations = array();
$operations['edit'] = l(t('edit'), 'admin/build/menu/item/' . $item['mlid'] . '/edit');
$operations['edit'] = l(t('edit'), 'admin/structure/menu/item/' . $item['mlid'] . '/edit');
// Only items created by the menu module can be deleted.
if ($item['module'] == 'menu' || $item['updated'] == 1) {
$operations['delete'] = l(t('delete'), 'admin/build/menu/item/' . $item['mlid'] . '/delete');
$operations['delete'] = l(t('delete'), 'admin/structure/menu/item/' . $item['mlid'] . '/delete');
}
// Set the reset column.
elseif ($item['module'] == 'system' && $item['customized']) {
$operations['reset'] = l(t('reset'), 'admin/build/menu/item/' . $item['mlid'] . '/reset');
$operations['reset'] = l(t('reset'), 'admin/structure/menu/item/' . $item['mlid'] . '/reset');
}
$form[$mlid]['operations'] = array();
@ -375,7 +375,7 @@ function menu_edit_item_validate($form, &$form_state) {
* Submit function for the delete button on the menu item editing form.
*/
function menu_item_delete_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/build/menu/item/' . $form_state['values']['menu']['mlid'] . '/delete';
$form_state['redirect'] = 'admin/structure/menu/item/' . $form_state['values']['menu']['mlid'] . '/delete';
}
/**
@ -394,7 +394,7 @@ function menu_edit_item_submit($form, &$form_state) {
if (!menu_link_save($item)) {
drupal_set_message(t('There was an error saving the menu link.'), 'error');
}
$form_state['redirect'] = 'admin/build/menu-customize/' . $item['menu_name'];
$form_state['redirect'] = 'admin/structure/menu-customize/' . $item['menu_name'];
}
/**
@ -456,7 +456,7 @@ function menu_edit_menu(&$form_state, $type, $menu = array()) {
* Submit function for the 'Delete' button on the menu editing form.
*/
function menu_custom_delete_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/build/menu-customize/' . $form_state['values']['menu_name'] . '/delete';
$form_state['redirect'] = 'admin/structure/menu-customize/' . $form_state['values']['menu_name'] . '/delete';
}
/**
@ -483,7 +483,7 @@ function menu_delete_menu_confirm(&$form_state, $menu) {
$caption .= '<p>' . format_plural($num_links, '<strong>Warning:</strong> There is currently 1 menu link in %title. It will be deleted (system-defined items will be reset).', '<strong>Warning:</strong> There are currently @count menu links in %title. They will be deleted (system-defined links will be reset).', array('%title' => $menu['title'])) . '</p>';
}
$caption .= '<p>' . t('This action cannot be undone.') . '</p>';
return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/build/menu-customize/' . $menu['menu_name'], $caption, t('Delete'));
return confirm_form($form, t('Are you sure you want to delete the custom menu %title?', array('%title' => $menu['title'])), 'admin/structure/menu-customize/' . $menu['menu_name'], $caption, t('Delete'));
}
/**
@ -491,7 +491,7 @@ function menu_delete_menu_confirm(&$form_state, $menu) {
*/
function menu_delete_menu_confirm_submit($form, &$form_state) {
$menu = $form['#menu'];
$form_state['redirect'] = 'admin/build/menu';
$form_state['redirect'] = 'admin/structure/menu';
// System-defined menus may not be deleted - only menus defined by this module.
$system_menus = menu_list_system_menus();
if (isset($system_menus[$menu['menu_name']]) || !(db_query("SELECT 1 FROM {menu_custom} WHERE menu_name = :menu", array(':menu' => $menu['menu_name']))->fetchField())) {
@ -503,7 +503,7 @@ function menu_delete_menu_confirm_submit($form, &$form_state) {
menu_reset_item($item);
}
// Delete all links to the overview page for this menu.
$result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = :link", array(':link' => 'admin/build/menu-customize/' . $menu['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
$result = db_query("SELECT mlid FROM {menu_links} ml WHERE ml.link_path = :link", array(':link' => 'admin/structure/menu-customize/' . $menu['menu_name']), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $m) {
menu_link_delete($m['mlid']);
}
@ -560,7 +560,7 @@ function menu_edit_menu_validate($form, &$form_state) {
*/
function menu_edit_menu_submit($form, &$form_state) {
$menu = $form_state['values'];
$path = 'admin/build/menu-customize/';
$path = 'admin/structure/menu-customize/';
if ($form['#insert']) {
// Add 'menu-' to the menu name to help avoid name-space conflicts.
$menu['menu_name'] = 'menu-' . $menu['menu_name'];
@ -569,7 +569,7 @@ function menu_edit_menu_submit($form, &$form_state) {
$link['router_path'] = $path . '%';
$link['module'] = 'menu';
$link['plid'] = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :link AND module = :module", array(
':link' => 'admin/build/menu',
':link' => 'admin/structure/menu',
':module' => 'system'
))
->fetchField();
@ -619,7 +619,7 @@ function menu_item_delete_page($item) {
*/
function menu_item_delete_form(&$form_state, $item) {
$form['#item'] = $item;
return confirm_form($form, t('Are you sure you want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/' . $item['menu_name']);
return confirm_form($form, t('Are you sure you want to delete the custom menu link %item?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name']);
}
/**
@ -631,7 +631,7 @@ function menu_item_delete_form_submit($form, &$form_state) {
$t_args = array('%title' => $item['link_title']);
drupal_set_message(t('The menu link %title has been deleted.', $t_args));
watchdog('menu', 'Deleted menu link %title.', $t_args, WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/build/menu-customize/' . $item['menu_name'];
$form_state['redirect'] = 'admin/structure/menu-customize/' . $item['menu_name'];
}
/**
@ -639,7 +639,7 @@ function menu_item_delete_form_submit($form, &$form_state) {
*/
function menu_reset_item_confirm(&$form_state, $item) {
$form['item'] = array('#type' => 'value', '#value' => $item);
return confirm_form($form, t('Are you sure you want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/build/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
return confirm_form($form, t('Are you sure you want to reset the link %item to its default values?', array('%item' => $item['link_title'])), 'admin/structure/menu-customize/' . $item['menu_name'], t('Any customizations will be lost. This action cannot be undone.'), t('Reset'));
}
/**
@ -649,7 +649,7 @@ function menu_reset_item_confirm_submit($form, &$form_state) {
$item = $form_state['values']['item'];
$new_item = menu_reset_item($item);
drupal_set_message(t('The menu link was reset to its default settings.'));
$form_state['redirect'] = 'admin/build/menu-customize/' . $new_item['menu_name'];
$form_state['redirect'] = 'admin/structure/menu-customize/' . $new_item['menu_name'];
}
/**

2
modules/menu/menu.install
View File

@ -16,7 +16,7 @@ function menu_install() {
$descriptions = array(
'navigation' => 'The <em>Navigation</em> menu contains links such as Recent posts (if the Tracker module is enabled). Non-administrative links are added to this menu by default by modules.',
'user-menu' => "The <em>User menu</em> contains links related to the user's account, as well as the 'Log out' link.",
'management' => 'The <em>Management</em> menu contains links for content creation, site building, user management, and similar site activities.',
'management' => 'The <em>Management</em> menu contains links for content creation, structure, user management, and similar site activities.',
'main-menu' => 'The <em>Main menu</em> is the default source for the Main links which are often used by themes to show the major sections of a site.',
'secondary-menu' => 'The <em>Secondary menu</em> is the default source for the Secondary links which are often used for legal notices, contact details, and other navigation items that play a lesser role than the Main links.',
);

42
modules/menu/menu.module
View File

@ -19,16 +19,16 @@ function menu_help($path, $arg) {
switch ($path) {
case 'admin/help#menu':
$output = '<p>' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links used to navigate a website. Each menu is rendered in a block that may be positioned and displayed using Drupal's flexible block system. Five menus are provided by Drupal and are always present: <em>Navigation</em>, <em>Management</em>, <em>User menu</em>, <em>Main menu</em>, and <em>Secondary menu</em>. The <em>Management</em> menu contains links for administration and content creation, while the <em>Navigation</em> menu is the default location for site navigation links created by newly enabled modules. Both of these are often displayed in either the left or right sidebar. Most Drupal themes also provide support for the <em>Main links</em> and <em>Secondary links</em>, by displaying them in either the header or footer of each page. The <em>Main menu</em> is the default source for the <em>Main links</em> and the <em>User menu</em> is the default source for the <em>Secondary links</em>. By default, the <em>User menu</em> has links to take the current user to their account or allow them to log out, while the <em>Main menu</em> and <em>Secondary menu</em> contain no menu links but may be configured to contain custom menu items specific to your site. You may create an unlimited number of additional menus, each of which will automatically have an associated block.") . '</p>';
$output .= '<p>' . t('The <a href="@menu">menus page</a> displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the <a href="@add-menu">add menu page</a> (the block containing a new menu must also be enabled on the <a href="@blocks">blocks administration page</a>).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . t('The <a href="@menu">menus page</a> displays all menus currently available on your site. Select a menu from this list to add or edit a menu link, or to rearrange links within the menu. Create new menus using the <a href="@add-menu">add menu page</a> (the block containing a new menu must also be enabled on the <a href="@blocks">blocks administration page</a>).', array('@menu' => url('admin/structure/menu'), '@add-menu' => url('admin/structure/menu/add'), '@blocks' => url('admin/structure/block'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@menu">Menu module</a>.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '</p>';
return $output;
case 'admin/build/menu/add':
return '<p>' . t('Enter the name for your new menu. Remember to enable the newly created block in the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
case 'admin/build/menu/item/add':
case 'admin/structure/menu/add':
return '<p>' . t('Enter the name for your new menu. Remember to enable the newly created block in the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
case 'admin/structure/menu/item/add':
return '<p>' . t('Enter the title and path for your new menu link.') . '</p>';
}
if ($path == 'admin/build/menu' && module_exists('block')) {
return '<p>' . t('Each menu has a corresponding block that is managed on the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/build/block'))) . '</p>';
if ($path == 'admin/structure/menu' && module_exists('block')) {
return '<p>' . t('Each menu has a corresponding block that is managed on the <a href="@blocks">blocks administration page</a>.', array('@blocks' => url('admin/structure/block'))) . '</p>';
}
}
@ -48,26 +48,26 @@ function menu_permission() {
* Implement hook_menu().
*/
function menu_menu() {
$items['admin/build/menu'] = array(
$items['admin/structure/menu'] = array(
'title' => 'Menus',
'description' => 'Add new menus to your site, edit existing menus, and rename and reorganize menu links.',
'page callback' => 'menu_overview_page',
'access callback' => 'user_access',
'access arguments' => array('administer menu'),
);
$items['admin/build/menu/list'] = array(
$items['admin/structure/menu/list'] = array(
'title' => 'List menus',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
$items['admin/build/menu/add'] = array(
$items['admin/structure/menu/add'] = array(
'title' => 'Add menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_menu', 'add'),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/menu/settings'] = array(
$items['admin/structure/menu/settings'] = array(
'title' => 'Settings',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_configure'),
@ -75,7 +75,7 @@ function menu_menu() {
'type' => MENU_LOCAL_TASK,
'weight' => 5,
);
$items['admin/build/menu-customize/%menu'] = array(
$items['admin/structure/menu-customize/%menu'] = array(
'title' => 'Customize menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_overview_form', 3),
@ -84,47 +84,47 @@ function menu_menu() {
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
$items['admin/build/menu-customize/%menu/list'] = array(
$items['admin/structure/menu-customize/%menu/list'] = array(
'title' => 'List links',
'weight' => -10,
'type' => MENU_DEFAULT_LOCAL_TASK,
);
$items['admin/build/menu-customize/%menu/add'] = array(
$items['admin/structure/menu-customize/%menu/add'] = array(
'title' => 'Add link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_item', 'add', NULL, 3),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/menu-customize/%menu/edit'] = array(
$items['admin/structure/menu-customize/%menu/edit'] = array(
'title' => 'Edit menu',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_menu', 'edit', 3),
'access arguments' => array('administer menu'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/menu-customize/%menu/delete'] = array(
$items['admin/structure/menu-customize/%menu/delete'] = array(
'title' => 'Delete menu',
'page callback' => 'menu_delete_menu_page',
'page arguments' => array(3),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
$items['admin/build/menu/item/%menu_link/edit'] = array(
$items['admin/structure/menu/item/%menu_link/edit'] = array(
'title' => 'Edit menu link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_edit_item', 'edit', 4, NULL),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
$items['admin/build/menu/item/%menu_link/reset'] = array(
$items['admin/structure/menu/item/%menu_link/reset'] = array(
'title' => 'Reset menu link',
'page callback' => 'drupal_get_form',
'page arguments' => array('menu_reset_item_confirm', 4),
'access arguments' => array('administer menu'),
'type' => MENU_CALLBACK,
);
$items['admin/build/menu/item/%menu_link/delete'] = array(
$items['admin/structure/menu/item/%menu_link/delete'] = array(
'title' => 'Delete menu link',
'page callback' => 'menu_item_delete_page',
'page arguments' => array(4),
@ -157,8 +157,8 @@ function menu_theme() {
*/
function menu_enable() {
menu_rebuild();
$base_link = db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'")->fetchAssoc();
$base_link['router_path'] = 'admin/build/menu-customize/%';
$base_link = db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/structure/menu' AND module = 'system'")->fetchAssoc();
$base_link['router_path'] = 'admin/structure/menu-customize/%';
$base_link['module'] = 'menu';
$result = db_query("SELECT * FROM {menu_custom}", array(), array('fetch' => PDO::FETCH_ASSOC));
foreach ($result as $menu) {
@ -166,7 +166,7 @@ function menu_enable() {
$link = $base_link;
$link['mlid'] = 0;
$link['link_title'] = $menu['title'];
$link['link_path'] = 'admin/build/menu-customize/' . $menu['menu_name'];
$link['link_path'] = 'admin/structure/menu-customize/' . $menu['menu_name'];
$menu_link = db_query("SELECT mlid FROM {menu_links} WHERE link_path = :path AND plid = :plid", array(
':path' => $link['link_path'],
':plid' => $link['plid']

42
modules/menu/menu.test
View File

@ -97,7 +97,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Add custom menu.
// Try adding a menu using a menu_name that is too long.
$this->drupalGet('admin/build/menu/add');
$this->drupalGet('admin/structure/menu/add');
$menu_name = substr(md5($this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI + 1);
$title = $this->randomName(16);
$edit = array(
@ -105,7 +105,7 @@ class MenuTestCase extends DrupalWebTestCase {
'description' => '',
'title' => $title,
);
$this->drupalPost('admin/build/menu/add', $edit, t('Save'));
$this->drupalPost('admin/structure/menu/add', $edit, t('Save'));
// Verify that using a menu_name that is too long results in a validation message.
$this->assertText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
@ -113,20 +113,20 @@ class MenuTestCase extends DrupalWebTestCase {
// Change the menu_name so it no longer exceeds the maximum length.
$menu_name = substr(md5($this->randomName(16)), 0, MENU_MAX_MENU_NAME_LENGTH_UI);
$edit['menu_name'] = $menu_name;
$this->drupalPost('admin/build/menu/add', $edit, t('Save'));
$this->drupalPost('admin/structure/menu/add', $edit, t('Save'));
// Verify that no validation error is given for menu_name length.
$this->assertNoText(format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."), t('Validation failed when menu name is too long.'));
// Unlike most other modules, there is no confirmation message displayed.
$this->drupalGet('admin/build/menu');
$this->drupalGet('admin/structure/menu');
$this->assertText($title, 'Menu created');
// Enable the custom menu block.
$menu_name = 'menu-' . $menu_name; // Drupal prepends the name with 'menu-'.
$edit = array();
$edit['menu_' . $menu_name . '[region]'] = 'left';
$this->drupalPost('admin/build/block', $edit, t('Save blocks'));
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
$this->assertResponse(200);
$this->assertText(t('The block settings have been updated.'), t('Custom menu block was enabled'));
@ -143,7 +143,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $this->menu['title'];
// Delete custom menu.
$this->drupalPost("admin/build/menu-customize/$menu_name/delete", array(), t('Delete'));
$this->drupalPost("admin/structure/menu-customize/$menu_name/delete", array(), t('Delete'));
$this->assertResponse(200);
$this->assertRaw(t('The custom menu %title has been deleted.', array('%title' => $title)), t('Custom menu was deleted'));
$this->assertFalse(menu_load($menu_name), 'Custom menu was deleted');
@ -181,7 +181,7 @@ class MenuTestCase extends DrupalWebTestCase {
// Note in the UI the 'mlid:x[hidden]' form element maps to enabled, or
// NOT hidden.
$edit['mlid:' . $item1['mlid'] . '[hidden]'] = TRUE;
$this->drupalPost('admin/build/menu-customize/' . $item1['menu_name'], $edit, t('Save configuration'));
$this->drupalPost('admin/structure/menu-customize/' . $item1['menu_name'], $edit, t('Save configuration'));
// Verify in the database.
$hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $item1['mlid']))->fetchField();
@ -202,7 +202,7 @@ class MenuTestCase extends DrupalWebTestCase {
*/
function addMenuLink($plid = 0, $link = '<front>', $menu_name = 'navigation') {
// View add menu link page.
$this->drupalGet("admin/build/menu-customize/$menu_name/add");
$this->drupalGet("admin/structure/menu-customize/$menu_name/add");
$this->assertResponse(200);
$title = '!link_' . $this->randomName(16);
@ -217,7 +217,7 @@ class MenuTestCase extends DrupalWebTestCase {
);
// Add menu link.
$this->drupalPost("admin/build/menu-customize/$menu_name/add", $edit, t('Save'));
$this->drupalPost("admin/structure/menu-customize/$menu_name/add", $edit, t('Save'));
$this->assertResponse(200);
// Unlike most other modules, there is no confirmation message displayed.
@ -254,7 +254,7 @@ class MenuTestCase extends DrupalWebTestCase {
'menu[link_path]' => $link_path,
'menu[link_title]' => 'title',
);
$this->drupalPost("admin/build/menu-customize/$menu_name/add", $edit, t('Save'));
$this->drupalPost("admin/structure/menu-customize/$menu_name/add", $edit, t('Save'));
$this->assertRaw(t("The path '@path' is either invalid or you do not have access to it.", array('@path' => $link_path)), 'Menu link was not created');
}
}
@ -308,12 +308,12 @@ class MenuTestCase extends DrupalWebTestCase {
// Edit menu link.
$edit = array();
$edit['menu[link_title]'] = $title;
$this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
$this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
$this->assertResponse(200);
// Unlike most other modules, there is no confirmation message displayed.
// Verify menu link.
$this->drupalGet('admin/build/menu-customize/' . $item['menu_name']);
$this->drupalGet('admin/structure/menu-customize/' . $item['menu_name']);
$this->assertText($title, 'Menu link was edited');
}
@ -328,7 +328,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $item['link_title'];
// Reset menu link.
$this->drupalPost("admin/build/menu/item/$mlid/reset", array(), t('Reset'));
$this->drupalPost("admin/structure/menu/item/$mlid/reset", array(), t('Reset'));
$this->assertResponse(200);
$this->assertRaw(t('The menu link was reset to its default settings.'), t('Menu link was reset'));
@ -351,7 +351,7 @@ class MenuTestCase extends DrupalWebTestCase {
$title = $item['link_title'];
// Delete menu link.
$this->drupalPost("admin/build/menu/item/$mlid/delete", array(), t('Confirm'));
$this->drupalPost("admin/structure/menu/item/$mlid/delete", array(), t('Confirm'));
$this->assertResponse(200);
$this->assertRaw(t('The menu link %title has been deleted.', array('%title' => $title)), t('Menu link was deleted'));
@ -388,7 +388,7 @@ class MenuTestCase extends DrupalWebTestCase {
function disableMenuLink($item) {
$mlid = $item['mlid'];
$edit['menu[enabled]'] = FALSE;
$this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
$this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
// Unlike most other modules, there is no confirmation message displayed.
// Verify in the database.
@ -405,7 +405,7 @@ class MenuTestCase extends DrupalWebTestCase {
function enableMenuLink($item) {
$mlid = $item['mlid'];
$edit['menu[enabled]'] = TRUE;
$this->drupalPost("admin/build/menu/item/$mlid/edit", $edit, t('Save'));
$this->drupalPost("admin/structure/menu/item/$mlid/edit", $edit, t('Save'));
// Verify in the database.
$hidden = db_query("SELECT hidden FROM {menu_links} WHERE mlid = :mlid", array(':mlid' => $mlid))->fetchField();
@ -440,14 +440,14 @@ class MenuTestCase extends DrupalWebTestCase {
}
// View menu build overview node.
$this->drupalGet('admin/build/menu');
$this->drupalGet('admin/structure/menu');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Menu build overview node was displayed'));
}
// View navigation menu customization node.
$this->drupalGet('admin/build/menu-customize/navigation');
$this->drupalGet('admin/structure/menu-customize/navigation');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Navigation'), t('Navigation menu node was displayed'));
@ -455,21 +455,21 @@ class MenuTestCase extends DrupalWebTestCase {
// View menu edit node.
$item = $this->getStandardMenuLink();
$this->drupalGet('admin/build/menu/item/' . $item['mlid'] . '/edit');
$this->drupalGet('admin/structure/menu/item/' . $item['mlid'] . '/edit');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Edit menu item'), t('Menu edit node was displayed'));
}
// View menu settings node.
$this->drupalGet('admin/build/menu/settings');
$this->drupalGet('admin/structure/menu/settings');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Menu settings node was displayed'));
}
// View add menu node.
$this->drupalGet('admin/build/menu/add');
$this->drupalGet('admin/structure/menu/add');
$this->assertResponse($response);
if ($response == 200) {
$this->assertText(t('Menus'), t('Add menu node was displayed'));

16
modules/node/content_types.inc
View File

@ -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. <a href="@link">Add content type</a>.', array('@link' => url('admin/build/types/add'))), 'colspan' => '5', 'class' => 'message'));
$rows[] = array(array('data' => t('No content types available. <a href="@link">Add content type</a>.', 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 .= '<p>' . t('This action cannot be undone.') . '</p>';
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;
}

18
modules/node/node.module
View File

@ -36,13 +36,13 @@ function node_help($path, $arg) {
switch ($path) {
case 'admin/help#node':
$output = '<p>' . 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.') . '</p>';
$output .= '<p>' . t('Though each post on your site is a node, each post is also of a particular <a href="@content-type">content type</a>. <a href="@content-type">Content types</a> 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 <em>Publishing options</em> and other workflow controls. By default, the two content types in a standard Drupal installation are <em>Page</em> and <em>Story</em>. Use the <a href="@content-type">content types page</a> 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'))) . '</p>';
$output .= '<p>' . t('Though each post on your site is a node, each post is also of a particular <a href="@content-type">content type</a>. <a href="@content-type">Content types</a> 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 <em>Publishing options</em> and other workflow controls. By default, the two content types in a standard Drupal installation are <em>Page</em> and <em>Story</em>. Use the <a href="@content-type">content types page</a> 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'))) . '</p>';
$output .= '<p>' . t('The administrative <a href="@content">content page</a> 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 <a href="@permissions">permissions page</a>.', array('@content' => url('admin/content/node'), '@permissions' => url('admin/user/permissions'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@node">Node module</a>.', array('@node' => 'http://drupal.org/handbook/modules/node/')) . '</p>';
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 '<p>' . 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.') . '</p>';
case 'node/%/revisions':
return '<p>' . t('The revisions let you track differences between multiple versions of a post.') . '</p>';
@ -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'),

10
modules/node/node.test
View File

@ -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();

4
modules/poll/poll.test
View File

@ -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.

4
modules/profile/profile.test
View File

@ -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.'));
}
}

8
modules/search/search.test
View File

@ -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');
}

2
modules/simpletest/simpletest.module
View File

@ -13,7 +13,7 @@ function simpletest_help($path, $arg) {
switch ($path) {
case 'admin/help#simpletest':
$output = '<p>' . 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.') . '</p>';
$output .= '<p>' . t('Visit <a href="@admin-simpletest">Administer >> Site building >> SimpleTest</a> to display a list of available tests. For comprehensive testing, select <em>all</em> 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'))) . '</p>';
$output .= '<p>' . t('Visit <a href="@admin-simpletest">Administer >> Structure >> SimpleTest</a> to display a list of available tests. For comprehensive testing, select <em>all</em> 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'))) . '</p>';
$output .= '<p>' . 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.') . '</p>';
$output .= '<p>' . t('For more information on creating and modifying your own tests, see the <a href="@simpletest-api">SimpleTest API Documentation</a> in the Drupal handbook.', array('@simpletest-api' => 'http://drupal.org/simpletest')) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@simpletest">SimpleTest module</a>.', array('@simpletest' => 'http://drupal.org/handbook/modules/simpletest')) . '</p>';

2
modules/statistics/statistics.module
View File

@ -19,7 +19,7 @@ function statistics_help($path, $arg) {
$output .= '<li>' . t('a <a href="@top-referrers">top referrers</a> log that displays the referring parties for your site visits (where your visitors came from).', array('@top-referrers' => url('admin/reports/referrers'))) . '</li>';
$output .= '<li>' . t('a <a href="@top-pages">top pages</a> log that displays site content in descending order by number of views.', array('@top-pages' => url('admin/reports/pages'))) . '</li>';
$output .= '<li>' . t('a <a href="@top-visitors">top visitors</a> log that displays the most active users on your site.', array('@top-visitors' => url('admin/reports/visitors'))) . '</li>';
$output .= '<li>' . t('a <em>Popular content</em> block that displays the day\'s most viewed content, the all-time most viewed content, and the last content viewed. (Enable the <em>Popular content</em> block on the <a href="@blocks">blocks administration page</a>.)', array('@blocks' => url('admin/build/block'))) . '</li></ul>';
$output .= '<li>' . t('a <em>Popular content</em> block that displays the day\'s most viewed content, the all-time most viewed content, and the last content viewed. (Enable the <em>Popular content</em> block on the <a href="@blocks">blocks administration page</a>.)', array('@blocks' => url('admin/structure/block'))) . '</li></ul>';
$output .= '<p>' . t('Configuring the statistics module') . '</p>';
$output .= '<ul><li>' . t('When the <em>Enable access log</em> setting on the <a href="@statistics-settings">statistics settings page</a> is enabled, data about every page accessed (including the remote host\'s IP address, referrer, node accessed, and user name) is stored in the access log. The access log must be enabled for the <a href="@recent-hits">recent hits</a>, <a href="@top-referrers">top referrers</a>, <a href="@top-pages">top pages</a>, and <a href="@top-visitors">top visitors</a> log pages to function. Enabling the access log adds one additional database call per page displayed by Drupal.', array('@statistics-settings' => url('admin/settings/statistics'), '@recent-hits' => url('admin/reports/hits'), '@top-referrers' => url('admin/reports/referrers'), '@top-pages' => url('admin/reports/pages'), '@top-visitors' => url('admin/reports/visitors'))) . '</li>';
$output .= '<li>' . t('The <em>Discard access logs older than</em> setting on the <a href="@statistics-settings">statistics settings page</a> specifies the length of time entries are retained in the access log before they are deleted. Automatic access log entry deletion requires a correctly configured <a href="@cron">cron maintenance task</a>.', array('@statistics-settings' => url('admin/settings/statistics'), '@cron' => url('admin/reports/status'))) . '</li>';

20
modules/system/system.admin.inc
View File

@ -63,7 +63,7 @@ function system_main_admin_page($arg = NULL) {
/**
* Provide a single block from the administration menu as a page.
* This function is often a destination for these blocks.
* For example, 'admin/build/types' needs to have a destination to be valid
* For example, 'admin/structure/types' needs to have a destination to be valid
* in the Drupal menu system, but too much information there might be
* hidden, so we supply the contents of the block.
*
@ -167,7 +167,7 @@ function system_themes_form() {
$options[$theme->name] = $theme->info['name'];
if (!empty($theme->status) || $theme->name == variable_get('admin_theme', 0)) {
$form[$theme->name]['operations'] = array('#markup' => l(t('configure'), 'admin/build/themes/settings/' . $theme->name) );
$form[$theme->name]['operations'] = array('#markup' => l(t('configure'), 'admin/structure/themes/settings/' . $theme->name) );
}
else {
// Dummy element for drupal_render. Cleaner than adding a check in the theme function.
@ -293,7 +293,7 @@ function system_themes_form_submit($form, &$form_state) {
menu_rebuild();
drupal_theme_rebuild();
drupal_set_message(t('The configuration options have been saved.'));
$form_state['redirect'] = 'admin/build/themes';
$form_state['redirect'] = 'admin/structure/themes';
// Notify locale module about new themes being enabled, so translations can
// be imported. This might start a batch, and only return to the redirect
@ -652,7 +652,7 @@ function system_modules($form_state = array()) {
'#type' => 'submit',
'#value' => t('Save configuration'),
);
$form['#action'] = url('admin/build/modules/list/confirm');
$form['#action'] = url('admin/structure/modules/list/confirm');
return $form;
}
@ -774,7 +774,7 @@ function system_modules_confirm_form($modules, $storage) {
$form = confirm_form(
$form,
t('Some required modules must be enabled'),
'admin/build/modules',
'admin/structure/modules',
t('Would you like to continue with enabling the above?'),
t('Continue'),
t('Cancel'));
@ -924,7 +924,7 @@ function system_modules_submit($form, &$form_state) {
drupal_clear_css_cache();
drupal_clear_js_cache();
$form_state['redirect'] = 'admin/build/modules';
$form_state['redirect'] = 'admin/structure/modules';
// Notify locale module about module changes, so translations can be
// imported. This might start a batch, and only return to the redirect
@ -990,7 +990,7 @@ function system_modules_uninstall($form_state = NULL) {
'#type' => 'submit',
'#value' => t('Uninstall'),
);
$form['#action'] = url('admin/build/modules/uninstall/confirm');
$form['#action'] = url('admin/structure/modules/uninstall/confirm');
}
else {
$form['modules'] = array();
@ -1031,7 +1031,7 @@ function system_modules_uninstall_confirm_form($storage) {
$form = confirm_form(
$form,
t('Confirm uninstall'),
'admin/build/modules/uninstall',
'admin/structure/modules/uninstall',
t('Would you like to continue with uninstalling the above?'),
t('Uninstall'),
t('Cancel'));
@ -1046,7 +1046,7 @@ function system_modules_uninstall_validate($form, &$form_state) {
// Form submitted, but no modules selected.
if (!count(array_filter($form_state['values']['uninstall']))) {
drupal_set_message(t('No modules selected.'), 'error');
drupal_goto('admin/build/modules/uninstall');
drupal_goto('admin/structure/modules/uninstall');
}
}
@ -1064,7 +1064,7 @@ function system_modules_uninstall_submit($form, &$form_state) {
drupal_set_message(t('The selected modules have been uninstalled.'));
unset($form_state['storage']);
$form_state['redirect'] = 'admin/build/modules/uninstall';
$form_state['redirect'] = 'admin/structure/modules/uninstall';
}
else {
$form_state['storage'] = $form_state['values'];

4
modules/system/system.css
View File

@ -505,14 +505,14 @@ html.js .js-hide {
}
/*
** Styles for the system modules page (admin/build/modules)
** Styles for the system modules page (admin/structure/modules)
*/
#system-modules div.incompatible {
font-weight: bold;
}
/*
** Styles for the system themes page (admin/build/themes)
** Styles for the system themes page (admin/structure/themes)
*/
#system-themes-form div.incompatible {
font-weight: bold;

10
modules/system/system.install
View File

@ -272,7 +272,7 @@ function system_requirements($phase) {
$requirements['update status'] = array(
'value' => $t('Not enabled'),
'severity' => REQUIREMENT_WARNING,
'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/build/modules'))),
'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/structure/modules'))),
);
}
else {
@ -2024,7 +2024,7 @@ function system_update_7021() {
// Add contact help block for themes, which had blocks.
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 5, 'help', 1, 'contact', -1)");
}
drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/build/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/structure/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
}
// Migrate user help setting.
@ -2034,7 +2034,7 @@ function system_update_7021() {
// Add user registration help block for themes, which had blocks.
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 5, 'help', 1, 'user/register', -1)");
}
drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/build/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/structure/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
}
// Migrate site mission setting.
@ -2044,7 +2044,7 @@ function system_update_7021() {
// Add mission block for themes, which had blocks.
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, visibility, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, 0, 'highlight', 1, '<front>', -1)");
}
drupal_set_message('The site mission was migrated to <a href="' . url('admin/build/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/build/block') . '">relocate the block</a>.');
drupal_set_message('The site mission was migrated to <a href="' . url('admin/structure/block/configure/block/' . $bid) . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
// Migrate mission to RSS site description.
variable_set('feed_description', $mission);
}
@ -2058,7 +2058,7 @@ function system_update_7021() {
// before the other blocks).
$ret[] = update_sql("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('block', '" . $bid . "', '" . $theme . "', 1, -10, 'footer', '', -1)");
}
drupal_set_message('The footer message was migrated to <a href="' . url('admin/build/block/configure/block/' . $bid) . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/build/block') . '">relocate the block</a>.');
drupal_set_message('The footer message was migrated to <a href="' . url('admin/structure/block/configure/block/' . $bid) . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
}
// Remove the variables (even if they were saved empty on the admin interface),

48
modules/system/system.module
View File

@ -92,8 +92,8 @@ function system_help($path, $arg) {
case 'admin/help#system':
$output = '<p>' . t('The system module is at the foundation of your Drupal website, and provides basic but extensible functionality for use by other modules and themes. Some integral elements of Drupal are contained in and managed by the system module, including caching, enabling or disabling of modules and themes, preparing and displaying the administrative page, and configuring fundamental site settings. A number of key system maintenance operations are also part of the system module.') . '</p>';
$output .= '<p>' . t('The system module provides:') . '</p>';
$output .= '<ul><li>' . t('support for enabling and disabling <a href="@modules">modules</a>. Drupal comes packaged with a number of core modules; each module provides a discrete set of features and may be enabled depending on the needs of your site. A wide array of additional modules contributed by members of the Drupal community are available for download at the <a href="@drupal-modules">Drupal.org module page</a>.', array('@modules' => url('admin/build/modules'), '@drupal-modules' => 'http://drupal.org/project/modules')) . '</li>';
$output .= '<li>' . t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/build/themes'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '</li>';
$output .= '<ul><li>' . t('support for enabling and disabling <a href="@modules">modules</a>. Drupal comes packaged with a number of core modules; each module provides a discrete set of features and may be enabled depending on the needs of your site. A wide array of additional modules contributed by members of the Drupal community are available for download at the <a href="@drupal-modules">Drupal.org module page</a>.', array('@modules' => url('admin/structure/modules'), '@drupal-modules' => 'http://drupal.org/project/modules')) . '</li>';
$output .= '<li>' . t('support for enabling and disabling <a href="@themes">themes</a>, which determine the design and presentation of your site. Drupal comes packaged with several core themes and additional contributed themes are available at the <a href="@drupal-themes">Drupal.org theme page</a>.', array('@themes' => url('admin/structure/themes'), '@drupal-themes' => 'http://drupal.org/project/themes')) . '</li>';
$output .= '<li>' . t('a robust <a href="@cache-settings">caching system</a> that allows the efficient re-use of previously-constructed web pages and web page components. Drupal stores the pages requested by anonymous users in a compressed format; depending on your site configuration and the amount of your web traffic tied to anonymous visitors, Drupal\'s caching system may significantly increase the speed of your site.', array('@cache-settings' => url('admin/settings/performance'))) . '</li>';
$output .= '<li>' . t('a set of routine administrative operations that rely on a correctly-configured <a href="@cron">cron maintenance task</a> to run automatically. A number of other modules, including the feed aggregator, and search also rely on <a href="@cron">cron maintenance tasks</a>. For more information, see the online handbook entry for <a href="@handbook">configuring cron jobs</a>.', array('@cron' => url('admin/reports/status'), '@handbook' => 'http://drupal.org/cron')) . '</li>';
$output .= '<li>' . t('basic configuration options for your site, including <a href="@regional-settings">date and time settings</a>, <a href="@file-system">file system settings</a>, <a href="@clean-url">clean URL support</a>, <a href="@site-info">site name and other information</a>, and a <a href="@maintenance-mode">maintenance mode</a> for taking your site temporarily offline.', array('@regional-settings' => url('admin/settings/regional-settings'), '@file-system' => url('admin/settings/file-system'), '@clean-url' => url('admin/settings/clean-urls'), '@site-info' => url('admin/settings/site-information'), '@maintenance-mode' => url('admin/settings/maintenance-mode'))) . '</li></ul>';
@ -101,24 +101,24 @@ function system_help($path, $arg) {
return $output;
case 'admin/by-module':
return '<p>' . t('This page shows you all available administration tasks for each module.') . '</p>';
case 'admin/build/themes':
case 'admin/structure/themes':
$output = '<p>' . t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for that theme. Note that different themes may have different regions available for displaying content; for consistency in presentation, you may wish to enable only one theme.') . '</p>';
$output .= '<p>' . t('To change the appearance of your site, a number of <a href="@themes">contributed themes</a> are available.', array('@themes' => 'http://drupal.org/project/themes')) . '</p>';
return $output;
case 'admin/build/themes/settings/' . $arg[4]:
case 'admin/structure/themes/settings/' . $arg[4]:
$reference = explode('.', $arg[4], 2);
$theme = array_pop($reference);
return '<p>' . t('These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="@global">global settings</a> for this theme.', array('%template' => $theme, '@global' => url('admin/build/themes/settings'))) . '</p>';
case 'admin/build/themes/settings':
return '<p>' . t('These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="@global">global settings</a> for this theme.', array('%template' => $theme, '@global' => url('admin/structure/themes/settings'))) . '</p>';
case 'admin/structure/themes/settings':
return '<p>' . t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') . '</p>';
case 'admin/build/modules':
case 'admin/structure/modules':
$output = '<p>' . t('Modules are plugins that extend Drupal\'s core functionality. To further extend your site\'s functionality, a number of <a href="@modules">contributed modules</a> are available for download.', array('@permissions' => url('admin/user/permissions'), '@modules' => 'http://drupal.org/project/modules')) . '</p>';
$output .= '<p>' . t('Module-related tasks can be located on the <a href="@by-module">administration by module page</a>. New <a href="@permissions">module-related permissions</a> may also become available as new modules are enabled.', array('@by-module' => url('admin/by-module'), '@permissions' => url('admin/user/permissions'))) . '</p>';
$output .= '<p>' . t('Each time a module is updated, it is important that <a href="@update-php">update.php</a> is run. To help manage the update process, the <em>Update status</em> module, if enabled, provides <a href="@updates">information on new versions of modules (and themes)</a> as they are released. Regular review of the <a href="@updates">available updates page</a> is essential to maintaining a secure and current site.', array('@update-php' => $base_url . '/update.php', '@updates' => url('admin/reports/updates'))) . '</p>';
return $output;
case 'admin/build/modules/uninstall':
return '<p>' . t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it on the main <a href="@modules">modules page</a>. Not all modules support this feature.', array('@modules' => url('admin/build/modules'))) . '</p>';
case 'admin/build/block/configure':
case 'admin/structure/modules/uninstall':
return '<p>' . t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it on the main <a href="@modules">modules page</a>. Not all modules support this feature.', array('@modules' => url('admin/structure/modules'))) . '</p>';
case 'admin/structure/block/configure':
if ($arg[4] == 'system' && $arg[5] == 'powered-by') {
return '<p>' . t('The <em>Powered by Drupal</em> block is an optional link to the home page of the Drupal project. While there is absolutely no requirement that sites feature this link, it may be used to show support for Drupal.') . '</p>';
}
@ -133,7 +133,7 @@ function system_help($path, $arg) {
$output = '<p>' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Modules, such as the trigger module, can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions.') . '</p>';
$output .= '<p>' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration, and are listed here automatically. Advanced actions can do more than simple actions; for example, send an e-mail to a specified address, or check for certain words within a piece of content. These actions need to be created and configured first before they may be used. To create an advanced action, select the action from the drop-down below and click the <em>Create</em> button.') . '</p>';
if (module_exists('trigger')) {
$output .= '<p>' . t('You may proceed to the <a href="@url">Triggers</a> page to assign these actions to system events.', array('@url' => url('admin/build/trigger'))) . '</p>';
$output .= '<p>' . t('You may proceed to the <a href="@url">Triggers</a> page to assign these actions to system events.', array('@url' => url('admin/structure/trigger'))) . '</p>';
}
return $output;
case 'admin/settings/actions/configure':
@ -538,44 +538,44 @@ function system_menu() {
'access callback' => 'system_admin_menu_block_access',
'access arguments' => array('admin/settings', 'access administration pages'),
);
$items['admin/build'] = array(
'title' => 'Site building',
$items['admin/structure'] = array(
'title' => 'Structure',
'description' => 'Control how your site looks and feels.',
'position' => 'right',
'weight' => -10,
'page callback' => 'system_admin_menu_block_page',
'access callback' => 'system_admin_menu_block_access',
'access arguments' => array('admin/build', 'access administration pages'),
'access arguments' => array('admin/structure', 'access administration pages'),
);
// Themes.
$items['admin/build/themes'] = array(
$items['admin/structure/themes'] = array(
'title' => 'Themes',
'description' => 'Change which theme your site uses or allows users to set.',
'page callback' => 'drupal_get_form',
'page arguments' => array('system_themes_form'),
'access arguments' => array('administer site configuration'),
);
$items['admin/build/themes/select'] = array(
$items['admin/structure/themes/select'] = array(
'title' => 'List',
'description' => 'Select the default theme for your site.',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -1,
);
$items['admin/build/themes/settings'] = array(
$items['admin/structure/themes/settings'] = array(
'title' => 'Configure',
'page arguments' => array('system_theme_settings'),
'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_TASK,
);
// Theme configuration subtabs.
$items['admin/build/themes/settings/global'] = array(
$items['admin/structure/themes/settings/global'] = array(
'title' => 'Global settings',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -1,
);
foreach (list_themes() as $theme) {
$items['admin/build/themes/settings/' . $theme->name] = array(
$items['admin/structure/themes/settings/' . $theme->name] = array(
'title' => $theme->info['name'],
'page arguments' => array('system_theme_settings', $theme->name),
'type' => MENU_LOCAL_TASK,
@ -585,29 +585,29 @@ function system_menu() {
}
// Modules.
$items['admin/build/modules'] = array(
$items['admin/structure/modules'] = array(
'title' => 'Modules',
'description' => 'Enable or disable add-on modules for your site.',
'page callback' => 'drupal_get_form',
'page arguments' => array('system_modules'),
'access arguments' => array('administer site configuration'),
);
$items['admin/build/modules/list'] = array(
$items['admin/structure/modules/list'] = array(
'title' => 'List',
'type' => MENU_DEFAULT_LOCAL_TASK,
);
$items['admin/build/modules/list/confirm'] = array(
$items['admin/structure/modules/list/confirm'] = array(
'title' => 'List',
'access arguments' => array('administer site configuration'),
'type' => MENU_CALLBACK,
);
$items['admin/build/modules/uninstall'] = array(
$items['admin/structure/modules/uninstall'] = array(
'title' => 'Uninstall',
'page arguments' => array('system_modules_uninstall'),
'access arguments' => array('administer site configuration'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/modules/uninstall/confirm'] = array(
$items['admin/structure/modules/uninstall/confirm'] = array(
'title' => 'Uninstall',
'access arguments' => array('administer site configuration'),
'type' => MENU_CALLBACK,

34
modules/system/system.test
View File

@ -114,7 +114,7 @@ class EnableDisableTestCase extends ModuleTestCase {
$edit = array();
$edit['modules[Core][aggregator][enable]'] = 'aggregator';
$edit['modules[Core][forum][enable]'] = 'forum';
$this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/modules', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
// Check that hook_modules_installed and hook_modules_enabled hooks were invoked and check tables.
@ -127,7 +127,7 @@ class EnableDisableTestCase extends ModuleTestCase {
// Disable aggregator, check tables, uninstall aggregator, check tables.
$edit = array();
$edit['modules[Core][aggregator][enable]'] = FALSE;
$this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/modules', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
// Check that hook_modules_disabled hook was invoked and check tables.
@ -139,7 +139,7 @@ class EnableDisableTestCase extends ModuleTestCase {
// Uninstall the module.
$edit = array();
$edit['uninstall[aggregator]'] = 'aggregator';
$this->drupalPost('admin/build/modules/uninstall', $edit, t('Uninstall'));
$this->drupalPost('admin/structure/modules/uninstall', $edit, t('Uninstall'));
$this->drupalPost(NULL, NULL, t('Uninstall'));
$this->assertText(t('The selected modules have been uninstalled.'), t('Modules status has been updated.'));
@ -153,7 +153,7 @@ class EnableDisableTestCase extends ModuleTestCase {
// Reinstall (and enable) aggregator module.
$edit = array();
$edit['modules[Core][aggregator][enable]'] = 'aggregator';
$this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/modules', $edit, t('Save configuration'));
$this->assertText(t('The configuration options have been saved.'), t('Modules status has been updated.'));
}
}
@ -177,7 +177,7 @@ class ModuleDependencyTestCase extends ModuleTestCase {
// Attempt to enable content translation without locale enabled.
$edit = array();
$edit['modules[Core][translation][enable]'] = 'translation';
$this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/modules', $edit, t('Save configuration'));
$this->assertText(t('Some required modules must be enabled'), t('Dependecy required.'));
$this->assertModules(array('translation', 'locale'), FALSE);
@ -214,7 +214,7 @@ class ModuleRequiredTestCase extends ModuleTestCase {
*/
function testDisableRequired() {
$required_modules = drupal_required_modules();
$this->drupalGet('admin/build/modules');
$this->drupalGet('admin/structure/modules');
foreach ($required_modules as $module) {
// Check to make sure the checkbox for required module is not found.
$this->assertNoFieldByName('modules[Core][' . $module . '][enable]');
@ -410,7 +410,7 @@ class AdminOverviewTestCase extends DrupalWebTestCase {
$permissions = array();
$permissions[] = 'access administration pages';
$permissions[] = 'administer nodes'; // Content management, Comment.
$permissions[] = 'administer blocks'; // Site building, Block.
$permissions[] = 'administer blocks'; // Structure, Block.
$permissions[] = 'administer filters'; // Site configuration, Filter.
$permissions[] = 'administer users'; // User management, User.
$permissions[] = 'access site reports'; // Reports, Database logging.
@ -418,7 +418,7 @@ class AdminOverviewTestCase extends DrupalWebTestCase {
$this->drupalLogin($admin_user2);
$this->drupalGet('admin');
$this->checkOverview(array(t('Content management'), t('User management'), t('Reports'), t('Site building'), t('Site configuration')));
$this->checkOverview(array(t('Content management'), t('User management'), t('Reports'), t('Structure'), t('Site configuration')));
$this->drupalGet('admin/by-module');
$this->checkOverview(array(t('Node'), t('Block'), t('Filter'), t('User'), t('Database logging')));
@ -457,7 +457,7 @@ class AdminOverviewTestCase extends DrupalWebTestCase {
// Make sure menu items without children are hidden.
$this->assertNoLink(t('Site configuration'));
$this->assertNoLink(t('Site building'));
$this->assertNoLink(t('Structure'));
$this->assertNoLink(t('User management'));
$this->assertNoLink(t('Reports'));
}
@ -796,13 +796,13 @@ class SystemBlockTestCase extends DrupalWebTestCase {
*/
function testPoweredByBlock() {
// Set block title and some settings to confirm that the interface is availble.
$this->drupalPost('admin/build/block/configure/system/powered-by', array('title' => $this->randomName(8), 'color' => 'powered-black', 'size' => '135x42'), t('Save block'));
$this->drupalPost('admin/structure/block/configure/system/powered-by', array('title' => $this->randomName(8), 'color' => 'powered-black', 'size' => '135x42'), t('Save block'));
$this->assertText(t('The block configuration has been saved.'), t('Block configuration set.'));
// Set the powered-by block to the footer region.
$edit = array();
$edit['system_powered-by[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.'));
// Confirm that the block is being displayed.
@ -811,7 +811,7 @@ class SystemBlockTestCase extends DrupalWebTestCase {
// Set the block to the disabled region.
$edit = array();
$edit['system_powered-by[region]'] = '-1';
$this->drupalPost('admin/build/block', $edit, t('Save blocks'));
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
// Confirm that the block is hidden.
$this->assertNoRaw('id="block-system-powered-by"', t('Block no longer appears on page.'));
@ -819,8 +819,8 @@ class SystemBlockTestCase extends DrupalWebTestCase {
// For convenience of developers, set the block to it's default settings.
$edit = array();
$edit['system_powered-by[region]'] = 'footer';
$this->drupalPost('admin/build/block', $edit, t('Save blocks'));
$this->drupalPost('admin/build/block/configure/system/powered-by', array('title' => '', 'color' => 'powered-blue', 'size' => '80x15'), t('Save block'));
$this->drupalPost('admin/structure/block', $edit, t('Save blocks'));
$this->drupalPost('admin/structure/block/configure/system/powered-by', array('title' => '', 'color' => 'powered-blue', 'size' => '80x15'), t('Save block'));
}
}
@ -934,7 +934,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
'admin_theme' => 'garland',
'node_admin_theme' => TRUE,
);
$this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/themes', $edit, t('Save configuration'));
$this->drupalGet('admin');
$this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
@ -952,7 +952,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
$edit = array(
'node_admin_theme' => FALSE,
);
$this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/themes', $edit, t('Save configuration'));
$this->drupalGet('admin');
$this->assertRaw('themes/garland', t('Administration theme used on an administration page.'));
@ -966,7 +966,7 @@ class SystemThemeFunctionalTest extends DrupalWebTestCase {
'admin_theme' => '0',
'node_admin_theme' => FALSE,
);
$this->drupalPost('admin/build/themes', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/themes', $edit, t('Save configuration'));
$this->drupalGet('admin');
$this->assertRaw('themes/garland', t('Site default theme used on administration page.'));

30
modules/taxonomy/taxonomy.admin.inc
View File

@ -26,9 +26,9 @@ function taxonomy_overview_vocabularies() {
$form[$vocabulary->vid]['name'] = array('#markup' => check_plain($vocabulary->name));
$form[$vocabulary->vid]['types'] = array('#markup' => implode(', ', $types));
$form[$vocabulary->vid]['weight'] = array('#type' => 'weight', '#delta' => 10, '#default_value' => $vocabulary->weight);
$form[$vocabulary->vid]['edit'] = array('#markup' => l(t('edit vocabulary'), "admin/build/taxonomy/$vocabulary->vid"));
$form[$vocabulary->vid]['list'] = array('#markup' => l(t('list terms'), "admin/build/taxonomy/$vocabulary->vid/list"));
$form[$vocabulary->vid]['add'] = array('#markup' => l(t('add terms'), "admin/build/taxonomy/$vocabulary->vid/add"));
$form[$vocabulary->vid]['edit'] = array('#markup' => l(t('edit vocabulary'), "admin/structure/taxonomy/$vocabulary->vid"));
$form[$vocabulary->vid]['list'] = array('#markup' => l(t('list terms'), "admin/structure/taxonomy/$vocabulary->vid/list"));
$form[$vocabulary->vid]['add'] = array('#markup' => l(t('add terms'), "admin/structure/taxonomy/$vocabulary->vid/add"));
}
// Only make this form include a submit button and weight if more than one
@ -84,7 +84,7 @@ function theme_taxonomy_overview_vocabularies($form) {
}
if (empty($rows)) {
$rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a>.', array('@link' => url('admin/build/taxonomy/add'))), 'colspan' => '5'));
$rows[] = array(array('data' => t('No vocabularies available. <a href="@link">Add vocabulary</a>.', array('@link' => url('admin/structure/taxonomy/add'))), 'colspan' => '5'));
}
$header = array(t('Vocabulary name'), t('Content types'));
@ -246,16 +246,16 @@ function taxonomy_form_vocabulary_submit($form, &$form_state) {
switch (taxonomy_vocabulary_save($vocabulary)) {
case SAVED_NEW:
drupal_set_message(t('Created new vocabulary %name.', array('%name' => $vocabulary->name)));
watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/build/taxonomy/' . $vocabulary->vid));
watchdog('taxonomy', 'Created new vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid));
break;
case SAVED_UPDATED:
drupal_set_message(t('Updated vocabulary %name.', array('%name' => $vocabulary->name)));
watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/build/taxonomy/' . $vocabulary->vid));
watchdog('taxonomy', 'Updated vocabulary %name.', array('%name' => $vocabulary->name), WATCHDOG_NOTICE, l(t('edit'), 'admin/structure/taxonomy/' . $vocabulary->vid));
break;
}
$form_state['vid'] = $vocabulary->vid;
$form_state['redirect'] = 'admin/build/taxonomy';
$form_state['redirect'] = 'admin/structure/taxonomy';
return;
}
@ -451,7 +451,7 @@ function taxonomy_overview_terms(&$form_state, $vocabulary) {
$form['#page_entries'] = $page_entries;
$form['#back_peddle'] = $back_peddle;
$form['#forward_peddle'] = $forward_peddle;
$form['#empty_text'] = t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/build/taxonomy/' . $vocabulary->vid . '/add')));
$form['#empty_text'] = t('No terms available. <a href="@link">Add term</a>.', array('@link' => url('admin/structure/taxonomy/' . $vocabulary->vid . '/add')));
if (!$vocabulary->tags && $vocabulary->hierarchy < 2 && count($tree) > 1) {
$form['submit'] = array(
@ -855,7 +855,7 @@ function taxonomy_form_term_submit($form, &$form_state) {
}
$form_state['tid'] = $term->tid;
$form_state['redirect'] = 'admin/build/taxonomy';
$form_state['redirect'] = 'admin/structure/taxonomy';
return;
}
@ -909,7 +909,7 @@ function taxonomy_term_confirm_delete(&$form_state, $tid) {
return confirm_form($form,
t('Are you sure you want to delete the term %title?',
array('%title' => $term->name)),
'admin/build/taxonomy',
'admin/structure/taxonomy',
t('Deleting a term will delete all its children if there are any. This action cannot be undone.'),
t('Delete'),
t('Cancel'));
@ -925,7 +925,7 @@ function taxonomy_term_confirm_delete_submit($form, &$form_state) {
taxonomy_check_vocabulary_hierarchy($form['#vocabulary'], $form_state['values']);
drupal_set_message(t('Deleted term %name.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Deleted term %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/build/taxonomy';
$form_state['redirect'] = 'admin/structure/taxonomy';
return;
}
@ -946,7 +946,7 @@ function taxonomy_vocabulary_confirm_delete(&$form_state, $vid) {
return confirm_form($form,
t('Are you sure you want to delete the vocabulary %title?',
array('%title' => $vocabulary->name)),
'admin/build/taxonomy',
'admin/structure/taxonomy',
t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'),
t('Delete'),
t('Cancel'));
@ -961,7 +961,7 @@ function taxonomy_vocabulary_confirm_delete_submit($form, &$form_state) {
$status = taxonomy_vocabulary_delete($form_state['values']['vid']);
drupal_set_message(t('Deleted vocabulary %name.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Deleted vocabulary %name.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/build/taxonomy';
$form_state['redirect'] = 'admin/structure/taxonomy';
return;
}
@ -981,7 +981,7 @@ function taxonomy_vocabulary_confirm_reset_alphabetical(&$form_state, $vid) {
return confirm_form($form,
t('Are you sure you want to reset the vocabulary %title to alphabetical order?',
array('%title' => $vocabulary->name)),
'admin/build/taxonomy/' . $vid,
'admin/structure/taxonomy/' . $vid,
t('Resetting a vocabulary will discard all custom ordering and sort items alphabetically.'),
t('Reset to alphabetical'),
t('Cancel'));
@ -999,5 +999,5 @@ function taxonomy_vocabulary_confirm_reset_alphabetical_submit($form, &$form_sta
->execute();
drupal_set_message(t('Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name'])));
watchdog('taxonomy', 'Reset vocabulary %name to alphabetical order.', array('%name' => $form_state['values']['name']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/build/taxonomy/' . $form_state['values']['vid'];
$form_state['redirect'] = 'admin/structure/taxonomy/' . $form_state['values']['vid'];
}

24
modules/taxonomy/taxonomy.module
View File

@ -39,8 +39,8 @@ function taxonomy_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'),
),
@ -162,7 +162,7 @@ function taxonomy_term_path($term) {
* Implement hook_menu().
*/
function taxonomy_menu() {
$items['admin/build/taxonomy'] = array(
$items['admin/structure/taxonomy'] = array(
'title' => 'Taxonomy',
'description' => 'Manage tagging, categorization, and classification of your content.',
'page callback' => 'drupal_get_form',
@ -170,13 +170,13 @@ function taxonomy_menu() {
'access arguments' => array('administer taxonomy'),
);
$items['admin/build/taxonomy/list'] = array(
$items['admin/structure/taxonomy/list'] = array(
'title' => 'List',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
$items['admin/build/taxonomy/add'] = array(
$items['admin/structure/taxonomy/add'] = array(
'title' => 'Add vocabulary',
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_form_vocabulary'),
@ -223,7 +223,7 @@ function taxonomy_menu() {
'type' => MENU_CALLBACK,
);
$items['admin/build/taxonomy/%taxonomy_vocabulary'] = array(
$items['admin/structure/taxonomy/%taxonomy_vocabulary'] = array(
'title' => 'Vocabulary', // this is replaced by callback
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_form_vocabulary', 3),
@ -233,13 +233,13 @@ function taxonomy_menu() {
'type' => MENU_CALLBACK,
);
$items['admin/build/taxonomy/%taxonomy_vocabulary/edit'] = array(
$items['admin/structure/taxonomy/%taxonomy_vocabulary/edit'] = array(
'title' => 'Edit vocabulary',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -20,
);
$items['admin/build/taxonomy/%taxonomy_vocabulary/list'] = array(
$items['admin/structure/taxonomy/%taxonomy_vocabulary/list'] = array(
'title' => 'List terms',
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_overview_terms', 3),
@ -248,7 +248,7 @@ function taxonomy_menu() {
'weight' => -10,
);
$items['admin/build/taxonomy/%taxonomy_vocabulary/add'] = array(
$items['admin/structure/taxonomy/%taxonomy_vocabulary/add'] = array(
'title' => 'Add term',
'page callback' => 'drupal_get_form',
'page arguments' => array('taxonomy_form_term', 3),
@ -1761,11 +1761,11 @@ function taxonomy_help($path, $arg) {
$output .= '<p>' . t('The taxonomy module supports the use of both synonyms and related terms, but does not directly use this functionality. However, optional contributed or custom modules may make full use of these advanced features.') . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@taxonomy">Taxonomy module</a>.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) . '</p>';
return $output;
case 'admin/build/taxonomy':
case 'admin/structure/taxonomy':
$output = '<p>' . t("The taxonomy module allows you to categorize your content using both tags and administrator defined terms. It is a flexible tool for classifying content with many advanced features. To begin, create a 'Vocabulary' to hold one set of terms or tags. You can create one free-tagging vocabulary for everything, or separate controlled vocabularies to define the various properties of your content, for example 'Countries' or 'Colors'.") . '</p>';
$output .= '<p>' . t('Use the list below to configure and review the vocabularies defined on your site, or to list and manage the terms (tags) they contain. A vocabulary may (optionally) be tied to specific content types as shown in the <em>Type</em> column and, if so, will be displayed when creating or editing posts of that type. Multiple vocabularies tied to the same content type will be displayed in the order shown below. To change the order of a vocabulary, grab a drag-and-drop handle under the <em>Name</em> column and drag it to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save</em> button at the bottom of the page.') . '</p>';
return $output;
case 'admin/build/taxonomy/%/list':
case 'admin/structure/taxonomy/%/list':
$vocabulary = taxonomy_vocabulary_load($arg[3]);
if ($vocabulary->tags) {
return '<p>' . t('%capital_name is a free-tagging vocabulary. To change the name or description of a term, click the <em>edit</em> link next to the term.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '</p>';
@ -1778,7 +1778,7 @@ function taxonomy_help($path, $arg) {
case 2:
return '<p>' . t('%capital_name is a multiple hierarchy vocabulary. To change the name or description of a term, click the <em>edit</em> link next to the term. Drag and drop of multiple hierarchies is not supported, but you can re-enable drag and drop support by editing each term to include only a single parent.', array('%capital_name' => drupal_ucfirst($vocabulary->name))) . '</p>';
}
case 'admin/build/taxonomy/add':
case 'admin/structure/taxonomy/add':
return '<p>' . t('Define how your vocabulary will be presented to administrators and users, and which content types to categorize with it. Tags allows users to create terms when submitting posts by typing a comma separated list. Otherwise terms are chosen from a select list and can only be created by users with the "administer taxonomy" permission.') . '</p>';
}
}

24
modules/taxonomy/taxonomy.test
View File

@ -64,7 +64,7 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
*/
function testVocabularyInterface() {
// Visit the main taxonomy administration page.
$this->drupalGet('admin/build/taxonomy');
$this->drupalGet('admin/structure/taxonomy');
// Create a new vocabulary.
$this->clickLink(t('Add vocabulary'));
@ -82,23 +82,23 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
$this->assertRaw(t('Created new vocabulary %name.', array('%name' => $edit['name'])), t('Vocabulary created successfully'));
// Edit the vocabulary.
$this->drupalGet('admin/build/taxonomy');
$this->drupalGet('admin/structure/taxonomy');
$this->assertText($edit['name'], t('Vocabulary found in the vocabulary overview listing.'));
$this->clickLink(t('edit vocabulary'));
$edit = array();
$edit['name'] = $this->randomName();
$this->drupalPost(NULL, $edit, t('Save'));
$this->drupalGet('admin/build/taxonomy');
$this->drupalGet('admin/structure/taxonomy');
$this->assertText($edit['name'], t('Vocabulary found in the vocabulary overview listing.'));
// Try to submit a vocabulary with a duplicate machine name.
$edit['machine_name'] = $machine_name;
$this->drupalPost('admin/build/taxonomy/add', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$this->assertText(t('This machine-readable name is already in use by another vocabulary and must be unique.'), t('Duplicate machine name validation was successful'));
// Try to submit an invalid machine name.
$edit['machine_name'] = '!&^%';
$this->drupalPost('admin/build/taxonomy/add', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$this->assertText(t('The machine-readable name must contain only lowercase letters, numbers, and underscores.'));
}
@ -119,7 +119,7 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
$edit[$key . '[weight]'] = $vocabulary->weight;
}
// Saving the new weights via the interface.
$this->drupalPost('admin/build/taxonomy/', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/', $edit, t('Save'));
// Load the vocabularies from the database.
$new_vocabularies = taxonomy_get_vocabularies();
@ -141,7 +141,7 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
}
// Confirm that no vocabularies are found in the database.
$this->assertFalse(taxonomy_get_vocabularies(), t('No vocabularies found in the database'));
$this->drupalGet('admin/build/taxonomy');
$this->drupalGet('admin/structure/taxonomy');
// Check the default message for no vocabularies.
$this->assertText(t('No vocabularies available.'), t('No vocabularies were found.'));
}
@ -156,7 +156,7 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
'machine_name' => drupal_strtolower($this->randomName()),
'nodes[article]' => 'article',
);
$this->drupalPost('admin/build/taxonomy/add', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/add', $edit, t('Save'));
$this->assertText(t('Created new vocabulary'), t('New vocabulary was created.'));
// Check the created vocabulary.
@ -168,7 +168,7 @@ class TaxonomyVocabularyFunctionalTest extends TaxonomyWebTestCase {
// Delete the vocabulary.
$edit = array();
$this->drupalPost('admin/build/taxonomy/' . $vid, $edit, t('Delete'));
$this->drupalPost('admin/structure/taxonomy/' . $vid, $edit, t('Delete'));
$this->assertRaw(t('Are you sure you want to delete the vocabulary %name?', array('%name' => $vocabulary->name)), t('[confirm deletion] Asks for confirmation.'));
$this->assertText(t('Deleting a vocabulary will delete all the terms in it. This action cannot be undone.'), t('[confirm deletion] Inform that all terms will be deleted.'));
@ -540,13 +540,13 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$edit['parent[]'] = 0;
// Create the term to edit.
$this->drupalPost('admin/build/taxonomy/' . $this->vocabulary->vid . '/add', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/' . $this->vocabulary->vid . '/add', $edit, t('Save'));
$term = reset(taxonomy_get_term_by_name($edit['name']));
$this->assertNotNull($term, t('Term found in database'));
// Submitting a term takes us to the add page; we need the List page.
$this->drupalGet('admin/build/taxonomy/' . $this->vocabulary->vid . '/list');
$this->drupalGet('admin/structure/taxonomy/' . $this->vocabulary->vid . '/list');
// Test edit link as accessed from Taxonomy administration pages.
// Because Simpletest creates its own database when running tests, we know
@ -707,7 +707,7 @@ class TaxonomyHooksTestCase extends TaxonomyWebTestCase {
'name' => $this->randomName(),
'antonyms' => 'Long',
);
$this->drupalPost('admin/build/taxonomy/' . $vocabulary->vid . '/add', $edit, t('Save'));
$this->drupalPost('admin/structure/taxonomy/' . $vocabulary->vid . '/add', $edit, t('Save'));
$term = reset(taxonomy_get_term_by_name($edit['name']));
$this->assertEqual($term->antonyms[0], $edit['antonyms'], t('Antonyms were loaded into the term object'));

4
modules/translation/translation.module
View File

@ -35,13 +35,13 @@ function translation_help($path, $arg) {
$output .= '<p>' . t('Configuring content translation and translation-enabled content types:') . '</p>';
$output .= '<ul><li>' . t('Assign the <em>translate content</em> permission to the appropriate user roles at the <a href="@permissions">Permissions configuration page</a>.', array('@permissions' => url('admin/user/permissions'))) . '</li>';
$output .= '<li>' . t('Add and enable desired languages at the <a href="@languages">Languages configuration page</a>.', array('@languages' => url('admin/settings/language'))) . '</li>';
$output .= '<li>' . t('Determine which <a href="@content-types">content types</a> should support translation features. To enable translation support for a content type, edit the type and at the <em>Multilingual support</em> drop down, select <em>Enabled, with translation</em>. (<em>Multilingual support</em> is located within <em>Publishing options</em>.) Be sure to save each content type after enabling multilingual support.', array('@content-types' => url('admin/build/types'))) . '</li></ul>';
$output .= '<li>' . t('Determine which <a href="@content-types">content types</a> should support translation features. To enable translation support for a content type, edit the type and at the <em>Multilingual support</em> drop down, select <em>Enabled, with translation</em>. (<em>Multilingual support</em> is located within <em>Publishing options</em>.) Be sure to save each content type after enabling multilingual support.', array('@content-types' => url('admin/structure/types'))) . '</li></ul>';
$output .= '<p>' . t('Working with translation-enabled content types:') . '</p>';
$output .= '<ul><li>' . t('Use the <em>Language</em> drop down to select the appropriate language when creating or editing posts.') . '</li>';
$output .= '<li>' . t('Provide new or edit current translations for existing posts via the <em>Translation</em> tab. Only visible while viewing a post as a user with the <em>translate content</em> permission, this tab allows translations to be added or edited using a specialized editing form that also displays the content being translated.') . '</li>';
$output .= '<li>' . t('Update translations as needed, so that they accurately reflect changes in the content of the original post. The translation status flag provides a simple method for tracking outdated translations. After editing a post, for example, select the <em>Flag translations as outdated</em> check box to mark all of its translations as outdated and in need of revision. Individual translations may be marked for revision by selecting the <em>This translation needs to be updated</em> check box on the translation editing form.') . '</li>';
$output .= '<li>' . t('The <a href="@content-node">Content management administration page</a> displays the language of each post, and also allows filtering by language or translation status.', array('@content-node' => url('admin/content/node'))) . '</li></ul>';
$output .= '<p>' . t('Use the <a href="@blocks">language switcher block</a> provided by locale module to allow users to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/build/block'))) . '</p>';
$output .= '<p>' . t('Use the <a href="@blocks">language switcher block</a> provided by locale module to allow users to select a language. If available, both the site interface and site content are presented in the language selected.', array('@blocks' => url('admin/structure/block'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@translation">Translation module</a>.', array('@translation' => 'http://drupal.org/handbook/modules/translation/')) . '</p>';
return $output;
case 'node/%/translate':

4
modules/translation/translation.test
View File

@ -31,10 +31,10 @@ class TranslationTestCase extends DrupalWebTestCase {
$this->addLanguage('es');
// Set page content type to use multilingual support with translation.
$this->drupalGet('admin/build/node-type/page');
$this->drupalGet('admin/structure/node-type/page');
$edit = array();
$edit['language_content_type'] = 2;
$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();

12
modules/trigger/trigger.admin.inc
View File

@ -18,7 +18,7 @@ function trigger_assign($type = NULL) {
// If no type is specified we default to node actions, since they
// are the most common.
if (!isset($type)) {
drupal_goto('admin/build/trigger/node');
drupal_goto('admin/structure/trigger/node');
}
$build = array();
@ -46,7 +46,7 @@ function trigger_assign($type = NULL) {
*/
function trigger_unassign($form_state, $hook = NULL, $op = NULL, $aid = NULL) {
if (!($hook && $op && $aid)) {
drupal_goto('admin/build/trigger/assign');
drupal_goto('admin/structure/trigger/assign');
}
$form['hook'] = array(
@ -65,7 +65,7 @@ function trigger_unassign($form_state, $hook = NULL, $op = NULL, $aid = NULL) {
$action = actions_function_lookup($aid);
$actions = actions_get_all_actions();
$destination = 'admin/build/trigger/' . ($hook == 'node' ? 'node' : $hook);
$destination = 'admin/structure/trigger/' . ($hook == 'node' ? 'node' : $hook);
return confirm_form($form,
t('Are you sure you want to unassign the action %title?', array('%title' => $actions[$action]['description'])),
@ -88,10 +88,10 @@ function trigger_unassign_submit($form, &$form_state) {
watchdog('actions', 'Action %action has been unassigned.', array('%action' => check_plain($actions[$aid]['description'])));
drupal_set_message(t('Action %action has been unassigned.', array('%action' => $actions[$aid]['description'])));
$hook = $form_values['hook'] == 'node' ? 'node' : $form_values['hook'];
$form_state['redirect'] = 'admin/build/trigger/' . $hook;
$form_state['redirect'] = 'admin/structure/trigger/' . $hook;
}
else {
drupal_goto('admin/build/trigger');
drupal_goto('admin/structure/trigger');
}
}
@ -152,7 +152,7 @@ function trigger_assign_form($form_state, $hook, $op, $description) {
foreach ($actions as $aid => $description) {
$form[$op]['assigned']['#value'][$aid] = array(
'description' => $description,
'link' => l(t('unassign'), "admin/build/trigger/unassign/$hook/$op/" . md5($aid))
'link' => l(t('unassign'), "admin/structure/trigger/unassign/$hook/$op/" . md5($aid))
);
}

26
modules/trigger/trigger.module
View File

@ -13,15 +13,15 @@
function trigger_help($path, $arg) {
$explanation = '<p>' . t('Triggers are system events, such as when new content is added or when a user logs in. Trigger module combines these triggers with actions (functional tasks), such as unpublishing content or e-mailing an administrator. The <a href="@url">Actions settings page</a> contains a list of existing actions and provides the ability to create and configure additional actions.', array('@url' => url('admin/settings/actions'))) . '</p>';
switch ($path) {
case 'admin/build/trigger/comment':
case 'admin/structure/trigger/comment':
return $explanation . '<p>' . t('Below you can assign actions to run when certain comment-related triggers happen. For example, you could promote a post to the front page when a comment is added.') . '</p>';
case 'admin/build/trigger/node':
case 'admin/structure/trigger/node':
return $explanation . '<p>' . t('Below you can assign actions to run when certain content-related triggers happen. For example, you could send an e-mail to an administrator when a post is created or updated.') . '</p>';
case 'admin/build/trigger/cron':
case 'admin/structure/trigger/cron':
return $explanation . '<p>' . t('Below you can assign actions to run during each pass of a <a href="@cron">cron maintenance task</a>.', array('@cron' => url('admin/reports/status'))) . '</p>';
case 'admin/build/trigger/taxonomy':
case 'admin/structure/trigger/taxonomy':
return $explanation . '<p>' . t('Below you can assign actions to run when certain taxonomy-related triggers happen. For example, you could send an e-mail to an administrator when a term is deleted.') . '</p>';
case 'admin/build/trigger/user':
case 'admin/structure/trigger/user':
return $explanation . '<p>' . t("Below you can assign actions to run when certain user-related triggers happen. For example, you could send an e-mail to an administrator when a user account is deleted.") . '</p>';
case 'admin/help#trigger':
$output = '<p>' . t('The Trigger module provides the ability to trigger <a href="@actions">actions</a> upon system events, such as when new content is added or when a user logs in.', array('@actions' => url('admin/settings/actions'))) . '</p>';
@ -35,7 +35,7 @@ function trigger_help($path, $arg) {
* Implement hook_menu().
*/
function trigger_menu() {
$items['admin/build/trigger'] = array(
$items['admin/structure/trigger'] = array(
'title' => 'Triggers',
'description' => 'Tell Drupal when to execute actions.',
'page callback' => 'trigger_assign',
@ -44,7 +44,7 @@ function trigger_menu() {
);
// We don't use a menu wildcard here because these are tabs,
// not invisible items.
$items['admin/build/trigger/node'] = array(
$items['admin/structure/trigger/node'] = array(
'title' => 'Content',
'page callback' => 'trigger_assign',
'page arguments' => array('node'),
@ -52,7 +52,7 @@ function trigger_menu() {
'access arguments' => array('node'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/trigger/user'] = array(
$items['admin/structure/trigger/user'] = array(
'title' => 'Users',
'page callback' => 'trigger_assign',
'page arguments' => array('user'),
@ -60,7 +60,7 @@ function trigger_menu() {
'access arguments' => array('user'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/trigger/comment'] = array(
$items['admin/structure/trigger/comment'] = array(
'title' => 'Comments',
'page callback' => 'trigger_assign',
'page arguments' => array('comment'),
@ -68,7 +68,7 @@ function trigger_menu() {
'access arguments' => array('comment'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/trigger/taxonomy'] = array(
$items['admin/structure/trigger/taxonomy'] = array(
'title' => 'Taxonomy',
'page callback' => 'trigger_assign',
'page arguments' => array('taxonomy'),
@ -76,7 +76,7 @@ function trigger_menu() {
'access arguments' => array('taxonomy'),
'type' => MENU_LOCAL_TASK,
);
$items['admin/build/trigger/cron'] = array(
$items['admin/structure/trigger/cron'] = array(
'title' => 'Cron',
'page callback' => 'trigger_assign',
'page arguments' => array('cron'),
@ -98,7 +98,7 @@ function trigger_menu() {
->fetchField();
$info = unserialize($info);
$nice_name = $info['name'];
$items["admin/build/trigger/$module"] = array(
$items["admin/structure/trigger/$module"] = array(
'title' => $nice_name,
'page callback' => 'trigger_assign',
'page arguments' => array($module),
@ -106,7 +106,7 @@ function trigger_menu() {
'type' => MENU_LOCAL_TASK,
);
}
$items['admin/build/trigger/unassign'] = array(
$items['admin/structure/trigger/unassign'] = array(
'title' => 'Unassign',
'description' => 'Unassign an action from a trigger.',
'page callback' => 'drupal_get_form',

14
modules/trigger/trigger.test
View File

@ -32,7 +32,7 @@ class TriggerContentTestCase extends DrupalWebTestCase {
$test_user = $this->drupalCreateUser(array('administer actions'));
$this->drupalLogin($test_user);
$edit = array('aid' => $hash);
$this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/node', $edit, t('Assign'));
// Create an unpublished node.
$web_user = $this->drupalCreateUser(array('create page content', 'access content', 'administer nodes'));
$this->drupalLogin($web_user);
@ -52,13 +52,13 @@ class TriggerContentTestCase extends DrupalWebTestCase {
$test_user = $this->drupalCreateUser(array('administer actions'));
$this->drupalLogin($test_user);
$edit = array('aid' => $hash);
$this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/node', $edit, t('Assign'));
$edit = array('aid' => $hash);
$this->drupalPost('admin/build/trigger/node', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/node', $edit, t('Assign'));
$this->assertRaw(t('The action you chose is already assigned to that trigger.'), t('Check to make sure an error occurs when assigning an action to a trigger twice.'));
// Test 3: The action should be able to be unassigned from a trigger.
$this->drupalPost('admin/build/trigger/unassign/node/presave/' . $hash, array(), t('Unassign'));
$this->drupalPost('admin/structure/trigger/unassign/node/presave/' . $hash, array(), t('Unassign'));
$this->assertRaw(t('Action %action has been unassigned.', array('%action' => ucfirst($info['name']))), t('Check to make sure the @action action can be unassigned from the trigger.', array('@action' => $info['name'])));
$assigned = db_result(db_query("SELECT COUNT(*) FROM {trigger_assignments} WHERE aid IN ('" . implode("','", $content_actions) . "')"));
$this->assertFalse($assigned, t('Check to make sure unassign worked properly at the database level.'));
@ -140,7 +140,7 @@ class TriggerCronTestCase extends DrupalWebTestCase {
// Assign a non-configurable action to the cron run trigger.
$edit = array('aid' => md5('trigger_test_system_cron_action'));
$this->drupalPost('admin/build/trigger/cron', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/cron', $edit, t('Assign'));
// Assign a configurable action to the cron trigger.
$hash = md5('trigger_test_system_cron_conf_action');
@ -151,7 +151,7 @@ class TriggerCronTestCase extends DrupalWebTestCase {
);
$this->drupalPost('admin/settings/actions/configure/' . $hash, $edit, t('Save'));
$edit = array('aid' => md5('1'));
$this->drupalPost('admin/build/trigger/cron', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/cron', $edit, t('Assign'));
// Add a second configurable action to the cron trigger.
$action_description = $this->randomName();
@ -161,7 +161,7 @@ class TriggerCronTestCase extends DrupalWebTestCase {
);
$this->drupalPost('admin/settings/actions/configure/' . $hash, $edit, t('Save'));
$edit = array('aid' => md5('2'));
$this->drupalPost('admin/build/trigger/cron', $edit, t('Assign'));
$this->drupalPost('admin/structure/trigger/cron', $edit, t('Assign'));
// Force a cron run.
drupal_cron_run();

2
modules/update/update.compare.inc
View File

@ -616,7 +616,7 @@ function update_project_cache($cid) {
// On certain paths, we should clear the cache and recompute the projects or
// update status of the site to avoid presenting stale information.
$q = $_GET['q'];
$paths = array('admin/build/modules', 'admin/build/themes', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check');
$paths = array('admin/structure/modules', 'admin/structure/themes', 'admin/reports', 'admin/reports/updates', 'admin/reports/status', 'admin/reports/updates/check');
if (in_array($q, $paths)) {
_update_cache_clear($cid);
}

6
modules/update/update.module
View File

@ -72,8 +72,8 @@ function update_help($path, $arg) {
$output .= '<p>' . t('To extend the functionality or to change the look of your site, a number of contributed <a href="@modules">modules</a> and <a href="@themes">themes</a> are available.', array('@modules' => 'http://drupal.org/project/modules', '@themes' => 'http://drupal.org/project/themes')) . '</p>';
$output .= '<p>' . t('Each time Drupal core or a contributed module or theme is updated, it is important that <a href="@update-php">update.php</a> is run.', array('@update-php' => url($base_url . '/update.php', array('external' => TRUE)))) . '</p>';
return $output;
case 'admin/build/themes':
case 'admin/build/modules':
case 'admin/structure/themes':
case 'admin/structure/modules':
include_once DRUPAL_ROOT . '/includes/install.inc';
$status = update_requirements('runtime');
foreach (array('core', 'contrib') as $report_type) {
@ -96,7 +96,7 @@ function update_help($path, $arg) {
case 'admin/help#update':
$output = '<p>' . t("The Update status module periodically checks for new versions of your site's software (including contributed modules and themes), and alerts you to available updates.") . '</p>';
$output .= '<p>' . t('The <a href="@update-report">report of available updates</a> will alert you when new releases are available for download. You may configure options for update checking frequency and notifications at the <a href="@update-settings">Update status module settings page</a>.', array('@update-report' => url('admin/reports/updates'), '@update-settings' => url('admin/settings/updates'))) . '</p>';
$output .= '<p>' . t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. If desired, you may disable the Update status module from the <a href="@modules">module administration page</a>.', array('@modules' => url('admin/build/modules'))) . '</p>';
$output .= '<p>' . t('Please note that in order to provide this information, anonymous usage statistics are sent to drupal.org. If desired, you may disable the Update status module from the <a href="@modules">module administration page</a>.', array('@modules' => url('admin/structure/modules'))) . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@update">Update status module</a>.', array('@update' => 'http://drupal.org/handbook/modules/update')) . '</p>';
return $output;

2
modules/user/user.test
View File

@ -782,7 +782,7 @@ class UserPermissionsTestCase extends DrupalWebTestCase {
// permission is assigned by default.
$edit = array();
$edit['modules[Core][aggregator][enable]'] = TRUE;
$this->drupalPost('admin/build/modules', $edit, t('Save configuration'));
$this->drupalPost('admin/structure/modules', $edit, t('Save configuration'));
$this->assertTrue(user_access('administer news feeds', $this->admin_user, TRUE), t('The permission was automatically assigned to the administrator role'));
}

2
profiles/default/default.profile
View File

@ -169,7 +169,7 @@ function default_profile_tasks(&$task, $url) {
menu_rebuild();
// Save some default links.
$link = array('link_path' => 'admin/build/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
$link = array('link_path' => 'admin/structure/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
menu_link_save($link);
}

2
scripts/run-tests.sh
View File

@ -137,7 +137,7 @@ All arguments are long options.
<test1>[,<test2>[,<test3> ...]]
One or more tests to be run. By default, these are interpreted
as the names of test groups as shown at ?q=admin/build/testing.
as the names of test groups as shown at ?q=admin/development/testing.
These group names typically correspond to module names like "User"
or "Profile" or "System", but there is also a group "XML-RPC".
If --class is specified then these are interpreted as the names of