MDL-19797 Upgraded calls to helpbutton, print_simple_box* and notify

diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php
index ca96c4bb018e3157f0a0b4779d45970e8b92536e..88a568ed285fe5c1923ce00b95ca9abf7feb8668 100644 (file)
--- 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 8418784dc52e47cf1162aeef27970dfa66e2a40f..47be2b48e0ffdb548863dd2362f3aac7acafc567 100644 (file)
--- 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 4e631e73f3f4fffa1df66f3d55279c90831605c7..9864aae0923476dfa7ccaaff253c2a47a5a3feda 100755 (executable)
--- 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 '<th class="header" scope="col">'.get_string('aggregation', 'grades').helpbutton('aggregation', 'aggregation', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('aggregation', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregation', 'aggregation', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('extracredit', 'grades').helpbutton('aggregationcoefcombo', 'aggregationcoefcombo', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('extracredit', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregationcoefcombo', 'aggregationcoefcombo', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('weightuc', 'grades').helpbutton('aggregationcoefweight', 'aggregationcoefweight', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('weightuc', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('aggregationcoefweight', 'aggregationcoefweight', 'grade')).'</th>';
     }
 
     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 '<th class="header" style="width: 40px" scope="col">'.get_string('aggregateonlygraded', 'grades')
-              .helpbutton('aggregateonlygraded', 'aggregateonlygraded', 'grade', true, false, '', true).'</th>';
+              .$OUTPUT->help_icon(moodle_help_icon::make('aggregateonlygraded', 'aggregateonlygraded', 'grade')).'</th>';
     }
 
     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 '<th class="header" style="width: 40px" scope="col">'.get_string('aggregatesubcats', 'grades')
-              .helpbutton('aggregatesubcats', 'aggregatesubcats', 'grade', true, false, '', true).'</th>';
+              .$OUTPUT->help_icon(moodle_help_icon::make('aggregatesubcats', 'aggregatesubcats', 'grade')).'</th>';
     }
 
     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 '<th class="header" style="width: 40px" scope="col">'.get_string('aggregateoutcomes', 'grades')
-              .helpbutton('aggregateoutcomes', 'aggregateoutcomes', 'grade', true, false, '', true).'</th>';
+              .$OUTPUT->help_icon(moodle_help_icon::make('aggregateoutcomes', 'aggregateoutcomes', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('droplow', 'grades').helpbutton('droplow', 'droplow', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('droplow', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('droplow', 'droplow', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('keephigh', 'grades').helpbutton('keephigh', 'keephigh', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('keephigh', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('keephigh', 'keephigh', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('multfactor', 'grades').helpbutton('multfactor', 'multfactor', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('multfactor', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('multfactor', 'multfactor', 'grade')).'</th>';
     }
 
     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 '<th class="header" scope="col">'.get_string('plusfactor', 'grades').helpbutton('plusfactor', 'plusfactor', 'grade', true, false, '', true).'</th>';
+        global $OUTPUT;
+        return '<th class="header" scope="col">'.get_string('plusfactor', 'grades').$OUTPUT->help_icon(moodle_help_icon::make('plusfactor', 'plusfactor', 'grade')).'</th>';
     }
 
     public function get_category_cell($category, $levelclass, $params) {

diff --git a/grade/import/csv/index.php b/grade/import/csv/index.php
index 94561f02e6d7553900888db9a4815a405700afad..695e78d68f7627ad687bf0f804bad1b135292354 100755 (executable)
--- 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 "<br/>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 "<br/>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 1f455ee5ba42275980c7c67d64e18091545a20cf..ab3f306402b9603a34b6feb13cf1fc6636b5152a 100755 (executable)
--- 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 = "<ul>\n";
@@ -138,9 +138,9 @@ function grade_import_commit($courseid, $importcode, $importfeedback=true, $verb
                 $list .= '<li>' . get_string('usergrade', 'grades', $u) . '</li>';
             }
             $list .= "</ul>\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 1db29f6eb7ee57907e3ea566dc54a0ffa476d41f..2c354cd7bb3af8526e76189600850efeeca84243 100755 (executable)
--- 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 7c5d7b6ed8831bf80f270167214edac510b62fe5..bad78c153a4b5c37ce6ebefd13e068ec968212ca 100644 (file)
--- a/grade/report/grader/index.php
+++ b/grade/report/grader/index.php
@@ -157,7 +157,7 @@ echo '<div class="clearer"></div>';
 
 //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 cf0d95bb483552843c3db4cf21df2b2de773bd09..686bd895ee1e88e7563f5dc4bec21b5c872666aa 100644 (file)
--- a/grade/report/grader/preferences.php
+++ b/grade/report/grader/preferences.php
@@ -68,10 +68,10 @@ if (has_capability('moodle/site:config', $systemcontext)) {
     echo "</a></div>\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 d9ec42b79e54deb56af7a4f72bdfe92f6d069c72..f0c9f32835a75459a8fd6564628cffb4b44976ff 100644 (file)
--- a/grade/report/grader/quickedit_item.php
+++ b/grade/report/grader/quickedit_item.php
@@ -81,7 +81,7 @@ echo '<div class="clearer"></div>';
 
 //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 8e392455416af8071e146b080979243b211b5fb5..b16199007368de1a989e3fb12502ac588ed308d0 100644 (file)
--- 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 '<br />'.$report->print_table(true);

diff --git a/grade/report/overview/lib.php b/grade/report/overview/lib.php
index 28c97626d26c04c4cb872c4274e55d1d4383ae8d..ab246dcb91feda8737465000c79d51e8cdbdbc16 100644 (file)
--- 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 ed2079e03235ad021a1d2b42bd599c3be13c3726..ac3be56c4b32b5223237756835b7cbe84b9a5fcf 100644 (file)
--- 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 '<br />'.$report->print_table(true);