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

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

View file

@ -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').'" />';

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'=>'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'));

View file

@ -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">

View file

@ -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" />';

View file

@ -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">';

View file

@ -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>';

View file

@ -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) {

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><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" >';

View file

@ -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 />';

View file

@ -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) {

View file

@ -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>';

View file

@ -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));

View file

@ -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>';

View file

@ -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'));

View file

@ -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>

View file

@ -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>

View file

@ -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];

View file

@ -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'])) {

View file

@ -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');

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="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;

View file

@ -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;

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="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);

View file

@ -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;

View file

@ -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>

View file

@ -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>';