Commit 2a1ef135 authored by Hugh Davenport's avatar Hugh Davenport Committed by Gerrit Code Review
Browse files

Merge changes Ib089413f,I21024e9f

* changes:
  Reword institution statistics page when no institutions
  Change string for institution statistics
parents 0e05cabf 3dc25586
......@@ -39,7 +39,8 @@ $institutionelement = get_institution_selector();
if (empty($institutionelement)) {
$smarty = smarty();
$smarty->display('admin/users/noinstitutions.tpl');
$smarty->assign('CANCREATEINST', $USER->get('admin'));
$smarty->display('admin/users/noinstitutionsstats.tpl');
exit;
}
......
......@@ -272,6 +272,7 @@ $string['nostats'] = 'No statistics available';
// Institution statistics
$string['statistics'] = 'Statistics';
$string['institutionstatistics'] = 'Institution statistics';
$string['institutionstatisticsfor'] = 'Institution statistics for \'%s\'';
$string['institutioncreated'] = 'Institution created';
......@@ -865,6 +866,7 @@ $string['Admins'] = 'Admins';
$string['noinstitutions'] = 'No institutions';
$string['noinstitutionsdescription'] = 'If you would like to associate users with an institution, you should create the institution first.';
$string['noinstitutionsstatsdescription'] = 'Institution statistics are not available because there are no institutions available to your user.';
$string['Lockedfields'] = 'Locked fields';
$string['disabledlockedfieldhelp'] = 'Note: Disabled check boxes are for profile fields which are locked in the institution settings for "%s". These profile fields are locked at the site level and cannot be unlocked here.';
......
......@@ -1987,7 +1987,7 @@ function admin_nav() {
'manageinstitutions/statistics' => array(
'path' => 'manageinstitutions/statistics',
'url' => 'admin/users/statistics.php',
'title' => get_string('statistics', 'admin'),
'title' => get_string('institutionstatistics', 'admin'),
'weight' => 80,
),
'manageinstitutions/pendingregistrations' => array(
......@@ -2150,7 +2150,7 @@ function institutional_admin_nav() {
'manageinstitutions/statistics' => array(
'path' => 'manageinstitutions/statistics',
'url' => 'admin/users/statistics.php',
'title' => get_string('statistics', 'admin'),
'title' => get_string('institutionstatistics', 'admin'),
'weight' => 90,
),
'manageinstitutions/pendingregistrations' => array(
......@@ -2185,7 +2185,7 @@ function staff_nav() {
'institutionalstatistics' => array(
'path' => 'statistics',
'url' => 'admin/users/statistics.php',
'title' => get_string('statistics', 'admin'),
'title' => get_string('institutionstatistics', 'admin'),
'weight' => 30,
),
);
......@@ -2207,7 +2207,7 @@ function institutional_staff_nav() {
'institutionalstatistics' => array(
'path' => 'statistics',
'url' => 'admin/users/statistics.php',
'title' => get_string('statistics', 'admin'),
'title' => get_string('institutionstatistics', 'admin'),
'weight' => 20,
),
);
......
{include file="header.tpl"}
<h1>{str tag="noinstitutions" section="admin"}</h1>
<p>{str tag="noinstitutionsstatsdescription" section="admin"}</p>
{if $CANCREATEINST}
<div class="institutioneditbuttons">
<form action="{$WWWROOT}admin/users/institutions.php" method="post">
<input type="submit" class="submit" name="add" value="{str tag="addinstitution" section="admin"}" id="admininstitution_add">
</form>
</div>
{/if}
{include file="footer.tpl"}
Markdown is supported
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