moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-35587 - Display grouping name for Drag and Dropped resources

Browse source
This commit is contained in:
Rex Lorenzo 2012-09-23 01:14:14 -07:00
parent c366bea3cf
commit e36ab38642
2 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
course/dndupload.js
View file

@ -445,6 +445,7 @@ M.course_dndupload = {
a: document.createElement('a'), a: document.createElement('a'),
icon: document.createElement('img'), icon: document.createElement('img'),
namespan: document.createElement('span'), namespan: document.createElement('span'),
groupingspan: document.createElement('span'),
progressouter: document.createElement('span'), progressouter: document.createElement('span'),
progress: document.createElement('span') progress: document.createElement('span')
}; };
@ -469,6 +470,9 @@ M.course_dndupload = {
resel.div.appendChild(document.createTextNode(' ')); resel.div.appendChild(document.createTextNode(' '));
resel.groupingspan.className = 'groupinglabel';
resel.div.appendChild(resel.groupingspan);
resel.progressouter.className = 'dndupload-progress-outer'; resel.progressouter.className = 'dndupload-progress-outer';
resel.progress.className = 'dndupload-progress-inner'; resel.progress.className = 'dndupload-progress-inner';
resel.progress.innerHTML = ' '; resel.progress.innerHTML = ' ';
@ -724,6 +728,13 @@ M.course_dndupload = {
resel.icon.src = result.icon; resel.icon.src = result.icon;
resel.a.href = result.link; resel.a.href = result.link;
resel.namespan.innerHTML = result.name; resel.namespan.innerHTML = result.name;
if (result.groupingname) {
resel.groupingspan.innerHTML = '(' + result.groupingname + ')';
} else {
resel.div.removeChild(resel.groupingspan);
}
resel.div.removeChild(resel.progressouter); resel.div.removeChild(resel.progressouter);
resel.li.id = result.elementid; resel.li.id = result.elementid;
resel.div.innerHTML += result.commands; resel.div.innerHTML += result.commands;
@ -904,6 +915,13 @@ M.course_dndupload = {
resel.icon.src = result.icon; resel.icon.src = result.icon;
resel.a.href = result.link; resel.a.href = result.link;
resel.namespan.innerHTML = result.name; resel.namespan.innerHTML = result.name;
if (result.groupingname) {
resel.groupingspan.innerHTML = '(' + result.groupingname + ')';
} else {
resel.div.removeChild(resel.groupingspan);
}
resel.div.removeChild(resel.progressouter); resel.div.removeChild(resel.progressouter);
resel.li.id = result.elementid; resel.li.id = result.elementid;
resel.div.innerHTML += result.commands; resel.div.innerHTML += result.commands;

6
course/dnduploadlib.php
View file

@ -667,6 +667,12 @@ class dndupload_ajax_processor {
$resp->commands = make_editing_buttons($mod, true, true, 0, $mod->sectionnum); $resp->commands = make_editing_buttons($mod, true, true, 0, $mod->sectionnum);
$resp->onclick = $mod->get_on_click(); $resp->onclick = $mod->get_on_click();
// if using groupings, then display grouping name
if (!empty($mod->groupingid) && has_capability('moodle/course:managegroups', $this->context)) {
$groupings = groups_get_all_groupings($this->course->id);
$resp->groupingname = format_string($groupings[$mod->groupingid]->name);
}
echo $OUTPUT->header(); echo $OUTPUT->header();
echo json_encode($resp); echo json_encode($resp);
die(); die();