diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/contact/contact.module | 11 | ||||
| -rw-r--r-- | modules/contact/contact.test | 6 | ||||
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | modules/system/system.test | 14 | ||||
| -rw-r--r-- | modules/user/user.js | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 8 | ||||
| -rw-r--r-- | modules/user/user.test | 4 |
7 files changed, 29 insertions, 18 deletions
diff --git a/modules/contact/contact.module b/modules/contact/contact.module index 10004fcb6..eb3056e3b 100644 --- a/modules/contact/contact.module +++ b/modules/contact/contact.module @@ -16,11 +16,11 @@ function contact_help($path, $arg) { $output .= '<p>' . t("Personal contact forms allow users to be contacted via e-mail, while keeping recipient e-mail addresses private. Users may enable or disable their personal contact forms by editing their <em>My account</em> page. If enabled, a <em>Contact</em> tab leading to their personal contact form is available on their user profile. Site administrators have access to all personal contact forms (even if they have been disabled). The <em>Contact</em> tab is only visible when viewing another user's profile (users do not see their own <em>Contact</em> tab).") . '</p>'; $output .= '<p>' . t('The <a href="@contact">contact page</a> provides a simple form for visitors to leave comments, feedback, or other requests. Messages are routed by selecting a category from a list of administrator-defined options; each category has its own set of e-mail recipients. Common categories for a business site include, for example, "Website feedback" (messages are forwarded to web site administrators) and "Product information" (messages are forwarded to members of the sales department). The actual e-mail addresses defined within a category are not displayed. Only users in roles with the <em>access site-wide contact form</em> permission may access the <a href="@contact">contact page</a>.', array('@contact' => url('contact'))) . '</p>'; $output .= '<p>' . t('A link to your site\'s <a href="@contact">contact page</a> from the main <em>Navigation</em> menu is created, but is disabled by default. Create a similar link on another menu by adding a menu item pointing to the path "contact"', array('@contact' => url('contact'))) . '</p>'; - $output .= '<p>' . t('Customize the <a href="@contact">contact page</a> with additional information (like physical location, mailing address, and telephone number) using the <a href="@contact-settings">contact form settings page</a>. The <a href="@contact-settings">settings page</a> also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/build/contact/settings'), '@contact' => url('contact'))) . '</p>'; + $output .= '<p>' . t('Customize the <a href="@contact">contact page</a> with additional information (like physical location, mailing address, and telephone number) using the <a href="@contact-settings">contact form settings page</a>. The <a href="@contact-settings">settings page</a> also provides configuration options for the maximum number of contact form submissions a user may perform per hour, and the default status of users\' personal contact forms.', array('@contact-settings' => url('admin/settings/contact'), '@contact' => url('contact'))) . '</p>'; $output .= '<p>' . t('For more information, see the online handbook entry for <a href="@contact">Contact module</a>.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) . '</p>'; return $output; case 'admin/build/contact': - $output = '<p>' . t('This page lets you set up <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) . '</p>'; + $output = '<p>' . t('This page lets you set up <a href="@form">your site-wide contact form</a>. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the <a href="@settings">settings page</a>, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/settings/contact'), '@form' => url('contact'))) . '</p>'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been <a href="@modules-page">enabled</a>.', array('@modules-page' => url('admin/settings/modules'))); } @@ -85,13 +85,12 @@ function contact_menu() { 'access arguments' => array('administer site-wide contact form'), 'type' => MENU_CALLBACK, ); - $items['admin/build/contact/settings'] = array( - 'title' => 'Settings', + $items['admin/settings/contact'] = array( + 'title' => 'Contact form', + 'description' => 'Toggle personal contact forms and maximum contact form submissions.', 'page callback' => 'drupal_get_form', 'page arguments' => array('contact_admin_settings'), 'access arguments' => array('administer site-wide contact form'), - 'type' => MENU_LOCAL_TASK, - 'weight' => 2, ); $items['contact'] = array( 'title' => 'Contact', diff --git a/modules/contact/contact.test b/modules/contact/contact.test index c31b709ce..0eae9fdb7 100644 --- a/modules/contact/contact.test +++ b/modules/contact/contact.test @@ -29,7 +29,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase { $edit = array(); $edit['contact_hourly_threshold'] = 3; $edit['contact_default_status'] = TRUE; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/settings/contact', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Delete old categories to ensure that new categories are used. @@ -322,7 +322,7 @@ class ContactPersonalTestCase extends DrupalWebTestCase { $edit = array(); $edit['contact_default_status'] = TRUE; $edit['contact_hourly_threshold'] = $flood_control; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/settings/contact', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Reload variables. @@ -366,7 +366,7 @@ class ContactPersonalTestCase extends DrupalWebTestCase { // Disable the personal contact form. $edit = array(); $edit['contact_default_status'] = FALSE; - $this->drupalPost('admin/build/contact/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/settings/contact', $edit, t('Save configuration')); $this->assertText(t('The configuration options have been saved.'), t('Setting successfully saved.')); // Reload variables. diff --git a/modules/system/system.install b/modules/system/system.install index 1c787f13f..fd383c765 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -1727,7 +1727,7 @@ function system_update_6017() { $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)"); $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)"); if ($old_name == 'user_mail_approval_body') { - drupal_set_message('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the <a href="' . url('admin/user/settings') . '">User settings</a> page for details.'); + drupal_set_message('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the <a href="' . url('admin/settings/user') . '">User settings</a> page for details.'); } } } diff --git a/modules/system/system.test b/modules/system/system.test index 46cafc001..17c76a65a 100644 --- a/modules/system/system.test +++ b/modules/system/system.test @@ -454,8 +454,8 @@ class AdminOverviewTestCase extends DrupalWebTestCase { $this->assertLink(t('Content management')); // Make sure menu items without children are hidden. - $this->assertNoLink(t('Site building')); $this->assertNoLink(t('Site configuration')); + $this->assertNoLink(t('Site building')); $this->assertNoLink(t('User management')); $this->assertNoLink(t('Reports')); } @@ -518,7 +518,11 @@ class AccessDeniedTestCase extends DrupalWebTestCase { $edit = array( 'title' => $this->randomName(10), +<<<<<<< system.test + NODE_BODY_FIELD => array(array('value' => $this->randomName(100))), +======= 'body' => array(array('value' => $this->randomName(100))), +>>>>>>> 1.47 ); $node = $this->drupalCreateNode($edit); @@ -579,7 +583,11 @@ class PageNotFoundTestCase extends DrupalWebTestCase { $edit = array( 'title' => $this->randomName(10), +<<<<<<< system.test + NODE_BODY_FIELD => array(array('value' => $this->randomName(100))), +======= 'body' => array(array('value' => $this->randomName(100))), +>>>>>>> 1.47 ); $node = $this->drupalCreateNode($edit); @@ -705,7 +713,11 @@ class PageTitleFiltering extends DrupalWebTestCase { // Generate node content. $edit = array( 'title' => '!SimpleTest! ' . $title . $this->randomName(20), +<<<<<<< system.test + NODE_BODY_FIELD . '[0][value]' => '!SimpleTest! test body' . $this->randomName(200), +======= 'body[0][value]' => '!SimpleTest! test body' . $this->randomName(200), +>>>>>>> 1.47 ); // Create the node with HTML in the title. $this->drupalPost('node/add/page', $edit, t('Save')); diff --git a/modules/user/user.js b/modules/user/user.js index 8be6c314e..5d3dac093 100644 --- a/modules/user/user.js +++ b/modules/user/user.js @@ -161,7 +161,7 @@ Drupal.evaluatePasswordStrength = function (password, translate) { }; /** - * Show all of the picture-related form elements at admin/user/settings + * Show all of the picture-related form elements at admin/settings/user * depending on whether user pictures are enabled or not. */ Drupal.behaviors.userSettings = { diff --git a/modules/user/user.module b/modules/user/user.module index 6c2dbe26e..c0ff8defa 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -806,7 +806,7 @@ function user_perm() { ), 'cancel account' => array( 'title' => t('Cancel account'), - 'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured <a href="@user-settings-url">user settings</a>.', array('@user-settings-url' => url('admin/user/settings'))), + 'description' => t('Remove or disable own user account and unpublish, anonymize, or remove own submissions depending on the configured <a href="@user-settings-url">user settings</a>.', array('@user-settings-url' => url('admin/settings/user'))), ), 'select account cancellation method' => array( 'title' => t('Select method for cancelling own account'), @@ -1360,8 +1360,8 @@ function user_menu() { 'access arguments' => array('administer users'), 'type' => MENU_LOCAL_TASK, ); - $items['admin/user/settings'] = array( - 'title' => 'User settings', + $items['admin/settings/user'] = array( + 'title' => 'Users', 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and user pictures.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_settings'), @@ -2401,7 +2401,7 @@ function user_help($path, $arg) { case 'admin/user/user/account/create': return '<p>' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '</p>'; case 'admin/user/permissions': - return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/user/roles'), '@settings' => url('admin/user/settings'))) . '</p>'; + return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/user/roles'), '@settings' => url('admin/settings/user'))) . '</p>'; case 'admin/user/roles': return t('<p>Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined in <a href="@permissions">user permissions</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the <em>role names</em> of the various roles. To delete a role choose "edit".</p><p>By default, Drupal comes with two user roles:</p> <ul> diff --git a/modules/user/user.test b/modules/user/user.test index 7c3ee18e7..ae0a53c84 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -770,12 +770,12 @@ class UserPermissionsTestCase extends DrupalWebTestCase { */ function testAdministratorRole() { $this->drupalLogin($this->admin_user); - $this->drupalGet('admin/user/settings'); + $this->drupalGet('admin/settings/user'); // Set the user's role to be the administrator role. $edit = array(); $edit['user_admin_role'] = $this->rid; - $this->drupalPost('admin/user/settings', $edit, t('Save configuration')); + $this->drupalPost('admin/settings/user', $edit, t('Save configuration')); // Enable aggregator module and ensure the 'administer news feeds' // permission is assigned by default. |