Commit 9e944432 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Altering userlist to be more accessible (Bug #1265088)"

parents eed0571d 7b37adf8
......@@ -291,7 +291,7 @@ EOF;
$smarty = smarty();
$smarty->assign('INLINEJAVASCRIPT', $js);
$smarty->assign('usertypeselector', $usertypeselector);
$smarty->assign('instructions', get_string('institutionusersinstructions'.$usertype, 'admin'));
$smarty->assign('instructions', get_string('institutionusersinstructions' . $usertype . '1', 'admin', $userlistelement['lefttitle'], $userlistelement['righttitle']));
$smarty->assign('institutionusersform', $userlistform);
$smarty->assign('PAGEHEADING', TITLE);
$smarty->display('admin/users/institutionusers.tpl');
......@@ -680,15 +680,15 @@ $string['importfailedfornusers'] = 'Import failed for %d of %d users.';
$string['invalidlistingfile'] = 'Invalid username listing. Did you use the Mahara bulk exporter to export these users?';
// Admin Users
$string['adminuserspagedescription'] = '<p>Here you can choose which users are administrators for the site. The current administrators are listed on the right, and potential administrators are on the left.</p><p>The system must have at least one administrator.</p>';
$string['institutionadminuserspagedescription'] = 'Here you can choose which users are administrators for the institution. The current administrators are listed on the right, and potential administrators are on the left.';
$string['adminuserspagedescription1'] = '<p>Here you can choose which users are administrators for the site. The current administrators are listed in the "Current administrators" field, and potential administrators are in the "Potential administrators" field.</p><p>The system must have at least one administrator.</p>';
$string['institutionadminuserspagedescription1'] = 'Here you can choose which users are administrators for the institution. The current administrators are listed in the "Current administrators" field, and potential administrators are in the "Institution memebers" field.';
$string['potentialadmins'] = 'Potential administrators';
$string['currentadmins'] = 'Current administrators';
$string['adminusersupdated'] = 'Administrators updated';
// Staff Users
$string['staffuserspagedescription'] = 'Here you can choose which users are staff for the site. The current staff are on the right, and potential staff are on the left.';
$string['institutionstaffuserspagedescription'] = 'Here you can choose which users are staff for your institution. The current staff are on the right, and potential staff are on the left.';
$string['staffuserspagedescription1'] = 'Here you can choose which users are staff for the site. The current staff are in the "Current staff" field, and potential staff are in the "Potential staff" field.';
$string['institutionstaffuserspagedescription1'] = 'Here you can choose which users are staff for your institution. The current staff are in the "Institution staff" field, and potential staff are in the "Institution members" field.';
$string['potentialstaff'] = 'Potential staff';
$string['currentstaff'] = 'Current staff';
$string['staffusersupdated'] = 'Staff users updated';
......@@ -868,11 +868,11 @@ $string['institutionmembers'] = 'Institution members';
$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['institutionusersinstructionsrequesters'] = 'The list of users on the left shows all users who have asked to join your institution. You can use the search box to reduce the number of users displayed. If you would like to add users to the institution or decline their membership requests, first move some users to the right-hand side by selecting one or more users and then clicking on the right arrow. The "Add members" button will add all the users on the right to the institution. The "Decline requests" button will remove the membership requests of the users on the right.';
$string['institutionusersinstructionsnonmembers'] = 'The list of users on the left shows all users who are not yet members of your institution. You can use the search box to reduce the number of users displayed. To invite users to join the institution, first move some users to the right-hand side by selecting one or more users and then clicking on the right arrow to move those users to the list on the right. The "Invite users" button will send invitations to all the users on the right. These users will not be associated with the institution until they accept the invitation.';
$string['institutionusersinstructionslastinstitution'] = 'The list of users on the left shows all users who are not yet members of your institution and who have left the selected institution. You can use the search box to reduce the number of users displayed. To invite users to join the institution, first move some users to the right-hand side by selecting one or more users and then clicking on the right arrow to move those users to the list on the right. The "Invite users" button will send invitations to all the users on the right. These users will not be associated with the institution until they accept the invitation.';
$string['institutionusersinstructionsmembers'] = 'The list of users on the left shows all members of the institution. You can use the search box to reduce the number of users displayed. To remove users from the institution, first move some users to the right-hand side by selecting one or more users on the left and then clicking on the right arrow. The users you selected will move to the right hand side. The "Remove users" button will remove all the users on the right from the institution. The users on the left will remain in the institution.';
$string['institutionusersinstructionsinvited'] = 'The list of users on the left shows all users who have been sent an invitation to join the institution and who have not yet accepted or declined. You can use the search box to reduce the number of users displayed. To revoke invitations to the institution, first move some users to the right-hand side by selecting one or more users on the left and then clicking on the right arrow. The users you selected will move to the right hand side. The "Revoke invitations" button will remove all invitations to the users on the right. The users on the left will retain their invitations and will still be able to join at any time.';
$string['institutionusersinstructionsrequesters1'] = 'The list of users in the "%1$s" field shows all users who have asked to join your institution. You can use the search box to reduce the number of users displayed. If you would like to add users to the institution or decline their membership requests, first move some users to the "%2$s" field by selecting one or more users and then clicking on the right arrow. The "Add members" button will add all the users in the "%2$s" field to the institution. The "Decline requests" button will remove the membership requests of the users in the "%2$s" field.';
$string['institutionusersinstructionsnonmembers1'] = 'The list of users in the "%1$s" field shows all users who are not yet members of your institution. You can use the search box to reduce the number of users displayed. To invite users to join the institution, first move some users to the "%2$s" field by selecting one or more users and then clicking on the right arrow button to move those users to the "%2$s" field. The "Invite users" button will send invitations to all the users in the "%2$s" field. These users will not be associated with the institution until they accept the invitation.';
$string['institutionusersinstructionslastinstitution1'] = 'The list of users in the "%1$s" field shows all users who are not yet members of your institution and who have left the selected institution. You can use the search box to reduce the number of users displayed. To invite users to join the institution, first move some users to the "%2$s" field by selecting one or more users and then clicking on the right arrow to move those users to the "%2$s" list. The "Invite users" button will send invitations to all the users in the "%2$s". These users will not be associated with the institution until they accept the invitation.';
$string['institutionusersinstructionsmembers1'] = 'The list of users in the "%1$s" field shows all members of the institution. You can use the search box to reduce the number of users displayed. To remove users from the institution, first move some users to the "%2$s" field by selecting one or more users and then clicking on the right arrow. The users you selected will move to the "%2$s" field. The "Remove users" button will remove all the users in the "%2$s" field from the institution.';
$string['institutionusersinstructionsinvited1'] = 'The list of users in the "%1$s" field shows all users who have been sent an invitation to join the institution and who have not yet accepted or declined. You can use the search box to reduce the number of users displayed. To revoke invitations to the institution, first move some users to the "%2$s" field by selecting one or more users and then clicking on the right arrow. The users you selected will move to the "%2$s" field. The "Revoke invitations" button will remove all invitations to the users in the "%2$s" field. The other users will retain their invitations and will still be able to join at any time.';
$string['editmembers'] = 'Edit members';
$string['editstaff'] = 'Edit staff';
......@@ -1053,8 +1053,8 @@ $string['groupvisible'] = 'Visibility';
$string['groupmanage'] = 'Manage';
$string['groupmanagespecific'] = 'Manage "%s"';
$string['groupdelete'] = 'Delete';
$string['managegroupquotadescription'] = 'Use the form below to change the group file quota for this group.';
$string['managegroupdescription'] = 'Use the form below to promote and demote administrators for this group. If you remove a group administrator they will remain a group member.';
$string['managegroupquotadescription1'] = 'Use this form to change the group file quota for this group.';
$string['managegroupdescription1'] = 'Use this form to promote and demote administrators for this group. If you remove a group administrator they will remain a group member.';
$string['userscandisabledevicedetection'] = 'Users can disable device detection';
$string['userscandisabledevicedetectiondescription'] = 'If checked, users will be allowed to disable mobile device detection when they are browsing this site.';
......
......@@ -66,7 +66,8 @@ legend {
th,
th label,
#files_filebrowser_agreement label,
.uploadform label {
.uploadform label,
.lrfieldlists label {
color: #42637B;
}
/******************** Buttons ********************/
......
......@@ -3315,6 +3315,7 @@ ul.groupuserstatus li.requesttojoin a {
}
.userlisttable .lrbuttons {
text-align: center;
vertical-align: middle;
}
.userlisttable .lrbuttons button {
margin: 0 3px 7px 3px;
......@@ -3325,6 +3326,9 @@ ul.groupuserstatus li.requesttojoin a {
.userlisttable .lrfieldlists {
width: 48%;
}
.userlisttable .lrfieldlists select {
margin-top: 10px;
}
/* Groups > Group's forums */
#viewforum {
border: 1px solid #EEEEEE;
......
{include file="header.tpl"}
<h3>{str tag=groupquotas section=admin args=$groupname}</h3>
<p>{str tag=managegroupquotadescription section=admin}</p>
<p>{str tag=managegroupquotadescription1 section=admin}</p>
<div>
{$quotasform|safe}
</div>
<h3>{str tag=groupadminsforgroup section=admin args=$groupname}</h3>
<p>{str tag=managegroupdescription section=admin}</p>
<p>{str tag=managegroupdescription1 section=admin}</p>
<div class="userlistform">
{$managegroupform|safe}
</div>
......
{include file="header.tpl"}
<p>{str tag="adminuserspagedescription" section="admin"}</p>
<p>{str tag="adminuserspagedescription1" section="admin"}</p>
<div class="userlistform">
{$adminusersform|safe}
</div>
......
{include file="header.tpl"}
<p>{str tag="institutionadminuserspagedescription" section="admin"}</p>
<p>{str tag="institutionadminuserspagedescription1" section="admin"}</p>
{$institutionselector|safe}
<div class="userlistform">
......
{include file="header.tpl"}
<p>{str tag="institutionstaffuserspagedescription" section="admin"}</p>
<p>{str tag="institutionstaffuserspagedescription1" section="admin"}</p>
{$institutionselector|safe}
<div class="userlistform">
{$staffusersform|safe}
......
{include file="header.tpl"}
<p>{str tag="staffuserspagedescription" section="admin"}</p>
<p>{str tag="staffuserspagedescription1" section="admin"}</p>
<div class="userlistform">
{$staffusersform|safe}
</div>
......
......@@ -142,30 +142,25 @@
});
</script>
<table class="userlisttable fullwidth">
{{if $lefttitle || $righttitle}}
<tr>
<th>{{$lefttitle}}</th>
<th></th>
<th>{{$righttitle}}</th>
</tr>
{{/if}}
<tr>
<td colspan="3" id="{{$name}}_messages">
</td>
</tr>
<tr>
<td class="lrfieldlists">
{{if $lefttitle}}<label for="{{$name}}_potential">{{$lefttitle}}</label>{{/if}}
<select id="{{$name}}_potential" size="10" multiple="true" style="width: 100%;"><option></option></select>
</td>
<td class="lrbuttons">
<button type="button" onClick="{{$name}}_moveopts('potential','members')" class="rightarrow">&gt;</button><br>
<button type="button" onClick="{{$name}}_moveopts('members','potential')" class="leftarrow">&lt;</button>
<button type="button" name="rightarrow" onClick="{{$name}}_moveopts('potential','members')" class="rightarrow">&gt;</button><br>
<button type="button" name="leftarrow" onClick="{{$name}}_moveopts('members','potential')" class="leftarrow">&lt;</button>
</td>
<td class="lrfieldlists">
{{if $righttitle}}<label for="{{$name}}_members">{{$righttitle}}</label>{{/if}}
<select size="10" multiple="true" id="{{$name}}_members" style="width: 100%;"><option></option>
{{foreach from=$options key=id item=user}}
{{foreach from=$options key=id item=user}}
<option value="{{$id}}">{{$user}}</option>
{{/foreach}}
{{/foreach}}
</select>
</td>
</tr>
......
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