L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SCORM MDL-26942 - initial fix for list in toc

Browse Source
This commit is contained in:
Dan Marsden
2011-07-09 11:06:35 +12:00
parent 0797000aa9
commit b6c88d755b
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/scorm/locallib.php
+13 -10
View File
@@ -1294,7 +1294,6 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$nextid = 0;
$findnext = false;
$parents[$level]='/';
foreach ($scoes as $pos => $sco) {
$isvisible = false;
$sco->title = $sco->title;
@@ -1311,11 +1310,15 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$i = $level;
$closelist = '';
while (($i > 0) && ($parents[$level] != $sco->parent)) {
$closelist .= "\t\t</li></ul></li>\n";
if ($i === 1) {
$closelist .= "\t\t</ul></li>\n";
} else {
$closelist .= "\t</li></ul></li>\n";
}
$i--;
}
if (($i == 0) && ($sco->parent != $currentorg)) {
$result->toc .= "\t\t<ul>\n";
$result->toc .= "\n\t<ul>\n";
$level++;
} else {
$result->toc .= $closelist;
@@ -1343,8 +1346,8 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
if (empty($sco->title)) {
$sco->title = $sco->identifier;
}
if (!empty($sco->launch)) {
if ($isvisible) {
if ($isvisible) {
if (!empty($sco->launch)) {
$score = '';
if (empty($scoid) && ($mode != 'normal')) {
$scoid = $sco->id;
@@ -1431,12 +1434,12 @@ function scorm_get_toc($user,$scorm,$cmid,$toclink=TOCJSLINK,$currentorg='',$sco
$result->toc .= $statusicon.'&nbsp;'.format_string($sco->title)."\n";
}
}
if (($nextsco === false) || $nextsco->parent == $sco->parent) {
$result->toc .= '</li>';
}
} else {
$result->toc .= '&nbsp;'.format_string($sco->title);
}
if (($nextsco === false) || $nextsco->parent == $sco->parent) {
$result->toc .= "</li>\n";
}
} else {
$result->toc .= '&nbsp;'.format_string($sco->title)."\n";
}
if (($nextsco !== false) && ($nextid == 0) && ($findnext)) {
if (!empty($nextsco->launch)) {