Commit cda281bf authored by Kristina Hoeppner's avatar Kristina Hoeppner
Browse files

Expand "Suspended users" to include expired (Bug #1037632)



- menu item changed to "Suspended and expired users"
- page heading changed to "Suspended and expired users"
- help text updated to include expired users

Change-Id: Ia358edc604fd057a5938ac5011543fa2441d9e3b
Signed-off-by: Kristina Hoeppner's avatarKristina D.C. Hoeppner <kristina@catalyst.net.nz>
parent 88947ce0
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
define('INTERNAL', 1); define('INTERNAL', 1);
define('INSTITUTIONALADMIN', 1); define('INSTITUTIONALADMIN', 1);
define('MENUITEM', 'configusers/suspendedusers'); define('MENUITEM', 'configusers/suspendeduserstitle');
require(dirname(dirname(dirname(__FILE__))) . '/init.php'); require(dirname(dirname(dirname(__FILE__))) . '/init.php');
define('TITLE', get_string('suspendedusers', 'admin')); define('TITLE', get_string('suspendeduserstitle', 'admin'));
define('SECTION_PLUGINTYPE', 'core'); define('SECTION_PLUGINTYPE', 'core');
define('SECTION_PLUGINNAME', 'admin'); define('SECTION_PLUGINNAME', 'admin');
define('SECTION_PAGE', 'suspendedusers'); define('SECTION_PAGE', 'suspendedusers');
......
...@@ -649,6 +649,7 @@ $string['exportingnotsupportedyet'] = 'Exporting user profiles is not supported ...@@ -649,6 +649,7 @@ $string['exportingnotsupportedyet'] = 'Exporting user profiles is not supported
$string['exportuserprofiles'] = 'Export user profiles'; $string['exportuserprofiles'] = 'Export user profiles';
$string['nousersselected'] = 'No users selected'; $string['nousersselected'] = 'No users selected';
$string['suspenduser'] = 'Suspend user'; $string['suspenduser'] = 'Suspend user';
$string['suspendeduserstitle'] = 'Suspended and expired users';
$string['suspendedusers'] = 'Suspended users'; $string['suspendedusers'] = 'Suspended users';
$string['suspensionreason'] = 'Suspension reason'; $string['suspensionreason'] = 'Suspension reason';
$string['errorwhilesuspending'] = 'An error occured while trying to suspend'; $string['errorwhilesuspending'] = 'An error occured while trying to suspend';
......
<h3>Suspended users</h3> <h3>Suspended and expired users</h3>
<p>Select a user by checking the box to the right of the user information. Click the appropriate button to unsuspend or delete selected users.</p> <p>Select one or more users by checking the box to the right of their information. Click the appropriate button to unsuspend, delete or reactivate selected users.</p>
...@@ -1867,7 +1867,7 @@ function admin_nav() { ...@@ -1867,7 +1867,7 @@ function admin_nav() {
'configusers/suspendedusers' => array( 'configusers/suspendedusers' => array(
'path' => 'configusers/suspendedusers', 'path' => 'configusers/suspendedusers',
'url' => 'admin/users/suspended.php', 'url' => 'admin/users/suspended.php',
'title' => get_string('suspendedusers', 'admin'), 'title' => get_string('suspendeduserstitle', 'admin'),
'weight' => 15, 'weight' => 15,
), ),
'configusers/staffusers' => array( 'configusers/staffusers' => array(
...@@ -2054,7 +2054,7 @@ function institutional_admin_nav() { ...@@ -2054,7 +2054,7 @@ function institutional_admin_nav() {
'configusers/suspendedusers' => array( 'configusers/suspendedusers' => array(
'path' => 'configusers/suspendedusers', 'path' => 'configusers/suspendedusers',
'url' => 'admin/users/suspended.php', 'url' => 'admin/users/suspended.php',
'title' => get_string('suspendedusers', 'admin'), 'title' => get_string('suspendeduserstitle', 'admin'),
'weight' => 20, 'weight' => 20,
), ),
'configusers/adduser' => array( 'configusers/adduser' => array(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment