? .buildpath ? .project ? .settings ? 563390-seven-style_2.patch ? 563390-seven-style_3.patch ? 563390-seven-style_4.patch ? 563390-seven-style_6.patch ? 563390-seven-style_7.patch ? 563390-seven-style_8.patch ? 676058_taxonomytermedit.patch ? drupal_add_action_1.patch ? orderofcategories.patch ? orderofcategories_1.patch ? overlaykeyhandlers.patch ? overlaykeyhandlers_0.patch ? overlaykeyhandlers_1.patch ? overlaykeyhandlers_2.patch ? overlayloading_1.patch ? overlayloading_4.patch ? overlayloadinggraphic.patch ? seven-ui-9.patch ? shortcuteditlink_0.patch ? shortcuteditlink_1.patch Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.871 diff -u -p -r1.871 system.module --- modules/system/system.module 8 Jan 2010 06:36:34 -0000 1.871 +++ modules/system/system.module 8 Jan 2010 12:26:21 -0000 @@ -708,12 +708,47 @@ function system_menu() { 'file' => 'system.admin.inc', ); + // Development settings. + $items['admin/config/development'] = array( + 'title' => 'Development', + 'description' => 'Development tools.', + 'position' => 'left', + 'weight' => -10, + 'page callback' => 'system_admin_menu_block_page', + 'access arguments' => array('access administration pages'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/development/maintenance'] = array( + 'title' => 'Maintenance mode', + 'description' => 'Take the site offline for maintenance or bring it back online.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_site_maintenance_mode'), + 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/development/performance'] = array( + 'title' => 'Performance', + 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_performance_settings'), + 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + ); + $items['admin/config/development/logging'] = array( + 'title' => 'Logging and errors', + 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_logging_settings'), + 'access arguments' => array('administer site configuration'), + 'file' => 'system.admin.inc', + ); + // Media settings. $items['admin/config/media'] = array( 'title' => 'Media', 'description' => 'Media tools.', 'position' => 'left', - 'weight' => 10, + 'weight' => -8, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -739,6 +774,8 @@ function system_menu() { $items['admin/config/services'] = array( 'title' => 'Web services', 'description' => 'Tools related to web services.', + 'position' => 'right', + 'weight' => -4, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -752,38 +789,30 @@ function system_menu() { 'file' => 'system.admin.inc', ); - // Development settings. - $items['admin/config/development'] = array( - 'title' => 'Development', - 'description' => 'Development tools.', + // Search settings. + $items['admin/config/search'] = array( + 'title' => 'Search and metadata', + 'description' => 'Local site search, metadata and SEO.', 'position' => 'left', - 'weight' => 10, + 'weight' => -6, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', ); - $items['admin/config/development/maintenance'] = array( - 'title' => 'Maintenance mode', - 'description' => 'Take the site offline for maintenance or bring it back online.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_site_maintenance_mode'), - 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', - ); - $items['admin/config/development/performance'] = array( - 'title' => 'Performance', - 'description' => 'Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.', + $items['admin/config/search/clean-urls'] = array( + 'title' => 'Clean URLs', + 'description' => 'Enable or disable clean URLs for your site.', 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_performance_settings'), + 'page arguments' => array('system_clean_url_settings'), 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); - $items['admin/config/development/logging'] = array( - 'title' => 'Logging and errors', - 'description' => "Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.", - 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_logging_settings'), - 'access arguments' => array('administer site configuration'), + $items['admin/config/search/clean-urls/check'] = array( + 'title' => 'Clean URL check', + 'page callback' => 'drupal_json_output', + 'page arguments' => array(array('status' => TRUE)), + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); @@ -792,7 +821,7 @@ function system_menu() { 'title' => 'Regional and language', 'description' => 'Regional settings, localization and translation.', 'position' => 'left', - 'weight' => -7, + 'weight' => -4, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -889,37 +918,12 @@ function system_menu() { 'file' => 'system.admin.inc', ); - // Search settings. - $items['admin/config/search'] = array( - 'title' => 'Search and metadata', - 'description' => 'Local site search, metadata and SEO.', - 'page callback' => 'system_admin_menu_block_page', - 'access arguments' => array('access administration pages'), - 'file' => 'system.admin.inc', - ); - $items['admin/config/search/clean-urls'] = array( - 'title' => 'Clean URLs', - 'description' => 'Enable or disable clean URLs for your site.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('system_clean_url_settings'), - 'access arguments' => array('administer site configuration'), - 'file' => 'system.admin.inc', - ); - $items['admin/config/search/clean-urls/check'] = array( - 'title' => 'Clean URL check', - 'page callback' => 'drupal_json_output', - 'page arguments' => array(array('status' => TRUE)), - 'access callback' => TRUE, - 'type' => MENU_CALLBACK, - 'file' => 'system.admin.inc', - ); - // System settings. $items['admin/config/system'] = array( 'title' => 'System', 'description' => 'General system related configuration.', 'position' => 'right', - 'weight' => -5, + 'weight' => -8, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -978,14 +982,16 @@ function system_menu() { 'title' => 'User interface', 'description' => 'Tools that enhance the user interface.', 'position' => 'right', + 'weight' => -2, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', - 'weight' => -5, ); $items['admin/config/workflow'] = array( 'title' => 'Workflow', 'description' => 'Content workflow, editorial workflow tools.', + 'position' => 'left', + 'weight' => -2, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -994,12 +1000,51 @@ function system_menu() { 'title' => 'Content authoring', 'description' => 'Settings related to formatting and authoring content.', 'position' => 'right', - 'weight' => 5, + 'weight' => -6, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', ); - + $items['admin/config/system/actions'] = array( + 'title' => 'Actions', + 'description' => 'Manage the actions defined for your site.', + 'access arguments' => array('administer actions'), + 'page callback' => 'system_actions_manage', + 'file' => 'system.admin.inc', + ); + $items['admin/config/system/actions/manage'] = array( + 'title' => 'Manage actions', + 'description' => 'Manage the actions defined for your site.', + 'page callback' => 'system_actions_manage', + 'type' => MENU_DEFAULT_LOCAL_TASK, + 'weight' => -2, + 'file' => 'system.admin.inc', + ); + $items['admin/config/system/actions/configure'] = array( + 'title' => 'Configure an advanced action', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_actions_configure'), + 'access arguments' => array('administer actions'), + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); + $items['admin/config/system/actions/delete/%actions'] = array( + 'title' => 'Delete action', + 'description' => 'Delete an action.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('system_actions_delete_form', 5), + 'access arguments' => array('administer actions'), + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); + $items['admin/config/system/actions/orphan'] = array( + 'title' => 'Remove orphans', + 'page callback' => 'system_actions_remove_orphans', + 'access arguments' => array('administer actions'), + 'type' => MENU_CALLBACK, + 'file' => 'system.admin.inc', + ); + // Reports. $items['admin/reports'] = array( 'title' => 'Reports', Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1099 diff -u -p -r1.1099 user.module --- modules/user/user.module 7 Jan 2010 04:54:18 -0000 1.1099 +++ modules/user/user.module 8 Jan 2010 12:26:22 -0000 @@ -1463,6 +1463,7 @@ function user_menu() { 'title' => 'People and permissions', 'description' => 'Configure user accounts, roles and permissions.', 'position' => 'right', + 'weight' => -10, 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc',