mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 16:36:37 +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
|
@ -79,10 +79,7 @@ $PAGE->navbar->add($stredit);
|
|||
$PAGE->set_focuscontrol('theform.summary');
|
||||
echo $OUTPUT->header();
|
||||
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $strsummaryof;
|
||||
$helpicon->page = 'summaries';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($strsummaryof, 'summaries');
|
||||
|
||||
$mform->display();
|
||||
echo $OUTPUT->footer();
|
|
@ -35,10 +35,7 @@ $strusers = get_string("users");
|
|||
$strusersnew = get_string("usersnew");
|
||||
$strimportgroups = get_string("importgroups");
|
||||
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $strimportgroups;
|
||||
$helpicon->page = 'uploadgroups';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($strimportgroups, 'uploadgroups');
|
||||
|
||||
$maxuploadsize = get_max_upload_file_size();
|
||||
echo '<p align="center">';
|
||||
|
|
|
@ -3026,7 +3026,7 @@ function print_groupmode_setting($form, $course=NULL) {
|
|||
$select = html_select::make($choices, 'groupmode', $groupmode, false);
|
||||
$select->disabled = $course->groupmodeforce;
|
||||
echo $OUTPUT->select($select);
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('groupmode', get_string('groupmode')));
|
||||
echo $OUTPUT->help_icon('groupmode', get_string('groupmode'));
|
||||
echo '</td></tr>';
|
||||
}
|
||||
}
|
||||
|
|
|
@ -616,11 +616,7 @@
|
|||
require($CFG->dirroot.'/'.$CFG->admin.'/roles/tabs.php');
|
||||
}
|
||||
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->page = 'mods';
|
||||
$helpicon->text = $pageheading;
|
||||
$helpicon->module = $module->name;
|
||||
echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->pix_url('icon', $module->name));
|
||||
echo $OUTPUT->heading_with_help($pageheading, 'mods', $module->name, 'icon');
|
||||
|
||||
$mform->display();
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@
|
|||
echo $OUTPUT->select(html_select::make($roleoptions,'roleid',$roleid,false));
|
||||
echo '<label for="menuaction">'.get_string('showactions').'</label>'."\n";
|
||||
echo $OUTPUT->select(html_select::make($actionoptions,'action',$action,false));
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make('participationreport',get_string('participationreport')));
|
||||
echo $OUTPUT->help_icon('participationreport', get_string('participationreport'));
|
||||
echo '<input type="submit" value="'.get_string('go').'" />'."\n</div></form>\n";
|
||||
|
||||
$baseurl = $CFG->wwwroot.'/course/report/participation/index.php?id='.$course->id.'&roleid='
|
||||
|
@ -281,7 +281,7 @@
|
|||
$select->label = get_string("withselectedusers");
|
||||
$select->add_action('change', 'conditionalsubmit', array('formid' => 'studentsform'));
|
||||
echo $OUTPUT->select($select);
|
||||
echo $OUTPUT->help_icon(moodle_help_icon::make("participantswithselectedusers", get_string("withselectedusers")));
|
||||
echo $OUTPUT->help_icon("participantswithselectedusers", get_string("withselectedusers"));
|
||||
echo '<input type="submit" value="' . get_string('ok') . '" />'."\n";
|
||||
echo '</div>'."\n";
|
||||
echo '</form>'."\n";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue