Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.123 diff -u -F^f -r1.123 system.install --- modules/system/system.install 23 Jun 2007 11:15:15 -0000 1.123 +++ modules/system/system.install 24 Jun 2007 04:32:43 -0000 @@ -117,7 +117,7 @@ function system_requirements($phase) { $requirements['file system'] = array( 'value' => $t('Not writable'), 'severity' => REQUIREMENT_ERROR, - 'description' => $error .' '. $t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/settings/file-system'))), + 'description' => $error .' '. $t('You may need to set the correct directory at the file system settings page or change the current directory\'s permissions so that it is writable.', array('@admin-file-system' => url('admin/media/file-system'))), ); } else { Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.495 diff -u -F^f -r1.495 system.module --- modules/system/system.module 22 Jun 2007 08:32:28 -0000 1.495 +++ modules/system/system.module 24 Jun 2007 04:32:44 -0000 @@ -175,6 +175,14 @@ function system_menu() { 'access arguments' => array('administer site configuration'), 'file' => 'system.admin.inc', ); + $items['admin/media'] = array( + 'title' => t('Media management'), + 'description' => t('Files, images and other media.'), + 'position' => 'right', + 'weight' => -8, + 'page callback' => 'system_admin_menu_block_page', + 'access arguments' => array('administer site configuration'), + ); $items['admin/settings/admin'] = array( 'title' => 'Administration theme', 'description' => 'Settings for how your administrative pages should look.', @@ -267,13 +275,13 @@ function system_menu() { 'page callback' => 'drupal_get_form', 'page arguments' => array('system_performance_settings'), ); - $items['admin/settings/file-system'] = array( + $items['admin/media/file-system'] = array( 'title' => 'File system', 'description' => 'Tell Drupal where to store uploaded files and how they are accessed.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_file_system_settings'), ); - $items['admin/settings/image-toolkit'] = array( + $items['admin/media/image-toolkit'] = array( 'title' => 'Image toolkit', 'description' => 'Choose which image toolkit to use if you have installed optional toolkits.', 'page callback' => 'drupal_get_form', Index: modules/upload/upload.module =================================================================== RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v retrieving revision 1.168 diff -u -F^f -r1.168 upload.module --- modules/upload/upload.module 22 Jun 2007 08:46:15 -0000 1.168 +++ modules/upload/upload.module 24 Jun 2007 04:32:45 -0000 @@ -17,7 +17,7 @@ function upload_help($section) { $output .= '

'. t('Users with the upload files permission can upload attachments. You can choose which post types can take attachments on the content types settings page. Each user role can be customized for the file size of uploads, and the dimension of image files.') .'

'; $output .= '

'. t('For more information please read the configuration and customization handbook Upload page.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'

'; return $output; - case 'admin/settings/upload': + case 'admin/media/upload': return '

'. t('Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.', array('@permissions' => url('admin/user/access'), '@types' => url('admin/settings/types'))) .'

'; } } @@ -82,7 +82,7 @@ function upload_menu() { 'access arguments' => array('upload files'), 'type' => MENU_CALLBACK, ); - $items['admin/settings/uploads'] = array( + $items['admin/media/uploads'] = array( 'title' => 'File uploads', 'description' => 'Control how files may be attached to content.', 'page callback' => 'drupal_get_form', @@ -166,7 +166,7 @@ function upload_admin_settings() { '#default_value' => variable_get('upload_max_resolution', 0), '#size' => 15, '#maxlength' => 10, - '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scalled down to fit.', array('!image-toolkit-link' => url('admin/settings/image-toolkit'))), + '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction. If an image toolkit is installed, files exceeding this value will be scalled down to fit.', array('!image-toolkit-link' => url('admin/media/image-toolkit'))), '#field_suffix' => ''. t('WIDTHxHEIGHT') .'' ); $form['settings_general']['upload_list_default'] = array( @@ -398,7 +398,7 @@ function upload_form_alter(&$form, $form if (!file_check_directory($path, FILE_CREATE_DIRECTORY) || !file_check_directory($temp, FILE_CREATE_DIRECTORY)) { $form['attachments']['#description'] = t('File attachments are disabled. The file directories have not been properly configured.'); if (user_access('administer site configuration')) { - $form['attachments']['#description'] .= ' '. t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/settings/file-system'))); + $form['attachments']['#description'] .= ' '. t('Please visit the file system configuration page.', array('@admin-file-system' => url('admin/media/file-system'))); } else { $form['attachments']['#description'] .= ' '. t('Please contact the site administrator.');