From c3b834b42d51e19e324ec2f92ebf3b7f77e43655 Mon Sep 17 00:00:00 2001 From: nicolasconnault Date: Tue, 18 Aug 2009 04:59:57 +0000 Subject: [PATCH] MDL-19797 Upgraded calls to helpbutton, print_simple_box* and notify --- grade/edit/scale/index.php | 4 ++-- grade/edit/tree/grade.php | 4 ++-- grade/edit/tree/lib.php | 30 +++++++++++++++++--------- grade/import/csv/index.php | 24 ++++++++++----------- grade/import/lib.php | 8 +++---- grade/import/xml/index.php | 4 ++-- grade/report/grader/index.php | 2 +- grade/report/grader/preferences.php | 4 ++-- grade/report/grader/quickedit_item.php | 2 +- grade/report/overview/index.php | 2 +- grade/report/overview/lib.php | 4 ++-- grade/report/user/index.php | 2 +- 12 files changed, 50 insertions(+), 40 deletions(-) diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php index ca96c4bb01..88a568ed28 100644 --- a/grade/edit/scale/index.php +++ b/grade/edit/scale/index.php @@ -77,8 +77,8 @@ if (!$courseid) { admin_externalpage_print_header(); } -$table = null; -$table2 = null; +$table = new stdClass(); +$table2 = new stdClass(); $heading = ''; if ($courseid and $scales = grade_scale::fetch_all_local($courseid)) { diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php index 8418784dc5..47be2b48e0 100644 --- a/grade/edit/tree/grade.php +++ b/grade/edit/tree/grade.php @@ -257,12 +257,12 @@ print_header_simple($strgrades . ': ' . $strgraderreport . ': ' . $strgradeedit, echo $OUTPUT->heading($strgradeedit); -print_simple_box_start("center"); +echo $OUTPUT->box_start(); // Form if in edit or add modes $mform->display(); -print_simple_box_end(); +echo $OUTPUT->box_end(); echo $OUTPUT->footer(); die; diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php index 4e631e73f3..9864aae092 100755 --- a/grade/edit/tree/lib.php +++ b/grade/edit/tree/lib.php @@ -539,7 +539,8 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category } public function get_header_cell() { - return ''.get_string('aggregation', 'grades').helpbutton('aggregation', 'aggregation', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('aggregation', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregation', 'aggregation', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -588,7 +589,8 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category class grade_edit_tree_column_extracredit extends grade_edit_tree_column { public function get_header_cell() { - return ''.get_string('extracredit', 'grades').helpbutton('aggregationcoefcombo', 'aggregationcoefcombo', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('extracredit', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregationcoefcombo', 'aggregationcoefcombo', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -625,7 +627,8 @@ class grade_edit_tree_column_extracredit extends grade_edit_tree_column { class grade_edit_tree_column_weight extends grade_edit_tree_column { public function get_header_cell() { - return ''.get_string('weightuc', 'grades').helpbutton('aggregationcoefweight', 'aggregationcoefweight', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('weightuc', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregationcoefweight', 'aggregationcoefweight', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -706,8 +709,9 @@ class grade_edit_tree_column_aggregateonlygraded extends grade_edit_tree_column_ } public function get_header_cell() { + global $OUTPUT; return ''.get_string('aggregateonlygraded', 'grades') - .helpbutton('aggregateonlygraded', 'aggregateonlygraded', 'grade', true, false, '', true).''; + .$OUTPUT->help_icon(moodle_help_icon::make('aggregateonlygraded', 'aggregateonlygraded', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -734,8 +738,9 @@ class grade_edit_tree_column_aggregatesubcats extends grade_edit_tree_column_cat } public function get_header_cell() { + global $OUTPUT; return ''.get_string('aggregatesubcats', 'grades') - .helpbutton('aggregatesubcats', 'aggregatesubcats', 'grade', true, false, '', true).''; + .$OUTPUT->help_icon(moodle_help_icon::make('aggregatesubcats', 'aggregatesubcats', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -763,8 +768,9 @@ class grade_edit_tree_column_aggregateoutcomes extends grade_edit_tree_column_ca } public function get_header_cell() { + global $OUTPUT; return ''.get_string('aggregateoutcomes', 'grades') - .helpbutton('aggregateoutcomes', 'aggregateoutcomes', 'grade', true, false, '', true).''; + .$OUTPUT->help_icon(moodle_help_icon::make('aggregateoutcomes', 'aggregateoutcomes', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -801,7 +807,8 @@ class grade_edit_tree_column_droplow extends grade_edit_tree_column_category { } public function get_header_cell() { - return ''.get_string('droplow', 'grades').helpbutton('droplow', 'droplow', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('droplow', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('droplow', 'droplow', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -826,7 +833,8 @@ class grade_edit_tree_column_keephigh extends grade_edit_tree_column_category { } public function get_header_cell() { - return ''.get_string('keephigh', 'grades').helpbutton('keephigh', 'keephigh', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('keephigh', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('keephigh', 'keephigh', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -851,7 +859,8 @@ class grade_edit_tree_column_multfactor extends grade_edit_tree_column { } public function get_header_cell() { - return ''.get_string('multfactor', 'grades').helpbutton('multfactor', 'multfactor', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('multfactor', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('multfactor', 'multfactor', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { @@ -880,7 +889,8 @@ class grade_edit_tree_column_multfactor extends grade_edit_tree_column { class grade_edit_tree_column_plusfactor extends grade_edit_tree_column { public function get_header_cell() { - return ''.get_string('plusfactor', 'grades').helpbutton('plusfactor', 'plusfactor', 'grade', true, false, '', true).''; + global $OUTPUT; + return ''.get_string('plusfactor', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('plusfactor', 'plusfactor', 'grade')).''; } public function get_category_cell($category, $levelclass, $params) { diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php index 94561f02e6..695e78d68f 100755 --- a/grade/import/csv/index.php +++ b/grade/import/csv/index.php @@ -261,7 +261,7 @@ if ($formdata = $mform->get_data()) { if (!$user = $DB->get_record('user', array('id' => $value))) { // user not found, abort whold import import_cleanup($importcode); - notify("user mapping error, could not find user with id \"$value\""); + echo $OUTPUT->notification("user mapping error, could not find user with id \"$value\""); $status = false; break 3; } @@ -271,7 +271,7 @@ if ($formdata = $mform->get_data()) { if (!$user = $DB->get_record('user', array('idnumber' => $value))) { // user not found, abort whold import import_cleanup($importcode); - notify("user mapping error, could not find user with idnumber \"$value\""); + echo $OUTPUT->notification("user mapping error, could not find user with idnumber \"$value\""); $status = false; break 3; } @@ -280,7 +280,7 @@ if ($formdata = $mform->get_data()) { case 'useremail': if (!$user = $DB->get_record('user', array('email' => $value))) { import_cleanup($importcode); - notify("user mapping error, could not find user with email address \"$value\""); + echo $OUTPUT->notification("user mapping error, could not find user with email address \"$value\""); $status = false; break 3; } @@ -289,7 +289,7 @@ if ($formdata = $mform->get_data()) { case 'username': if (!$user = $DB->get_record('user', array('username' => $value))) { import_cleanup($importcode); - notify("user mapping error, could not find user with username \"$value\""); + echo $OUTPUT->notification("user mapping error, could not find user with username \"$value\""); $status = false; break 3; } @@ -327,7 +327,7 @@ if ($formdata = $mform->get_data()) { // had to pick mapping $status = false; import_cleanup($importcode); - notify(get_string('importfailed', 'grades')); + echo $OUTPUT->notification(get_string('importfailed', 'grades')); break 3; } @@ -348,7 +348,7 @@ if ($formdata = $mform->get_data()) { // had to pick mapping $status = false; import_cleanup($importcode); - notify(get_string('importfailed', 'grades')); + echo $OUTPUT->notification(get_string('importfailed', 'grades')); break 3; } @@ -356,7 +356,7 @@ if ($formdata = $mform->get_data()) { if ($gradeitem->is_locked()) { $status = false; import_cleanup($importcode); - notify(get_string('gradeitemlocked', 'grades')); + echo $OUTPUT->notification(get_string('gradeitemlocked', 'grades')); break 3; } @@ -376,7 +376,7 @@ if ($formdata = $mform->get_data()) { echo "
grade is $value"; $status = false; import_cleanup($importcode); - notify(get_string('badgrade', 'grades')); + echo $OUTPUT->notification(get_string('badgrade', 'grades')); break 3; } $value = $key; @@ -392,7 +392,7 @@ if ($formdata = $mform->get_data()) { echo "
grade is $value"; $status = false; import_cleanup($importcode); - notify(get_string('badgrade', 'grades')); + echo $OUTPUT->notification(get_string('badgrade', 'grades')); break 3; } $newgrade->finalgrade = $value; @@ -409,7 +409,7 @@ if ($formdata = $mform->get_data()) { // user not found, abort whold import $status = false; import_cleanup($importcode); - notify('user mapping error, could not find user!'); + echo $OUTPUT->notification('user mapping error, could not find user!'); break; } @@ -417,7 +417,7 @@ if ($formdata = $mform->get_data()) { // not allowed to import into this group, abort $status = false; import_cleanup($importcode); - notify('user not member of current group, can not update!'); + echo $OUTPUT->notification('user not member of current group, can not update!'); break; } @@ -432,7 +432,7 @@ if ($formdata = $mform->get_data()) { // individual grade locked $status = false; import_cleanup($importcode); - notify(get_string('gradelocked', 'grades')); + echo $OUTPUT->notification(get_string('gradelocked', 'grades')); break 2; } } diff --git a/grade/import/lib.php b/grade/import/lib.php index 1f455ee5ba..ab3f306402 100755 --- a/grade/import/lib.php +++ b/grade/import/lib.php @@ -43,7 +43,7 @@ function get_new_importcode() { * @return bool success */ function grade_import_commit($courseid, $importcode, $importfeedback=true, $verbose=true) { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; $commitstart = time(); // start time in case we need to roll back $newitemids = array(); // array to hold new grade_item ids from grade_import_newitem table, mapping array @@ -129,7 +129,7 @@ function grade_import_commit($courseid, $importcode, $importfeedback=true, $verb } if ($verbose) { - notify(get_string('importsuccess', 'grades'), 'notifysuccess'); + echo $OUTPUT->notification(get_string('importsuccess', 'grades'), 'notifysuccess'); $unenrolledusers = get_unenrolled_users_in_import($importcode, $courseid); if ($unenrolledusers) { $list = "\n"; - notify(get_string('unenrolledusersinimport', 'grades', $list), 'notifysuccess'); + echo $OUTPUT->notification(get_string('unenrolledusersinimport', 'grades', $list), 'notifysuccess'); } - print_continue($CFG->wwwroot.'/grade/index.php?id='.$courseid); + echo $OUTPUT->continue_button($CFG->wwwroot.'/grade/index.php?id='.$courseid); } // clean up import_cleanup($importcode); diff --git a/grade/import/xml/index.php b/grade/import/xml/index.php index 1db29f6eb7..2c354cd7bb 100755 --- a/grade/import/xml/index.php +++ b/grade/import/xml/index.php @@ -60,8 +60,8 @@ if ($data = $mform->get_data()) { echo $OUTPUT->footer(); die; } else { - notify($error); - print_continue($CFG->wwwroot.'/grade/index.php?id='.$course->id); + echo $OUTPUT->notification($error); + echo $OUTPUT->continue_button($CFG->wwwroot.'/grade/index.php?id='.$course->id); echo $OUTPUT->footer(); die; } diff --git a/grade/report/grader/index.php b/grade/report/grader/index.php index 7c5d7b6ed8..bad78c153a 100644 --- a/grade/report/grader/index.php +++ b/grade/report/grader/index.php @@ -157,7 +157,7 @@ echo '
'; //show warnings if any foreach($warnings as $warning) { - notify($warning); + echo $OUTPUT->notification($warning); } $studentsperpage = $report->get_pref('studentsperpage'); diff --git a/grade/report/grader/preferences.php b/grade/report/grader/preferences.php index cf0d95bb48..686bd895ee 100644 --- a/grade/report/grader/preferences.php +++ b/grade/report/grader/preferences.php @@ -68,10 +68,10 @@ if (has_capability('moodle/site:config', $systemcontext)) { echo "\n"; } -print_simple_box_start("center"); +echo $OUTPUT->box_start(); $mform->display(); -print_simple_box_end(); +echo $OUTPUT->box_end(); echo $OUTPUT->footer(); ?> diff --git a/grade/report/grader/quickedit_item.php b/grade/report/grader/quickedit_item.php index d9ec42b79e..f0c9f32835 100644 --- a/grade/report/grader/quickedit_item.php +++ b/grade/report/grader/quickedit_item.php @@ -81,7 +81,7 @@ echo '
'; //show warnings if any foreach($warnings as $warning) { - notify($warning); + echo $OUTPUT->notification($warning); } $studentsperpage = $report->get_pref('studentsperpage'); diff --git a/grade/report/overview/index.php b/grade/report/overview/index.php index 8e39245541..b161990073 100644 --- a/grade/report/overview/index.php +++ b/grade/report/overview/index.php @@ -115,7 +115,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all echo $user_selector; if ($currentgroup and !groups_is_member($currentgroup, $userid)) { - notify(get_string('groupusernotmember', 'error')); + echo $OUTPUT->notification(get_string('groupusernotmember', 'error')); } else { if ($report->fill_table()) { echo '
'.$report->print_table(true); diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php index 28c97626d2..ab246dcb91 100644 --- a/grade/report/overview/lib.php +++ b/grade/report/overview/lib.php @@ -103,7 +103,7 @@ class grade_report_overview extends grade_report { } public function fill_table() { - global $CFG, $DB; + global $CFG, $DB, $OUTPUT; // MDL-11679, only show 'mycourses' instead of all courses if ($courses = get_my_courses($this->user->id, 'c.sortorder ASC', 'id, shortname, showgrades')) { @@ -192,7 +192,7 @@ class grade_report_overview extends grade_report { return true; } else { - notify(get_string('nocourses', 'grades')); + echo $OUTPUT->notification(get_string('nocourses', 'grades')); return false; } } diff --git a/grade/report/user/index.php b/grade/report/user/index.php index ed2079e032..ac3be56c4b 100644 --- a/grade/report/user/index.php +++ b/grade/report/user/index.php @@ -122,7 +122,7 @@ if (has_capability('moodle/grade:viewall', $context)) { //Teachers will see all echo $user_selector; if ($currentgroup and !groups_is_member($currentgroup, $userid)) { - notify(get_string('groupusernotmember', 'error')); + echo $OUTPUT->notification(get_string('groupusernotmember', 'error')); } else { if ($report->fill_table()) { echo '
'.$report->print_table(true); -- 2.39.5