MDL-21695 renaming ->help_icon() to old_help_icon() and going to introduce new help_i...

diff --git a/admin/index.php b/admin/index.php
index ecadd64..a9e6b6d 100644 (file)
--- a/admin/index.php
+++ b/admin/index.php
@@ -376,7 +376,7 @@ if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
 $lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
 if (time() - $lastcron > 3600 * 24) {
     $strinstallation = get_string('installation', 'install');
-    $helpbutton = $OUTPUT->help_icon('install', $strinstallation);
+    $helpbutton = $OUTPUT->old_help_icon('install', $strinstallation);
     echo $OUTPUT->box(get_string('cronwarning', 'admin').' '.$helpbutton, 'generalbox adminwarning');
 }
 

diff --git a/admin/roles/lib.php b/admin/roles/lib.php
index dde9aca..de66b3a 100644 (file)
--- a/admin/roles/lib.php
+++ b/admin/roles/lib.php
@@ -484,7 +484,7 @@ abstract class capability_table_with_risks extends capability_table_base {
     protected function add_header_cells() {
         global $OUTPUT;
         echo '<th colspan="' . count($this->displaypermissions) . '" scope="col">' .
-                get_string('permission', 'role') . ' ' . $OUTPUT->help_icon('permissions', get_string('permissions', 'role')) . '</th>';
+                get_string('permission', 'role') . ' ' . $OUTPUT->old_help_icon('permissions', get_string('permissions', 'role')) . '</th>';
         echo '<th class="risk" colspan="' . count($this->allrisks) . '" scope="col">' . get_string('risks','role') . '</th>';
     }
 

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index f0a7788..5260345 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -194,7 +194,7 @@
     $table->wrap = array('nowrap', '', 'nowrap','nowrap');
     $table->width = '90%';
     $table->head = array(
-        get_string('role') . ' ' . $OUTPUT->help_icon('roles', get_string('roles')),
+        get_string('role') . ' ' . $OUTPUT->old_help_icon('roles', get_string('roles')),
         get_string('description'),
         get_string('shortname'),
         get_string('edit')

diff --git a/backup/backup_form.html b/backup/backup_form.html
index 974864f..3e376ac 100644 (file)
--- a/backup/backup_form.html
+++ b/backup/backup_form.html
@@ -281,7 +281,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             echo "<tr>";
             echo "<td align=\"right\" colspan=\"2\"><b>";
             echo '<label for="menubackup_site_files">'.get_string ("sitefilesused").'</label>';
-            echo $OUTPUT->help_icon('sitefilesused', get_string('sitefilesused'));
+            echo $OUTPUT->old_help_icon('sitefilesused', get_string('sitefilesused'));
             echo "</b></td><td colspan=\"2\">";
             $course_file_options[0] = get_string("no");
             $course_file_options[1] = get_string("yes");

diff --git a/backup/restore_form.html b/backup/restore_form.html
index 97bb8c4..dc72830 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -265,7 +265,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         echo '<label for="shortnamefield">'.get_string ('shortname').'</label>';
         echo "</td>";
         echo "<td><input type=\"text\" id=\"shortnamefield\" name=\"shortname\" maxlength=\"100\"  size=\"20\" value=\"".s($form1->shortname)."\" alt=\"".get_string("shortname")."\"  />" ;
-        echo $OUTPUT->help_icon("courseshortname", get_string("shortname"));
+        echo $OUTPUT->old_help_icon("courseshortname", get_string("shortname"));
         if (isset($err["shortname"])) echo $OUTPUT->error_text($err["shortname"]);
         echo "</td>";
         echo "</tr>";
@@ -274,7 +274,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         echo '<label for="fullnamefield">'.get_string ('fullname').'</label>';
         echo "</td>";
         echo "<td><input type=\"text\" id=\"fullnamefield\" name=\"fullname\" maxlength=\"254\" size=\"50\" value=\"".s($form1->fullname)."\" alt=\" ".get_string("fullname")."\"  />" ;
-        echo $OUTPUT->help_icon("coursefullname", get_string("fullname"));
+        echo $OUTPUT->old_help_icon("coursefullname", get_string("fullname"));
         if (isset($err["fullname"])) echo $OUTPUT->error_text($err["fullname"]);
         echo"</td></tr>";
     } else {
@@ -299,7 +299,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
             $yearselector = html_writer::select_time('years', "startyear", $form1->startdate);
 
             echo $dayselector . $monthselector . $yearselector;
-            echo $OUTPUT->help_icon("coursestartdate", get_string("startdate"));
+            echo $OUTPUT->old_help_icon("coursestartdate", get_string("startdate"));
         } else {
             print_string('notavailable');
             echo '<input type="hidden" name="startyear" value="0" />';
@@ -459,7 +459,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
         //Now print the Groups tr (assume there is no $info->backup_groups)
         echo "<tr>";
         echo "<td align=\"right\" colspan=\"2\"><b>";
-        $helplink = $OUTPUT->help_icon('grouprestore', get_string('groups'));
+        $helplink = $OUTPUT->old_help_icon('grouprestore', get_string('groups'));
         echo '<label for="menurestore_groups">'.get_string ("groups").'</label>'.$helplink;
         echo "</b></td><td colspan=\"2\">";
         $group_options[RESTORE_GROUPS_NONE] = get_string('none');

diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php
index e6bafc8..58da6ba 100644 (file)
--- a/blocks/search_forums/block_search_forums.php
+++ b/blocks/search_forums/block_search_forums.php
@@ -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 .= $OUTPUT->help_icon('search', $advancedsearch);
+        $this->content->text .= $OUTPUT->old_help_icon('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 de0e6c2..c10c9e8 100644 (file)
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -231,7 +231,7 @@ class block_tags extends block_base {
                     $tagthisunit = get_string('tagthisunit', $tagslang);
                     $buttonadd = get_string('add', $tagslang);
                     $arrowtitle = get_string('arrowtitle', $tagslang);
-                    $coursetaghelpbutton = $OUTPUT->help_icon('addtags', 'adding tags', $tagslang);
+                    $coursetaghelpbutton = $OUTPUT->old_help_icon('addtags', 'adding tags', $tagslang);
                     $sesskey = sesskey();
                     $arrowright = $OUTPUT->pix_url('t/arrow_left');
                     $this->content->footer .= <<<EOT

diff --git a/course/lib.php b/course/lib.php
index 54f8b38..959d612 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -1647,13 +1647,13 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false,
 
     if (!empty($resources)) {
         $select = new url_select($resources, '', array(''=>$straddresource), "ressection$section");
-        $select->set_help_icon('resource/types', $straddresource);
+        $select->set_old_help_icon('resource/types', $straddresource);
         $output .= $OUTPUT->render($select);
     }
 
     if (!empty($activities)) {
         $select = new url_select($activities, '', array(''=>$straddactivity), "section$section");
-        $select->set_help_icon('mods', $straddactivity);
+        $select->set_old_help_icon('mods', $straddactivity);
         $output .= $OUTPUT->render($select);
     }
 

diff --git a/course/report/participation/index.php b/course/report/participation/index.php
index b8c81ed..9501bea 100644 (file)
--- a/course/report/participation/index.php
+++ b/course/report/participation/index.php
@@ -125,7 +125,7 @@
     echo html_writer::select($roleoptions,'roleid',$roleid,false);
     echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n";
     echo html_writer::select($actionoptions,'action',$action,false);
-    echo $OUTPUT->help_icon('participationreport', get_string('participationreport'));
+    echo $OUTPUT->old_help_icon('participationreport', get_string('participationreport'));
     echo '<input type="submit" value="'.get_string('go').'" />'."\n</div></form>\n";
 
     $baseurl =  $CFG->wwwroot.'/course/report/participation/index.php?id='.$course->id.'&amp;roleid='
@@ -277,7 +277,7 @@
         echo '<label for="formaction">'.get_string("withselectedusers").'</label>';
         $displaylist['messageselect.php'] = get_string('messageselectadd');
         echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionselect'));
-        echo $OUTPUT->help_icon("participantswithselectedusers", get_string("withselectedusers"));
+        echo $OUTPUT->old_help_icon("participantswithselectedusers", get_string("withselectedusers"));
         echo '<input type="submit" value="' . get_string('ok') . '" />'."\n";
         echo '</div>';
         echo '</div>'."\n";

diff --git a/enrol/authorize/config_form.php b/enrol/authorize/config_form.php
index 07535f5..d6eabdf 100755 (executable)
--- a/enrol/authorize/config_form.php
+++ b/enrol/authorize/config_form.php
@@ -129,7 +129,7 @@ if (!isset($frm->acceptechecktypes)) {
 <tr valign="top">
     <td align="right">an_authcode:</td>
     <td><?php echo html_writer::checkbox('an_authcode', '1', !empty($frm->an_authcode), get_string("adminauthcode", "enrol_authorize"));  ?>
-        <?php echo $OUTPUT->help_icon('authorize/authcode', 'authcode', 'enrol'); ?><br />
+        <?php echo $OUTPUT->old_help_icon('authorize/authcode', 'authcode', 'enrol'); ?><br />
     </td>
 </tr>
 
@@ -174,20 +174,20 @@ if (!isset($frm->acceptechecktypes)) {
 </tr>
 
 <tr valign="top"><td colspan="2"><h4><?php print_string("adminauthorizeccapture", "enrol_authorize") ?>
-                                     <?php echo $OUTPUT->help_icon('authorize/orderreview', 'orderreview', 'enrol'); ?>
+                                     <?php echo $OUTPUT->old_help_icon('authorize/orderreview', 'orderreview', 'enrol'); ?>
                                  </h4></td></tr>
 
 <tr valign="top">
     <td align="right">an_review:</td>
     <td><?php echo html_writer::checkbox('an_review', '1', !empty($frm->an_review), get_string("adminreview", "enrol_authorize")); ?>
-        <?php echo $OUTPUT->help_icon('authorize/review', get_string('adminhelpreviewtitle', 'enrol_authorize'), 'enrol'); ?><br />
+        <?php echo $OUTPUT->old_help_icon('authorize/review', get_string('adminhelpreviewtitle', 'enrol_authorize'), 'enrol'); ?><br />
     </td>
 </tr>
 
 <tr valign="top">
     <td align="right">an_capture_day:</td>
     <td><input type="text" name="an_capture_day" size="2" maxlength="2" value="<?php p($frm->an_capture_day) ?>" />
-        <?php echo $OUTPUT->help_icon('authorize/captureday', get_string('adminhelpcapturetitle', 'enrol_authorize'), 'enrol'); ?><br />
+        <?php echo $OUTPUT->old_help_icon('authorize/captureday', get_string('adminhelpcapturetitle', 'enrol_authorize'), 'enrol'); ?><br />
         <?php print_string("reviewday", "enrol_authorize", $frm->an_capture_day) ?></td>
 </tr>
 

diff --git a/enrol/imsenterprise/config.html b/enrol/imsenterprise/config.html
index e4e592d..56ba350 100644 (file)
--- a/enrol/imsenterprise/config.html
+++ b/enrol/imsenterprise/config.html
@@ -38,7 +38,7 @@
         <input type="checkbox" value="1" name="enrol_createnewusers" <?php if ($frm->enrol_createnewusers) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('createnewusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('createnewusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -48,7 +48,7 @@
         <input type="checkbox" value="1" name="enrol_imsdeleteusers" <?php if ($frm->enrol_imsdeleteusers) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('deleteusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('deleteusers', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -78,7 +78,7 @@
         <input type="checkbox" value="1" name="enrol_imssourcedidfallback" <?php if ($frm->enrol_imssourcedidfallback) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('sourceddidfallback', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('sourceddidfallback', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 <!--
@@ -138,7 +138,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
         <input type="text" <?php echo 'value="'.intval($frm->enrol_truncatecoursecodes).'"' ?> name="enrol_truncatecoursecodes" size="3" maxlength="3" />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('truncatecoursecodes', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('truncatecoursecodes', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -148,7 +148,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
         <input type="checkbox" value="1" name="enrol_createnewcourses" <?php if ($frm->enrol_createnewcourses) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('createnewcourses', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('createnewcourses', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -158,7 +158,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
         <input type="checkbox" value="1" name="enrol_createnewcategories" <?php if ($frm->enrol_createnewcategories) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('categorisation', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('categorisation', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -168,7 +168,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
         <input type="checkbox" value="1" name="enrol_imsunenrol" <?php if ($frm->enrol_imsunenrol) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('unenrol', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('unenrol', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -180,7 +180,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
     <td align="right"><?php  print_string('restricttarget', 'enrol_imsenterprise') ?>:</td>
     <td colspan="2">
         <input type="text" <?php echo 'value="'.htmlspecialchars($frm->enrol_imsrestricttarget).'"' ?> name="enrol_imsrestricttarget" size="20" maxlength="32" />
-    <?php echo $OUTPUT->help_icon('target', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('target', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 
@@ -190,7 +190,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
         <input type="checkbox" value="1" name="enrol_imscapitafix" <?php if ($frm->enrol_imscapitafix) echo "checked=\"checked\"" ?> />
     </td>
     <td>
-    <?php echo $OUTPUT->help_icon('capita', 'More detail about this option', 'enrol/imsenterprise'); ?>
+    <?php echo $OUTPUT->old_help_icon('capita', 'More detail about this option', 'enrol/imsenterprise'); ?>
     </td>
 </tr>
 

diff --git a/grade/edit/tree/lib.php b/grade/edit/tree/lib.php
index 8e6fd4a..66c0f91 100755 (executable)
--- a/grade/edit/tree/lib.php
+++ b/grade/edit/tree/lib.php
@@ -621,7 +621,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('aggregation', 'grades').$OUTPUT->help_icon('aggregation', 'aggregation', 'grade');
+        $headercell->text = get_string('aggregation', 'grades').$OUTPUT->old_help_icon('aggregation', 'aggregation', 'grade');
         return $headercell;
     }
 
@@ -677,7 +677,7 @@ class grade_edit_tree_column_extracredit extends grade_edit_tree_column {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('extracredit', 'grades').$OUTPUT->help_icon('aggregationcoefcombo', 'aggregationcoefcombo', 'grade');
+        $headercell->text = get_string('extracredit', 'grades').$OUTPUT->old_help_icon('aggregationcoefcombo', 'aggregationcoefcombo', 'grade');
         return $headercell;
     }
 
@@ -719,7 +719,7 @@ class grade_edit_tree_column_weight extends grade_edit_tree_column {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('weightuc', 'grades').$OUTPUT->help_icon('aggregationcoefweight', 'aggregationcoefweight', 'grade');
+        $headercell->text = get_string('weightuc', 'grades').$OUTPUT->old_help_icon('aggregationcoefweight', 'aggregationcoefweight', 'grade');
         return $headercell;
     }
 
@@ -814,7 +814,7 @@ class grade_edit_tree_column_aggregateonlygraded extends grade_edit_tree_column_
         $headercell = clone($this->headercell);
         $headercell->style .= 'width: 40px;';
         $headercell->text = get_string('aggregateonlygraded', 'grades')
-                . $OUTPUT->help_icon('aggregateonlygraded', 'aggregateonlygraded', 'grade');
+                . $OUTPUT->old_help_icon('aggregateonlygraded', 'aggregateonlygraded', 'grade');
         return $headercell;
     }
 
@@ -851,7 +851,7 @@ class grade_edit_tree_column_aggregatesubcats extends grade_edit_tree_column_cat
         $headercell = clone($this->headercell);
         $headercell->style .= 'width: 40px;';
         $headercell->text = get_string('aggregatesubcats', 'grades')
-              .$OUTPUT->help_icon('aggregatesubcats', 'aggregatesubcats', 'grade');
+              .$OUTPUT->old_help_icon('aggregatesubcats', 'aggregatesubcats', 'grade');
         return $headercell;
     }
 
@@ -889,7 +889,7 @@ class grade_edit_tree_column_aggregateoutcomes extends grade_edit_tree_column_ca
         $headercell = clone($this->headercell);
         $headercell->style .= 'width: 40px;';
         $headercell->text = get_string('aggregateoutcomes', 'grades')
-              .$OUTPUT->help_icon('aggregateoutcomes', 'aggregateoutcomes', 'grade');
+              .$OUTPUT->old_help_icon('aggregateoutcomes', 'aggregateoutcomes', 'grade');
         return $headercell;
     }
 
@@ -933,7 +933,7 @@ class grade_edit_tree_column_droplow extends grade_edit_tree_column_category {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('droplow', 'grades').$OUTPUT->help_icon('droplow', 'droplow', 'grade');
+        $headercell->text = get_string('droplow', 'grades').$OUTPUT->old_help_icon('droplow', 'droplow', 'grade');
         return $headercell;
     }
 
@@ -966,7 +966,7 @@ class grade_edit_tree_column_keephigh extends grade_edit_tree_column_category {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('keephigh', 'grades').$OUTPUT->help_icon('keephigh', 'keephigh', 'grade');
+        $headercell->text = get_string('keephigh', 'grades').$OUTPUT->old_help_icon('keephigh', 'keephigh', 'grade');
         return $headercell;
     }
 
@@ -999,7 +999,7 @@ class grade_edit_tree_column_multfactor extends grade_edit_tree_column {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('multfactor', 'grades').$OUTPUT->help_icon('multfactor', 'multfactor', 'grade');
+        $headercell->text = get_string('multfactor', 'grades').$OUTPUT->old_help_icon('multfactor', 'multfactor', 'grade');
         return $headercell;
     }
 
@@ -1040,7 +1040,7 @@ class grade_edit_tree_column_plusfactor extends grade_edit_tree_column {
     public function get_header_cell() {
         global $OUTPUT;
         $headercell = clone($this->headercell);
-        $headercell->text = get_string('plusfactor', 'grades').$OUTPUT->help_icon('plusfactor', 'plusfactor', 'grade');
+        $headercell->text = get_string('plusfactor', 'grades').$OUTPUT->old_help_icon('plusfactor', 'plusfactor', 'grade');
         return $headercell;
     }
 

diff --git a/lib/completionlib.php b/lib/completionlib.php
index 349d0df..eef9282 100644 (file)
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -169,7 +169,7 @@ class completion_info {
         global $PAGE, $OUTPUT;
         if ($this->is_enabled() && !$PAGE->user_is_editing() && isloggedin() && !isguestuser()) {
             echo '<span id = "completionprogressid" class="completionprogress">'.get_string('yourprogress','completion').' ';
-            echo $OUTPUT->help_icon('completionicons',get_string('completionicons','completion'),'completion');
+            echo $OUTPUT->old_help_icon('completionicons',get_string('completionicons','completion'),'completion');
             echo '</span>';
         }
     }

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index fd15982..2f3e8ec 100644 (file)
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -2733,11 +2733,11 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
  * @return string|void Depending on value of $return
  */
 function helpbutton($page, $title, $module='moodle', $image=true, $linktext=false, $text='', $return=false, $imagetext='') {
-    debugging('helpbutton() has been deprecated. Please change your code to use $OUTPUT->help_icon().');
+    debugging('helpbutton() has been deprecated. Please change your code to use $OUTPUT->old_help_icon().');
 
     global $OUTPUT;
 
-    $output = $OUTPUT->help_icon($page, $title, $module, $linktext);
+    $output = $OUTPUT->old_help_icon($page, $title, $module, $linktext);
 
     // hide image with CSS if needed
 
@@ -3291,7 +3291,7 @@ function popup_form($baseurl, $options, $formid, $selected='', $nothing='choose'
     $select->disabled = $disabled;
 
     $select->set_label($selectlabel);
-    $select->set_help_icon($help, $helptext);
+    $select->set_old_help_icon($help, $helptext);
 
     $output = $OUTPUT->render($select);
 

diff --git a/lib/formslib.php b/lib/formslib.php
index ed7fcee..3ac34a6 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -1352,7 +1352,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
             $module   = isset($buttonargs[2]) ? $buttonargs[2] : 'moodle';
             $linktext = isset($buttonargs[3]) ? $buttonargs[3] : false;
 
-            $element->_helpbutton = $OUTPUT->help_icon($page, $text, $module, $linktext);
+            $element->_helpbutton = $OUTPUT->old_help_icon($page, $text, $module, $linktext);
 
         } else if (!$suppresscheck) {
             print_error('nonexistentformelements', 'form', '', $elementname);
@@ -1372,7 +1372,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
      */
     function addHelpButton($elementname, $identifier, $title, $component = 'moodle', $linktext = '') {
         if (array_key_exists($elementname, $this->_elementIndex)) {
-            $element->_helpbutton = $OUTPUT->help_icon($identifier, $title, $component, $linktext);
+            $element->_helpbutton = $OUTPUT->old_help_icon($identifier, $title, $component, $linktext);
         } else if (!$suppresscheck) {
             debugging(get_string('nonexistentformelements', 'form', $elementname));
         }

diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 67ebec2..30dfd97 100644 (file)
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -151,7 +151,7 @@ class user_picture implements renderable {
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since     Moodle 2.0
  */
-class help_icon implements renderable {
+class old_help_icon implements renderable {
     /**
      * @var string $helpidentifier lang pack identifier (should inlcude the "_hlp" suffix)
      */
@@ -430,8 +430,8 @@ class single_select implements renderable {
      * @param bool $linktext add extra text to icon
      * @return void
      */
-    public function set_help_icon($helppage, $title, $component = 'moodle') {
-        $this->helpicon = new help_icon($helppage, $title, $component);
+    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
+        $this->helpicon = new old_help_icon($helppage, $title, $component);
     }
 
     /**
@@ -527,8 +527,8 @@ class url_select implements renderable {
      * @param bool $linktext add extra text to icon
      * @return void
      */
-    public function set_help_icon($helppage, $title, $component = 'moodle') {
-        $this->helpicon = new help_icon($helppage, $title, $component);
+    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
+        $this->helpicon = new old_help_icon($helppage, $title, $component);
     }
 
     /**

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 3e82382..96952b2 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -1355,7 +1355,7 @@ END;
             $image = $this->pix_icon($icon, $iconalt, $component, array('class'=>'icon'));
         }
 
-        $help = $this->help_icon($helpidentifier, $text, $component);
+        $help = $this->old_help_icon($helpidentifier, $text, $component);
 
         return $this->heading($image.$text.$help, 2, 'main help');
     }
@@ -1369,8 +1369,8 @@ END;
      * @param string|bool $linktext true means use $title as link text, string means link text value
      * @return string HTML fragment
      */
-    public function help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') {
-        $icon = new help_icon($helpidentifier, $title, $component);
+    public function old_help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') {
+        $icon = new old_help_icon($helpidentifier, $title, $component);
         if ($linktext === true) {
             $icon->linktext = $title;
         } else if (!empty($linktext)) {
@@ -1384,7 +1384,7 @@ END;
      * @param help_icon $helpicon
      * @return string HTML fragment
      */
-    protected function render_help_icon(help_icon $helpicon) {
+    protected function render_old_help_icon(old_help_icon $helpicon) {
         global $CFG;
 
         // first get the help image icon

diff --git a/lib/tablelib.php b/lib/tablelib.php
index ba9f4e2..9ceab87 100644 (file)
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -942,7 +942,7 @@ class flexible_table {
             $html .= '<div class="mdl-align">';
             $html .= '<input type="submit" value="'.get_string('downloadas', 'table').'"/>';
             $html .= html_writer::select($downloadoptions, 'download', $this->defaultdownloadformat, false);
-            $html .= $OUTPUT->help_icon('tableexportformats', get_string('tableexportformats', 'table'));
+            $html .= $OUTPUT->old_help_icon('tableexportformats', get_string('tableexportformats', 'table'));
             $html .= '</div></form>';
 
             return $html;

diff --git a/lib/weblib.php b/lib/weblib.php
index a52f708..12f7233 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2287,7 +2287,7 @@ function switchroles_form($courseid) {
         unset($roles[$CFG->guestroleid]);
         $popupurl = new moodle_url('/course/view.php', array('id'=>$courseid, 'sesskey'=>sesskey()));
         $select = new single_select($popupurl, 'switchrole', $roles, null, array(''=>get_string('switchroleto')), 'switchrole');
-        $select->set_help_icon('switchrole', get_string('switchroleto'));
+        $select->set_old_help_icon('switchrole', get_string('switchroleto'));
         return $OUTPUT->render($select);
     }
 

diff --git a/login/index_form.html b/login/index_form.html
index 86da024..b0d45bf 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -15,7 +15,7 @@ if ($show_instructions) {
             if (empty($CFG->usesid)) {
                 echo '<br/>';
                 echo '('.get_string("cookiesenabled").')';
-                echo $OUTPUT->help_icon("cookies", get_string("cookiesenabled"));
+                echo $OUTPUT->old_help_icon("cookies", get_string("cookiesenabled"));
             }
            ?>
         </div>

diff --git a/message/edit.php b/message/edit.php
index 259bb23..6959608 100644 (file)
--- a/message/edit.php
+++ b/message/edit.php
@@ -210,9 +210,9 @@ foreach ( $providers as $providerid => $provider){
 
 /// TODO XXX: This is only a quick hack ... helpfile locations should be provided as part of the provider definition
     if ($provider->component == 'moodle') {
-        $helpbtn = $OUTPUT->help_icon('moodle_'.$provider->name, $providername, 'message');
+        $helpbtn = $OUTPUT->old_help_icon('moodle_'.$provider->name, $providername, 'message');
     } else {
-        $helpbtn = $OUTPUT->help_icon('message_'.$provider->name, $providername, basename($provider->component));
+        $helpbtn = $OUTPUT->old_help_icon('message_'.$provider->name, $providername, basename($provider->component));
     }
 
     echo '<tr><th align="right">'.$providername.$helpbtn.'</th><td colspan="'.$number_procs.'"></td></tr>'."\n";

diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php
index 8638b1c..8496fd7 100644 (file)
--- a/mod/assignment/lib.php
+++ b/mod/assignment/lib.php
@@ -1000,7 +1000,7 @@ class assignment_base {
             } else {
                 echo '<div class="format">';
                 echo html_writer::select(format_text_menu(), "format", $submission->format, false);
-                echo $OUTPUT->help_icon("textformat", get_string("helpformatting"));
+                echo $OUTPUT->old_help_icon("textformat", get_string("helpformatting"));
                 echo '</div>';
             }
         }
@@ -1402,7 +1402,7 @@ class assignment_base {
             echo '<label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>';
             echo '<input type="hidden" name="mailinfo" value="0" />';
             echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' />';
-            echo $OUTPUT->help_icon('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'</p></div>';
+            echo $OUTPUT->old_help_icon('emailnotification', get_string('enableemailnotification', 'assignment'), 'assignment').'</p></div>';
             echo '</div>';
             echo '<div class="fastgbutton"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
             echo '</div>';
@@ -1420,7 +1420,7 @@ class assignment_base {
         echo '</td>';
         echo '<td>';
         echo '<input type="text" id="perpage" name="perpage" size="1" value="'.$perpage.'" />';
-        echo $OUTPUT->help_icon('pagesize', get_string('pagesize','assignment'), 'assignment');
+        echo $OUTPUT->old_help_icon('pagesize', get_string('pagesize','assignment'), 'assignment');
         echo '</td></tr>';
         echo '<tr><td>';
         echo '<label for="quickgrade">'.get_string('quickgrade','assignment').'</label>';
@@ -1428,7 +1428,7 @@ class assignment_base {
         echo '<td>';
         $checked = $quickgrade ? 'checked="checked"' : '';
         echo '<input type="checkbox" id="quickgrade" name="quickgrade" value="1" '.$checked.' />';
-        echo $OUTPUT->help_icon('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'</p></div>';
+        echo $OUTPUT->old_help_icon('quickgrade', get_string('quickgrade', 'assignment'), 'assignment').'</p></div>';
         echo '</td></tr>';
         echo '<tr><td colspan="2">';
         echo '<input type="submit" value="'.get_string('savepreferences').'" />';

diff --git a/mod/chat/gui_header_js/chatinput.php b/mod/chat/gui_header_js/chatinput.php
index c94cad5..9e0366d 100644 (file)
--- a/mod/chat/gui_header_js/chatinput.php
+++ b/mod/chat/gui_header_js/chatinput.php
@@ -49,7 +49,7 @@ echo html_writer::start_tag('form', array('action'=>'../empty.php', 'method'=>'p
 echo html_writer::empty_tag('input', array('type'=>'text', 'id'=>'input_chat_message', 'name'=>'chat_message', 'size'=>'50', 'value'=>''));
 echo html_writer::empty_tag('input', array('type'=>'checkbox', 'id'=>'auto', 'checked'=>'checked', 'value'=>''));
 echo html_writer::tag('label', get_string('autoscroll', 'chat'), array('for'=>'auto'));
-echo $OUTPUT->help_icon('chatting', get_string('helpchatting', 'chat'), 'chat', true);
+echo $OUTPUT->old_help_icon('chatting', get_string('helpchatting', 'chat'), 'chat', true);
 echo html_writer::end_tag('form');
 
 echo html_writer::start_tag('form', array('action'=>'insert.php', 'method'=>'post', 'target'=>'empty', 'id'=>'sendForm'));

diff --git a/mod/chat/gui_sockets/chatinput.php b/mod/chat/gui_sockets/chatinput.php
index 20a9f8d..8883482 100644 (file)
--- a/mod/chat/gui_sockets/chatinput.php
+++ b/mod/chat/gui_sockets/chatinput.php
@@ -29,7 +29,7 @@ echo $OUTPUT->header();
     <form action="../empty.php" method="get" target="empty" id="inputform"
           onsubmit="return empty_field_and_submit();">
         <input type="text" name="chat_message" id="chat_message" size="60" value="" />
-        <?php echo $OUTPUT->help_icon("chatting", get_string("helpchatting", "chat"), "chat", true); ?>
+        <?php echo $OUTPUT->old_help_icon("chatting", get_string("helpchatting", "chat"), "chat", true); ?>
     </form>
 
     <form action="<?php echo "http://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform">

diff --git a/mod/data/edit.php b/mod/data/edit.php
index 0c140eb..08bbd1b 100755 (executable)
--- a/mod/data/edit.php
+++ b/mod/data/edit.php
@@ -341,7 +341,7 @@ if (has_capability('mod/data:manageentries',$context)) {
         echo '<tr>';
         echo '<td align="right">'.get_string('csvfile', 'data').':</td>';
         echo '<td><input type="file" name="recordsfile" size="30" />';
-        echo $OUTPUT->help_icon('importcsv', get_string('csvimport', 'data'), 'data');
+        echo $OUTPUT->old_help_icon('importcsv', get_string('csvimport', 'data'), 'data');
         echo '</td><tr>';
         echo '<td align="right">'.get_string('fielddelimiter', 'data').':</td>';
         echo '<td><input type="text" name="fielddelimiter" size="6" />';

diff --git a/mod/data/field.php b/mod/data/field.php
index c22b6d9..472aa57 100755 (executable)
--- a/mod/data/field.php
+++ b/mod/data/field.php
@@ -306,7 +306,7 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) {          ///
     echo '<label for="fieldform_jump">'.get_string('newfield','data').'</label>';
     $popupurl = $CFG->wwwroot.'/mod/data/field.php?d='.$data->id.'&mode=new&sesskey='.  sesskey();
     echo $OUTPUT->single_select(new moodle_url($popupurl), 'newtype', $menufield, null, array(''=>'choosedots'), "fieldform");
-    echo $OUTPUT->help_icon('fields', get_string('addafield','data'), 'data');
+    echo $OUTPUT->old_help_icon('fields', get_string('addafield','data'), 'data');
     echo '</div>';
 
     echo '<div class="sortdefault">';

diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index d30f645..75b9897 100755 (executable)
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -74,7 +74,7 @@ class data_field_textarea extends data_field_base {
             $str .= '<option value="'.s($key).'" '.$selected.'>'.$desc.'</option>';
         }
         $str .= '</select>';
-        $str .= $OUTPUT->help_icon('textformat', get_string('helpformatting'), 'moodle');
+        $str .= $OUTPUT->old_help_icon('textformat', get_string('helpformatting'), 'moodle');
         $str .= '</div>';
 
         $str .= '</div>';

diff --git a/mod/data/lib.php b/mod/data/lib.php
index cca012f..5f25ec5 100755 (executable)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -2216,7 +2216,7 @@ class PresetImporter {
 
         if (!empty($currentfields) && !empty($newfields)) {
             echo "<h3>$strfieldmappings ";
-            echo $OUTPUT->help_icon('fieldmappings', $strfieldmappings, 'data');
+            echo $OUTPUT->old_help_icon('fieldmappings', $strfieldmappings, 'data');
             echo '</h3><table>';
 
             foreach ($newfields as $nid => $newfield) {

diff --git a/mod/data/preset.php b/mod/data/preset.php
index 2fa7bd6..5a84cc0 100644 (file)
--- a/mod/data/preset.php
+++ b/mod/data/preset.php
@@ -333,7 +333,7 @@ echo '<table class="presets" cellpadding="5">';
 echo '<tr><td valign="top" colspan="2" align="center"><h3>'.$strexport.'</h3></td></tr>';
 
 echo '<tr><td><label>'.$strexportaszip.'</label>';
-echo $OUTPUT->help_icon('exportzip', get_string('help'), 'data', false);
+echo $OUTPUT->old_help_icon('exportzip', get_string('help'), 'data', false);
 echo '</td><td>';
 $options = array();
 $options['sesskey'] = sesskey();
@@ -343,7 +343,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strexport);
 echo '</td></tr>';
 
 echo '<tr><td><label>'.$strsaveaspreset.'</label>';
-echo $OUTPUT->help_icon('savepreset', get_string('help'), 'data', false);
+echo $OUTPUT->old_help_icon('savepreset', get_string('help'), 'data', false);
 echo '</td><td>';
 $options = array();
 $options['sesskey'] = sesskey();
@@ -353,7 +353,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strsave);
 echo '</td></tr>';
 echo '<tr><td valign="top" colspan="2" align="center"><h3>'.$strimport.'</h3></td></tr>';
 echo '<tr><td><label for="fromfile">'.$strfromfile.'</label>';
-echo $OUTPUT->help_icon('importfromfile', get_string('help'), 'data', true);
+echo $OUTPUT->old_help_icon('importfromfile', get_string('help'), 'data', true);
 echo '</td><td>';
 echo '<form id="uploadpreset" method="post" action="preset.php">';
 echo '<fieldset class="invisiblefieldset">';
@@ -366,7 +366,7 @@ echo '</fieldset></form>';
 echo '</td></tr>';
 
 echo '<tr valign="top"><td><label>'.$strusestandard.'</label>';
-echo $OUTPUT->help_icon('usepreset', get_string('help'), 'data', true);
+echo $OUTPUT->old_help_icon('usepreset', get_string('help'), 'data', true);
 echo '</td><td>';
 
 echo '<form id="presets" method="post" action="preset.php" >';

diff --git a/mod/data/templates.php b/mod/data/templates.php
index 566ac50..667d57a 100755 (executable)
--- a/mod/data/templates.php
+++ b/mod/data/templates.php
@@ -203,7 +203,7 @@ echo '<tr><td valign="top">';
 if ($mode != 'csstemplate' and $mode != 'jstemplate') {
     // Add all the available fields for this data.
     echo '<label for="availabletags">'.get_string('availabletags','data').'</label>';
-    echo $OUTPUT->help_icon('tags', get_string('tags'), 'data');
+    echo $OUTPUT->old_help_icon('tags', get_string('tags'), 'data');
     echo '<br />';
 
 

diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php
index f5d4f96..64c7b86 100644 (file)
--- a/mod/feedback/edit.php
+++ b/mod/feedback/edit.php
@@ -215,7 +215,7 @@ if($do_show == 'edit') {
     if(is_array($feedbackitems)){
         $itemnr = 0;
 
-        $helpbutton = $OUTPUT->help_icon('preview', get_string('preview','feedback'), 'feedback',true);
+        $helpbutton = $OUTPUT->old_help_icon('preview', get_string('preview','feedback'), 'feedback',true);
 
         echo $OUTPUT->heading($helpbutton . get_string('preview', 'feedback'));
         if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {

diff --git a/mod/feedback/mapcourse.php b/mod/feedback/mapcourse.php
index 37f4b9a..a9d6ed0 100644 (file)
--- a/mod/feedback/mapcourse.php
+++ b/mod/feedback/mapcourse.php
@@ -96,14 +96,14 @@ if (($courses = $DB->get_records_sql_menu($sql, $params)) && !empty($searchcours
     echo ' ' . get_string('courses') . ': ';
     echo html_writer::select($courses, 'coursefilter', $coursefilter);
     echo '<input type="submit" value="'.get_string('mapcourse', 'feedback').'"/>';
-    echo $OUTPUT->help_icon('mapcourses', '', 'feedback', true);
+    echo $OUTPUT->old_help_icon('mapcourses', '', 'feedback', true);
     echo '<input type="button" value="'.get_string('searchagain').'" onclick="document.location=\'mapcourse.php?id='.$id.'\'"/>';
     echo '<input type="hidden" name="searchcourse" value="'.$searchcourse.'"/>';
     echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'"/>';
-    echo $OUTPUT->help_icon('searchcourses', '', 'feedback', true);
+    echo $OUTPUT->old_help_icon('searchcourses', '', 'feedback', true);
 } else {
     echo '<input type="text" name="searchcourse" value="'.$searchcourse.'"/> <input type="submit" value="'.get_string('searchcourses').'"/>';
-    echo $OUTPUT->help_icon('searchcourses', '', 'feedback', true);
+    echo $OUTPUT->old_help_icon('searchcourses', '', 'feedback', true);
 }
 
 echo '</form>';

diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index c3b9e65..ee3cf92 100644 (file)
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -114,7 +114,7 @@ if($do_show == 'showentries'){
             $analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid));
             echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">';
             echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
-            echo $OUTPUT->help_icon('viewcompleted', '', 'feedback', true);
+            echo $OUTPUT->old_help_icon('viewcompleted', '', 'feedback', true);
             echo '</div>';
         }else {
             $analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid));

diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 8a6612c..6d774ff 100644 (file)
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -149,7 +149,7 @@ if($feedback_complete_cap) {
         echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
         echo '<input type="hidden" name="id" value="'.$id.'" />';
         echo '<button type="submit">'.get_string('mapcourses', 'feedback').'</button>';
-        echo $OUTPUT->help_icon('mapcourse', '', 'feedback', true);
+        echo $OUTPUT->old_help_icon('mapcourse', '', 'feedback', true);
         echo '</form>';
         echo '<br />';
         echo '</div>';

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 888b9cc..3807ba2 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -4204,7 +4204,7 @@ function forum_search_form($course, $search='') {
     $output  = '<div class="forumsearch">';
     $output .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">';
     $output .= '<fieldset class="invisiblefieldset">';
-    $output .= $OUTPUT->help_icon('search', get_string('search'));
+    $output .= $OUTPUT->old_help_icon('search', get_string('search'));
     $output .= '<input name="search" type="text" size="18" value="'.s($search, true).'" alt="search" />';
     $output .= '<input value="'.get_string('searchforums', 'forum').'" type="submit" />';
     $output .= '<input name="id" type="hidden" value="'.$course->id.'" />';
@@ -8032,7 +8032,7 @@ function forum_extend_settings_navigation(settings_navigation $settingsnav, navi
         if (forum_is_forcesubscribed($forumobject)) {
             $notekey = $forumnode->add(get_string("forcessubscribe", 'forum'));
             $string = get_string('allowchoice', 'forum');
-            $helpbutton = $OUTPUT->help_icon("subscription", $string, "forum");
+            $helpbutton = $OUTPUT->old_help_icon("subscription", $string, "forum");
             if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
                 $url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'no'));
                 $forumnode->add($string, $url, navigation_node::TYPE_SETTING);
@@ -8042,11 +8042,11 @@ function forum_extend_settings_navigation(settings_navigation $settingsnav, navi
         } else if ($forumobject->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) {
             $string = get_string('disallowsubscribe', 'forum');
             $notekey = $forumnode->add($string);
-            $helpbutton = $OUTPUT->help_icon("subscription", $string, "forum");
+            $helpbutton = $OUTPUT->old_help_icon("subscription", $string, "forum");
         } else {
             $string = get_string("forcesubscribe", "forum");
             $notekey = $forumnode->add(get_string("allowsallsubscribe", 'forum'));
-            $helpbutton = $OUTPUT->help_icon("subscription", $string, "forum");
+            $helpbutton = $OUTPUT->old_help_icon("subscription", $string, "forum");
 
             if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
                 $url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'yes'));

diff --git a/mod/glossary/editcategories.html b/mod/glossary/editcategories.html
index 258ede1..da9b915 100644 (file)
--- a/mod/glossary/editcategories.html
+++ b/mod/glossary/editcategories.html
@@ -27,7 +27,7 @@
        }
        ?>><?php echo get_string("no") ?>
       </option>
-      </select> <?php echo $OUTPUT->help_icon("linkcategory", get_string("linkcategory", "glossary"), "glossary") ?>
+      </select> <?php echo $OUTPUT->old_help_icon("linkcategory", get_string("linkcategory", "glossary"), "glossary") ?>
     </td>
 </tr>
 <tr>

diff --git a/mod/glossary/import.html b/mod/glossary/import.html
index 312f597..44d6eac 100644 (file)
--- a/mod/glossary/import.html
+++ b/mod/glossary/import.html
@@ -6,7 +6,7 @@
            echo '(';
            print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
            echo ') ';
-           echo $OUTPUT->help_icon("filetoimport", get_string("filetoimport", "glossary"), "glossary");
+           echo $OUTPUT->old_help_icon("filetoimport", get_string("filetoimport", "glossary"), "glossary");
         ?>
     </b></td>
     <td style="width:70%">
@@ -24,10 +24,10 @@
         <td style="width:25%"><select size="1" name="dest">
         <option selected="selected" value="current"><?php print_string("currentglossary","glossary") ?></option>
         <option value="new"><?php print_string("newglossary","glossary") ?></option>
-        </select> <?php echo $OUTPUT->help_icon("destination", get_string("destination", "glossary"), "glossary") ?></td>
+        </select> <?php echo $OUTPUT->old_help_icon("destination", get_string("destination", "glossary"), "glossary") ?></td>
         <td style="width:25%" align="right"><?php print_string("importcategories","glossary") ?>:</td>
         <td style="width:25%"><input type="checkbox" name="catsincl" value="1" alt="<?php print_string("importcategories","glossary") ?>" />
-            <?php echo $OUTPUT->help_icon("importcategories", get_string("importcategories", "glossary"), "glossary") ?>
+            <?php echo $OUTPUT->old_help_icon("importcategories", get_string("importcategories", "glossary"), "glossary") ?>
         </td>
       </tr>
     </table>

diff --git a/mod/hotpot/report.php b/mod/hotpot/report.php
index 4a8c958..24f8dca 100644 (file)
--- a/mod/hotpot/report.php
+++ b/mod/hotpot/report.php
@@ -548,7 +548,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
     );
 
     print '<tr><td>';
-    echo $OUTPUT->help_icon('reportcontent', get_string('reportcontent', 'hotpot'), 'hotpot');
+    echo $OUTPUT->old_help_icon('reportcontent', get_string('reportcontent', 'hotpot'), 'hotpot');
     print '</td><th align="right" scope="col">'.get_string('reportcontent', 'hotpot').':</th><td colspan="7">';
     foreach ($menus as $name => $options) {
         $value = $formdata[$name];
@@ -587,7 +587,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
     );
 
     print '<tr><td>';
-    echo $OUTPUT->help_icon('reportformat', get_string('reportformat', 'hotpot'), 'hotpot');
+    echo $OUTPUT->old_help_icon('reportformat', get_string('reportformat', 'hotpot'), 'hotpot');
     print '</td>';
     foreach ($menus as $name => $options) {
         $value = $formdata[$name];

diff --git a/mod/hotpot/report/fullstat/report.php b/mod/hotpot/report/fullstat/report.php
index 95974bd..f289bde 100644 (file)
--- a/mod/hotpot/report/fullstat/report.php
+++ b/mod/hotpot/report/fullstat/report.php
@@ -136,7 +136,7 @@ class hotpot_report extends hotpot_default_report {
                                                        if (empty($table->caption)) {
                                                                $table->caption = get_string('indivresp', 'quiz');
                                                                if ($is_html) {
-                                                                       $table->caption .= $OUTPUT->help_icon('responsestable', $table->caption, 'hotpot');
+                                                                       $table->caption .= $OUTPUT->old_help_icon('responsestable', $table->caption, 'hotpot');
                                                                }
                                                        }
                                                        $hints = empty($response->hints) ? 0 : $response->hints;
@@ -260,14 +260,14 @@ class hotpot_report extends hotpot_default_report {
                        $br = $is_html ? '<br />' : "\n";
                        $space = $is_html ? '&nbsp;' : "";
                        $no_value = $is_html ? '--' : "";
-                       $help_button = $is_html ? $OUTPUT->help_icon("discrimination", get_string('discrimination', 'quiz'), "quiz") : "";
+                       $help_button = $is_html ? $OUTPUT->old_help_icon("discrimination", get_string('discrimination', 'quiz'), "quiz") : "";
                        // table properties
                        unset($table);
                        $table->border = 1;
                        $table->width = '100%';
                        $table->caption = get_string('itemanal', 'quiz');
                        if ($is_html) {
-                               $table->caption .= $OUTPUT->help_icon('analysistable', $table->caption, 'hotpot');
+                               $table->caption .= $OUTPUT->old_help_icon('analysistable', $table->caption, 'hotpot');
                        }
                        // initialize legend, if necessary
                        if (!empty($options['reportshowlegend'])) {

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index d3184f2..acf0ff9 100644 (file)
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -454,7 +454,7 @@ function lesson_mediafile_block_contents($cmid, $lesson) {
     $action = new popup_action('click', $link, 'lessonmediafile', $options);
     $content = $OUTPUT->action_link($link, get_string('mediafilepopup', 'lesson'), $action, array('title'=>get_string('mediafilepopup', 'lesson')));
 
-    $content .= $OUTPUT->help_icon("mediafilestudent", get_string("mediafile", "lesson"), "lesson");
+    $content .= $OUTPUT->old_help_icon("mediafilestudent", get_string("mediafile", "lesson"), "lesson");
 
     $bc = new block_contents();
     $bc->title = get_string('linkedmedia', 'lesson');

diff --git a/mod/quiz/edit.php b/mod/quiz/edit.php
index 19870cd..e80138a 100644 (file)
--- a/mod/quiz/edit.php
+++ b/mod/quiz/edit.php
@@ -106,7 +106,7 @@ function module_specific_controls($totalnumber, $recurse, $category, $cmid, $cmo
             $out .= '<input type="hidden" name="categoryid" value="' . $category->id . '" />';
             $out .= ' <input type="submit" name="addrandom" value="'.
                     $straddtoquiz.'" '.$disabled.' />';
-            $out .= $OUTPUT->help_icon('random', get_string('random', 'quiz'), 'quiz');
+            $out .= $OUTPUT->old_help_icon('random', get_string('random', 'quiz'), 'quiz');
         }
     }
     return $out;
@@ -516,7 +516,7 @@ if ($quiz_reordertool) {
     echo '</div>';
 }
 echo $OUTPUT->heading($pagetitle.": ".$quiz->name, 2);
-echo $OUTPUT->help_icon('editconcepts', get_string('basicideasofquiz', 'quiz'), 'quiz', true);
+echo $OUTPUT->old_help_icon('editconcepts', get_string('basicideasofquiz', 'quiz'), 'quiz', true);
 quiz_print_status_bar($quiz);
 
 $tabindex = 0;

diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index 26d8d57..feb74b7 100644 (file)
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -669,7 +669,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts) {
             </div>
         </form>
     </div>
-    <?php echo $OUTPUT->help_icon('random', get_string('random', 'quiz'), 'quiz'); ?>
+    <?php echo $OUTPUT->old_help_icon('random', get_string('random', 'quiz'), 'quiz'); ?>
     <?php
     echo "\n</div>";
 }
@@ -1139,7 +1139,7 @@ function quiz_print_grading_form($quiz, $pageurl, $tabindex) {
     echo '<label for="inputmaxgrade">' . get_string('maximumgradex', '', $a) . "</label>";
     echo '<input type="hidden" name="savechanges" value="save" />';
     echo '<input type="submit" value="' . $strsave . '" />';
-    echo $OUTPUT->help_icon('maxgrade', get_string('maximumgrade'), 'quiz');
+    echo $OUTPUT->old_help_icon('maxgrade', get_string('maximumgrade'), 'quiz');
     echo '</fieldset>';
     echo "</div></form>\n";
     return $tabindex + 1;

diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index b5987d4..8e17ad2 100644 (file)
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -419,7 +419,7 @@ class quiz_statistics_report extends quiz_default_report {
             $quizinformationtablehtml .= '<input type="hidden" name="everything" value="1"/>';
             $quizinformationtablehtml .= '<input type="submit" value="'.get_string('downloadeverything', 'quiz_statistics').'"/>';
             $quizinformationtablehtml .= html_writer::select($downloadoptions, 'download', $this->table->defaultdownloadformat, false);
-            $quizinformationtablehtml .= $OUTPUT->help_icon('tableexportformats', get_string('tableexportformats', 'table'));
+            $quizinformationtablehtml .= $OUTPUT->old_help_icon('tableexportformats', get_string('tableexportformats', 'table'));
             $quizinformationtablehtml .= '</div></form>';
         }
         $quizinformationtablehtml .= html_writer::table($quizinformationtable);

diff --git a/mod/quiz/report/statistics/statistics_table.php b/mod/quiz/report/statistics/statistics_table.php
index ef79cc5..81fdbeb 100644 (file)
--- a/mod/quiz/report/statistics/statistics_table.php
+++ b/mod/quiz/report/statistics/statistics_table.php
@@ -146,7 +146,7 @@ class quiz_report_statistics_table extends flexible_table {
             if ($question->_stats->negcovar){
                 $negcovar = get_string('negcovar', 'quiz_statistics');
                 if (!$this->is_downloading()){
-                    $negcovar .= $OUTPUT->help_icon('negcovar', $negcovar, 'quiz_statistics');
+                    $negcovar .= $OUTPUT->old_help_icon('negcovar', $negcovar, 'quiz_statistics');
                     return '<div class="negcovar">'.$negcovar.'</div>';
                 } else {
                     return $negcovar;

diff --git a/mod/wiki/revertpages.html b/mod/wiki/revertpages.html
index 393a669..630e77e 100644 (file)
--- a/mod/wiki/revertpages.html
+++ b/mod/wiki/revertpages.html
@@ -28,7 +28,7 @@ if($err->remark) {
     <td>
         <input type="text" name="authorfieldpattern" size="30" value="<?php p($form->authorfieldpattern) ?>" />
 <?php
-        echo $OUTPUT->help_icon('revertauthorfieldpattern', get_string('authorfieldpattern', 'wiki'), 'wiki');
+        echo $OUTPUT->old_help_icon('revertauthorfieldpattern', get_string('authorfieldpattern', 'wiki'), 'wiki');
         if (!empty($err->authorfieldpattern)) { echo $OUTPUT->error_text($err->authorfieldpattern); }
 ?>
     </td>

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index fae5ed4..3ebed73 100644 (file)
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -367,7 +367,7 @@
 
         /// Formatting Rules
         echo '<td class="howtowiki">';
-        echo $OUTPUT->help_icon('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
+        echo $OUTPUT->old_help_icon('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
         echo '</td>';
 
         echo '</tr></table>';

diff --git a/question/editlib.php b/question/editlib.php
index 413b1d9..4adc8a3 100644 (file)
--- a/question/editlib.php
+++ b/question/editlib.php
@@ -1924,7 +1924,7 @@ function create_new_question_button($categoryid, $params, $caption, $tooltip = '
     $url = new moodle_url('/question/addquestion.php', $params);
     echo $OUTPUT->single_button($url, $caption, 'get', array('disabled'=>$disabled, 'title'=>$tooltip));
 
-    echo $OUTPUT->help_icon('types', get_string('createnewquestion', 'question'), 'question');
+    echo $OUTPUT->old_help_icon('types', get_string('createnewquestion', 'question'), 'question');
     $PAGE->requires->yui2_lib('dragdrop');
     $PAGE->requires->yui2_lib('container');
     if (!$choiceformprinted) {

diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php
index c70d94a..3284924 100644 (file)
--- a/tag/coursetags_edit.php
+++ b/tag/coursetags_edit.php
@@ -127,7 +127,7 @@ echo $OUTPUT->header();
 
         // Print the add and delete form
         coursetag_get_jscript();
-        $addtagshelp = $OUTPUT->help_icon('addtags', 'adding tags', $tagslang);
+        $addtagshelp = $OUTPUT->old_help_icon('addtags', 'adding tags', $tagslang);
         $edittagthisunit = get_string('edittagthisunit', $tagslang);
         $arrowtitle = get_string('arrowtitle', $tagslang);
         $sesskey = sesskey();
@@ -160,7 +160,7 @@ echo $OUTPUT->header();
                     </div>
 EOT;
         if ($coursetabs) {
-            $deletetagshelp = $OUTPUT->help_icon('deletetags', 'deleting tags', $tagslang);
+            $deletetagshelp = $OUTPUT->old_help_icon('deletetags', 'deleting tags', $tagslang);
             $editdeletemytag = get_string('editdeletemytag', $tagslang);
             $outstr .= <<<EOT1
                     <div class="coursetag_edit_row">

diff --git a/tag/coursetags_more.php b/tag/coursetags_more.php
index d827d0a..9dfccf8 100644 (file)
--- a/tag/coursetags_more.php
+++ b/tag/coursetags_more.php
@@ -185,7 +185,7 @@ if (strlen($tags) < 10000) { $fclass = 'coursetag_more_large'; }
 $outstr = '
     <div class="coursetag_more_title">
         <div style="padding-bottom:5px">'.$welcome.
-            $OUTPUT->help_icon('usingtags', 'using tags', $tagslang).'
+            $OUTPUT->old_help_icon('usingtags', 'using tags', $tagslang).'
         </div>
         <div class="coursetag_more_link">'.$link1.'</div>
         <div class="coursetag_more_link">'.$link2.'</div>

diff --git a/user/addnote.php b/user/addnote.php
index 7e4f782..d8b13d8 100644 (file)
--- a/user/addnote.php
+++ b/user/addnote.php
@@ -90,8 +90,8 @@ echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 echo '</fieldset>';
 $table = new html_table();
 $table->head  = array (get_string('fullname'),
-    get_string('content', 'notes') . $OUTPUT->help_icon('writing', get_string('helpwriting')),
-    get_string('publishstate', 'notes') . $OUTPUT->help_icon('status', get_string('publishstate', 'notes'), 'notes'),
+    get_string('content', 'notes') . $OUTPUT->old_help_icon('writing', get_string('helpwriting')),
+    get_string('publishstate', 'notes') . $OUTPUT->old_help_icon('status', get_string('publishstate', 'notes'), 'notes'),
     );
 $table->align = array ('left', 'center', 'center');
 $state_names = note_get_state_names();

diff --git a/user/extendenrol.php b/user/extendenrol.php
index 0054317..9b384e2 100644 (file)
--- a/user/extendenrol.php
+++ b/user/extendenrol.php
@@ -138,7 +138,7 @@ if($course->enrollable == 2) {
 }
 
 $title = get_string('extendenrol');
-echo $OUTPUT->heading($title . $OUTPUT->help_icon('extendenrol', $title));
+echo $OUTPUT->heading($title . $OUTPUT->old_help_icon('extendenrol', $title));
 echo "<form method=\"post\" action=\"extendenrol.php\">\n";
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';

diff --git a/user/groupaddnote.php b/user/groupaddnote.php
index 45c5c6f..9dbfc44 100644 (file)
--- a/user/groupaddnote.php
+++ b/user/groupaddnote.php
@@ -116,11 +116,11 @@ echo get_string('users'). ': ' . implode(', ', $userlist) . '.';
 echo '</p>';
 
 echo '<p>' . get_string('content', 'notes');
-echo $OUTPUT->help_icon('writing', get_string('helpwriting'));
+echo $OUTPUT->old_help_icon('writing', get_string('helpwriting'));
 echo '<br /><textarea name="content" rows="5" cols="50">' . strip_tags(@$content) . '</textarea></p>';
 
 echo '<p>' . $strpublishstate;
-echo $OUTPUT->help_icon('status', $strpublishstate, 'notes');
+echo $OUTPUT->old_help_icon('status', $strpublishstate, 'notes');
 echo html_writer::select($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $state, false);
 echo '</p>';
 

diff --git a/user/groupextendenrol.php b/user/groupextendenrol.php
index 4438270..20073b1 100755 (executable)
--- a/user/groupextendenrol.php
+++ b/user/groupextendenrol.php
@@ -134,7 +134,7 @@ if($course->enrollable == 2) {
 }
 
 $title = get_string('groupextendenrol');
-echo $OUTPUT->heading($title . $OUTPUT->help_icon('groupextendenrol', $title));
+echo $OUTPUT->heading($title . $OUTPUT->old_help_icon('groupextendenrol', $title));
 echo '<form method="post" action="groupextendenrol.php">';
 echo '<input type="hidden" name="id" value="'.$course->id.'" />';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';

diff --git a/user/index.php b/user/index.php
index 488eac1..7303479 100644 (file)
--- a/user/index.php
+++ b/user/index.php
@@ -851,7 +851,7 @@
             $displaylist['groupextendenrol.php'] = get_string('groupextendenrol');
         }
 
-        echo $OUTPUT->help_icon("participantswithselectedusers", get_string("withselectedusers"));
+        echo $OUTPUT->old_help_icon("participantswithselectedusers", get_string("withselectedusers"));
         echo html_writer::tag('label', get_string("withselectedusers"), array('for'=>'formactionid'));
         echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionid'));
 

diff --git a/user/message.html b/user/message.html
index 849a3b4..ec18a38 100644 (file)
--- a/user/message.html
+++ b/user/message.html
@@ -16,14 +16,14 @@
     <td align="right" valign="middle" nowrap="nowrap">
      <?php
      //TODO: replace by new editor stuff!
-        echo $OUTPUT->help_icon("reading", get_string("helpreading"), "moodle", true);
+        echo $OUTPUT->old_help_icon("reading", get_string("helpreading"), "moodle", true);
         echo "<br />";
-        echo $OUTPUT->help_icon("writing", get_string("helpwriting"), "moodle", true);
+        echo $OUTPUT->old_help_icon("writing", get_string("helpwriting"), "moodle", true);
         echo "<br />";
-        echo $OUTPUT->help_icon("questions", get_string("helpquestions"), "moodle", true);
+        echo $OUTPUT->old_help_icon("questions", get_string("helpquestions"), "moodle", true);
         echo "<br />";
         if ($usehtmleditor) {
-           echo $OUTPUT->help_icon("richtext2", get_string("helprichtext"), "moodle", true);
+           echo $OUTPUT->old_help_icon("richtext2", get_string("helprichtext"), "moodle", true);
         } else {
            //emoticonhelpbutton("theform", "message"); to be replaced by new editor stuff
         }
@@ -42,7 +42,7 @@
         } else {
             choose_from_menu(format_text_menu(), "format", $format, "");
         }
-        echo $OUTPUT->help_icon("textformat", get_string("helpformatting"));
+        echo $OUTPUT->old_help_icon("textformat", get_string("helpformatting"));
      ?>
     </td>
 </tr>