From 59c71f4b37a9210c4a729e3a5c73405b66d4037b Mon Sep 17 00:00:00 2001 From: bobopinna Date: Mon, 20 Sep 2004 13:50:38 +0000 Subject: [PATCH] Updated XHTML tags and attributes in order to pass W3C validation --- mod/scorm/cmi.php | 1 - mod/scorm/coursefiles.php | 133 +++++++++--------- mod/scorm/details.php | 280 +++++++++++++++++++------------------- mod/scorm/index.php | 6 +- mod/scorm/lib.php | 2 +- mod/scorm/playscorm.php | 40 +++--- mod/scorm/scormAPI.php | 2 +- mod/scorm/view.php | 38 +++--- 8 files changed, 256 insertions(+), 246 deletions(-) diff --git a/mod/scorm/cmi.php b/mod/scorm/cmi.php index 254dd4aedf..844fe126b3 100755 --- a/mod/scorm/cmi.php +++ b/mod/scorm/cmi.php @@ -72,7 +72,6 @@ - diff --git a/mod/scorm/coursefiles.php b/mod/scorm/coursefiles.php index bc89638b5b..e944666d31 100755 --- a/mod/scorm/coursefiles.php +++ b/mod/scorm/coursefiles.php @@ -4,7 +4,7 @@ // This file is a hack to files/index.php that removes // the headers and adds some controls so that images -// can be selected within the Richtext editor. +// can be selected within the Richtext editor. // All the Moodle-specific stuff is in this top section // Configuration and access control occurs here. @@ -32,17 +32,17 @@ function html_footer() { echo ""; } - + function html_header($course, $wdir, $formfield=""){ - global $CFG,$THEME,$ME; + global $CFG, $THEME, $ME; if ($course->id == SITEID) { $strfiles = get_string("sitefiles"); } else { $strfiles = get_string("files"); } - + if ($wdir == "/") { $fullnav = "$strfiles"; } else { @@ -97,11 +97,11 @@ $regexp="\\.\\."; - if (ereg( $regexp, $file, $regs )| ereg( $regexp, $wdir,$regs )) { + if (ereg( $regexp, $file, $regs )| ereg( $regexp, $wdir,$regs )) { $message = "Error: Directories can not contain \"..\""; $wdir = "/"; $action = ""; - } + } if (!$wdir) { $wdir="/"; @@ -134,17 +134,17 @@ echo "

$struploadafile ($strmaxsize) --> $wdir"; echo "\n"; - echo "
"; echo "
"; - echo " "; - echo " "; - echo " "; upload_print_form_fragment(1,array('userfile'),null,false,null,$course->maxbytes,0,false); + echo " "; + echo " "; + echo " "; echo "
"; echo " "; echo ""; echo ""; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; @@ -174,7 +174,7 @@ printfilelist($USER->filelist); print_simple_box_end(); echo "
"; - notice_yesno (get_string("deletecheckfiles"), + notice_yesno (get_string("deletecheckfiles"), "".basename($ME)."?id=$id&wdir=$wdir&action=delete&confirm=1", "".basename($ME)."?id=$id&wdir=$wdir&action=cancel"); } else { @@ -224,7 +224,7 @@ echo "Error: could not rename $oldname to $name"; } displaydir($wdir); - + } else { $strrename = get_string("rename"); $strcancel = get_string("cancel"); @@ -233,8 +233,8 @@ echo "

$strrenamefileto:"; echo " +
"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo " "; @@ -242,8 +242,8 @@ echo "
"; echo "		"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; @@ -262,7 +262,7 @@ echo "Error: could not create $name"; } displaydir($wdir); - + } else { $strcreate = get_string("create"); $strcancel = get_string("cancel"); @@ -271,16 +271,16 @@ echo "

$strcreatefolder:"; echo "
"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo " "; echo "
"; echo "		"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; @@ -296,7 +296,7 @@ fputs($fileptr, stripslashes($text)); fclose($fileptr); displaydir($wdir); - + } else { $streditfile = get_string("edit", "", "$file"); $fileptr = fopen($basedir.$file, "r"); @@ -319,7 +319,7 @@ echo "
"; echo "
"; - echo " "; + echo " "; echo " "; echo " "; echo " "; @@ -329,14 +329,14 @@ echo "
"; echo "		"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; echo "
"; - if ($usehtmleditor) { + if ($usehtmleditor) { print_richedit_javascript("form", "text", "yes"); } @@ -370,7 +370,7 @@ } clearfilelist(); displaydir($wdir); - + } else { html_header($course, $wdir, "form.name"); @@ -383,7 +383,7 @@ echo "

".get_string("whattocallzip"); echo "
"; echo "
"; - echo " "; + echo " "; echo " "; echo " "; echo " "; @@ -391,8 +391,8 @@ echo "
"; echo "		"; echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; @@ -446,7 +446,7 @@ } echo "
"; } - + } else { // Use external unzip program print_simple_box_start("center"); echo "

";
@@ -457,8 +457,8 @@
                 }
 
                 echo "
";
-                echo " ";
-                echo " ";
+                echo " ";
+                echo " ";
                 echo " ";
                 echo " ";
                 echo "
";
@@ -504,8 +504,8 @@
                     echo "
"; } echo "

"; - echo " "; - echo " "; + echo " "; + echo " "; echo " "; echo " "; echo "
"; @@ -558,13 +558,13 @@ /// FILE FUNCTIONS /////////////////////////////////////////////////////////// -function fulldelete($location) { +function fulldelete($location) { if (is_dir($location)) { $currdir = opendir($location); - while ($file = readdir($currdir)) { + while ($file = readdir($currdir)) { if ($file <> ".." && $file <> ".") { $fullfile = $location."/".$file; - if (is_dir($fullfile)) { + if (is_dir($fullfile)) { if (!fulldelete($fullfile)) { return false; } @@ -572,9 +572,9 @@ function fulldelete($location) { if (!unlink($fullfile)) { return false; } - } + } } - } + } closedir($currdir); if (! rmdir($location)) { return false; @@ -622,14 +622,14 @@ function printfilelist($filelist) { echo "pixpath/f/folder.gif\" height=\"16\" width=\"16\" alt=\"\" /> $file
"; $subfilelist = array(); $currdir = opendir($basedir.$file); - while ($subfile = readdir($currdir)) { + while ($subfile = readdir($currdir)) { if ($subfile <> ".." && $subfile <> ".") { $subfilelist[] = $file."/".$subfile; } } printfilelist($subfilelist); - } else { + } else { $icon = mimeinfo("icon", $file); echo "pixpath/f/$icon\" height=\"16\" width=\"16\" alt=\"\" /> $file
"; } @@ -646,6 +646,7 @@ function print_cell($alignment="center", $text=" ") { } function displaydir ($wdir) { + // $wdir == / or /a or /a/b/c/d etc global $basedir; @@ -659,12 +660,13 @@ function displaydir ($wdir) { if ($file == "." || $file == "..") { continue; } - + if (is_dir($fullpath."/".$file)) { $dirlist[] = $file; } else { - if ((basename(strtolower($file),".zip") != basename(strtolower($file))) || (basename(strtolower($file),".pif") != basename(strtolower($file)))) - $filelist[] = $file; + if ((basename(strtolower($file),".zip") != basename(strtolower($file))) || (basename(strtolower($file),".pif") != basename(strtolower($file)))) { + $filelist[] = $file; + } } } closedir($directory); @@ -688,7 +690,7 @@ function displaydir ($wdir) { echo "
"; - echo ""; + echo "
"; echo ""; echo ""; echo ""; @@ -713,7 +715,7 @@ function displaydir ($wdir) { $fileurl = rawurlencode($wdir."/".$dir); $filesafe = rawurlencode($dir); $filedate = userdate(filectime($filename), "%d %b %Y, %I:%M %p"); - + echo ""; print_cell("center", ""); @@ -721,12 +723,11 @@ function displaydir ($wdir) { print_cell("right", "-"); print_cell("right", $filedate); print_cell("right", "$strrename"); - + echo ""; } } - if (!empty($filelist)) { asort($filelist); foreach ($filelist as $file) { @@ -756,8 +757,8 @@ function displaydir ($wdir) { print_cell("center", ""); echo ""; } } echo "
$strname
"; - link_to_popup_window ($ffurl, "display", - "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />", + link_to_popup_window ($ffurl, "display", + "pixpath/f/$icon\" height=\"16\" width=\"16\" border=\"0\" alt=\"file\" />", 480, 640); echo ""; link_to_popup_window ($ffurl, "display", htmlspecialchars($file), 480, 640); @@ -767,7 +768,7 @@ function displaydir ($wdir) { print_cell("right", display_size($file_size)); print_cell("right", $filedate); - $edittext = "$strchoose "; + $edittext = "$strchoose "; if ($icon == "text.gif" || $icon == "html.gif") { $edittext .= "$stredit"; @@ -777,19 +778,19 @@ function displaydir ($wdir) { } print_cell("right", "$edittext $strrename"); - + echo "
"; - echo "
"; + echo "
"; if (empty($wdir)) { $wdir = "/"; } - echo ""; - echo "
"; + echo ""; + echo "
"; echo ""; echo " "; $options = array ( @@ -801,34 +802,36 @@ function displaydir ($wdir) { choose_from_menu ($options, "action", "", "$strwithchosenfiles...", "javascript:document.dirform.submit()"); } - echo ""; - echo ""; + echo "
"; + echo ""; if (!empty($USER->fileop) and ($USER->fileop == "move") and ($USER->filesource <> $wdir)) { + echo ""; } - echo ""; - echo ""; echo "
"; echo "
"; - echo " "; + echo " "; echo " "; echo " "; echo " "; echo "
"; + echo "		"; + echo ""; echo "
"; - echo " "; + echo " "; echo " "; echo " "; echo " "; echo "
"; echo "		"; + echo ""; echo "
"; - echo " "; + echo " "; echo " "; echo " "; echo " "; echo "
"; echo "
"; - echo "
"; + echo "
"; } diff --git a/mod/scorm/details.php b/mod/scorm/details.php index e3874ae354..a49ebdeeee 100755 --- a/mod/scorm/details.php +++ b/mod/scorm/details.php @@ -33,22 +33,22 @@ $coursedir = "$CFG->dataroot/$course->id"; if ($scormdir = make_upload_directory("$course->id/$CFG->moddata/scorm")) { - if ($tempdir = scorm_datadir($scormdir, $form->datadir)) { - copy ("$coursedir/$form->reference", $tempdir."/".basename($form->reference)); - if (empty($CFG->unzip)) { // Use built-in php-based unzip function - include_once($CFG->dirroot.'/lib/pclzip/pclzip.lib.php'); - $archive = new PclZip($tempdir."/".basename($form->reference)); - if (!$list = $archive->extract($tempdir)) { - error($archive->errorInfo(true)); - } - } else { - $command = "cd $tempdir; $CFG->unzip -o ".basename($form->reference)." 2>&1"; - exec($command); + if ($tempdir = scorm_datadir($scormdir, $form->datadir)) { + copy ("$coursedir/$form->reference", $tempdir."/".basename($form->reference)); + if (empty($CFG->unzip)) { // Use built-in php-based unzip function + include_once($CFG->dirroot.'/lib/pclzip/pclzip.lib.php'); + $archive = new PclZip($tempdir."/".basename($form->reference)); + if (!$list = $archive->extract($tempdir)) { + error($archive->errorInfo(true)); } - $result = scorm_validate($tempdir."/imsmanifest.xml"); } else { - $result = "packagedir"; + $command = "cd $tempdir; $CFG->unzip -o ".basename($form->reference)." 2>&1"; + exec($command); } + $result = scorm_validate($tempdir."/imsmanifest.xml"); + } else { + $result = "packagedir"; + } } else { $result = "datadir"; } @@ -64,70 +64,72 @@ // if (is_dir($tempdir)) scorm_delete_files($tempdir); - } else { - // + } else { + // // Delete package file // - unlink ($tempdir."/".basename($form->reference)); - if ($form->mode == "update") { + unlink ($tempdir."/".basename($form->reference)); + if ($form->mode == "update") { $fp = fopen($coursedir."/".$form->reference,"r"); - $fstat = fstat($fp); - fclose($fp); - if (get_field("scorm","timemodified","id",$form->instance) < $fstat["mtime"]) - $form->launch = 0; - } - } - // - // Print validation result - // - print_simple_box_start("center", "", "$THEME->cellheading"); - echo "\n"; - echo " \n"; - echo " \n"; - if ($errorlogs != '') { - $lines = round(count($errors)/4); - if ($lines < 5) { - $lines = 5; + $fstat = fstat($fp); + fclose($fp); + if (get_field("scorm","timemodified","id",$form->instance) < $fstat["mtime"]) { + $form->launch = 0; } - echo " \n"; } - if (($form->mode == "update") && ($form->launch == 0) && (get_records("scorm_sco_users","scormid",$form->instance))) + } + // + // Print validation result + // + print_simple_box_start("center", "", "$THEME->cellheading"); + echo "

$strname:

$form->name

".get_string("validation","scorm").":

".get_string($result,"scorm")."

".get_string("errorlogs","scorm").":

\n"; + echo " \n"; + echo " \n"; + if ($errorlogs != '') { + $lines = round(count($errors)/4); + if ($lines < 5) { + $lines = 5; + } + echo " \n"; + } + if (($form->mode == "update") && ($form->launch == 0) && (get_records("scorm_sco_users","scormid",$form->instance))) { echo " \n"; - echo "

$strname:

$form->name

".get_string("validation","scorm").":

".get_string($result,"scorm")."

".get_string("errorlogs","scorm").":

".get_string("trackingloose","scorm")."

\n"; - if (($result == "regular") || ($result == "found")){ - if (empty($form->auto)) { - $form->auto = ""; - } - if (empty($form->maxgrade)) { - $form->maxgrade = ""; - } - if (empty($form->grademethod)) { - $form->grademethod = "0"; - } + } + echo "
\n"; + if (($result == "regular") || ($result == "found")) { + if (empty($form->auto)) { + $form->auto = ""; + } + if (empty($form->maxgrade)) { + $form->maxgrade = ""; + } + if (empty($form->grademethod)) { + $form->grademethod = "0"; + } echo "
destination\">\n"; //$form->popup = $CFG->scorm_popup; $strnewwindow = get_string("newwindow", "scorm"); - $strnewwindowopen = get_string("newwindowopen", "scorm"); + $strnewwindowopen = get_string("newwindowopen", "scorm"); foreach ($SCORM_WINDOW_OPTIONS as $optionname) { $stringname = "str$optionname"; $$stringname = get_string("new$optionname", "scorm"); $window->$optionname = ""; $jsoption[] = "\"$optionname\""; - } - $alljsoptions = implode(",", $jsoption); + } + $alljsoptions = implode(",", $jsoption); - if ($form->instance) { // Re-editing + if ($form->instance) { // Re-editing if ($form->popup == "") { - $newwindow = ""; // Disable the new window - foreach ($SCORM_WINDOW_OPTIONS as $optionname) { - $defaultvalue = "scorm_popup$optionname"; - $window->$optionname = $CFG->$defaultvalue; + $newwindow = ""; // Disable the new window + foreach ($SCORM_WINDOW_OPTIONS as $optionname) { + $defaultvalue = "scorm_popup$optionname"; + $window->$optionname = $CFG->$defaultvalue; } } else { - $newwindow = "checked"; - $rawoptions = explode(',', $form->popup); - foreach ($rawoptions as $rawoption) { + $newwindow = "checked"; + $rawoptions = explode(',', $form->popup); + foreach ($rawoptions as $rawoption) { $option = explode('=', trim($rawoption)); if (($option[0] != 'location') && ($option[0] != 'menubar') && ($option[0] != 'toolbar')) { $optionname = $option[0]; @@ -138,56 +140,55 @@ $window->$optionname = "checked"; } } - } + } } - } else { - foreach ($SCORM_WINDOW_OPTIONS as $optionname) { - $defaultvalue = "scorm_popup$optionname"; - $window->$optionname = $CFG->$defaultvalue; + } else { + foreach ($SCORM_WINDOW_OPTIONS as $optionname) { + $defaultvalue = "scorm_popup$optionname"; + $window->$optionname = $CFG->$defaultvalue; } $newwindow = $CFG->scorm_popup; - } - + } ?> - + - - + + - - - - - - + + + + + + @@ -196,30 +197,36 @@ var subitems = []; function autowindow() { - if (document.theform.newwindow.checked) + if (document.theform.newwindow.checked) { document.theform.auto.disabled=true; - else + } else { document.theform.auto.disabled=false; + } } - onclick="autowindow();return lockoptions('theform','newwindow', subitems);" /> - -
    + /> + +
    • $value) { - if ($name == "height" or $name == "width") { - continue; - } - echo "\t\t\n"; - echo "\t\t$name." /> "; - $stringname = "str$name"; - echo $$stringname."
      \n"; + foreach ($window as $name => $value) { + if ($name == "height" or $name == "width") { + continue; + } + echo "\t\t\n"; + if ($window->$name == 'checked') { + $window->$name = 'checked="checked"'; + } + echo "\t\t$name." /> "; + $stringname = "str$name"; + echo $$stringname."
      \n"; } ?> @@ -227,46 +234,45 @@

      - \n\n"; } ?> -
    -

    +
- -

:

 - grademethod", ""); - helpbutton("grademethod", get_string("grademethod","scorm"), "scorm"); - ?> + grademethod", ""); + helpbutton("grademethod", get_string("grademethod","scorm"), "scorm"); + ?>

:

 - =1; $i--) { + =1; $i--) { $grades[$i] = $i; - } + } - choose_from_menu($grades, "maxgrade", "$form->maxgrade", ""); - helpbutton("maxgrade", get_string("maximumgrade"), "scorm"); - ?> + choose_from_menu($grades, "maxgrade", "$form->maxgrade", ""); + helpbutton("maxgrade", get_string("maximumgrade"), "scorm"); + ?>

:

 - auto); - ?> -

:

 + auto); + ?> +

- - - - - - - - - - - - -
- " /> - " /> -
-
+
+ + + + + + + + + + + + +

+ " /> + " /> +
+ -
- " onClick="document.location='wwwroot ?>/course/view.php?id=id ?>';" /> -
+
+ " onclick="document.location='wwwroot ?>/course/view.php?id=id ?>';" /> +
diff --git a/mod/scorm/index.php b/mod/scorm/index.php index ba3e8dd89d..49c6121511 100755 --- a/mod/scorm/index.php +++ b/mod/scorm/index.php @@ -41,13 +41,13 @@ if ($course->format == "weeks") { $table->head = array ($strweek, $strname, $strsummary); - $table->align = array ("CENTER", "LEFT", "LEFT"); + $table->align = array ("center", "left", "left"); } else if ($course->format == "topics") { $table->head = array ($strtopic, $strname, $strsummary); - $table->align = array ("CENTER", "LEFT", "LEFT"); + $table->align = array ("center", "left", "left"); } else { $table->head = array ($strlastmodified, $strname, $strsummary); - $table->align = array ("LEFT", "LEFT", "LEFT"); + $table->align = array ("left", "left", "left"); } foreach ($scorms as $scorm) { diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index 310b3d0010..4e0ae3e72b 100755 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -588,7 +588,7 @@ function scorm_string_round($stringa) { // Crop a string to $len character and set an anchor title to the full string $len=11; if ( strlen($stringa)>$len ) { - return "".substr($stringa,0,$len-4).'...'.substr($stringa,strlen($stringa)-1,1).''; + return "".substr($stringa,0,$len-4).'...'.substr($stringa,strlen($stringa)-1,1).''; } else return $stringa; } diff --git a/mod/scorm/playscorm.php b/mod/scorm/playscorm.php index 431c321d9c..8c1c910f9b 100755 --- a/mod/scorm/playscorm.php +++ b/mod/scorm/playscorm.php @@ -73,7 +73,7 @@ // $bodyscripts = ""; if ($scorm->popup != "") { - $bodyscripts = "onLoad='SCOInitialize();' onUnload='SCOFinish(); closeMain();' onbeforeUnload='SCOFinish();'"; + $bodyscripts = "onload='SCOInitialize();' onunload='SCOFinish(); closeMain();'"; } print_header($pagetitle, "$course->fullname", "$navigation framename}\" href=\"view.php?id=$cm->id\" title=\"$scorm->summary\">$scorm->name", @@ -91,7 +91,7 @@ $currentSCO = $_POST['scoid']; ?>
- - \n"; echo "
".get_string("coursestruct","scorm")."
\n
    \n"; + echo "
\n
    \n"; $incomplete = false; if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' AND organization='$currentorg' order by id ASC")){ $level=0; @@ -141,7 +139,7 @@ $i--; } if (($i == 0) && ($sco->parent != $currentorg)) { - echo "
    • \n"; + echo "
      • \n"; $level++; } else { echo $closelist; @@ -154,22 +152,22 @@ $nextsco = next($scoes); if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) { $sublist++; - echo " \"\"\n"; + echo " \"-\"\n"; } else { - echo " \"\"\n"; + echo " \"\n"; } if ($sco->launch) { $startbold = ''; $endbold = ''; if ($sco->id == $currentSCO) { - $startbold = '-> '; - $endbold = ' <-'; + $startbold = '-> '; + $endbold = ' <-'; } if (($currentSCO == "") && ($mode != "normal")) { $currentSCO = $sco->id; - $startbold = '-> '; - $endbold = ' <-'; + $startbold = '-> '; + $endbold = ' >-'; } $score = ""; if ($sco_user=get_record("scorm_sco_users","scoid",$sco->id,"userid",$USER->id)) { @@ -190,10 +188,10 @@ } } else { if ($sco->type == 'sco') { - echo " \"".get_string("notattempted","scorm")."\""; + echo " \"".get_string("notattempted","scorm")."\""; $incomplete = true; } else { - echo " \"".get_string("asset","scorm")."\""; + echo " \"".get_string("asset","scorm")."\""; } } echo "  $startboldid.");\">$sco->title $score$endbold\n \n"; @@ -214,11 +212,11 @@ echo "\n \n"; echo " \n"; diff --git a/mod/scorm/scormAPI.php b/mod/scorm/scormAPI.php index 4fe90af14d..703eeedbc3 100755 --- a/mod/scorm/scormAPI.php +++ b/mod/scorm/scormAPI.php @@ -191,7 +191,7 @@ function SCOInitialize() { function SCOFinish(){ if (typeof API != "undefined") { - SaveTotalTime(); + API.SaveTotalTime(); } } diff --git a/mod/scorm/view.php b/mod/scorm/view.php index 7aa2d6bf85..6655be17f1 100755 --- a/mod/scorm/view.php +++ b/mod/scorm/view.php @@ -64,7 +64,7 @@ // if (!$cm->visible and !isteacher($course->id)) { print_header($pagetitle, "$course->fullname", "$navigation $scorm->name", "", "", true, - update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm)); + update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm)); notice(get_string("activityiscurrentlyhidden")); } else { print_header($pagetitle, "$course->fullname","$navigation framename}\" href=\"$ME?id=$cm->id\" title=\"$scorm->summary\">$scorm->name", @@ -81,7 +81,7 @@ print_heading($scorm->name); - print_simple_box(text_to_html($scorm->summary), "CENTER"); + print_simple_box(text_to_html($scorm->summary), "center"); if (isguest()) { print_heading(get_string("guestsno", "scorm")); @@ -89,8 +89,8 @@ exit; } echo "
        "; - echo "\n"; - print_simple_box_start("CENTER"); + $liststyle = "style=\"list-style-type:none;\""; + print_simple_box_start("center"); echo "
        -
        id\" target=\"_top\"> + id\" target=\"_top\"> -  \n"; +  \n"; if ($scorm->popup == "") { $currentorg = ''; @@ -254,7 +252,7 @@ } choose_from_menu($options, "courseStructure", "", "", "document.navform.scoid.value=document.navform.courseStructure.options[document.navform.courseStructure.selectedIndex].value;document.navform.submit();"); } - echo "  \n"; + echo "  \n"; echo "
        \n"; echo " \n"; $organization = $scorm->launch; @@ -99,7 +99,7 @@ if (isset($_POST['organization'])) { $organization = $_POST['organization']; } - echo "\n"; } @@ -112,7 +112,7 @@ $orgidentifier = $org->organization; } } - echo " \n"; echo "
        ".get_string("coursestruct","scorm")."
        ".get_string('organizations','scorm').": \n"; + echo "
        ".get_string('organizations','scorm').": \n"; choose_from_menu($orgs, 'organization', "$organization", '','submit()'); echo "
        \n
          \n"; + echo "
        \n
          \n"; $incomplete = false; if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' AND organization='$orgidentifier' order by id ASC")){ $level=0; @@ -131,7 +131,7 @@ $i--; } if (($i == 0) && ($sco->parent != $orgidentifier)) { - echo "
          • \n"; + echo "
            • \n"; $level++; } else { echo $closelist; @@ -145,9 +145,9 @@ $nextsco = next($scoes); if (($nextsco !== false) && ($sco->parent != $nextsco->parent) && (($level==0) || (($level>0) && ($nextsco->parent == $sco->identifier)))) { $sublist++; - echo " \"\"\n"; + echo " \"-\"\n"; } else { - echo " \"\"\n"; + echo " \"\n"; } if ($sco->launch) { $score = ""; @@ -164,10 +164,10 @@ } } else { if ($sco->type == 'sco') { - echo " \"".get_string("notattempted","scorm")."\""; + echo " \"".get_string("notattempted","scorm")."\""; $incomplete = true; } else { - echo " \"".get_string("asset","scorm")."\""; + echo " \"".get_string("asset","scorm")."\""; } } echo "  id.")\">$sco->title $score\n \n"; @@ -182,8 +182,8 @@ echo "
        \n"; print_simple_box_end(); - echo "
        id\">\n"; - echo "\n\n
        "; + echo "id\">\n"; + echo "\n\n\n\n
        "; print_string("mode","scorm"); echo ": \n"; if ($incomplete === true) { @@ -197,7 +197,7 @@ '; echo "\n
        \n
        "; ?> -