From 3a003eadbb66273943e963fe429065c1e46f1d74 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Tue, 18 Aug 2009 05:01:20 +0000 Subject: [PATCH] MDL-19803 Upgraded calls to helpbutton, print_simple_box* and notify --- mod/assignment/db/upgrade.php | 4 +- mod/assignment/lib.php | 25 ++++---- .../type/online/assignment.class.php | 16 ++--- mod/assignment/type/online/file.php | 6 +- .../type/upload/assignment.class.php | 60 +++++++++---------- mod/assignment/type/upload/notes.php | 8 +-- .../type/uploadsingle/assignment.class.php | 12 ++-- 7 files changed, 67 insertions(+), 64 deletions(-) diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php index 97a63fdddb..7a807ae0d9 100644 --- a/mod/assignment/db/upgrade.php +++ b/mod/assignment/db/upgrade.php @@ -21,7 +21,7 @@ // before any action that may take longer time to finish. function xmldb_assignment_upgrade($oldversion) { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; $dbman = $DB->get_manager(); $result = true; @@ -76,7 +76,7 @@ function xmldb_assignment_upgrade($oldversion) { continue; } if (!$item->isReadable()) { - notify(" File not readable, skipping: ".$path.$item->getFilename()); + echo $OUTPUT->notification(" File not readable, skipping: ".$path.$item->getFilename()); continue; } $filename = clean_param($item->getFilename(), PARAM_FILE); diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index cbefe869ba..4db75391b4 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -206,9 +206,10 @@ class assignment_base { * The default implementation prints the assignment description in a box */ function view_intro() { - print_simple_box_start('center', '', '', 0, 'generalbox', 'intro'); + global $OUTPUT; + echo $OUTPUT->box_start('generalbox boxaligncenter', 'intro'); echo format_module_intro('assignment', $this->assignment, $this->cm->id); - print_simple_box_end(); + echo $OUTPUT->box_end(); } /** @@ -218,11 +219,12 @@ class assignment_base { * This will be suitable for most assignment types */ function view_dates() { + global $OUTPUT; if (!$this->assignment->timeavailable && !$this->assignment->timedue) { return; } - print_simple_box_start('center', '', '', 0, 'generalbox', 'dates'); + echo $OUTPUT->box_start('generalbox boxaligncenter', 'dates'); echo ''; if ($this->assignment->timeavailable) { echo ''; @@ -233,7 +235,7 @@ class assignment_base { echo ' '; } echo '
'.get_string('availabledate','assignment').':'.userdate($this->assignment->timedue).'
'; - print_simple_box_end(); + echo $OUTPUT->box_end(); } @@ -674,7 +676,7 @@ class assignment_base { } - $message = notify(get_string('changessaved'), 'notifysuccess', 'center', true); + $message = $OUTPUT->notification(get_string('changessaved'), 'notifysuccess'); $this->display_submissions($message); break; @@ -996,7 +998,7 @@ class assignment_base { } else { echo '
'; echo $OUTPUT->select(html_select::make(format_text_menu(), "format", $submission->format, false)); - helpbutton("textformat", get_string("helpformatting")); + echo $OUTPUT->help_icon(moodle_help_icon::make("textformat", get_string("helpformatting"))); echo '
'; } } @@ -1401,7 +1403,7 @@ class assignment_base { echo ''; echo ''; echo ''; - helpbutton('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'

'; + echo $OUTPUT->help_icon(moodle_help_icon::make('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment')).'

'; echo ''; echo '
'; echo ''; @@ -1419,7 +1421,7 @@ class assignment_base { echo ''; echo ''; echo ''; - helpbutton('pagesize', get_string('pagesize','assignment'), 'assignment'); + echo $OUTPUT->help_icon(moodle_help_icon::make('pagesize', get_string('pagesize','assignment'), 'assignment')); echo ''; echo ''; echo ''; @@ -1427,7 +1429,7 @@ class assignment_base { echo ''; $checked = $quickgrade ? 'checked="checked"' : ''; echo ''; - helpbutton('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'

'; + echo $OUTPUT->help_icon(moodle_help_icon::make('quickgrade', get_string('quickgrade', 'assignment'), 'assignment')).'

'; echo ''; echo ''; echo ''; @@ -1883,6 +1885,7 @@ class assignment_base { * @param $user object */ function user_complete($user) { + global $OUTPUT; if ($submission = $this->get_submission($user->id)) { $fs = get_file_storage(); @@ -1895,7 +1898,7 @@ class assignment_base { } } - print_simple_box_start(); + echo $OUTPUT->box_start(); echo get_string("lastmodified").": "; echo userdate($submission->timemodified); echo $this->display_lateness($submission->timemodified); @@ -1910,7 +1913,7 @@ class assignment_base { $this->view_feedback($submission); } - print_simple_box_end(); + echo $OUTPUT->box_end(); } else { print_string("notsubmittedyet", "assignment"); diff --git a/mod/assignment/type/online/assignment.class.php b/mod/assignment/type/online/assignment.class.php index 76300cfd08..b886a9fc6c 100644 --- a/mod/assignment/type/online/assignment.class.php +++ b/mod/assignment/type/online/assignment.class.php @@ -76,7 +76,7 @@ class assignment_online extends assignment_base { redirect('view.php?id='.$this->cm->id.'&saved=1'); } else { // TODO: add better error message - notify(get_string("error")); //submitting not allowed! + echo $OUTPUT->notification(get_string("error")); //submitting not allowed! } } @@ -92,7 +92,7 @@ class assignment_online extends assignment_base { $this->view_dates(); if ($saved) { - notify(get_string('submissionsaved', 'assignment'), 'notifysuccess'); + echo $OUTPUT->notification(get_string('submissionsaved', 'assignment'), 'notifysuccess'); } if (has_capability('mod/assignment:submit', $context)) { @@ -131,13 +131,13 @@ class assignment_online extends assignment_base { * Display the assignment dates */ function view_dates() { - global $USER, $CFG; + global $USER, $CFG, $OUTPUT; if (!$this->assignment->timeavailable && !$this->assignment->timedue) { return; } - print_simple_box_start('center', '', '', 0, 'generalbox', 'dates'); + echo $OUTPUT->box_start('generalbox boxaligncenter', 'dates'); echo ''; if ($this->assignment->timeavailable) { echo ''; @@ -159,7 +159,7 @@ class assignment_online extends assignment_base { } } echo '
'.get_string('availabledate','assignment').':
'; - print_simple_box_end(); + echo $OUTPUT->box_end(); } function update_submission($data) { @@ -211,15 +211,15 @@ class assignment_online extends assignment_base { ///Stolen code from file.php - print_simple_box_start('center', '', '', 0, 'generalbox', 'wordcount'); + echo $OUTPUT->box_start('generalbox boxaligncenter', 'wordcount'); /// Decide what to count if ($CFG->assignment_itemstocount == ASSIGNMENT_COUNT_WORDS) { echo ' ('.get_string('numwords', '', count_words(format_text($submission->data1, $submission->data2))).')'; } else if ($CFG->assignment_itemstocount == ASSIGNMENT_COUNT_LETTERS) { echo ' ('.get_string('numletters', '', count_letters(format_text($submission->data1, $submission->data2))).')'; } - print_simple_box_end(); - print_simple_box(format_text($submission->data1, $submission->data2), 'center', '100%'); + echo $OUTPUT->box_end(); + echo $OUTPUT->box(format_text($submission->data1, $submission->data2), 'generalbox boxaligncenter boxwidthwide'); ///End of stolen code from file.php diff --git a/mod/assignment/type/online/file.php b/mod/assignment/type/online/file.php index 5915c2e18d..c439855f9f 100644 --- a/mod/assignment/type/online/file.php +++ b/mod/assignment/type/online/file.php @@ -38,7 +38,7 @@ if ($submission = $assignmentinstance->get_submission($user->id)) { print_header(fullname($user,true).': '.$assignment->name); - print_simple_box_start('center', '', '', '', 'generalbox', 'dates'); + echo $OUTPUT->box_start('generalbox boxaligcenter', 'dates'); echo ''; if ($assignment->timedue) { echo ''; @@ -53,9 +53,9 @@ echo ' ('.get_string('numletters', '', count_letters(format_text($submission->data1, $submission->data2))).')'; } echo '
'.get_string('duedate','assignment').':
'; - print_simple_box_end(); + echo $OUTPUT->box_end(); - print_simple_box(format_text($submission->data1, $submission->data2), 'center', '100%'); + echo $OUTPUT->box(format_text($submission->data1, $submission->data2), 'generalbox boxaligncenter boxwidthwide'); echo $OUTPUT->close_window_button(); echo $OUTPUT->footer(); } else { diff --git a/mod/assignment/type/upload/assignment.class.php b/mod/assignment/type/upload/assignment.class.php index e81b83dbd5..9ccfc01a25 100644 --- a/mod/assignment/type/upload/assignment.class.php +++ b/mod/assignment/type/upload/assignment.class.php @@ -28,9 +28,9 @@ class assignment_upload extends assignment_base { if ($this->assignment->timeavailable > time() and !has_capability('mod/assignment:grade', $this->context) // grading user can see it anytime and $this->assignment->var3) { // force hiding before available date - print_simple_box_start('center', '', '', 0, 'generalbox', 'intro'); + echo $OUTPUT->box_start('generalbox boxaligncenter', 'intro'); print_string('notavailableyet', 'assignment'); - print_simple_box_end(); + echo $OUTPUT->box_end(); } else { $this->view_intro(); } @@ -50,12 +50,12 @@ class assignment_upload extends assignment_base { } if ($filecount and $submission) { - print_simple_box($this->print_user_files($USER->id, true), 'center'); + echo $OUTPUT->box($this->print_user_files($USER->id, true), 'generalbox boxaligncenter'); } else { if (!$this->isopen() or $this->is_finalized($submission)) { - print_simple_box(get_string('nofiles', 'assignment'), 'center'); + echo $OUTPUT->box(get_string('nofiles', 'assignment'), 'generalbox boxaligncenter'); } else { - print_simple_box(get_string('nofilesyet', 'assignment'), 'center'); + echo $OUTPUT->box(get_string('nofilesyet', 'assignment'), 'generalbox boxaligncenter'); } } @@ -84,7 +84,7 @@ class assignment_upload extends assignment_base { if ($this->count_responsefiles($USER->id)) { echo $OUTPUT->heading(get_string('responsefiles', 'assignment'), 3); $responsefiles = $this->print_responsefiles($USER->id, true); - print_simple_box($responsefiles, 'center'); + echo $OUTPUT->box($responsefiles, 'generalbox boxaligncenter'); } return; } @@ -169,13 +169,13 @@ class assignment_upload extends assignment_base { } function view_notes() { - global $USER; + global $USER, $OUTPUT; if ($submission = $this->get_submission($USER->id) and !empty($submission->data1)) { - print_simple_box(format_text($submission->data1, FORMAT_HTML), 'center', '630px'); + echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML), 'generalbox boxaligncenter boxwidthwide'); } else { - print_simple_box(get_string('notesempty', 'assignment'), 'center'); + echo $OUTPUT->box(get_string('notesempty', 'assignment'), 'generalbox boxaligncenter'); } if ($this->can_update_notes($submission)) { $options = array ('id'=>$this->cm->id, 'action'=>'editnotes'); @@ -482,8 +482,8 @@ class assignment_upload extends assignment_base { if (!$this->can_update_notes($submission)) { $this->view_header(get_string('upload')); - notify(get_string('uploaderror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('uploaderror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -503,8 +503,8 @@ class assignment_upload extends assignment_base { } else { $this->view_header(get_string('notes', 'assignment')); - notify(get_string('notesupdateerror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('notesupdateerror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -543,14 +543,14 @@ class assignment_upload extends assignment_base { } } print_header(get_string('upload')); - notify(get_string('uploaderror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('uploaderror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); echo $OUTPUT->footer(); die; } function upload_file() { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; $returnurl = 'view.php?id='.$this->cm->id; @@ -559,8 +559,8 @@ class assignment_upload extends assignment_base { if (!$this->can_upload_file($submission)) { $this->view_header(get_string('upload')); - notify(get_string('uploaderror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('uploaderror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -591,8 +591,8 @@ class assignment_upload extends assignment_base { } $this->view_header(get_string('upload')); - notify(get_string('uploaderror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('uploaderror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -664,8 +664,8 @@ class assignment_upload extends assignment_base { $this->email_teachers($submission); } else { $this->view_header(get_string('submitformarking', 'assignment')); - notify(get_string('finalizeerror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('finalizeerror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -723,8 +723,8 @@ class assignment_upload extends assignment_base { $this->update_grade($submission); } else { $this->view_header(get_string('submitformarking', 'assignment')); - notify(get_string('unfinalizeerror', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('unfinalizeerror', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -783,8 +783,8 @@ class assignment_upload extends assignment_base { // print delete error print_header(get_string('delete')); - notify(get_string('deletefilefailed', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('deletefilefailed', 'assignment')); + echo $OUTPUT->continue_button($returnurl); echo $OUTPUT->footer(); die; @@ -815,8 +815,8 @@ class assignment_upload extends assignment_base { if (!$submission = $this->get_submission($userid) // incorrect submission or !$this->can_delete_files($submission)) { // can not delete $this->view_header(get_string('delete')); - notify(get_string('cannotdeletefiles', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('cannotdeletefiles', 'assignment')); + echo $OUTPUT->continue_button($returnurl); $this->view_footer(); die; } @@ -857,8 +857,8 @@ class assignment_upload extends assignment_base { } else { print_header(get_string('delete')); } - notify(get_string('deletefilefailed', 'assignment')); - print_continue($returnurl); + echo $OUTPUT->notification(get_string('deletefilefailed', 'assignment')); + echo $OUTPUT->continue_button($returnurl); if (empty($mode)) { $this->view_footer(); } else { diff --git a/mod/assignment/type/upload/notes.php b/mod/assignment/type/upload/notes.php index 120d375729..9b9b08cf97 100644 --- a/mod/assignment/type/upload/notes.php +++ b/mod/assignment/type/upload/notes.php @@ -43,21 +43,21 @@ and !empty($submission->data1)) { print_header(fullname($user,true).': '.$assignment->name); echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true)); - print_simple_box(format_text($submission->data1, FORMAT_HTML), 'center', '100%'); + echo $OUTPUT->box(format_text($submission->data1, FORMAT_HTML), 'generalbox boxaligncenter boxwidthwide'); if ($mode != 'single') { echo $OUTPUT->close_window_button(); } else { - print_continue($returnurl); + echo $OUTPUT->continue_button($returnurl); } echo $OUTPUT->footer(); } else { print_header(fullname($user,true).': '.$assignment->name); echo $OUTPUT->heading(get_string('notes', 'assignment').' - '.fullname($user,true)); - print_simple_box(get_string('notesempty', 'assignment'), 'center', '100%'); + echo $OUTPUT->box(get_string('notesempty', 'assignment'), 'generalbox boxaligncenter boxwidthwide'); if ($mode != 'single') { echo $OUTPUT->close_window_button(); } else { - print_continue($returnurl); + echo $OUTPUT->continue_button($returnurl); } echo $OUTPUT->footer(); } diff --git a/mod/assignment/type/uploadsingle/assignment.class.php b/mod/assignment/type/uploadsingle/assignment.class.php index a625534199..90ebce1b76 100644 --- a/mod/assignment/type/uploadsingle/assignment.class.php +++ b/mod/assignment/type/uploadsingle/assignment.class.php @@ -37,7 +37,7 @@ class assignment_uploadsingle extends assignment_base { function view() { - global $USER; + global $USER, $OUTPUT; $context = get_context_instance(CONTEXT_MODULE,$this->cm->id); require_capability('mod/assignment:view', $context); @@ -57,7 +57,7 @@ class assignment_uploadsingle extends assignment_base { $this->view_feedback(); } if ($filecount) { - print_simple_box($this->print_user_files($USER->id, true), 'center'); + echo $OUTPUT->box($this->print_user_files($USER->id, true), 'generalbox boxaligncenter'); } } @@ -88,7 +88,7 @@ class assignment_uploadsingle extends assignment_base { if ($submission = $this->get_submission($USER->id)) { //TODO: change later to ">= 0", to prevent resubmission when graded 0 if (($submission->grade > 0) and !$this->assignment->resubmit) { - notify(get_string('alreadygraded', 'assignment')); + echo $OUTPUT->notification(get_string('alreadygraded', 'assignment')); } } @@ -110,17 +110,17 @@ class assignment_uploadsingle extends assignment_base { echo $OUTPUT->heading(get_string('uploadedfile')); redirect('view.php?id='.$this->cm->id); } else { - notify(get_string("uploadnotregistered", "assignment", $newfile_name) ); + echo $OUTPUT->notification(get_string("uploadnotregistered", "assignment", $newfile_name) ); $file->delete(); } } } } else { - notify(get_string("uploaderror", "assignment")); //submitting not allowed! + echo $OUTPUT->notification(get_string("uploaderror", "assignment")); //submitting not allowed! } } - print_continue('view.php?id='.$this->cm->id); + echo $OUTPUT->continue_button('view.php?id='.$this->cm->id); $this->view_footer(); } -- 2.39.5