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

diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 71531ef74aa191accb987c3bdec8ed07cd689a08..c3a928604f2e982e1650dc0cebb326d58c888b70 100644 (file)
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -591,7 +591,7 @@ class block_base {
      * @return boolean whether anything was done. Blocks should use edit_form.php.
      */
     function instance_config_print() {
-        global $CFG, $DB;
+        global $CFG, $DB, $OUTPUT;
         // Default behavior: print the config_instance.html file
         // You don't need to override this if you're satisfied with the above
         if (!$this->instance_allow_multiple() && !$this->instance_allow_config()) {
@@ -599,9 +599,9 @@ class block_base {
         }
 
         if (is_file($CFG->dirroot .'/blocks/'. $this->name() .'/config_instance.html')) {
-            print_simple_box_start('center', '', '', 5, 'blockconfiginstance');
+            echo $OUTPUT->box_start('generalbox boxaligncenter blockconfiginstance');
             include($CFG->dirroot .'/blocks/'. $this->name() .'/config_instance.html');
-            print_simple_box_end();
+            echo $OUTPUT->box_end();
         } else {
             notice(get_string('blockconfigbad'), str_replace('blockaction=', 'dummy=', qualified_me()));
         }

diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php
index 5bddd329e86e6e6fb56f4637285fe15ac6c2df6d..fd641f744b3ae1e7baea3b137a3364344d22c9f8 100644 (file)
--- a/blocks/search_forums/block_search_forums.php
+++ b/blocks/search_forums/block_search_forums.php
@@ -7,7 +7,7 @@ class block_search_forums extends block_base {
     }
 
     function get_content() {
-        global $CFG;
+        global $CFG, $OUTPUT;
 
         if($this->content !== NULL) {
             return $this->content;
@@ -36,7 +36,7 @@ class block_search_forums extends block_base {
                                 '<input id="searchform_search" name="search" type="text" size="16" />';
         $this->content->text .= '<button id="searchform_button" type="submit" title="'.$search.'">'.$button.'</button><br />'; 
         $this->content->text .= '<a href="'.$CFG->wwwroot.'/mod/forum/search.php?id='.$this->page->course->id.'">'.$advancedsearch.'</a>';
-        $this->content->text .= helpbutton('search', $advancedsearch, 'moodle', true, false, '', true);
+        $this->content->text .= $OUTPUT->help_icon(moodle_help_icon::make('search', $advancedsearch));
         $this->content->text .= '</fieldset></form></div>';
 
         return $this->content;

diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php
index 70fb6a7dc5f896f4e7db1871131b9ce17cb45ceb..e27b5315c2624da44feb9bed80ed97eff70dd078 100644 (file)
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -229,7 +229,7 @@ class block_tags extends block_base {
                     $tagthisunit = get_string('tagthisunit', $tagslang);
                     $buttonadd = get_string('add', $tagslang);
                     $arrowtitle = get_string('arrowtitle', $tagslang);
-                    $coursetaghelpbutton = helpbutton('addtags', 'adding tags', $tagslang, TRUE, FALSE, '', TRUE);
+                    $coursetaghelpbutton = $OUTPUT->help_icon(moodle_help_icon::make('addtags', 'adding tags', $tagslang));
                     $sesskey = sesskey();
                     $arrowright = $OUTPUT->old_icon_url('t/arrow_left');
                     $this->content->footer .= <<<EOT