From 955ee33d1e0cb8bb6da6f9f319bf467e545b1b8c Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Tue, 18 Aug 2009 00:12:25 +0000 Subject: [PATCH] MDL-19812 Upgraded calls to choose_from_menu --- mod/lesson/action/addbranchtable.php | 4 ++-- mod/lesson/action/addpage.php | 14 +++++++------- mod/lesson/action/editpage.php | 20 ++++++++++---------- mod/lesson/essay.php | 4 +++- mod/lesson/import.php | 2 +- mod/lesson/view.php | 4 ++-- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php index b7e7309a79..3f4019cbcb 100644 --- a/mod/lesson/action/addbranchtable.php +++ b/mod/lesson/action/addbranchtable.php @@ -65,10 +65,10 @@ echo "".get_string("jump", "lesson")." $iplus1: \n"; if ($i) { // answers 2, 3, 4... jumpto this page - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); } else { // answer 1 jumpto next page - choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); echo "\n"; diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php index 3093d460c1..070cae3508 100644 --- a/mod/lesson/action/addpage.php +++ b/mod/lesson/action/addpage.php @@ -90,10 +90,10 @@ echo "".get_string("jump", "lesson")." $iplus1: \n"; if ($i) { // answers 2, 3, 4... jumpto this page - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); } else { // answer 1 jumpto next page - choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { @@ -108,7 +108,7 @@ break; case LESSON_ESSAY : echo "".get_string("jump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[0]", LESSON_NEXTPAGE, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[0]", LESSON_NEXTPAGE, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if ($lesson->custom) { echo get_string("score", "lesson").": "; @@ -136,7 +136,7 @@ } if ($i == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("correctanswerscore", "lesson").": "; @@ -144,7 +144,7 @@ echo "\n"; } elseif ($i == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("wronganswerscore", "lesson").": "; @@ -168,10 +168,10 @@ echo "".get_string("jump", "lesson")." $iplus1: \n"; if ($i) { // answers 2, 3, 4... jumpto this page - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); } else { // answer 1 jumpto next page - choose_from_menu($jump, "jumpto[$i]", LESSON_NEXTPAGE, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php index 9c9966b747..14e548e54d 100644 --- a/mod/lesson/action/editpage.php +++ b/mod/lesson/action/editpage.php @@ -291,7 +291,7 @@ case LESSON_MATCHING : if ($n == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) echo get_string("correctanswerscore", "lesson").": score\" size=\"5\" />"; @@ -299,7 +299,7 @@ } if ($n == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) echo get_string("wronganswerscore", "lesson").": score\" size=\"5\" />"; @@ -309,7 +309,7 @@ break; case LESSON_ESSAY : echo "".get_string("jump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("score", "lesson").": score\" size=\"5\" />"; @@ -321,7 +321,7 @@ case LESSON_SHORTANSWER: case LESSON_NUMERICAL: echo "".get_string("jump", "lesson")." $nplus1: \n"; - choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("score", "lesson")." $nplus1: score\" size=\"5\" />"; @@ -333,7 +333,7 @@ case LESSON_ENDOFCLUSTER: case LESSON_ENDOFBRANCH: echo "".get_string("jump", "lesson")." $nplus1: \n"; - choose_from_menu($jump, "jumpto[$n]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); echo "\n"; break; @@ -412,7 +412,7 @@ case LESSON_ESSAY : if ($i < 1) { echo "".get_string("jump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("score", "lesson").": "; @@ -423,7 +423,7 @@ case LESSON_MATCHING : if ($i == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if ($lesson->custom) { echo get_string("correctanswerscore", "lesson").": score\" size=\"5\" />"; @@ -432,7 +432,7 @@ } if ($i == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; - choose_from_menu($jump, "jumpto[$i]", $answer->jumpto, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if ($lesson->custom) { echo get_string("wronganswerscore", "lesson").": score\" size=\"5\" />"; @@ -446,7 +446,7 @@ case LESSON_SHORTANSWER: case LESSON_NUMERICAL: echo "".get_string("jump", "lesson")." $iplus1: \n"; - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); if($lesson->custom) { echo get_string("score", "lesson")." $iplus1: "; @@ -455,7 +455,7 @@ break; case LESSON_BRANCHTABLE : echo "".get_string("jump", "lesson")." $iplus1: \n"; - choose_from_menu($jump, "jumpto[$i]", 0, ""); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); echo "\n"; break; diff --git a/mod/lesson/essay.php b/mod/lesson/essay.php index 1c9d218d18..a72a769363 100644 --- a/mod/lesson/essay.php +++ b/mod/lesson/essay.php @@ -369,7 +369,9 @@ $options[0] = get_string('nocredit', 'lesson'); $options[1] = get_string('credit', 'lesson'); } - $table->data[] = array(get_string('essayscore', 'lesson').': '.choose_from_menu($options, 'score', $essayinfo->score, '', '', '', true)); + $select = html_select::make($options, 'score', $essayinfo->score, false); + $select->nothingvalue = ''; + $table->data[] = array(get_string('essayscore', 'lesson').': '.$OUTPUT->select($select)); print_table($table); echo '
diff --git a/mod/lesson/import.php b/mod/lesson/import.php index a4f60151b1..7d8540a472 100644 --- a/mod/lesson/import.php +++ b/mod/lesson/import.php @@ -95,7 +95,7 @@ echo ""; print_string("fileformat", "lesson"); echo ":"; - choose_from_menu($fileformatnames, "format", "gift", ""); + echo $OUTPUT->select(html_select::make($fileformatnames, "format", "gift", false)); echo ""; echo ""; diff --git a/mod/lesson/view.php b/mod/lesson/view.php index 6f605198ed..88f11a45f1 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -684,10 +684,10 @@ if (isset($USER->modattempts[$lesson->id])) { $selected = htmlspecialchars(trim($answers[$useranswers[$t]]->response)); // gets the user's previous answer - choose_from_menu ($responseoptions, "response[$answer->id]", $selected); + echo $OUTPUT->select(html_select::make ($responseoptions, "response[$answer->id]", $selected)); $t++; } else { - choose_from_menu ($responseoptions, "response[$answer->id]"); + echo $OUTPUT->select(html_select::make ($responseoptions, "response[$answer->id]")); } echo ''; if ($answer != end($answers)) { -- 2.39.5