mirror of
https://github.com/moodle/moodle.git
synced 2025-08-04 08:26: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
|
@ -296,10 +296,7 @@
|
|||
}
|
||||
|
||||
/// Print heading.
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $title;
|
||||
$helpicon->page = 'assignroles';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($title, 'assignroles');
|
||||
|
||||
if ($roleid) {
|
||||
/// Show UI for assigning a particular role to users.
|
||||
|
@ -330,7 +327,7 @@
|
|||
if ($hidden) { echo 'checked="checked" '; } ?>/>
|
||||
<label for="hidden" title="<?php print_string('createhiddenassign', 'role'); ?>">
|
||||
<?php print_string('hidden', 'role'); ?>
|
||||
<?php echo $OUTPUT->help_icon(moodle_help_icon::make('hiddenassign', get_string('createhiddenassign', 'role'))); ?>
|
||||
<?php echo $OUTPUT->help_icon('hiddenassign', get_string('createhiddenassign', 'role')); ?>
|
||||
</label></p>
|
||||
|
||||
<p><label for="extendperiod"><?php print_string('enrolperiod') ?></label><br />
|
||||
|
|
|
@ -138,10 +138,7 @@
|
|||
}
|
||||
|
||||
/// Print heading.
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $title;
|
||||
$helpicon->page = 'checkpermissions';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($title, 'checkpermissions');
|
||||
|
||||
/// If a user has been chosen, show all the permissions for this user.
|
||||
$reportuser = $userselector->get_selected_user();
|
||||
|
|
|
@ -120,10 +120,7 @@
|
|||
} else if ($action == 'edit') {
|
||||
$title = get_string('editingrolex', 'role', $rolenames[$roleid]->localname);
|
||||
}
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $title;
|
||||
$helpicon->page = 'roles';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($title, 'roles');
|
||||
|
||||
/// Work out some button labels.
|
||||
if ($action == 'add' || $action == 'duplicate') {
|
||||
|
|
|
@ -380,7 +380,7 @@ abstract class capability_table_with_risks extends capability_table_base {
|
|||
protected function add_header_cells() {
|
||||
global $OUTPUT;
|
||||
echo '<th colspan="' . count($this->displaypermissions) . '" scope="col">' .
|
||||
get_string('permission', 'role') . ' ' . $OUTPUT->help_icon(moodle_help_icon::make('permissions', get_string('permissions', 'role'))) . '</th>';
|
||||
get_string('permission', 'role') . ' ' . $OUTPUT->help_icon('permissions', get_string('permissions', 'role')) . '</th>';
|
||||
echo '<th class="risk" colspan="' . count($this->allrisks) . '" scope="col">' . get_string('risks','role') . '</th>';
|
||||
}
|
||||
|
||||
|
|
|
@ -206,7 +206,7 @@
|
|||
$table->wrap = array('nowrap', '', 'nowrap','nowrap');
|
||||
$table->width = '90%';
|
||||
$table->head = array(
|
||||
get_string('role') . ' ' . $OUTPUT->help_icon(moodle_help_icon::make('roles', get_string('roles'))),
|
||||
get_string('role') . ' ' . $OUTPUT->help_icon('roles', get_string('roles')),
|
||||
get_string('description'),
|
||||
get_string('shortname'),
|
||||
get_string('edit')
|
||||
|
|
|
@ -175,10 +175,7 @@
|
|||
include_once('tabs.php');
|
||||
}
|
||||
|
||||
$helpicon = new moodle_help_icon();
|
||||
$helpicon->text = $title;
|
||||
$helpicon->page = 'overrides';
|
||||
echo $OUTPUT->heading_with_help($helpicon);
|
||||
echo $OUTPUT->heading_with_help($title, 'overrides');
|
||||
|
||||
if ($roleid) {
|
||||
/// Show UI for overriding roles.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue