moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 08:26:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-21695 renaming ->help_icon() to old_help_icon() and going to introduce new help_icon() with new parameters and detailed debugging - hopefully this will help during the conversion to new help

Browse source
This commit is contained in:
Petr Skoda 2010-04-13 20:34:27 +00:00
parent 9f9193f623
commit 596509e431
55 changed files with 116 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/index.php
View file

@ -376,7 +376,7 @@ if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}'); $lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
if (time() - $lastcron > 3600 * 24) { if (time() - $lastcron > 3600 * 24) {
$strinstallation = get_string('installation', 'install'); $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'); echo $OUTPUT->box(get_string('cronwarning', 'admin').' '.$helpbutton, 'generalbox adminwarning');
} }

2
admin/roles/lib.php
View file

@ -484,7 +484,7 @@ abstract class capability_table_with_risks extends capability_table_base {
protected function add_header_cells() { protected function add_header_cells() {
global $OUTPUT; global $OUTPUT;
echo '<th colspan="' . count($this->displaypermissions) . '" scope="col">' . 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>'; echo '<th class="risk" colspan="' . count($this->allrisks) . '" scope="col">' . get_string('risks','role') . '</th>';
} }

2
admin/roles/manage.php
View file

@ -194,7 +194,7 @@
$table->wrap = array('nowrap', '', 'nowrap','nowrap'); $table->wrap = array('nowrap', '', 'nowrap','nowrap');
$table->width = '90%'; $table->width = '90%';
$table->head = array( $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('description'),
get_string('shortname'), get_string('shortname'),
get_string('edit') get_string('edit')

2
backup/backup_form.html
View file

@ -281,7 +281,7 @@ function selectItemInCheckboxByName(formId, checkName, checked ) {
echo "<tr>"; echo "<tr>";
echo "<td align=\"right\" colspan=\"2\"><b>"; echo "<td align=\"right\" colspan=\"2\"><b>";
echo '<label for="menubackup_site_files">'.get_string ("sitefilesused").'</label>'; 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\">"; echo "</b></td><td colspan=\"2\">";
$course_file_options[0] = get_string("no"); $course_file_options[0] = get_string("no");
$course_file_options[1] = get_string("yes"); $course_file_options[1] = get_string("yes");

8
backup/restore_form.html
View file

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

2
blocks/search_forums/block_search_forums.php
View file

@ -36,7 +36,7 @@ class block_search_forums extends block_base {
'<input id="searchform_search" name="search" type="text" size="16" />'; '<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 .= '<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 .= '<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>'; $this->content->text .= '</fieldset></form></div>';
return $this->content; return $this->content;

2
blocks/tags/block_tags.php
View file

@ -231,7 +231,7 @@ class block_tags extends block_base {
$tagthisunit = get_string('tagthisunit', $tagslang); $tagthisunit = get_string('tagthisunit', $tagslang);
$buttonadd = get_string('add', $tagslang); $buttonadd = get_string('add', $tagslang);
$arrowtitle = get_string('arrowtitle', $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(); $sesskey = sesskey();
$arrowright = $OUTPUT->pix_url('t/arrow_left'); $arrowright = $OUTPUT->pix_url('t/arrow_left');
$this->content->footer .= <<<EOT $this->content->footer .= <<<EOT

4
course/lib.php
View file

@ -1647,13 +1647,13 @@ function print_section_add_menus($course, $section, $modnames, $vertical=false,
if (!empty($resources)) { if (!empty($resources)) {
$select = new url_select($resources, '', array(''=>$straddresource), "ressection$section"); $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); $output .= $OUTPUT->render($select);
} }
if (!empty($activities)) { if (!empty($activities)) {
$select = new url_select($activities, '', array(''=>$straddactivity), "section$section"); $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); $output .= $OUTPUT->render($select);
} }

4
course/report/participation/index.php
View file

@ -125,7 +125,7 @@
echo html_writer::select($roleoptions,'roleid',$roleid,false); echo html_writer::select($roleoptions,'roleid',$roleid,false);
echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n"; echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n";
echo html_writer::select($actionoptions,'action',$action,false); 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"; 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=' $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>'; echo '<label for="formaction">'.get_string("withselectedusers").'</label>';
$displaylist['messageselect.php'] = get_string('messageselectadd'); $displaylist['messageselect.php'] = get_string('messageselectadd');
echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionselect')); 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 '<input type="submit" value="' . get_string('ok') . '" />'."\n";
echo '</div>'; echo '</div>';
echo '</div>'."\n"; echo '</div>'."\n";

8
enrol/authorize/config_form.php
View file

@ -129,7 +129,7 @@ if (!isset($frm->acceptechecktypes)) {
<tr valign="top"> <tr valign="top">
<td align="right">an_authcode:</td> <td align="right">an_authcode:</td>
<td><?php echo html_writer::checkbox('an_authcode', '1', !empty($frm->an_authcode), get_string("adminauthcode", "enrol_authorize")); ?> <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> </td>
</tr> </tr>
@ -174,20 +174,20 @@ if (!isset($frm->acceptechecktypes)) {
</tr> </tr>
<tr valign="top"><td colspan="2"><h4><?php print_string("adminauthorizeccapture", "enrol_authorize") ?> <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> </h4></td></tr>
<tr valign="top"> <tr valign="top">
<td align="right">an_review:</td> <td align="right">an_review:</td>
<td><?php echo html_writer::checkbox('an_review', '1', !empty($frm->an_review), get_string("adminreview", "enrol_authorize")); ?> <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> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right">an_capture_day:</td> <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) ?>" /> <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> <?php print_string("reviewday", "enrol_authorize", $frm->an_capture_day) ?></td>
</tr> </tr>

18
enrol/imsenterprise/config.html
View file

@ -38,7 +38,7 @@
<input type="checkbox" value="1" name="enrol_createnewusers" <?php if ($frm->enrol_createnewusers) echo "checked=\"checked\"" ?> /> <input type="checkbox" value="1" name="enrol_createnewusers" <?php if ($frm->enrol_createnewusers) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </tr>
@ -48,7 +48,7 @@
<input type="checkbox" value="1" name="enrol_imsdeleteusers" <?php if ($frm->enrol_imsdeleteusers) echo "checked=\"checked\"" ?> /> <input type="checkbox" value="1" name="enrol_imsdeleteusers" <?php if ($frm->enrol_imsdeleteusers) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </tr>
@ -78,7 +78,7 @@
<input type="checkbox" value="1" name="enrol_imssourcedidfallback" <?php if ($frm->enrol_imssourcedidfallback) echo "checked=\"checked\"" ?> /> <input type="checkbox" value="1" name="enrol_imssourcedidfallback" <?php if ($frm->enrol_imssourcedidfallback) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </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" /> <input type="text" <?php echo 'value="'.intval($frm->enrol_truncatecoursecodes).'"' ?> name="enrol_truncatecoursecodes" size="3" maxlength="3" />
</td> </td>
<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> </td>
</tr> </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\"" ?> /> <input type="checkbox" value="1" name="enrol_createnewcourses" <?php if ($frm->enrol_createnewcourses) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </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\"" ?> /> <input type="checkbox" value="1" name="enrol_createnewcategories" <?php if ($frm->enrol_createnewcategories) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </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\"" ?> /> <input type="checkbox" value="1" name="enrol_imsunenrol" <?php if ($frm->enrol_imsunenrol) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </tr>
@ -180,7 +180,7 @@ foreach($this->imsroles as $imsrolenum=>$imsrolename){
<td align="right"><?php print_string('restricttarget', 'enrol_imsenterprise') ?>:</td> <td align="right"><?php print_string('restricttarget', 'enrol_imsenterprise') ?>:</td>
<td colspan="2"> <td colspan="2">
<input type="text" <?php echo 'value="'.htmlspecialchars($frm->enrol_imsrestricttarget).'"' ?> name="enrol_imsrestricttarget" size="20" maxlength="32" /> <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> </td>
</tr> </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\"" ?> /> <input type="checkbox" value="1" name="enrol_imscapitafix" <?php if ($frm->enrol_imscapitafix) echo "checked=\"checked\"" ?> />
</td> </td>
<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> </td>
</tr> </tr>

20
grade/edit/tree/lib.php
View file

@ -621,7 +621,7 @@ class grade_edit_tree_column_aggregation extends grade_edit_tree_column_category
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -677,7 +677,7 @@ class grade_edit_tree_column_extracredit extends grade_edit_tree_column {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -719,7 +719,7 @@ class grade_edit_tree_column_weight extends grade_edit_tree_column {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -814,7 +814,7 @@ class grade_edit_tree_column_aggregateonlygraded extends grade_edit_tree_column_
$headercell = clone($this->headercell); $headercell = clone($this->headercell);
$headercell->style .= 'width: 40px;'; $headercell->style .= 'width: 40px;';
$headercell->text = get_string('aggregateonlygraded', 'grades') $headercell->text = get_string('aggregateonlygraded', 'grades')
. $OUTPUT->help_icon('aggregateonlygraded', 'aggregateonlygraded', 'grade'); . $OUTPUT->old_help_icon('aggregateonlygraded', 'aggregateonlygraded', 'grade');
return $headercell; return $headercell;
} }
@ -851,7 +851,7 @@ class grade_edit_tree_column_aggregatesubcats extends grade_edit_tree_column_cat
$headercell = clone($this->headercell); $headercell = clone($this->headercell);
$headercell->style .= 'width: 40px;'; $headercell->style .= 'width: 40px;';
$headercell->text = get_string('aggregatesubcats', 'grades') $headercell->text = get_string('aggregatesubcats', 'grades')
.$OUTPUT->help_icon('aggregatesubcats', 'aggregatesubcats', 'grade'); .$OUTPUT->old_help_icon('aggregatesubcats', 'aggregatesubcats', 'grade');
return $headercell; return $headercell;
} }
@ -889,7 +889,7 @@ class grade_edit_tree_column_aggregateoutcomes extends grade_edit_tree_column_ca
$headercell = clone($this->headercell); $headercell = clone($this->headercell);
$headercell->style .= 'width: 40px;'; $headercell->style .= 'width: 40px;';
$headercell->text = get_string('aggregateoutcomes', 'grades') $headercell->text = get_string('aggregateoutcomes', 'grades')
.$OUTPUT->help_icon('aggregateoutcomes', 'aggregateoutcomes', 'grade'); .$OUTPUT->old_help_icon('aggregateoutcomes', 'aggregateoutcomes', 'grade');
return $headercell; return $headercell;
} }
@ -933,7 +933,7 @@ class grade_edit_tree_column_droplow extends grade_edit_tree_column_category {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -966,7 +966,7 @@ class grade_edit_tree_column_keephigh extends grade_edit_tree_column_category {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -999,7 +999,7 @@ class grade_edit_tree_column_multfactor extends grade_edit_tree_column {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }
@ -1040,7 +1040,7 @@ class grade_edit_tree_column_plusfactor extends grade_edit_tree_column {
public function get_header_cell() { public function get_header_cell() {
global $OUTPUT; global $OUTPUT;
$headercell = clone($this->headercell); $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; return $headercell;
} }

2
lib/completionlib.php
View file

@ -169,7 +169,7 @@ class completion_info {
global $PAGE, $OUTPUT; global $PAGE, $OUTPUT;
if ($this->is_enabled() && !$PAGE->user_is_editing() && isloggedin() && !isguestuser()) { if ($this->is_enabled() && !$PAGE->user_is_editing() && isloggedin() && !isguestuser()) {
echo '<span id = "completionprogressid" class="completionprogress">'.get_string('yourprogress','completion').' '; 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>'; echo '</span>';
} }
} }

6
lib/deprecatedlib.php
View file

@ -2733,11 +2733,11 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
* @return string|void Depending on value of $return * @return string|void Depending on value of $return
*/ */
function helpbutton($page, $title, $module='moodle', $image=true, $linktext=false, $text='', $return=false, $imagetext='') { 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; 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 // hide image with CSS if needed
@ -3291,7 +3291,7 @@ function popup_form($baseurl, $options, $formid, $selected='', $nothing='choose'
$select->disabled = $disabled; $select->disabled = $disabled;
$select->set_label($selectlabel); $select->set_label($selectlabel);
$select->set_help_icon($help, $helptext); $select->set_old_help_icon($help, $helptext);
$output = $OUTPUT->render($select); $output = $OUTPUT->render($select);

4
lib/formslib.php
View file

@ -1352,7 +1352,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
$module = isset($buttonargs[2]) ? $buttonargs[2] : 'moodle'; $module = isset($buttonargs[2]) ? $buttonargs[2] : 'moodle';
$linktext = isset($buttonargs[3]) ? $buttonargs[3] : false; $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) { } else if (!$suppresscheck) {
print_error('nonexistentformelements', 'form', '', $elementname); print_error('nonexistentformelements', 'form', '', $elementname);
@ -1372,7 +1372,7 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
*/ */
function addHelpButton($elementname, $identifier, $title, $component = 'moodle', $linktext = '') { function addHelpButton($elementname, $identifier, $title, $component = 'moodle', $linktext = '') {
if (array_key_exists($elementname, $this->_elementIndex)) { 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) { } else if (!$suppresscheck) {
debugging(get_string('nonexistentformelements', 'form', $elementname)); debugging(get_string('nonexistentformelements', 'form', $elementname));
} }

10
lib/outputcomponents.php
View file

@ -151,7 +151,7 @@ class user_picture implements renderable {
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @since Moodle 2.0 * @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) * @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 * @param bool $linktext add extra text to icon
* @return void * @return void
*/ */
public function set_help_icon($helppage, $title, $component = 'moodle') { public function set_old_help_icon($helppage, $title, $component = 'moodle') {
$this->helpicon = new help_icon($helppage, $title, $component); $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 * @param bool $linktext add extra text to icon
* @return void * @return void
*/ */
public function set_help_icon($helppage, $title, $component = 'moodle') { public function set_old_help_icon($helppage, $title, $component = 'moodle') {
$this->helpicon = new help_icon($helppage, $title, $component); $this->helpicon = new old_help_icon($helppage, $title, $component);
} }
/** /**

8
lib/outputrenderers.php
View file

@ -1355,7 +1355,7 @@ END;
$image = $this->pix_icon($icon, $iconalt, $component, array('class'=>'icon')); $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'); 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 * @param string|bool $linktext true means use $title as link text, string means link text value
* @return string HTML fragment * @return string HTML fragment
*/ */
public function help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') { public function old_help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') {
$icon = new help_icon($helpidentifier, $title, $component); $icon = new old_help_icon($helpidentifier, $title, $component);
if ($linktext === true) { if ($linktext === true) {
$icon->linktext = $title; $icon->linktext = $title;
} else if (!empty($linktext)) { } else if (!empty($linktext)) {
@ -1384,7 +1384,7 @@ END;
* @param help_icon $helpicon * @param help_icon $helpicon
* @return string HTML fragment * @return string HTML fragment
*/ */
protected function render_help_icon(help_icon $helpicon) { protected function render_old_help_icon(old_help_icon $helpicon) {
global $CFG; global $CFG;
// first get the help image icon // first get the help image icon

2
lib/tablelib.php
View file

@ -942,7 +942,7 @@ class flexible_table {
$html .= '<div class="mdl-align">'; $html .= '<div class="mdl-align">';
$html .= '<input type="submit" value="'.get_string('downloadas', 'table').'"/>'; $html .= '<input type="submit" value="'.get_string('downloadas', 'table').'"/>';
$html .= html_writer::select($downloadoptions, 'download', $this->defaultdownloadformat, false); $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>'; $html .= '</div></form>';
return $html; return $html;

2
lib/weblib.php
View file

@ -2287,7 +2287,7 @@ function switchroles_form($courseid) {
unset($roles[$CFG->guestroleid]); unset($roles[$CFG->guestroleid]);
$popupurl = new moodle_url('/course/view.php', array('id'=>$courseid, 'sesskey'=>sesskey())); $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 = 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); return $OUTPUT->render($select);
} }

2
login/index_form.html
View file

@ -15,7 +15,7 @@ if ($show_instructions) {
if (empty($CFG->usesid)) { if (empty($CFG->usesid)) {
echo '<br/>'; echo '<br/>';
echo '('.get_string("cookiesenabled").')'; echo '('.get_string("cookiesenabled").')';
echo $OUTPUT->help_icon("cookies", get_string("cookiesenabled")); echo $OUTPUT->old_help_icon("cookies", get_string("cookiesenabled"));
} }
?> ?>
</div> </div>

4
message/edit.php
View file

@ -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 /// TODO XXX: This is only a quick hack ... helpfile locations should be provided as part of the provider definition
if ($provider->component == 'moodle') { if ($provider->component == 'moodle') {
$helpbtn = $OUTPUT->help_icon('moodle_'.$provider->name, $providername, 'message'); $helpbtn = $OUTPUT->old_help_icon('moodle_'.$provider->name, $providername, 'message');
} else { } 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"; echo '<tr><th align="right">'.$providername.$helpbtn.'</th><td colspan="'.$number_procs.'"></td></tr>'."\n";

8
mod/assignment/lib.php
View file

@ -1000,7 +1000,7 @@ class assignment_base {
} else { } else {
echo '<div class="format">'; echo '<div class="format">';
echo html_writer::select(format_text_menu(), "format", $submission->format, false); 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>'; echo '</div>';
} }
} }
@ -1402,7 +1402,7 @@ class assignment_base {
echo '<label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>'; echo '<label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>';
echo '<input type="hidden" name="mailinfo" value="0" />'; echo '<input type="hidden" name="mailinfo" value="0" />';
echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' />'; 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>';
echo '<div class="fastgbutton"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>'; echo '<div class="fastgbutton"><input type="submit" name="fastg" value="'.get_string('saveallfeedback', 'assignment').'" /></div>';
echo '</div>'; echo '</div>';
@ -1420,7 +1420,7 @@ class assignment_base {
echo '</td>'; echo '</td>';
echo '<td>'; echo '<td>';
echo '<input type="text" id="perpage" name="perpage" size="1" value="'.$perpage.'" />'; 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 '</td></tr>';
echo '<tr><td>'; echo '<tr><td>';
echo '<label for="quickgrade">'.get_string('quickgrade','assignment').'</label>'; echo '<label for="quickgrade">'.get_string('quickgrade','assignment').'</label>';
@ -1428,7 +1428,7 @@ class assignment_base {
echo '<td>'; echo '<td>';
$checked = $quickgrade ? 'checked="checked"' : ''; $checked = $quickgrade ? 'checked="checked"' : '';
echo '<input type="checkbox" id="quickgrade" name="quickgrade" value="1" '.$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 '</td></tr>';
echo '<tr><td colspan="2">'; echo '<tr><td colspan="2">';
echo '<input type="submit" value="'.get_string('savepreferences').'" />'; echo '<input type="submit" value="'.get_string('savepreferences').'" />';

2
mod/chat/gui_header_js/chatinput.php
View file

@ -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'=>'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::empty_tag('input', array('type'=>'checkbox', 'id'=>'auto', 'checked'=>'checked', 'value'=>''));
echo html_writer::tag('label', get_string('autoscroll', 'chat'), array('for'=>'auto')); 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::end_tag('form');
echo html_writer::start_tag('form', array('action'=>'insert.php', 'method'=>'post', 'target'=>'empty', 'id'=>'sendForm')); echo html_writer::start_tag('form', array('action'=>'insert.php', 'method'=>'post', 'target'=>'empty', 'id'=>'sendForm'));

2
mod/chat/gui_sockets/chatinput.php
View file

@ -29,7 +29,7 @@ echo $OUTPUT->header();
<form action="../empty.php" method="get" target="empty" id="inputform" <form action="../empty.php" method="get" target="empty" id="inputform"
onsubmit="return empty_field_and_submit();"> onsubmit="return empty_field_and_submit();">
<input type="text" name="chat_message" id="chat_message" size="60" value="" /> <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>
<form action="<?php echo "http://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform"> <form action="<?php echo "http://$CFG->chat_serverhost:$CFG->chat_serverport/"; ?>" method="get" target="empty" id="sendform">

2
mod/data/edit.php
View file

@ -341,7 +341,7 @@ if (has_capability('mod/data:manageentries',$context)) {
echo '<tr>'; echo '<tr>';
echo '<td align="right">'.get_string('csvfile', 'data').':</td>'; echo '<td align="right">'.get_string('csvfile', 'data').':</td>';
echo '<td><input type="file" name="recordsfile" size="30" />'; 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><tr>';
echo '<td align="right">'.get_string('fielddelimiter', 'data').':</td>'; echo '<td align="right">'.get_string('fielddelimiter', 'data').':</td>';
echo '<td><input type="text" name="fielddelimiter" size="6" />'; echo '<td><input type="text" name="fielddelimiter" size="6" />';

2
mod/data/field.php
View file

@ -306,7 +306,7 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { ///
echo '<label for="fieldform_jump">'.get_string('newfield','data').'</label>'; echo '<label for="fieldform_jump">'.get_string('newfield','data').'</label>';
$popupurl = $CFG->wwwroot.'/mod/data/field.php?d='.$data->id.'&mode=new&sesskey='. sesskey(); $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->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>';
echo '<div class="sortdefault">'; echo '<div class="sortdefault">';

2
mod/data/field/textarea/field.class.php
View file

@ -74,7 +74,7 @@ class data_field_textarea extends data_field_base {
$str .= '<option value="'.s($key).'" '.$selected.'>'.$desc.'</option>'; $str .= '<option value="'.s($key).'" '.$selected.'>'.$desc.'</option>';
} }
$str .= '</select>'; $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>';
$str .= '</div>'; $str .= '</div>';

2
mod/data/lib.php
View file

@ -2216,7 +2216,7 @@ class PresetImporter {
if (!empty($currentfields) && !empty($newfields)) { if (!empty($currentfields) && !empty($newfields)) {
echo "<h3>$strfieldmappings "; echo "<h3>$strfieldmappings ";
echo $OUTPUT->help_icon('fieldmappings', $strfieldmappings, 'data'); echo $OUTPUT->old_help_icon('fieldmappings', $strfieldmappings, 'data');
echo '</h3><table>'; echo '</h3><table>';
foreach ($newfields as $nid => $newfield) { foreach ($newfields as $nid => $newfield) {

8
mod/data/preset.php
View file

@ -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 valign="top" colspan="2" align="center"><h3>'.$strexport.'</h3></td></tr>';
echo '<tr><td><label>'.$strexportaszip.'</label>'; 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>'; echo '</td><td>';
$options = array(); $options = array();
$options['sesskey'] = sesskey(); $options['sesskey'] = sesskey();
@ -343,7 +343,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strexport);
echo '</td></tr>'; echo '</td></tr>';
echo '<tr><td><label>'.$strsaveaspreset.'</label>'; 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>'; echo '</td><td>';
$options = array(); $options = array();
$options['sesskey'] = sesskey(); $options['sesskey'] = sesskey();
@ -353,7 +353,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strsave);
echo '</td></tr>'; echo '</td></tr>';
echo '<tr><td valign="top" colspan="2" align="center"><h3>'.$strimport.'</h3></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 '<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 '</td><td>';
echo '<form id="uploadpreset" method="post" action="preset.php">'; echo '<form id="uploadpreset" method="post" action="preset.php">';
echo '<fieldset class="invisiblefieldset">'; echo '<fieldset class="invisiblefieldset">';
@ -366,7 +366,7 @@ echo '</fieldset></form>';
echo '</td></tr>'; echo '</td></tr>';
echo '<tr valign="top"><td><label>'.$strusestandard.'</label>'; 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 '</td><td>';
echo '<form id="presets" method="post" action="preset.php" >'; echo '<form id="presets" method="post" action="preset.php" >';

2
mod/data/templates.php
View file

@ -203,7 +203,7 @@ echo '<tr><td valign="top">';
if ($mode != 'csstemplate' and $mode != 'jstemplate') { if ($mode != 'csstemplate' and $mode != 'jstemplate') {
// Add all the available fields for this data. // Add all the available fields for this data.
echo '<label for="availabletags">'.get_string('availabletags','data').'</label>'; 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 />'; echo '<br />';

2
mod/feedback/edit.php
View file

@ -215,7 +215,7 @@ if($do_show == 'edit') {
if(is_array($feedbackitems)){ if(is_array($feedbackitems)){
$itemnr = 0; $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')); echo $OUTPUT->heading($helpbutton . get_string('preview', 'feedback'));
if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) { if(isset($SESSION->feedback->moving) AND $SESSION->feedback->moving->shouldmoving == 1) {

6
mod/feedback/mapcourse.php
View file

@ -96,14 +96,14 @@ if (($courses = $DB->get_records_sql_menu($sql, $params)) && !empty($searchcours
echo ' ' . get_string('courses') . ': '; echo ' ' . get_string('courses') . ': ';
echo html_writer::select($courses, 'coursefilter', $coursefilter); echo html_writer::select($courses, 'coursefilter', $coursefilter);
echo '<input type="submit" value="'.get_string('mapcourse', 'feedback').'"/>'; 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="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="searchcourse" value="'.$searchcourse.'"/>';
echo '<input type="hidden" name="feedbackid" value="'.$feedback->id.'"/>'; 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 { } else {
echo '<input type="text" name="searchcourse" value="'.$searchcourse.'"/> <input type="submit" value="'.get_string('searchcourses').'"/>'; 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>'; echo '</form>';

2
mod/feedback/show_entries.php
View file

@ -114,7 +114,7 @@ if($do_show == 'showentries'){
$analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid)); $analysisurl = new moodle_url('/mod/feedback/analysis_course.php', array('id'=>$id, 'courseid'=>$courseid));
echo '<div class="mdl-align"><a href="'.$analysisurl->out().'">'; 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 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>'; echo '</div>';
}else { }else {
$analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid)); $analysisurl = new moodle_url('/mod/feedback/analysis.php', array('id'=>$id, 'courseid'=>$courseid));

2
mod/feedback/view.php
View file

@ -149,7 +149,7 @@ if($feedback_complete_cap) {
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'; echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '<input type="hidden" name="id" value="'.$id.'" />'; echo '<input type="hidden" name="id" value="'.$id.'" />';
echo '<button type="submit">'.get_string('mapcourses', 'feedback').'</button>'; 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 '</form>';
echo '<br />'; echo '<br />';
echo '</div>'; echo '</div>';

8
mod/forum/lib.php
View file

@ -4204,7 +4204,7 @@ function forum_search_form($course, $search='') {
$output = '<div class="forumsearch">'; $output = '<div class="forumsearch">';
$output .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">'; $output .= '<form action="'.$CFG->wwwroot.'/mod/forum/search.php" style="display:inline">';
$output .= '<fieldset class="invisiblefieldset">'; $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 name="search" type="text" size="18" value="'.s($search, true).'" alt="search" />';
$output .= '<input value="'.get_string('searchforums', 'forum').'" type="submit" />'; $output .= '<input value="'.get_string('searchforums', 'forum').'" type="submit" />';
$output .= '<input name="id" type="hidden" value="'.$course->id.'" />'; $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)) { if (forum_is_forcesubscribed($forumobject)) {
$notekey = $forumnode->add(get_string("forcessubscribe", 'forum')); $notekey = $forumnode->add(get_string("forcessubscribe", 'forum'));
$string = get_string('allowchoice', '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)) { if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
$url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'no')); $url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'no'));
$forumnode->add($string, $url, navigation_node::TYPE_SETTING); $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) { } else if ($forumobject->forcesubscribe == FORUM_DISALLOWSUBSCRIBE) {
$string = get_string('disallowsubscribe', 'forum'); $string = get_string('disallowsubscribe', 'forum');
$notekey = $forumnode->add($string); $notekey = $forumnode->add($string);
$helpbutton = $OUTPUT->help_icon("subscription", $string, "forum"); $helpbutton = $OUTPUT->old_help_icon("subscription", $string, "forum");
} else { } else {
$string = get_string("forcesubscribe", "forum"); $string = get_string("forcesubscribe", "forum");
$notekey = $forumnode->add(get_string("allowsallsubscribe", '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)) { if (has_capability('mod/forum:managesubscriptions', $PAGE->cm->context)) {
$url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'yes')); $url = new moodle_url('/mod/forum/subscribe.php', array('id'=>$forumobject->id, 'force'=>'yes'));

2
mod/glossary/editcategories.html
View file

@ -27,7 +27,7 @@
} }
?>><?php echo get_string("no") ?> ?>><?php echo get_string("no") ?>
</option> </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> </td>
</tr> </tr>
<tr> <tr>

6
mod/glossary/import.html
View file

@ -6,7 +6,7 @@
echo '('; echo '(';
print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes))); print_string("maxsize", "", display_size(get_max_upload_file_size($CFG->maxbytes, $course->maxbytes)));
echo ') '; echo ') ';
echo $OUTPUT->help_icon("filetoimport", get_string("filetoimport", "glossary"), "glossary"); echo $OUTPUT->old_help_icon("filetoimport", get_string("filetoimport", "glossary"), "glossary");
?> ?>
</b></td> </b></td>
<td style="width:70%"> <td style="width:70%">
@ -24,10 +24,10 @@
<td style="width:25%"><select size="1" name="dest"> <td style="width:25%"><select size="1" name="dest">
<option selected="selected" value="current"><?php print_string("currentglossary","glossary") ?></option> <option selected="selected" value="current"><?php print_string("currentglossary","glossary") ?></option>
<option value="new"><?php print_string("newglossary","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%" 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") ?>" /> <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> </td>
</tr> </tr>
</table> </table>

4
mod/hotpot/report.php
View file

@ -548,7 +548,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
); );
print '<tr><td>'; 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">'; print '</td><th align="right" scope="col">'.get_string('reportcontent', 'hotpot').':</th><td colspan="7">';
foreach ($menus as $name => $options) { foreach ($menus as $name => $options) {
$value = $formdata[$name]; $value = $formdata[$name];
@ -587,7 +587,7 @@ function hotpot_print_report_selector(&$course, &$hotpot, &$formdata) {
); );
print '<tr><td>'; 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>'; print '</td>';
foreach ($menus as $name => $options) { foreach ($menus as $name => $options) {
$value = $formdata[$name]; $value = $formdata[$name];

6
mod/hotpot/report/fullstat/report.php
View file

@ -136,7 +136,7 @@ class hotpot_report extends hotpot_default_report {
if (empty($table->caption)) { if (empty($table->caption)) {
$table->caption = get_string('indivresp', 'quiz'); $table->caption = get_string('indivresp', 'quiz');
if ($is_html) { 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; $hints = empty($response->hints) ? 0 : $response->hints;
@ -260,14 +260,14 @@ class hotpot_report extends hotpot_default_report {
$br = $is_html ? '<br />' : "\n"; $br = $is_html ? '<br />' : "\n";
$space = $is_html ? '&nbsp;' : ""; $space = $is_html ? '&nbsp;' : "";
$no_value = $is_html ? '--' : ""; $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 // table properties
unset($table); unset($table);
$table->border = 1; $table->border = 1;
$table->width = '100%'; $table->width = '100%';
$table->caption = get_string('itemanal', 'quiz'); $table->caption = get_string('itemanal', 'quiz');
if ($is_html) { 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 // initialize legend, if necessary
if (!empty($options['reportshowlegend'])) { if (!empty($options['reportshowlegend'])) {

2
mod/lesson/locallib.php
View file

@ -454,7 +454,7 @@ function lesson_mediafile_block_contents($cmid, $lesson) {
$action = new popup_action('click', $link, 'lessonmediafile', $options); $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->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 = new block_contents();
$bc->title = get_string('linkedmedia', 'lesson'); $bc->title = get_string('linkedmedia', 'lesson');

4
mod/quiz/edit.php
View file

@ -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="hidden" name="categoryid" value="' . $category->id . '" />';
$out .= ' <input type="submit" name="addrandom" value="'. $out .= ' <input type="submit" name="addrandom" value="'.
$straddtoquiz.'" '.$disabled.' />'; $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; return $out;
@ -516,7 +516,7 @@ if ($quiz_reordertool) {
echo '</div>'; echo '</div>';
} }
echo $OUTPUT->heading($pagetitle.": ".$quiz->name, 2); 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); quiz_print_status_bar($quiz);
$tabindex = 0; $tabindex = 0;

4
mod/quiz/editlib.php
View file

@ -669,7 +669,7 @@ function quiz_print_pagecontrols($quiz, $pageurl, $page, $hasattempts) {
</div> </div>
</form> </form>
</div> </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 <?php
echo "\n</div>"; 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 '<label for="inputmaxgrade">' . get_string('maximumgradex', '', $a) . "</label>";
echo '<input type="hidden" name="savechanges" value="save" />'; echo '<input type="hidden" name="savechanges" value="save" />';
echo '<input type="submit" value="' . $strsave . '" />'; 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 '</fieldset>';
echo "</div></form>\n"; echo "</div></form>\n";
return $tabindex + 1; return $tabindex + 1;

2
mod/quiz/report/statistics/report.php
View file

@ -419,7 +419,7 @@ class quiz_statistics_report extends quiz_default_report {
$quizinformationtablehtml .= '<input type="hidden" name="everything" value="1"/>'; $quizinformationtablehtml .= '<input type="hidden" name="everything" value="1"/>';
$quizinformationtablehtml .= '<input type="submit" value="'.get_string('downloadeverything', 'quiz_statistics').'"/>'; $quizinformationtablehtml .= '<input type="submit" value="'.get_string('downloadeverything', 'quiz_statistics').'"/>';
$quizinformationtablehtml .= html_writer::select($downloadoptions, 'download', $this->table->defaultdownloadformat, false); $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 .= '</div></form>';
} }
$quizinformationtablehtml .= html_writer::table($quizinformationtable); $quizinformationtablehtml .= html_writer::table($quizinformationtable);

2
mod/quiz/report/statistics/statistics_table.php
View file

@ -146,7 +146,7 @@ class quiz_report_statistics_table extends flexible_table {
if ($question->_stats->negcovar){ if ($question->_stats->negcovar){
$negcovar = get_string('negcovar', 'quiz_statistics'); $negcovar = get_string('negcovar', 'quiz_statistics');
if (!$this->is_downloading()){ 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>'; return '<div class="negcovar">'.$negcovar.'</div>';
} else { } else {
return $negcovar; return $negcovar;

2
mod/wiki/revertpages.html
View file

@ -28,7 +28,7 @@ if($err->remark) {
<td> <td>
<input type="text" name="authorfieldpattern" size="30" value="<?php p($form->authorfieldpattern) ?>" /> <input type="text" name="authorfieldpattern" size="30" value="<?php p($form->authorfieldpattern) ?>" />
<?php <?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); } if (!empty($err->authorfieldpattern)) { echo $OUTPUT->error_text($err->authorfieldpattern); }
?> ?>
</td> </td>

2
mod/wiki/view.php
View file

@ -367,7 +367,7 @@
/// Formatting Rules /// Formatting Rules
echo '<td class="howtowiki">'; 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 '</td>';
echo '</tr></table>'; echo '</tr></table>';

2
question/editlib.php
View file

@ -1924,7 +1924,7 @@ function create_new_question_button($categoryid, $params, $caption, $tooltip = '
$url = new moodle_url('/question/addquestion.php', $params); $url = new moodle_url('/question/addquestion.php', $params);
echo $OUTPUT->single_button($url, $caption, 'get', array('disabled'=>$disabled, 'title'=>$tooltip)); 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('dragdrop');
$PAGE->requires->yui2_lib('container'); $PAGE->requires->yui2_lib('container');
if (!$choiceformprinted) { if (!$choiceformprinted) {

4
tag/coursetags_edit.php
View file

@ -127,7 +127,7 @@ echo $OUTPUT->header();
// Print the add and delete form // Print the add and delete form
coursetag_get_jscript(); 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); $edittagthisunit = get_string('edittagthisunit', $tagslang);
$arrowtitle = get_string('arrowtitle', $tagslang); $arrowtitle = get_string('arrowtitle', $tagslang);
$sesskey = sesskey(); $sesskey = sesskey();
@ -160,7 +160,7 @@ echo $OUTPUT->header();
</div> </div>
EOT; EOT;
if ($coursetabs) { if ($coursetabs) {
$deletetagshelp = $OUTPUT->help_icon('deletetags', 'deleting tags', $tagslang); $deletetagshelp = $OUTPUT->old_help_icon('deletetags', 'deleting tags', $tagslang);
$editdeletemytag = get_string('editdeletemytag', $tagslang); $editdeletemytag = get_string('editdeletemytag', $tagslang);
$outstr .= <<<EOT1 $outstr .= <<<EOT1
<div class="coursetag_edit_row"> <div class="coursetag_edit_row">

2
tag/coursetags_more.php
View file

@ -185,7 +185,7 @@ if (strlen($tags) < 10000) { $fclass = 'coursetag_more_large'; }
$outstr = ' $outstr = '
<div class="coursetag_more_title"> <div class="coursetag_more_title">
<div style="padding-bottom:5px">'.$welcome. <div style="padding-bottom:5px">'.$welcome.
$OUTPUT->help_icon('usingtags', 'using tags', $tagslang).' $OUTPUT->old_help_icon('usingtags', 'using tags', $tagslang).'
</div> </div>
<div class="coursetag_more_link">'.$link1.'</div> <div class="coursetag_more_link">'.$link1.'</div>
<div class="coursetag_more_link">'.$link2.'</div> <div class="coursetag_more_link">'.$link2.'</div>

4
user/addnote.php
View file

@ -90,8 +90,8 @@ echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
echo '</fieldset>'; echo '</fieldset>';
$table = new html_table(); $table = new html_table();
$table->head = array (get_string('fullname'), $table->head = array (get_string('fullname'),
get_string('content', 'notes') . $OUTPUT->help_icon('writing', get_string('helpwriting')), get_string('content', 'notes') . $OUTPUT->old_help_icon('writing', get_string('helpwriting')),
get_string('publishstate', 'notes') . $OUTPUT->help_icon('status', get_string('publishstate', 'notes'), 'notes'), get_string('publishstate', 'notes') . $OUTPUT->old_help_icon('status', get_string('publishstate', 'notes'), 'notes'),
); );
$table->align = array ('left', 'center', 'center'); $table->align = array ('left', 'center', 'center');
$state_names = note_get_state_names(); $state_names = note_get_state_names();

2
user/extendenrol.php
View file

@ -138,7 +138,7 @@ if($course->enrollable == 2) {
} }
$title = get_string('extendenrol'); $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 "<form method=\"post\" action=\"extendenrol.php\">\n";
echo '<input type="hidden" name="id" value="'.$course->id.'" />'; echo '<input type="hidden" name="id" value="'.$course->id.'" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'; echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';

4
user/groupaddnote.php
View file

@ -116,11 +116,11 @@ echo get_string('users'). ': ' . implode(', ', $userlist) . '.';
echo '</p>'; echo '</p>';
echo '<p>' . get_string('content', 'notes'); 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 '<br /><textarea name="content" rows="5" cols="50">' . strip_tags(@$content) . '</textarea></p>';
echo '<p>' . $strpublishstate; 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 html_writer::select($state_names, 'state', empty($state) ? NOTES_STATE_PUBLIC : $state, false);
echo '</p>'; echo '</p>';

2
user/groupextendenrol.php
View file

@ -134,7 +134,7 @@ if($course->enrollable == 2) {
} }
$title = get_string('groupextendenrol'); $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 '<form method="post" action="groupextendenrol.php">';
echo '<input type="hidden" name="id" value="'.$course->id.'" />'; echo '<input type="hidden" name="id" value="'.$course->id.'" />';
echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />'; echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';

2
user/index.php
View file

@ -851,7 +851,7 @@
$displaylist['groupextendenrol.php'] = get_string('groupextendenrol'); $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::tag('label', get_string("withselectedusers"), array('for'=>'formactionid'));
echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionid')); echo html_writer::select($displaylist, 'formaction', '', array(''=>'choosedots'), array('id'=>'formactionid'));

10
user/message.html
View file

@ -16,14 +16,14 @@
<td align="right" valign="middle" nowrap="nowrap"> <td align="right" valign="middle" nowrap="nowrap">
<?php <?php
//TODO: replace by new editor stuff! //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 "<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 "<br />";
echo $OUTPUT->help_icon("questions", get_string("helpquestions"), "moodle", true); echo $OUTPUT->old_help_icon("questions", get_string("helpquestions"), "moodle", true);
echo "<br />"; echo "<br />";
if ($usehtmleditor) { if ($usehtmleditor) {
echo $OUTPUT->help_icon("richtext2", get_string("helprichtext"), "moodle", true); echo $OUTPUT->old_help_icon("richtext2", get_string("helprichtext"), "moodle", true);
} else { } else {
//emoticonhelpbutton("theform", "message"); to be replaced by new editor stuff //emoticonhelpbutton("theform", "message"); to be replaced by new editor stuff
} }
@ -42,7 +42,7 @@
} else { } else {
choose_from_menu(format_text_menu(), "format", $format, ""); 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> </td>
</tr> </tr>