diff options
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/user.admin.inc | 10 | ||||
| -rw-r--r-- | modules/user/user.js | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 55 | ||||
| -rw-r--r-- | modules/user/user.test | 10 |
4 files changed, 45 insertions, 32 deletions
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index 8f6dd919f..e1fcaba94 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -297,7 +297,7 @@ function user_admin_settings() { $form['registration_cancellation']['user_cancel_method'] = array( '#type' => 'item', '#title' => t('When cancelling a user account'), - '#description' => t('Users with the %select-cancel-method or %administer-users <a href="@permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => t('Select method for cancelling account'), '%administer-users' => t('Administer users'), '@permissions-url' => url('admin/settings/permissions'))), + '#description' => t('Users with the %select-cancel-method or %administer-users <a href="@permissions-url">permissions</a> can override this default method.', array('%select-cancel-method' => t('Select method for cancelling account'), '%administer-users' => t('Administer users'), '@permissions-url' => url('admin/config/people/permissions'))), ); $form['registration_cancellation']['user_cancel_method'] += user_cancel_methods(); foreach (element_children($form['registration_cancellation']['user_cancel_method']) as $element) { @@ -731,7 +731,7 @@ function user_admin_role() { $rid = arg(4); if ($rid) { if ($rid == DRUPAL_ANONYMOUS_RID || $rid == DRUPAL_AUTHENTICATED_RID) { - drupal_goto('admin/settings/roles'); + drupal_goto('admin/config/people/roles'); } // Display the edit role form. $role = db_query('SELECT * FROM {role} WHERE rid = :rid', array(':rid' => $rid))->fetchObject(); @@ -820,7 +820,7 @@ function user_admin_role_submit($form, &$form_state) { ->execute(); drupal_set_message(t('The role has been added.')); } - $form_state['redirect'] = 'admin/settings/roles'; + $form_state['redirect'] = 'admin/config/people/roles'; return; } @@ -877,9 +877,9 @@ function theme_user_admin_account($form) { function theme_user_admin_new_role($form) { $header = array(t('Name'), array('data' => t('Operations'), 'colspan' => 2)); foreach (user_roles() as $rid => $name) { - $edit_permissions = l(t('edit permissions'), 'admin/settings/permissions/' . $rid); + $edit_permissions = l(t('edit permissions'), 'admin/config/people/permissions/' . $rid); if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) { - $rows[] = array($name, l(t('edit role'), 'admin/settings/roles/edit/' . $rid), $edit_permissions); + $rows[] = array($name, l(t('edit role'), 'admin/config/people/roles/edit/' . $rid), $edit_permissions); } else { $rows[] = array($name, t('locked'), $edit_permissions); diff --git a/modules/user/user.js b/modules/user/user.js index 5d3dac093..9d75911fa 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/settings/user + * Show all of the picture-related form elements at admin/config/people/accounts * 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 a7fb466c5..0f62c996b 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -97,7 +97,7 @@ function user_fieldable_info() { 'user' => array( 'label' => t('User'), 'admin' => array( - 'path' => 'admin/settings/user', + 'path' => 'admin/config/people/accounts', 'access arguments' => array('administer users'), ), ), @@ -813,7 +813,7 @@ function user_permission() { ), '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/settings/user'))), + '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/config/people/accounts'))), ), 'select account cancellation method' => array( 'title' => t('Select method for cancelling own account'), @@ -1345,7 +1345,7 @@ function user_menu() { 'menu_name' => 'user-menu', ); - // User administration pages. + // User listing pages. $items['admin/people'] = array( 'title' => 'People', 'description' => 'Find and manage people interacting with your site.', @@ -1366,40 +1366,53 @@ function user_menu() { 'access arguments' => array('administer users'), 'type' => MENU_LOCAL_TASK, ); - $items['admin/settings/user'] = array( - 'title' => 'Users', + + // Administration pages. + $items['admin/config/people'] = array( + 'title' => 'People and permissions', + 'description' => 'Configure user accounts, roles and permissions.', + 'position' => 'right', + 'page callback' => 'system_admin_menu_block_page', + 'access callback' => 'system_admin_menu_block_access', + 'access arguments' => array('admin/config/people', 'access administration pages'), + ); + $items['admin/config/people/accounts'] = array( + 'title' => 'Account settings', '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'), 'access arguments' => array('administer users'), + 'weight' => -10, ); - $items['admin/settings/user/settings'] = array( + $items['admin/config/people/accounts/settings'] = array( 'title' => 'Settings', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); // Permission administration pages. - $items['admin/settings/permissions'] = array( - 'title' => 'Permissions', - 'description' => 'Determine access to features by selecting permissions for roles.', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('user_admin_permissions'), - 'access arguments' => array('administer permissions'), - ); - $items['admin/settings/roles'] = array( + $items['admin/config/people/roles'] = array( 'title' => 'Roles', 'description' => 'List, edit, or add user roles.', 'page callback' => 'drupal_get_form', 'page arguments' => array('user_admin_new_role'), 'access arguments' => array('administer permissions'), + 'weight' => -9, ); - $items['admin/settings/roles/edit'] = array( + $items['admin/config/people/roles/edit'] = array( 'title' => 'Edit role', 'page arguments' => array('user_admin_role'), 'access arguments' => array('administer permissions'), 'type' => MENU_CALLBACK, ); + $items['admin/config/people/permissions'] = array( + 'title' => 'Permissions', + 'description' => 'Determine access to features by selecting permissions for roles.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('user_admin_permissions'), + 'access arguments' => array('administer permissions'), + 'weight' => -8, + ); $items['user/%user_uid_optional'] = array( 'title' => 'My account', @@ -2456,17 +2469,17 @@ function user_help($path, $arg) { return $output; case 'admin/people/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/settings/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/settings/roles'), '@settings' => url('admin/settings/user'))) . '</p>'; - case 'admin/settings/roles': + case 'admin/config/people/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/config/people/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>'; + case 'admin/config/people/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> <li>Anonymous user: this role is used for users that don\'t have a user account or that are not authenticated.</li> <li>Authenticated user: this role is automatically granted to all logged in users.</li> - </ul>', array('@permissions' => url('admin/settings/permissions'))); - case 'admin/settings/user/fields': + </ul>', array('@permissions' => url('admin/config/people/permissions'))); + case 'admin/config/people/accounts/fields': return '<p>' . t('This form lets administrators add, edit, and arrange fields for storing user data.') . '</p>'; - case 'admin/settings/user/display': + case 'admin/config/people/accounts/display': return '<p>' . t('This form lets administrators configure how fields should be displayed when rendering a user profile page.') . '</p>'; case 'admin/people/search': return '<p>' . t('Enter a simple pattern ("*" may be used as a wildcard match) to search for a username or e-mail address. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda@example.com".') . '</p>'; diff --git a/modules/user/user.test b/modules/user/user.test index 0eda8128b..153bd30a0 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -871,7 +871,7 @@ class UserPermissionsTestCase extends DrupalWebTestCase { $this->assertFalse(user_access('administer nodes', $account, TRUE), t('User does not have "administer nodes" permission.')); $edit = array(); $edit[$rid . '[administer nodes]'] = TRUE; - $this->drupalPost('admin/settings/permissions', $edit, t('Save permissions')); + $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.')); $this->assertTrue(user_access('administer nodes', $account, TRUE), t('User now has "administer nodes" permission.')); @@ -879,7 +879,7 @@ class UserPermissionsTestCase extends DrupalWebTestCase { $this->assertTrue(user_access('access user profiles', $account, TRUE), t('User has "access user profiles" permission.')); $edit = array(); $edit[$rid . '[access user profiles]'] = FALSE; - $this->drupalPost('admin/settings/permissions', $edit, t('Save permissions')); + $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.')); $this->assertFalse(user_access('access user profiles', $account, TRUE), t('User no longer has "access user profiles" permission.')); } @@ -889,12 +889,12 @@ class UserPermissionsTestCase extends DrupalWebTestCase { */ function testAdministratorRole() { $this->drupalLogin($this->admin_user); - $this->drupalGet('admin/settings/user'); + $this->drupalGet('admin/config/people/accounts'); // Set the user's role to be the administrator role. $edit = array(); $edit['user_admin_role'] = $this->rid; - $this->drupalPost('admin/settings/user', $edit, t('Save configuration')); + $this->drupalPost('admin/config/people/accounts', $edit, t('Save configuration')); // Enable aggregator module and ensure the 'administer news feeds' // permission is assigned by default. @@ -1079,7 +1079,7 @@ class UserBlocksUnitTests extends DrupalWebTestCase { $edit = array(); $edit['name'] = $user->name; $edit['pass'] = $user->pass_raw; - $this->drupalPost('admin/settings/permissions', $edit, t('Log in')); + $this->drupalPost('admin/config/people/permissions', $edit, t('Log in')); $this->assertNoText(t('User login'), t('Logged in.')); // Check that we are still on the same page. |