mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
MDL-21217, MDL-21198 simplified/improved outputlib help icon related apis + several fixed regresions
This commit is contained in:
parent
48a67d9f01
commit
4bcc51185c
113 changed files with 442 additions and 970 deletions
|
@ -142,11 +142,7 @@ if($check_anonymously) {
|
|||
echo '</table>';
|
||||
}
|
||||
}else {
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = get_string('insufficient_responses_for_this_group', 'feedback');
|
||||
$helpicon->page = 'insufficient_responses';
|
||||
$helpicon->module = 'feedback';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help(get_string('insufficient_responses_for_this_group', 'feedback'), 'insufficient_responses', 'feedback');
|
||||
}
|
||||
echo '</td></tr></table></div>';
|
||||
echo $OUTPUT->box_end();
|
||||
|
|
|
@ -211,7 +211,7 @@ if($do_show == 'edit') {
|
|||
if(is_array($feedbackitems)){
|
||||
$itemnr = 0;
|
||||
|
||||
$helpbutton = $OUTPUT->help_icon(moodle_help_icon::make('preview', get_string('preview','feedback'), 'feedback',true));
|
||||
$helpbutton = $OUTPUT->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) {
|
||||
|
|
|
@ -97,14 +97,14 @@ if (($courses = $DB->get_records_sql_menu($sql, $params)) && !empty($searchcours
|
|||
echo ' ' . get_string('courses') . ': ';
|
||||
echo $OUTPUT->select(html_select::make ($courses, 'coursefilter', $coursefilter));
|
||||
echo '<input type="submit" value="'.get_string('mapcourse', 'feedback').'"/>';
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('mapcourses', '', 'feedback', true));
|
||||
echo $OUTPUT->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(moodle_help_icon::make('searchcourses', '', 'feedback', true));
|
||||
echo $OUTPUT->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(moodle_help_icon::make('searchcourses', '', 'feedback', true));
|
||||
echo $OUTPUT->help_icon('searchcourses', '', 'feedback', true);
|
||||
}
|
||||
|
||||
echo '</form>';
|
||||
|
|
|
@ -112,7 +112,7 @@ if($do_show == 'showentries'){
|
|||
if($feedback->course == SITEID){
|
||||
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis_course.php?id=' . $id . '&courseid='.$courseid).'">';
|
||||
echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('viewcompleted', '', 'feedback', true));
|
||||
echo $OUTPUT->help_icon('viewcompleted', '', 'feedback', true);
|
||||
echo '</div>';
|
||||
}else {
|
||||
echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
|
||||
|
|
|
@ -136,7 +136,7 @@ if($capabilities->mapcourse) {
|
|||
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(moodle_help_icon::make('mapcourse', '', 'feedback', true));
|
||||
echo $OUTPUT->help_icon('mapcourse', '', 'feedback', true);
|
||||
echo '</form>';
|
||||
echo '<br />';
|
||||
echo '</div>';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue