From d68ccdbaaa537c736e63e1304b7bbc193683cb0c Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Tue, 18 Aug 2009 05:15:52 +0000 Subject: [PATCH] MDL-19812 Upgraded calls to helpbutton, print_simple_box* and notify --- mod/lesson/action/addbranchtable.php | 2 +- mod/lesson/action/addpage.php | 14 +++--- mod/lesson/action/editpage.php | 70 ++++++++++++++-------------- mod/lesson/edit.php | 2 +- mod/lesson/format.php | 14 +++--- mod/lesson/highscores.php | 4 +- mod/lesson/import.php | 10 ++-- mod/lesson/importppt.php | 10 ++-- mod/lesson/lib.php | 10 ++-- mod/lesson/locallib.php | 17 +++---- mod/lesson/mediafile.php | 2 +- mod/lesson/report.php | 2 +- mod/lesson/view.php | 2 +- 13 files changed, 80 insertions(+), 79 deletions(-) diff --git a/mod/lesson/action/addbranchtable.php b/mod/lesson/action/addbranchtable.php index 3f4019cbcb..f2b7a3595d 100644 --- a/mod/lesson/action/addbranchtable.php +++ b/mod/lesson/action/addbranchtable.php @@ -70,7 +70,7 @@ // answer 1 jumpto next page echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); echo "\n"; } // close table and form diff --git a/mod/lesson/action/addpage.php b/mod/lesson/action/addpage.php index 070cae3508..06c2152c10 100644 --- a/mod/lesson/action/addpage.php +++ b/mod/lesson/action/addpage.php @@ -52,7 +52,7 @@ '.get_string("questiontype", "lesson").": \n"; - echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; + echo $OUTPUT->help_icon(moodle_help_icon::make("questiontypes", get_string("questiontype", "lesson"), "lesson"))."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $qtype, "lesson.php?id=$cm->id&action=addpage&pageid=".$pageid.$linkadd); @@ -64,7 +64,7 @@ $qoptionstr = get_string('multianswer', 'lesson'); } echo ""; - helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("questionoption", get_string("questionoption", "lesson"), "lesson")); echo '

'; } ?> @@ -95,7 +95,7 @@ // answer 1 jumpto next page echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { if ($i) { echo get_string("score", "lesson")." $iplus1: "; @@ -109,7 +109,7 @@ case LESSON_ESSAY : echo "".get_string("jump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[0]", LESSON_NEXTPAGE, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if ($lesson->custom) { echo get_string("score", "lesson").": "; } @@ -137,7 +137,7 @@ if ($i == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("correctanswerscore", "lesson").": "; } @@ -145,7 +145,7 @@ } elseif ($i == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("wronganswerscore", "lesson").": "; } @@ -173,7 +173,7 @@ // answer 1 jumpto next page echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", LESSON_NEXTPAGE, false)); } - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { if ($i) { echo get_string("score", "lesson")." $iplus1: "; diff --git a/mod/lesson/action/editpage.php b/mod/lesson/action/editpage.php index 14e548e54d..e6f27f10f5 100644 --- a/mod/lesson/action/editpage.php +++ b/mod/lesson/action/editpage.php @@ -66,7 +66,7 @@ switch ($page->qtype) { case LESSON_MULTICHOICE : echo ''.get_string("questiontype", "lesson").": \n"; - echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; + echo $OUTPUT->help_icon(moodle_help_icon::make("questiontypes", get_string("questiontype", "lesson"), "lesson"))."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); @@ -76,12 +76,12 @@ } else { echo ""; } - helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("questionoption", get_string("questionoption", "lesson"), "lesson")); echo "

\n"; break; case LESSON_SHORTANSWER : echo ''.get_string("questiontype", "lesson").": \n"; - echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; + echo $OUTPUT->help_icon(moodle_help_icon::make("questiontypes", get_string("questiontype", "lesson"), "lesson"))."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); @@ -91,7 +91,7 @@ } else { echo ""; } - helpbutton("questionoption", get_string("questionoption", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("questionoption", get_string("questionoption", "lesson"), "lesson")); echo "

\n"; break; case LESSON_TRUEFALSE : @@ -99,7 +99,7 @@ case LESSON_MATCHING : case LESSON_NUMERICAL : echo ''.get_string("questiontype", "lesson").": \n"; - echo helpbutton("questiontypes", get_string("questiontype", "lesson"), "lesson")."
"; + echo $OUTPUT->help_icon(moodle_help_icon::make("questiontypes", get_string("questiontype", "lesson"), "lesson"))."
"; lesson_qtype_menu($LESSON_QUESTION_TYPE, $page->qtype, "lesson.php?id=$cm->id&action=editpage&pageid=$page->id", "getElementById('editpage').redisplay.value=1;getElementById('editpage').submit();"); @@ -170,13 +170,13 @@ if ($flags & LESSON_ANSWER_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "answer[$n]", $answer->answer); } @@ -185,13 +185,13 @@ if ($flags & LESSON_ANSWER_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "answer[$n]", $answer->answer); } @@ -201,13 +201,13 @@ if ($flags & LESSON_ANSWER_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "answer[$n]", $answer->answer); } @@ -216,13 +216,13 @@ if ($flags & LESSON_RESPONSE_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "response[$n]", $answer->response); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "response[$n]", $answer->response); } @@ -237,14 +237,14 @@ if ($flags & LESSON_ANSWER_EDITOR and $page->qtype != LESSON_SHORTANSWER and $page->qtype != LESSON_NUMERICAL) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer); } else { if ($page->qtype != LESSON_SHORTANSWER and $page->qtype != LESSON_NUMERICAL) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "answer[$n]", $answer->answer); } else { @@ -257,13 +257,13 @@ if ($flags & LESSON_RESPONSE_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "response[$n]", $answer->response); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 6, 70, 630, 300, "response[$n]", $answer->response); } @@ -274,13 +274,13 @@ if ($flags & LESSON_ANSWER_EDITOR) { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea($usehtmleditor, 20, 70, 630, 300, "answer[$n]", $answer->answer); } else { echo " [: ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "answer[$n]", $answer->answer); } @@ -292,15 +292,15 @@ if ($n == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) echo get_string("correctanswerscore", "lesson").": score\" size=\"5\" />"; echo "\n"; } if ($n == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; - echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) echo get_string("wronganswerscore", "lesson").": score\" size=\"5\" />"; echo "\n"; @@ -310,7 +310,7 @@ case LESSON_ESSAY : echo "".get_string("jump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("score", "lesson").": score\" size=\"5\" />"; } @@ -322,7 +322,7 @@ case LESSON_NUMERICAL: echo "".get_string("jump", "lesson")." $nplus1: \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("score", "lesson")." $nplus1: score\" size=\"5\" />"; } @@ -334,7 +334,7 @@ case LESSON_ENDOFBRANCH: echo "".get_string("jump", "lesson")." $nplus1: \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$n]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); echo "\n"; break; } @@ -362,14 +362,14 @@ echo "".get_string("answer", "lesson")." $icorrected:\n"; echo " [".get_string("useeditor", "lesson").": ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "answer[$i]"); echo "\n"; echo "".get_string("matchesanswer", "lesson")." $icorrected:\n"; echo " [".get_string("useeditor", "lesson").": ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "response[$i]"); echo "\n"; @@ -382,7 +382,7 @@ if ($page->qtype != LESSON_SHORTANSWER and $page->qtype != LESSON_NUMERICAL) { echo " [".get_string("useeditor", "lesson").": ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "answer[$i]"); } else { @@ -393,7 +393,7 @@ echo "".get_string("response", "lesson")." $iplus1:\n"; echo " [".get_string("useeditor", "lesson").": ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "response[$i]"); echo "\n"; @@ -402,7 +402,7 @@ echo "".get_string("description", "lesson")." $iplus1:\n"; echo " [".get_string("useeditor", "lesson").": ". ""; - helpbutton("useeditor", get_string("useeditor", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("useeditor", get_string("useeditor", "lesson"), "lesson")); echo "]
\n"; print_textarea(false, 10, 70, 630, 300, "answer[$i]"); echo "\n"; @@ -413,7 +413,7 @@ if ($i < 1) { echo "".get_string("jump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("score", "lesson").": "; } @@ -424,7 +424,7 @@ if ($i == 2) { echo "".get_string("correctanswerjump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if ($lesson->custom) { echo get_string("correctanswerscore", "lesson").": score\" size=\"5\" />"; } @@ -433,7 +433,7 @@ if ($i == 3) { echo "".get_string("wronganswerjump", "lesson").": \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", $answer->jumpto, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if ($lesson->custom) { echo get_string("wronganswerscore", "lesson").": score\" size=\"5\" />"; } @@ -447,7 +447,7 @@ case LESSON_NUMERICAL: echo "".get_string("jump", "lesson")." $iplus1: \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); if($lesson->custom) { echo get_string("score", "lesson")." $iplus1: "; } @@ -456,7 +456,7 @@ case LESSON_BRANCHTABLE : echo "".get_string("jump", "lesson")." $iplus1: \n"; echo $OUTPUT->select(html_select::make($jump, "jumpto[$i]", 0, false)); - helpbutton("jumpto", get_string("jump", "lesson"), "lesson"); + echo $OUTPUT->help_icon(moodle_help_icon::make("jumpto", get_string("jump", "lesson"), "lesson")); echo "\n"; break; } diff --git a/mod/lesson/edit.php b/mod/lesson/edit.php index 94adf5f542..308606ee4e 100644 --- a/mod/lesson/edit.php +++ b/mod/lesson/edit.php @@ -43,7 +43,7 @@ if (empty($firstpage)) { // There are no pages; give teacher some options if (has_capability('mod/lesson:edit', $context)) { - print_simple_box( "\n
".get_string("whatdofirst", "lesson")."
". + echo $OUTPUT->box( "\n
".get_string("whatdofirst", "lesson")."
". "id&pageid=0\">". get_string("importquestions", "lesson")."
". "id&pageid=0\">". diff --git a/mod/lesson/format.php b/mod/lesson/format.php index eb8dc7230d..6ac1838267 100644 --- a/mod/lesson/format.php +++ b/mod/lesson/format.php @@ -31,22 +31,22 @@ class qformat_default { } function importprocess($filename, $lesson, $pageid) { - global $DB; + global $DB, $OUTPUT; /// Processes a given file. There's probably little need to change this $timenow = time(); if (! $lines = $this->readdata($filename)) { - notify("File could not be read, or was empty"); + echo $OUTPUT->notification("File could not be read, or was empty"); return false; } if (! $questions = $this->readquestions($lines)) { // Extract all the questions - notify("There are no questions in this file!"); + echo $OUTPUT->notification("There are no questions in this file!"); return false; } - notify(get_string('importcount', 'lesson', sizeof($questions))); + echo $OUTPUT->notification(get_string('importcount', 'lesson', sizeof($questions))); $count = 0; @@ -128,18 +128,18 @@ class qformat_default { $result = lesson_save_question_options($question); if (!empty($result->error)) { - notify($result->error); + echo $OUTPUT->notification($result->error); return false; } if (!empty($result->notice)) { - notify($result->notice); + echo $OUTPUT->notification($result->notice); return true; } break; // the Bad ones default : - notify(get_string('unsupportedqtype', 'lesson', $question->qtype)); + echo $OUTPUT->notification(get_string('unsupportedqtype', 'lesson', $question->qtype)); } } diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php index 09d6a546a1..7a5a9c8097 100644 --- a/mod/lesson/highscores.php +++ b/mod/lesson/highscores.php @@ -136,7 +136,7 @@ switch ($mode) { case 'add': - print_simple_box_start('center'); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo '
@@ -146,7 +146,7 @@ echo get_string("entername", "lesson").": \n

\n"; lesson_print_submit_link(get_string("submitname", "lesson"), 'nickname'); echo "

\n
\n
\n"; - print_simple_box_end(); + echo $OUTPUT->box_end(); break; default: $params = array ("lessonid" => $lesson->id); diff --git a/mod/lesson/import.php b/mod/lesson/import.php index 7d8540a472..8dc26d8dcc 100644 --- a/mod/lesson/import.php +++ b/mod/lesson/import.php @@ -43,11 +43,11 @@ $form->format = clean_param($form->format, PARAM_SAFEDIR); // For safety if (empty($_FILES['newfile'])) { // file was just uploaded - notify(get_string("uploadproblem") ); + echo $OUTPUT->notification(get_string("uploadproblem") ); } if ((!is_uploaded_file($_FILES['newfile']['tmp_name']) or $_FILES['newfile']['size'] == 0)) { - notify(get_string("uploadnofilefound") ); + echo $OUTPUT->notification(get_string("uploadnofilefound") ); } else { // Valid file is found @@ -74,7 +74,7 @@ } echo "
"; - print_continue("view.php?id=$cm->id"); + echo $OUTPUT->continue_button("view.php?id=$cm->id"); echo $OUTPUT->footer(); exit; } @@ -86,7 +86,7 @@ print_heading_with_help($strimportquestions, "import", "lesson"); - print_simple_box_start("center"); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo "
"; echo "id\" />\n"; echo "\n"; @@ -108,7 +108,7 @@ echo "
"; echo ""; - print_simple_box_end(); + echo $OUTPUT->box_end(); echo $OUTPUT->footer(); diff --git a/mod/lesson/importppt.php b/mod/lesson/importppt.php index cdfecb4ac3..1e885e3f7e 100644 --- a/mod/lesson/importppt.php +++ b/mod/lesson/importppt.php @@ -50,11 +50,11 @@ if ($form = data_submitted()) { /// Filename if (empty($_FILES['newfile'])) { // file was just uploaded - notify(get_string("uploadproblem") ); + echo $OUTPUT->notification(get_string("uploadproblem") ); } if ((!is_uploaded_file($_FILES['newfile']['tmp_name']) or $_FILES['newfile']['size'] == 0)) { - notify(get_string("uploadnofilefound") ); + echo $OUTPUT->notification(get_string("uploadnofilefound") ); } else { // Valid file is found @@ -75,7 +75,7 @@ } echo "
"; - print_continue("$CFG->wwwroot/mod/$modname/view.php?id=$cm->id"); + echo $OUTPUT->continue_button("$CFG->wwwroot/mod/$modname/view.php?id=$cm->id"); echo $OUTPUT->footer(); exit; } @@ -85,7 +85,7 @@ print_heading_with_help($strimportppt, "importppt", "lesson"); - print_simple_box_start("center"); + echo $OUTPUT->box_start('generalbox boxaligncenter'); echo "
"; echo "id\" />\n"; echo "\n"; @@ -101,7 +101,7 @@ echo "
"; echo ""; - print_simple_box_end(); + echo $OUTPUT->box_end(); echo $OUTPUT->footer(); diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php index 4fb86ffd0c..024d1eef05 100644 --- a/mod/lesson/lib.php +++ b/mod/lesson/lib.php @@ -151,14 +151,14 @@ function lesson_delete_instance($id) { * @return boolean */ function lesson_delete_course($course, $feedback=true) { - global $DB; + global $DB, $OUTPUT; $count = $DB->count_records('lesson_default', array('course'=>$course->id)); $DB->delete_records('lesson_default', array('course' => $course->id)); //Inform about changes performed if feedback is enabled if ($feedback) { - notify(get_string('deletedefaults', 'lesson', $count)); + echo $OUTPUT->notification(get_string('deletedefaults', 'lesson', $count)); } return true; @@ -213,12 +213,12 @@ function lesson_user_outline($course, $user, $mod, $lesson) { * @return bool */ function lesson_user_complete($course, $user, $mod, $lesson) { - global $DB; + global $DB, $OUTPUT; $params = array ("lessonid" => $lesson->id, "userid" => $user->id); if ($attempts = $DB->get_records_select("lesson_attempts", "lessonid = :lessonid AND userid = :userid", $params, "retry, timeseen")) { - print_simple_box_start(); + echo $OUTPUT->box_start(); $table->head = array (get_string("attempt", "lesson"), get_string("numberofpagesviewed", "lesson"), get_string("numberofcorrectanswers", "lesson"), get_string("time")); $table->width = "100%"; @@ -253,7 +253,7 @@ function lesson_user_complete($course, $user, $mod, $lesson) { $table->data[] = array($retry + 1, $npages, $ncorrect, userdate($timeseen)); } print_table($table); - print_simple_box_end(); + echo $OUTPUT->box_end(); // also print grade summary $params = array ("lessonid" => $lesson->id, "userid" => $user->id); if ($grades = $DB->get_records_select("lesson_grades", "lessonid = :lessonid AND userid = :userid", $params, diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index af8b353718..fe96145e82 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -347,7 +347,7 @@ function lesson_set_message($message, $class="notifyproblem", $align='center') { * @return boolean **/ function lesson_print_messages() { - global $SESSION; + global $SESSION, $OUTPUT; if (empty($SESSION->lesson_messages)) { // No messages to print @@ -355,7 +355,7 @@ function lesson_print_messages() { } foreach($SESSION->lesson_messages as $message) { - notify($message[0], $message[1], $message[2]); + echo $OUTPUT->notification($message[0], $message[1], $message[2]); } // Reset @@ -1530,7 +1530,7 @@ function lesson_grade($lesson, $ntries, $userid = 0) { * @return void **/ function lesson_print_ongoing_score($lesson) { - global $USER, $DB; + global $USER, $DB, $OUTPUT; $cm = get_coursemodule_from_instance('lesson', $lesson->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -1548,11 +1548,11 @@ function lesson_print_ongoing_score($lesson) { if ($lesson->custom) { $a->score = $gradeinfo->earned; $a->currenthigh = $gradeinfo->total; - print_simple_box(get_string("ongoingcustom", "lesson", $a), "center"); + echo $OUTPUT->box(get_string("ongoingcustom", "lesson", $a), "generalbox boxaligncenter"); } else { $a->correct = $gradeinfo->earned; $a->viewed = $gradeinfo->attempts; - print_simple_box(get_string("ongoingnormal", "lesson", $a), "center"); + echo $OUTPUT->box(get_string("ongoingnormal", "lesson", $a), "generalbox boxaligncenter"); } } } @@ -1591,7 +1591,7 @@ function lesson_qtype_menu($qtypes, $selected="", $link="", $onclick="") { * @return boolean The return is not significant as of yet. Will return true/false. **/ function lesson_print_progress_bar($lesson, $course) { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; $cm = get_coursemodule_from_instance('lesson', $lesson->id); $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -1603,7 +1603,7 @@ function lesson_print_progress_bar($lesson, $course) { // catch teachers if (has_capability('mod/lesson:manage', $context)) { - notify(get_string('progressbarteacherwarning2', 'lesson')); + echo $OUTPUT->notification(get_string('progressbarteacherwarning2', 'lesson')); return false; } if (!isset($USER->modattempts[$lesson->id])) { @@ -1756,6 +1756,7 @@ function lesson_add_pretend_blocks($page, $cm, $lesson, $timer = null) { * @return block_contents **/ function lesson_mediafile_block_contents($cmid, $lesson) { + global $OUTPUT; if (empty($lesson->mediafile)) { return null; } @@ -1765,7 +1766,7 @@ function lesson_mediafile_block_contents($cmid, $lesson) { $name = 'lessonmediafile'; $content = link_to_popup_window ($url, $name, get_string('mediafilepopup', 'lesson'), '', '', get_string('mediafilepopup', 'lesson'), $options, true); - $content .= helpbutton("mediafilestudent", get_string("mediafile", "lesson"), "lesson", true, false, '', true); + $content .= $OUTPUT->help_icon(moodle_help_icon::make("mediafilestudent", get_string("mediafile", "lesson"), "lesson")); $bc = new block_contents(); $bc->title = get_string('linkedmedia', 'lesson'); diff --git a/mod/lesson/mediafile.php b/mod/lesson/mediafile.php index 9483910640..b7516c80ca 100644 --- a/mod/lesson/mediafile.php +++ b/mod/lesson/mediafile.php @@ -183,7 +183,7 @@ $filename = basename($file['basename'], '.'.$file['extension']); echo "

"; - notify(get_string('clicktodownload', 'lesson')); + echo $OUTPUT->notification(get_string('clicktodownload', 'lesson')); echo "".format_string($filename).''; echo "

"; diff --git a/mod/lesson/report.php b/mod/lesson/report.php index 56b1315450..fcf7f0092c 100644 --- a/mod/lesson/report.php +++ b/mod/lesson/report.php @@ -118,7 +118,7 @@ } if ($nothingtodisplay) { - notify(get_string('nolessonattempts', 'lesson')); + echo $OUTPUT->notification(get_string('nolessonattempts', 'lesson')); echo $OUTPUT->footer(); exit(); } diff --git a/mod/lesson/view.php b/mod/lesson/view.php index 88f11a45f1..6f97df90e8 100644 --- a/mod/lesson/view.php +++ b/mod/lesson/view.php @@ -70,7 +70,7 @@ echo '
'; echo '' . "\n"; if (optional_param('userpassword', 0, PARAM_CLEAN)) { - notify(get_string('loginfail', 'lesson')); + echo $OUTPUT->notification(get_string('loginfail', 'lesson')); } echo get_string('passwordprotectedlesson', 'lesson', format_string($lesson->name))."

\n". -- 2.39.5