Commit f27757ba authored by Hugh Davenport's avatar Hugh Davenport
Browse files

Reword administration menu title (bug #1037450)



Now both site administrators and institution administrators have the
same title for the menu, just "Administration".

Change-Id: I9f421e9881386e5fb0c1da93bc71751853ac30b2
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent 6bd2b12a
...@@ -806,7 +806,6 @@ $string['institutionadmin'] = 'Institution admin'; ...@@ -806,7 +806,6 @@ $string['institutionadmin'] = 'Institution admin';
$string['institutionadministrator'] = 'Institution administrator'; $string['institutionadministrator'] = 'Institution administrator';
$string['institutionadmindescription'] = 'If checked, the user can administer all users in this institution.'; $string['institutionadmindescription'] = 'If checked, the user can administer all users in this institution.';
$string['settingsfor'] = 'Settings for:'; $string['settingsfor'] = 'Settings for:';
$string['institutionadministration'] = 'Institution administration';
$string['institutionmembers'] = 'Institution members'; $string['institutionmembers'] = 'Institution members';
$string['notadminforinstitution'] = 'You are not an administrator for that institution'; $string['notadminforinstitution'] = 'You are not an administrator for that institution';
$string['institutionmemberspagedescription'] = 'On this page, you can see users who have requested membership of your institution and add them as members. You can also remove users from your institution and invite users to join.'; $string['institutionmemberspagedescription'] = 'On this page, you can see users who have requested membership of your institution and add them as members. You can also remove users from your institution and invite users to join.';
......
...@@ -553,8 +553,7 @@ $string['groups'] = 'Groups'; ...@@ -553,8 +553,7 @@ $string['groups'] = 'Groups';
$string['mygroups'] = 'My groups'; $string['mygroups'] = 'My groups';
$string['findgroups'] = 'Find groups'; $string['findgroups'] = 'Find groups';
$string['returntosite'] = 'Return to site'; $string['returntosite'] = 'Return to site';
$string['siteadministration'] = 'Site administration'; $string['administration'] = 'Administration';
$string['institutionadministration'] = 'Institution administration';
$string['siteinformation'] = 'Site information'; $string['siteinformation'] = 'Site information';
$string['institutioninformation'] = 'Institution information'; $string['institutioninformation'] = 'Institution information';
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF} {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li> <li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
{elseif $USER->get('admin') && !$MOBILE} {elseif $USER->get('admin') && !$MOBILE}
<li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li> <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a></span></li>
{elseif $USER->is_institutional_admin() && !$MOBILE} {elseif $USER->is_institutional_admin() && !$MOBILE}
<li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li> <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="administration"}</a></span></li>
{elseif $USER->get('staff')} {elseif $USER->get('staff')}
<li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li> <li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
{elseif $USER->is_institutional_staff()} {elseif $USER->is_institutional_staff()}
......
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
{/if} {/if}
{/foreach} {/foreach}
{if $USER->get('admin')} {if $USER->get('admin')}
<a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a> | <a href="{$WWWROOT}admin/">{str tag="administration"}</a> |
{elseif $USER->is_institutional_admin()} {elseif $USER->is_institutional_admin()}
<a href="{$WWWROOT}admin/users/search.php">{str tag="institutionadministration"}</a> | <a href="{$WWWROOT}admin/users/search.php">{str tag="administration"}</a> |
{/if} {/if}
{if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if} {if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if}
......
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
{if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF} {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
<li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li> <li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
{elseif $USER->get('admin')} {elseif $USER->get('admin')}
<li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li> <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a></span></li>
{elseif $USER->is_institutional_admin()} {elseif $USER->is_institutional_admin()}
<li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li> <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="administration"}</a></span></li>
{elseif $USER->get('staff')} {elseif $USER->get('staff')}
<li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li> <li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
{elseif $USER->is_institutional_staff()} {elseif $USER->is_institutional_staff()}
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
{/if} {/if}
{/foreach} {/foreach}
{if $USER->get('admin')} {if $USER->get('admin')}
<a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a> | <a href="{$WWWROOT}admin/">{str tag="administration"}</a> |
{elseif $USER->is_institutional_admin()} {elseif $USER->is_institutional_admin()}
<a href="{$WWWROOT}admin/users/search.php">{str tag="institutionadministration"}</a> | <a href="{$WWWROOT}admin/users/search.php">{str tag="administration"}</a> |
{/if} {/if}
{if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if} {if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if}
......
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