From fd21e467e5e7fc3cbceaac6772a4bdf010fe5ec9 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Mon, 10 Aug 2009 03:36:01 +0000 Subject: [PATCH] MDL-19815 Converted calls to popup_form() --- mod/scorm/datamodels/aicclib.php | 6 ++++-- mod/scorm/datamodels/scorm_12lib.php | 6 ++++-- mod/scorm/datamodels/scorm_13lib.php | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 804f756742..728abd9bcc 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -539,8 +539,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $result->toc .= $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js')->asap(); } - $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid='; - $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true); + $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; + $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select->nothinglabel = false; + $result->tocmenu = $OUTPUT->select($select); return $result; } diff --git a/mod/scorm/datamodels/scorm_12lib.php b/mod/scorm/datamodels/scorm_12lib.php index 637f3b47bd..116a2b6b12 100644 --- a/mod/scorm/datamodels/scorm_12lib.php +++ b/mod/scorm/datamodels/scorm_12lib.php @@ -323,8 +323,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js'); } - $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid='; - $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true); + $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; + $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select->nothinglabel = false; + $result->tocmenu = $OUTPUT->select($select); return $result; } diff --git a/mod/scorm/datamodels/scorm_13lib.php b/mod/scorm/datamodels/scorm_13lib.php index 95b3aed640..f7fa4d50a7 100644 --- a/mod/scorm/datamodels/scorm_13lib.php +++ b/mod/scorm/datamodels/scorm_13lib.php @@ -214,8 +214,10 @@ function scorm_get_toc($user,$scorm,$liststyle,$currentorg='',$scoid='',$mode='n $PAGE->requires->js('mod/scorm/datamodels/scorm_datamodels.js'); } - $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&currentorg='.$currentorg.$modestr.'&scoid='; - $result->tocmenu = popup_form($url,$tocmenus, "tocmenu", $sco->id, '', '', '', true); + $url = $CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'¤torg='.$currentorg.$modestr; + $select = moodle_select::make_popup_form($url, 'scoid', $tocmenus, "tocmenu", $sco->id); + $select->nothinglabel = false; + $result->tocmenu = $OUTPUT->select($select); return $result; } -- 2.39.5