mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
Merge branch '23837-27' of git://github.com/samhemelryk/moodle
This commit is contained in:
Eloy Lafuente (stronk7)
commit
382addccef
@ -184,10 +184,11 @@ class core_enrol_renderer extends plugin_renderer_base {
|
||||
* @return string
|
||||
*/
|
||||
public function user_roles_and_actions($userid, $roles, $assignableroles, $canassign, $pageurl) {
|
||||
$iconenroladd = $this->output->pix_url('t/enroladd');
|
||||
$iconenrolremove = $this->output->pix_url('t/delete');
|
||||
|
||||
// get list of roles
|
||||
|
||||
|
||||
// Get list of roles.
|
||||
$rolesoutput = '';
|
||||
foreach ($roles as $roleid=>$role) {
|
||||
if ($canassign and (is_siteadmin() or isset($assignableroles[$roleid])) and !$role['unchangeable']) {
|
||||
@ -210,9 +211,10 @@ class core_enrol_renderer extends plugin_renderer_base {
|
||||
}
|
||||
}
|
||||
if (!$hasallroles) {
|
||||
$url = new moodle_url($pageurl, array('action'=>'assign', 'user'=>$userid));
|
||||
$icon = html_writer::empty_tag('img', array('alt'=>get_string('assignroles', 'role'), 'src'=>$iconenroladd));
|
||||
$output = html_writer::tag('div', html_writer::link($url, $icon, array('class'=>'assignrolelink', 'title'=>get_string('assignroles', 'role'))), array('class'=>'addrole'));
|
||||
$url = new moodle_url($pageurl, array('action' => 'assign', 'user' => $userid));
|
||||
$roleicon = $this->output->pix_icon('i/assignroles', get_string('assignroles', 'role'));
|
||||
$link = html_writer::link($url, $roleicon, array('class' => 'assignrolelink'));
|
||||
$output = html_writer::tag('div', $link, array('class'=>'addrole'));
|
||||
}
|
||||
}
|
||||
$output .= html_writer::tag('div', $rolesoutput, array('class'=>'roles'));
|
||||
@ -230,9 +232,9 @@ class core_enrol_renderer extends plugin_renderer_base {
|
||||
* @return string
|
||||
*/
|
||||
public function user_groups_and_actions($userid, $groups, $allgroups, $canmanagegroups, $pageurl) {
|
||||
$iconenroladd = $this->output->pix_url('t/enroladd');
|
||||
$iconenrolremove = $this->output->pix_url('t/delete');
|
||||
$straddgroup = get_string('addgroup', 'group');
|
||||
|
||||
$groupicon = $this->output->pix_icon('i/group', get_string('addgroup', 'group'));
|
||||
|
||||
$groupoutput = '';
|
||||
foreach($groups as $groupid=>$name) {
|
||||
@ -244,13 +246,13 @@ class core_enrol_renderer extends plugin_renderer_base {
|
||||
$groupoutput .= html_writer::tag('div', $name, array('class'=>'group', 'rel'=>$groupid));
|
||||
}
|
||||
}
|
||||
$groupoutput = html_writer::tag('div', $groupoutput, array('class'=>'groups'));
|
||||
$output = '';
|
||||
if ($canmanagegroups && (count($groups) < count($allgroups))) {
|
||||
$icon = html_writer::empty_tag('img', array('alt'=>$straddgroup, 'src'=>$iconenroladd));
|
||||
$url = new moodle_url($pageurl, array('action'=>'addmember', 'user'=>$userid));
|
||||
$groupoutput .= html_writer::tag('div', html_writer::link($url, $icon), array('class'=>'addgroup'));
|
||||
$output .= html_writer::tag('div', html_writer::link($url, $groupicon), array('class'=>'addgroup'));
|
||||
}
|
||||
return $groupoutput;
|
||||
$output = $output.html_writer::tag('div', $groupoutput, array('class'=>'groups'));
|
||||
return $output;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
9
enrol/yui/rolemanager/rolemanager.js
vendored
9
enrol/yui/rolemanager/rolemanager.js
vendored
@ -284,15 +284,6 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
|
||||
if (allroles) {
|
||||
this.get(CONTAINER).addClass('hasAllRoles');
|
||||
} else {
|
||||
if (!link) {
|
||||
var m = this.get(MANIPULATOR);
|
||||
link = Y.Node.create('<div class="addrole"></div>').append(
|
||||
Y.Node.create('<img alt="" />').setAttribute('src', M.util.image_url('t/enroladd', 'moodle'))
|
||||
);
|
||||
link.on('click', m.addRole, m, this);
|
||||
this.get(CONTAINER).one('.col_role').insert(link, 0);
|
||||
this.set(ASSIGNROLELINK, link);
|
||||
}
|
||||
this.get(CONTAINER).removeClass('hasAllRoles');
|
||||
}
|
||||
},
|
||||
|
||||
@ -711,24 +711,27 @@ body.tag .managelink {padding: 5px;}
|
||||
* Enrol
|
||||
*/
|
||||
.userenrolment {width:100%;border-collapse: collapse;}
|
||||
.userenrolment td {padding:0;height:41px;}
|
||||
.userenrolment tr {vertical-align:top;}
|
||||
.userenrolment td {height:41px;padding:3px;}
|
||||
.userenrolment td > * {margin:3px;}
|
||||
.userenrolment .subfield {margin-right:5px;}
|
||||
.userenrolment .col_userdetails .subfield_picture {float:left;}
|
||||
.userenrolment .col_lastseen {width:150px;}
|
||||
.userenrolment .col_role {width:262px;}
|
||||
.userenrolment .col_role .roles {margin-right:30px;}
|
||||
.userenrolment .col_role .role {float:left;padding:3px;margin:3px;}
|
||||
.dir-rtl .userenrolment .col_role .role {float:right;}
|
||||
.userenrolment .col_role .role a {margin-left:3px;cursor:pointer;}
|
||||
.userenrolment .col_role .addrole {float:right;width:18px;margin:3px;height:18px;text-align:center;}
|
||||
.userenrolment .col_role .addrole a img {vertical-align:bottom;}
|
||||
.userenrolment .hasAllRoles .col_role .addrole {display:none;}
|
||||
.userenrolment .col_role .roles,
|
||||
.userenrolment .col_group .groups {margin-right:30px;}
|
||||
.userenrolment .col_group .group {float:left;padding:3px;margin:3px;white-space:nowrap;}
|
||||
.userenrolment .col_role .role,
|
||||
.userenrolment .col_group .group {float:left;white-space:nowrap;margin-right:6px;}
|
||||
.userenrolment .col_role .role a,
|
||||
.userenrolment .col_group .group a {margin-left:3px;cursor:pointer;}
|
||||
.userenrolment .col_group .addgroup {float:right;width:18px;margin:3px;height:18px;text-align:center;}
|
||||
.userenrolment .col_role .addrole,
|
||||
.userenrolment .col_group .addgroup {float:right;}
|
||||
.userenrolment .col_role .addrole a img,
|
||||
.userenrolment .col_group .addgroup a img {vertical-align:bottom;}
|
||||
.userenrolment .col_enrol .enrolment {float:left;padding:3px;margin:3px;}
|
||||
.userenrolment .hasAllRoles .col_role .addrole {display:none;}
|
||||
.dir-rtl .userenrolment .col_role .role {float:right;}
|
||||
|
||||
.userenrolment .col_enrol .enrolment {float:left;}
|
||||
.userenrolment .col_enrol .enrolment a {float:right;margin-left:3px;}
|
||||
#page-enrol-users .enrol_user_buttons {float:right;}
|
||||
#page-enrol-users .enrol_user_buttons .singlebutton {margin-top: 2px; line-height: 2;}
|
||||
|
||||
@ -1021,6 +1021,9 @@ body.tag .managelink {
|
||||
width: 100%;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.userenrolment tr {
|
||||
vertical-align:top;
|
||||
}
|
||||
.userenrolment td {
|
||||
padding: 0;
|
||||
height: 41px;
|
||||
@ -1037,59 +1040,44 @@ body.tag .managelink {
|
||||
.userenrolment .col_role {
|
||||
width: 262px;
|
||||
}
|
||||
.userenrolment .col_role .roles {
|
||||
margin-right: 30px;
|
||||
}
|
||||
.userenrolment .col_role .role {
|
||||
float: left;
|
||||
padding: 3px;
|
||||
margin: 3px;
|
||||
}
|
||||
.dir-rtl .userenrolment .col_role .role {
|
||||
float: right;
|
||||
}
|
||||
.userenrolment .col_role .role a {
|
||||
margin-left: 3px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.userenrolment .col_role .addrole {
|
||||
float: right;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
margin: 3px;
|
||||
text-align: center;
|
||||
background-color: @successBackground;
|
||||
border: 1px solid @successBorder;
|
||||
}
|
||||
.userenrolment .col_role .addrole img {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
.userenrolment .hasAllRoles .col_role .addrole {
|
||||
display: none;
|
||||
}
|
||||
.userenrolment .col_role .roles,
|
||||
.userenrolment .col_group .groups {
|
||||
margin-right: 30px;
|
||||
}
|
||||
.userenrolment .col_role .role,
|
||||
.userenrolment .col_group .group {
|
||||
float: left;
|
||||
padding: 3px;
|
||||
margin: 3px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.userenrolment .col_role .role a,
|
||||
.userenrolment .col_group .group a {
|
||||
margin-left: 3px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.userenrolment .col_role .addrole,
|
||||
.userenrolment .col_group .addgroup {
|
||||
float: right;
|
||||
width: 18px;
|
||||
padding: 3px;
|
||||
margin: 3px;
|
||||
height: 18px;
|
||||
text-align: center;
|
||||
> *:hover {
|
||||
border-bottom:1px solid #666;
|
||||
}
|
||||
}
|
||||
.userenrolment .col_group .addgroup a img {
|
||||
vertical-align: bottom;
|
||||
.userenrolment .col_role .addrole img,
|
||||
.userenrolment .col_group .addgroup img {
|
||||
vertical-align: baseline;
|
||||
}
|
||||
|
||||
.dir-rtl .userenrolment .col_role .role {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.userenrolment .hasAllRoles .col_role .addrole {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.userenrolment .col_enrol .enrolment {
|
||||
float: left;
|
||||
padding: 3px;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -427,7 +427,7 @@ table#tag-management-list {margin: 10px auto;width: 80%;}
|
||||
/**
|
||||
* Enrol
|
||||
*/
|
||||
.userenrolment {font-size:90%;border:1px solid #999;}
|
||||
.userenrolment {border:1px solid #999;}
|
||||
.userenrolment tr.r0 {background-color:#F9F9F9;}
|
||||
.userenrolment tr.r1 {background-color:#F3F3F3;}
|
||||
.userenrolment td {border:1px solid #E9E9E9;border-top-color:#F6F6F6;border-right-color:#EEE;border-left-color:#F3F3F3;}
|
||||
@ -437,17 +437,16 @@ table#tag-management-list {margin: 10px auto;width: 80%;}
|
||||
.userenrolment .r0 .col_bulkops {background-color:#FFFFFF;}
|
||||
.userenrolment .r1 .col_bulkops {background-color:#F9F9F9;}
|
||||
.userenrolment tr.lastrow td {border-bottom-width:0;}
|
||||
.userenrolment .col_userdetails {padding:3px;min-width:35%;}
|
||||
.userenrolment .col_role .roles {position:relative;}
|
||||
.userenrolment .col_role .role {line-height:10px;font-size:10px;}
|
||||
.userenrolment .col_userdetails {min-width:35%;}
|
||||
.userenrolment .col_role .role a img {height:8px;}
|
||||
.userenrolment .col_role .addrole {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;}
|
||||
.userenrolment .col_role .addrole > * {padding-bottom:3px;}
|
||||
.userenrolment .col_role .addrole > *:hover {border-bottom:1px solid #666;}
|
||||
.userenrolment .col_group {max-width:300px;}
|
||||
.userenrolment .col_group .group {line-height:10px;font-size:10px;}
|
||||
.userenrolment .col_group .group a img {height:8px;}
|
||||
.userenrolment .col_group .addgroup {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;}
|
||||
.userenrolment .col_group .addgroup > * {padding-bottom:3px;}
|
||||
.userenrolment .col_group .addgroup > *:hover {border-bottom:1px solid #666;}
|
||||
.userenrolment .col_enrol {max-width:300px;}
|
||||
.userenrolment .col_enrol .enrolment {border:1px outset #E6E6E6;background-color:#EEE;line-height:10px;font-size:10px;-moz-border-radius:5px;}
|
||||
.userenrolment .col_enrol .enrolment {border:1px outset #E6E6E6;background-color:#EEE;-moz-border-radius:5px;}
|
||||
.userenrolment.otheruserenrolment .col_role .role {float:none;}
|
||||
.path-enrol .enrolusersbutton,
|
||||
.path-enrol .enrolcohortbutton {float:left;}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user