diff --git a/modules/dblog/dblog.test b/modules/dblog/dblog.test
index 31162cf90b224be4e6c26f067154e89449c32788..551def4f82238520b65e6c1f966fff2f5dcda16b 100644
--- a/modules/dblog/dblog.test
+++ b/modules/dblog/dblog.test
@@ -185,7 +185,7 @@ class DBLogTestCase extends DrupalWebTestCase {
$edit['pass[pass1]'] = $pass;
$edit['pass[pass2]'] = $pass;
$edit['status'] = 1;
- $this->drupalPost('admin/user/create', $edit, t('Create new account'));
+ $this->drupalPost('admin/people/create', $edit, t('Create new account'));
$this->assertResponse(200);
// Retrieve user object.
$user = user_load_by_name($name);
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 6a05e6552523cda4b8dec31326d5e033a2655d7e..cd316e6ce178e741a0f516955859bd16c0ca62d3 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -114,7 +114,7 @@ function user_filter_form_submit($form, &$form_state) {
return;
}
- $form_state['redirect'] = 'admin/user';
+ $form_state['redirect'] = 'admin/people';
return;
}
diff --git a/modules/user/user.api.php b/modules/user/user.api.php
index 2030422aeae17d74a9be0816674f496b0fc00ce8..7e8396ecae2d0f0460590678c9452ce70eaefe7c 100644
--- a/modules/user/user.api.php
+++ b/modules/user/user.api.php
@@ -221,7 +221,7 @@ function hook_user_cancel_methods_alter(&$methods) {
* Add mass user operations.
*
* This hook enables modules to inject custom operations into the mass operations
- * dropdown found at admin/user, by associating a callback function with
+ * dropdown found at admin/people, by associating a callback function with
* the operation, which is called when the form is submitted. The callback function
* receives one initial argument, which is an array of the checked users.
*
diff --git a/modules/user/user.module b/modules/user/user.module
index ae21574ce95beee99468c89b6fc9ee422c1fc295..39ea46abe8ca04e2174af5cb679173437a7a46e3 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1314,19 +1314,19 @@ function user_menu() {
);
// User administration pages.
- $items['admin/user'] = array(
- 'title' => 'Users',
+ $items['admin/people'] = array(
+ 'title' => 'People',
'page callback' => 'user_admin',
'page arguments' => array('list'),
'access arguments' => array('administer users'),
'weight' => -4,
);
- $items['admin/user/list'] = array(
+ $items['admin/people/list'] = array(
'title' => 'List',
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -10,
);
- $items['admin/user/create'] = array(
+ $items['admin/people/create'] = array(
'title' => 'Add user',
'page arguments' => array('create'),
'access arguments' => array('administer users'),
@@ -2376,7 +2376,7 @@ function user_multiple_cancel_confirm(&$form_state) {
return confirm_form($form,
t('Are you sure you want to cancel these user accounts?'),
- 'admin/user', t('This action cannot be undone.'),
+ 'admin/people', t('This action cannot be undone.'),
t('Cancel accounts'), t('Cancel'));
}
@@ -2403,7 +2403,7 @@ function user_multiple_cancel_confirm_submit($form, &$form_state) {
}
}
}
- $form_state['redirect'] = 'admin/user';
+ $form_state['redirect'] = 'admin/people';
return;
}
@@ -2420,7 +2420,7 @@ function user_help($path, $arg) {
$output .= '<p>' . t('A visitor accessing your website is assigned a unique ID, or session ID, which is stored in a cookie. The cookie does not contain personal information, but acts as a key to retrieve information from your site. Users should have cookies enabled in their web browser when using your site.') . '</p>';
$output .= '<p>' . t('For more information, see the online handbook entry for <a href="@user">User module</a>.', array('@user' => 'http://drupal.org/handbook/modules/user/')) . '</p>';
return $output;
- case 'admin/user/create':
+ 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>';
@@ -2430,7 +2430,7 @@ function user_help($path, $arg) {
<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/user/search':
+ 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>';
}
}
@@ -2929,7 +2929,7 @@ function user_register() {
'#title' => t('Notify user of new account')
);
// Redirect back to page which initiated the create request;
- // usually admin/user/create.
+ // usually admin/people/create.
$form['destination'] = array('#type' => 'hidden', '#value' => $_GET['q']);
}
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 31783cd0b2edccdcdbee224adbbe9c8ecff5031b..e0c047142a2335815771f58f155b7b54ddf4c7d2 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -411,7 +411,7 @@ function user_cancel_confirm_form_submit($form, &$form_state) {
user_cancel($form_state['values'], $account->uid, $form_state['values']['user_cancel_method']);
if (!isset($_REQUEST['destination'])) {
- $form_state['redirect'] = 'admin/user';
+ $form_state['redirect'] = 'admin/people';
}
}
else {
diff --git a/modules/user/user.test b/modules/user/user.test
index 42fe6bf42d7c62b84b5c58b6fe7c69e2e65e1002..b382c239bcf7b9ae12b85e81a2e19df91cc95500 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -592,7 +592,7 @@ class UserCancelTestCase extends DrupalWebTestCase {
$edit['accounts[' . $uid . ']'] = TRUE;
}
$edit['accounts[' . $admin_user->uid . ']'] = TRUE;
- $this->drupalPost('admin/user', $edit, t('Update'));
+ $this->drupalPost('admin/people', $edit, t('Update'));
$this->assertText(t('Are you sure you want to cancel these user accounts?'), t('Confirmation form to cancel accounts displayed.'));
$this->assertText(t('When cancelling these accounts'), t('Allows to select account cancellation method.'));
$this->assertText(t('Require e-mail confirmation to cancel account.'), t('Allows to send confirmation mail.'));
@@ -926,7 +926,7 @@ class UserAdminTestCase extends DrupalWebTestCase {
// Create admin user to delete registered user.
$admin_user = $this->drupalCreateUser(array('administer users'));
$this->drupalLogin($admin_user);
- $this->drupalGet('admin/user');
+ $this->drupalGet('admin/people');
$this->assertText($user_a->name, t('Found user A on admin users page'));
$this->assertText($user_b->name, t('Found user B on admin users page'));
$this->assertText($user_c->name, t('Found user C on admin users page'));
@@ -936,7 +936,7 @@ class UserAdminTestCase extends DrupalWebTestCase {
$edit = array();
$edit['filter'] = 'permission';
$edit['permission'] = 'administer taxonomy';
- $this->drupalPost('admin/user', $edit, t('Filter'));
+ $this->drupalPost('admin/people', $edit, t('Filter'));
// Check if the correct users show up.
$this->assertNoText($user_a->name, t('User A not on filtered by perm admin users page'));
@@ -949,7 +949,7 @@ class UserAdminTestCase extends DrupalWebTestCase {
$edit = array();
$edit['operation'] = 'block';
$edit['accounts[' . $account->uid . ']'] = TRUE;
- $this->drupalPost('admin/user', $edit, t('Update'));
+ $this->drupalPost('admin/people', $edit, t('Update'));
$account = user_load($user_b->uid, TRUE);
$this->assertEqual($account->status, 0, 'User B blocked');
}
diff --git a/themes/seven/style.css b/themes/seven/style.css
index dc84298e9e8c791c2bbaed50193d8151c9353179..12848cf87278e4f627630664b7fe896a4a029bd6 100644
--- a/themes/seven/style.css
+++ b/themes/seven/style.css
@@ -637,7 +637,7 @@ div.admin-panel {
display: block;
}
-/* admin/content/node and admin/user/user */
+/* admin/content and admin/people */
#block-system-main dl.multiselect,
#block-system-main dl.multiselect dt,
#block-system-main dl.multiselect dd {