? .directory ? 370835-nice-password-checker.patch ? consistent-paths.patch ? drupal7 ? passwordfloat.patch ? modules/system/node.module.2 ? sites/default/files ? sites/default/settings.php Index: includes/install.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/install.inc,v retrieving revision 1.86 diff -u -p -r1.86 install.inc --- includes/install.inc 1 Mar 2009 09:32:17 -0000 1.86 +++ includes/install.inc 17 Mar 2009 00:06:48 -0000 @@ -524,7 +524,7 @@ function drupal_install_modules($module_ * * 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/build/module. * * @param $module * The machine name of the module to install. Index: modules/block/block.test =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.test,v retrieving revision 1.12 diff -u -p -r1.12 block.test --- modules/block/block.test 14 Mar 2009 16:41:29 -0000 1.12 +++ modules/block/block.test 17 Mar 2009 00:06:49 -0000 @@ -166,7 +166,7 @@ class NonDefaultBlockAdmin extends Drupa 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->drupalPost('admin/build/theme', array('status[stark]' => 1), t('Save configuration')); $this->drupalGet('admin/build/block/list/stark'); $this->assertRaw('stark/layout.css', t('Stark CSS found')); } Index: modules/color/color.module =================================================================== RCS file: /cvs/drupal/drupal/modules/color/color.module,v retrieving revision 1.56 diff -u -p -r1.56 color.module --- modules/color/color.module 18 Feb 2009 14:28:22 -0000 1.56 +++ modules/color/color.module 17 Mar 2009 00:06:49 -0000 @@ -9,7 +9,7 @@ function color_help($path, $arg) { case 'admin/help#color': $output = '

' . 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 file download method be set to public.', array('@url' => url('admin/settings/file-system'))) . '

'; $output .= '

' . 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.") . '

'; - $output .= '

' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/build/themes'))) . '

'; + $output .= '

' . t('To change the color settings for a compatible theme, select the "configure" link for the theme on the themes administration page.', array('@themes' => url('admin/build/theme'))) . '

'; $output .= '

' . t('For more information, see the online handbook entry for Color module.', array('@color' => 'http://drupal.org/handbook/modules/color/')) . '

'; return $output; Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1031 diff -u -p -r1.1031 node.module --- modules/node/node.module 14 Mar 2009 23:01:36 -0000 1.1031 +++ modules/node/node.module 17 Mar 2009 00:06:51 -0000 @@ -2052,8 +2052,8 @@ function node_page_default() { $default_message .= '

' . t('Please follow these steps to set up and start using your website:') . '

'; $default_message .= '
    '; $default_message .= '
  1. ' . t('Configure your website Once logged in, visit the administration section, where you can customize and configure all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/settings'))) . '
  2. '; - $default_message .= '
  3. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/build/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '
  4. '; - $default_message .= '
  5. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/build/themes'), '@download_themes' => 'http://drupal.org/project/themes')) . '
  6. '; + $default_message .= '
  7. ' . t('Enable additional functionality Next, visit the module list and enable features which suit your specific needs. You can find additional modules in the Drupal modules download section.', array('@modules' => url('admin/build/module'), '@download_modules' => 'http://drupal.org/project/modules')) . '
  8. '; + $default_message .= '
  9. ' . t('Customize your website design To change the "look and feel" of your website, visit the themes section. You may choose from one of the included themes or download additional themes from the Drupal themes download section.', array('@themes' => url('admin/build/theme'), '@download_themes' => 'http://drupal.org/project/themes')) . '
  10. '; $default_message .= '
  11. ' . t('Start posting content Finally, you can create content for your website. This message will disappear once you have promoted a post to the front page.', array('@content' => url('node/add'))) . '
  12. '; $default_message .= '
'; $default_message .= '

' . t('For more information, please refer to the help section, or the online Drupal handbooks. You may also post at the Drupal forum, or view the wide range of other support options available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '

'; Index: modules/simpletest/tests/menu.test =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v retrieving revision 1.7 diff -u -p -r1.7 menu.test --- modules/simpletest/tests/menu.test 14 Mar 2009 20:56:06 -0000 1.7 +++ modules/simpletest/tests/menu.test 17 Mar 2009 00:06:51 -0000 @@ -41,7 +41,7 @@ class MenuIncTestCase extends DrupalWebT $this->assertEqual($name, 'original', t('Menu name is "original".')); // Force a menu rebuild by going to the modules page. - $this->drupalGet('admin/build/modules', array('query' => array("hook_menu_name" => 'changed'))); + $this->drupalGet('admin/build/module', array('query' => array("hook_menu_name" => 'changed'))); $sql = "SELECT menu_name FROM {menu_links} WHERE router_path = 'menu_name_test'"; $name = db_result(db_query($sql)); Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.130 diff -u -p -r1.130 system.admin.inc --- modules/system/system.admin.inc 9 Mar 2009 11:44:54 -0000 1.130 +++ modules/system/system.admin.inc 17 Mar 2009 00:06:52 -0000 @@ -168,7 +168,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/build/theme/settings/' . $theme->name) ); } else { // Dummy element for drupal_render. Cleaner than adding a check in the theme function. @@ -292,7 +292,7 @@ function system_themes_form_submit($form 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/build/theme'; // Notify locale module about new themes being enabled, so translations can // be imported. This might start a batch, and only return to the redirect @@ -663,7 +663,7 @@ function system_modules($form_state = ar '#type' => 'submit', '#value' => t('Save configuration'), ); - $form['#action'] = url('admin/build/modules/list/confirm'); + $form['#action'] = url('admin/build/module/list/confirm'); return $form; } @@ -785,7 +785,7 @@ function system_modules_confirm_form($mo $form = confirm_form( $form, t('Some required modules must be enabled'), - 'admin/build/modules', + 'admin/build/module', t('Would you like to continue with enabling the above?'), t('Continue'), t('Cancel')); @@ -930,7 +930,7 @@ function system_modules_submit($form, &$ drupal_clear_css_cache(); drupal_clear_js_cache(); - $form_state['redirect'] = 'admin/build/modules'; + $form_state['redirect'] = 'admin/build/module'; // Notify locale module about module changes, so translations can be // imported. This might start a batch, and only return to the redirect @@ -996,7 +996,7 @@ function system_modules_uninstall($form_ '#type' => 'submit', '#value' => t('Uninstall'), ); - $form['#action'] = url('admin/build/modules/uninstall/confirm'); + $form['#action'] = url('admin/build/module/uninstall/confirm'); } else { $form['modules'] = array(); @@ -1037,7 +1037,7 @@ function system_modules_uninstall_confir $form = confirm_form( $form, t('Confirm uninstall'), - 'admin/build/modules/uninstall', + 'admin/build/module/uninstall', t('Would you like to continue with uninstalling the above?'), t('Uninstall'), t('Cancel')); @@ -1052,7 +1052,7 @@ function system_modules_uninstall_valida // 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/build/module/uninstall'); } } @@ -1070,7 +1070,7 @@ function system_modules_uninstall_submit 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/build/module/uninstall'; } else { $form_state['storage'] = $form_state['values']; Index: modules/system/system.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.css,v retrieving revision 1.53 diff -u -p -r1.53 system.css --- modules/system/system.css 5 Dec 2008 12:50:28 -0000 1.53 +++ modules/system/system.css 17 Mar 2009 00:06:52 -0000 @@ -500,14 +500,14 @@ html.js .js-hide { } /* -** Styles for the system modules page (admin/build/modules) +** Styles for the system modules page (admin/build/module) */ #system-modules div.incompatible { font-weight: bold; } /* -** Styles for the system themes page (admin/build/themes) +** Styles for the system themes page (admin/build/theme) */ #system-themes-form div.incompatible { font-weight: bold; Index: modules/system/system.install =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.install,v retrieving revision 1.311 diff -u -p -r1.311 system.install --- modules/system/system.install 1 Mar 2009 09:32:17 -0000 1.311 +++ modules/system/system.install 17 Mar 2009 00:06:54 -0000 @@ -262,7 +262,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 highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/build/modules'))), + 'description' => $t('Update notifications are not enabled. It is highly recommended that you enable the update status module from the module administration page in order to stay up-to-date on new releases. For more information please read the Update status handbook page.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/build/module'))), ); } else { @@ -2175,7 +2175,7 @@ function system_update_6026() { $ret = array(); // Notify user that new update module exists. - drupal_set_message('Drupal can check periodically for important bug fixes and security releases using the new update status module. This module can be turned on from the modules administration page. For more information please read the Update status handbook page.'); + drupal_set_message('Drupal can check periodically for important bug fixes and security releases using the new update status module. This module can be turned on from the modules administration page. For more information please read the Update status handbook page.'); return $ret; } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.672 diff -u -p -r1.672 system.module --- modules/system/system.module 14 Mar 2009 23:01:37 -0000 1.672 +++ modules/system/system.module 17 Mar 2009 00:06:55 -0000 @@ -66,8 +66,8 @@ function system_help($path, $arg) { case 'admin/help#system': $output = '

' . 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.') . '

'; $output .= '

' . t('The system module provides:') . '

'; - $output .= '