diff options
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.admin.inc | 4 | ||||
| -rw-r--r-- | modules/node/node.api.php | 2 | ||||
| -rw-r--r-- | modules/node/node.module | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index dc63f5c0a..889a405ed 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -578,7 +578,7 @@ function node_multiple_delete_confirm(&$form_state, $nodes) { 'Are you sure you want to delete these items?'); return confirm_form($form, $confirm_question, - 'admin/content/node', t('This action cannot be undone.'), + 'admin/content', t('This action cannot be undone.'), t('Delete'), t('Cancel')); } @@ -589,7 +589,7 @@ function node_multiple_delete_confirm_submit($form, &$form_state) { watchdog('content', 'Deleted @count posts.', array('@count' => $count)); drupal_set_message(t('Deleted @count posts.', array('@count' => $count))); } - $form_state['redirect'] = 'admin/content/node'; + $form_state['redirect'] = 'admin/content'; return; } diff --git a/modules/node/node.api.php b/modules/node/node.api.php index 872fc6385..2a490e57a 100644 --- a/modules/node/node.api.php +++ b/modules/node/node.api.php @@ -219,7 +219,7 @@ function hook_node_grants_alter(&$grants, $account, $op) { * Add mass node operations. * * This hook enables modules to inject custom operations into the mass operations - * dropdown found at admin/content/node, by associating a callback function with + * dropdown found at admin/content, by associating a callback function with * the operation, which is called when the form is submitted. The callback function * receives one initial argument, which is an array of the checked nodes. * diff --git a/modules/node/node.module b/modules/node/node.module index 5f8e30f5a..e8bda4815 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -37,10 +37,10 @@ function node_help($path, $arg) { 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/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('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'), '@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': + case 'admin/content': return ' '; // Return a non-null value so that the 'more help' link is shown. 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>'; @@ -1656,14 +1656,14 @@ function _node_add_access() { * Implement hook_menu(). */ function node_menu() { - $items['admin/content/content'] = array( + $items['admin/content'] = array( 'title' => 'Content', - 'description' => "View, edit, and delete your site's content.", 'page callback' => 'drupal_get_form', 'page arguments' => array('node_admin_content'), 'access arguments' => array('administer nodes'), + 'weight' => -10, ); - $items['admin/content/content/node'] = array( + $items['admin/content/node'] = array( 'title' => 'Content', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, |