#594908 by Berdir, Bojhan, mrfelton, yoroy, catch: Changed Weight categories on Configuration & Modules correctly.

merge-requests/26/head
Angie Byron 2010-03-30 07:17:19 +00:00
parent 145e717897
commit 72bffa0278
6 changed files with 30 additions and 17 deletions

View File

@ -106,6 +106,7 @@ function locale_menu() {
'page arguments' => array('locale_languages_overview_form'), 'page arguments' => array('locale_languages_overview_form'),
'access arguments' => array('administer languages'), 'access arguments' => array('administer languages'),
'file' => 'locale.admin.inc', 'file' => 'locale.admin.inc',
'weight' => -10,
); );
$items['admin/config/regional/language/overview'] = array( $items['admin/config/regional/language/overview'] = array(
'title' => 'List', 'title' => 'List',
@ -167,6 +168,7 @@ function locale_menu() {
'page callback' => 'locale_translate_overview_screen', 'page callback' => 'locale_translate_overview_screen',
'access arguments' => array('translate interface'), 'access arguments' => array('translate interface'),
'file' => 'locale.admin.inc', 'file' => 'locale.admin.inc',
'weight' => -5,
); );
$items['admin/config/regional/translate/overview'] = array( $items['admin/config/regional/translate/overview'] = array(
'title' => 'Overview', 'title' => 'Overview',

View File

@ -224,7 +224,7 @@ function search_menu() {
'page arguments' => array('search_admin_settings'), 'page arguments' => array('search_admin_settings'),
'access arguments' => array('administer search'), 'access arguments' => array('administer search'),
'type' => MENU_NORMAL_ITEM, 'type' => MENU_NORMAL_ITEM,
'weight' => -5, 'weight' => -10,
'file' => 'search.admin.inc', 'file' => 'search.admin.inc',
); );
$items['admin/config/search/settings/reindex'] = array( $items['admin/config/search/settings/reindex'] = array(

View File

@ -36,6 +36,7 @@ function simpletest_menu() {
'description' => 'Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.', 'description' => 'Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.',
'access arguments' => array('administer unit tests'), 'access arguments' => array('administer unit tests'),
'file' => 'simpletest.pages.inc', 'file' => 'simpletest.pages.inc',
'weight' => -5,
); );
$items['admin/config/development/testing/list'] = array( $items['admin/config/development/testing/list'] = array(
'title' => 'List', 'title' => 'List',

View File

@ -174,6 +174,7 @@ function statistics_menu() {
'page arguments' => array('statistics_settings_form'), 'page arguments' => array('statistics_settings_form'),
'access arguments' => array('administer statistics'), 'access arguments' => array('administer statistics'),
'file' => 'statistics.admin.inc', 'file' => 'statistics.admin.inc',
'weight' => -15,
); );
$items['user/%user/track/navigation'] = array( $items['user/%user/track/navigation'] = array(
'title' => 'Track page visits', 'title' => 'Track page visits',

View File

@ -674,6 +674,7 @@ function system_menu() {
'page callback' => 'system_ip_blocking', 'page callback' => 'system_ip_blocking',
'access arguments' => array('block IP addresses'), 'access arguments' => array('block IP addresses'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => 10,
); );
$items['admin/config/people/ip-blocking/delete/%blocked_ip'] = array( $items['admin/config/people/ip-blocking/delete/%blocked_ip'] = array(
'title' => 'Delete IP address', 'title' => 'Delete IP address',
@ -689,7 +690,7 @@ function system_menu() {
'title' => 'Media', 'title' => 'Media',
'description' => 'Media tools.', 'description' => 'Media tools.',
'position' => 'left', 'position' => 'left',
'weight' => 10, 'weight' => -10,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -700,7 +701,7 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_file_system_settings'), 'page arguments' => array('system_file_system_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => 10, 'weight' => -10,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
); );
$items['admin/config/media/image-toolkit'] = array( $items['admin/config/media/image-toolkit'] = array(
@ -717,6 +718,8 @@ function system_menu() {
$items['admin/config/services'] = array( $items['admin/config/services'] = array(
'title' => 'Web services', 'title' => 'Web services',
'description' => 'Tools related to web services.', 'description' => 'Tools related to web services.',
'position' => 'right',
'weight' => 0,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -734,8 +737,8 @@ function system_menu() {
$items['admin/config/development'] = array( $items['admin/config/development'] = array(
'title' => 'Development', 'title' => 'Development',
'description' => 'Development tools.', 'description' => 'Development tools.',
'position' => 'left', 'position' => 'right',
'weight' => 10, 'weight' => -10,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -746,8 +749,8 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_site_maintenance_mode'), 'page arguments' => array('system_site_maintenance_mode'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => 50,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => -10,
); );
$items['admin/config/development/performance'] = array( $items['admin/config/development/performance'] = array(
'title' => 'Performance', 'title' => 'Performance',
@ -755,8 +758,8 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_performance_settings'), 'page arguments' => array('system_performance_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => -10,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => -20,
); );
$items['admin/config/development/logging'] = array( $items['admin/config/development/logging'] = array(
'title' => 'Logging and errors', 'title' => 'Logging and errors',
@ -764,8 +767,8 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_logging_settings'), 'page arguments' => array('system_logging_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => 60,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => -15,
); );
// Regional and date settings. // Regional and date settings.
@ -773,7 +776,7 @@ function system_menu() {
'title' => 'Regional and language', 'title' => 'Regional and language',
'description' => 'Regional settings, localization and translation.', 'description' => 'Regional settings, localization and translation.',
'position' => 'left', 'position' => 'left',
'weight' => -7, 'weight' => -5,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -784,7 +787,7 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_regional_settings'), 'page arguments' => array('system_regional_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => 50, 'weight' => -20,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
); );
$items['admin/config/regional/date-time'] = array( $items['admin/config/regional/date-time'] = array(
@ -793,7 +796,7 @@ function system_menu() {
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('system_date_time_settings'), 'page arguments' => array('system_date_time_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'weight' => 60, 'weight' => -15,
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
); );
$items['admin/config/regional/date-time/types'] = array( $items['admin/config/regional/date-time/types'] = array(
@ -874,6 +877,8 @@ function system_menu() {
$items['admin/config/search'] = array( $items['admin/config/search'] = array(
'title' => 'Search and metadata', 'title' => 'Search and metadata',
'description' => 'Local site search, metadata and SEO.', 'description' => 'Local site search, metadata and SEO.',
'position' => 'left',
'weight' => -10,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -885,6 +890,7 @@ function system_menu() {
'page arguments' => array('system_clean_url_settings'), 'page arguments' => array('system_clean_url_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => 5,
); );
$items['admin/config/search/clean-urls/check'] = array( $items['admin/config/search/clean-urls/check'] = array(
'title' => 'Clean URL check', 'title' => 'Clean URL check',
@ -900,7 +906,7 @@ function system_menu() {
'title' => 'System', 'title' => 'System',
'description' => 'General system related configuration.', 'description' => 'General system related configuration.',
'position' => 'right', 'position' => 'right',
'weight' => -5, 'weight' => -20,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -951,7 +957,7 @@ function system_menu() {
'page arguments' => array('system_site_information_settings'), 'page arguments' => array('system_site_information_settings'),
'access arguments' => array('administer site configuration'), 'access arguments' => array('administer site configuration'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => -10, 'weight' => -20,
); );
// Additional categories // Additional categories
@ -962,11 +968,13 @@ function system_menu() {
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
'weight' => -5, 'weight' => -15,
); );
$items['admin/config/workflow'] = array( $items['admin/config/workflow'] = array(
'title' => 'Workflow', 'title' => 'Workflow',
'description' => 'Content workflow, editorial workflow tools.', 'description' => 'Content workflow, editorial workflow tools.',
'position' => 'right',
'weight' => 5,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',
@ -974,8 +982,8 @@ function system_menu() {
$items['admin/config/content'] = array( $items['admin/config/content'] = array(
'title' => 'Content authoring', 'title' => 'Content authoring',
'description' => 'Settings related to formatting and authoring content.', 'description' => 'Settings related to formatting and authoring content.',
'position' => 'right', 'position' => 'left',
'weight' => 5, 'weight' => -15,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',

View File

@ -1554,7 +1554,8 @@ function user_menu() {
$items['admin/config/people'] = array( $items['admin/config/people'] = array(
'title' => 'People', 'title' => 'People',
'description' => 'Configure user accounts.', 'description' => 'Configure user accounts.',
'position' => 'right', 'position' => 'left',
'weight' => -20,
'page callback' => 'system_admin_menu_block_page', 'page callback' => 'system_admin_menu_block_page',
'access arguments' => array('access administration pages'), 'access arguments' => array('access administration pages'),
'file' => 'system.admin.inc', 'file' => 'system.admin.inc',