lib/maxmind/MaxMind/
lib/ltiprovider/
lib/amd/src/truncate.js
+lib/fonts/
media/player/videojs/amd/src/video-lazy.js
media/player/videojs/amd/src/Youtube-lazy.js
media/player/videojs/videojs/
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
theme/bootstrapbase/less/bootstrap/
theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
\ No newline at end of file
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/
\ No newline at end of file
lib/maxmind/MaxMind/
lib/ltiprovider/
lib/amd/src/truncate.js
+lib/fonts/
media/player/videojs/amd/src/video-lazy.js
media/player/videojs/amd/src/Youtube-lazy.js
media/player/videojs/videojs/
theme/boost/amd/src/tooltip.js
theme/boost/amd/src/util.js
theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
theme/bootstrapbase/less/bootstrap/
theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
\ No newline at end of file
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/
\ No newline at end of file
$visible = '';
} else if ($blocks[$blockid]->visible) {
$visible = '<a href="blocks.php?hide='.$blockid.'&sesskey='.sesskey().'" title="'.$strhide.'">'.
- '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
+ $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
} else {
$visible = '<a href="blocks.php?show='.$blockid.'&sesskey='.sesskey().'" title="'.$strshow.'">'.
- '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
+ $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
$class = 'dimmed_text';
}
$undeletable = '';
} else if (in_array($blockname, $undeletableblocktypes)) {
$undeletable = '<a href="blocks.php?unprotect='.$blockid.'&sesskey='.sesskey().'" title="'.$strunprotect.'">'.
- '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="iconsmall" alt="'.$strunprotect.'" /></a>';
+ $OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
} else {
$undeletable = '<a href="blocks.php?protect='.$blockid.'&sesskey='.sesskey().'" title="'.$strprotect.'">'.
- '<img src="'.$OUTPUT->pix_url('t/lock') . '" class="iconsmall" alt="'.$strprotect.'" /></a>';
+ $OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
}
$row = array(
// Re-order.
$updown = '';
- $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
+ $spacer = $OUTPUT->spacer();
if ($state->active != TEXTFILTER_DISABLED) {
if (!$isfirstrow) {
$updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));
} else {
$columndir = $dir == "ASC" ? "DESC" : "ASC";
$columnicon = $dir == "ASC" ? "down" : "up";
- $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
+ $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort'));
}
$headings[$column] = "<a href=\"?sort=$column&dir=$columndir&\">".$string[$column]."</a>$columnicon";
}
$missing = true;
} else {
// took out hspace="\10\", because it does not validate. don't know what to replace with.
- $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+ $icon = "<img src=\"" . $OUTPUT->image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
$strmodulename = $icon.' '.get_string('modulename', $module->name);
$missing = false;
}
$class = '';
} else if ($module->visible) {
$visible = "<a href=\"modules.php?hide=$module->name&sesskey=".sesskey()."\" title=\"$strhide\">".
- "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" /></a>";
+ $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
$class = '';
} else {
$visible = "<a href=\"modules.php?show=$module->name&sesskey=".sesskey()."\" title=\"$strshow\">".
- "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" /></a>";
+ $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
$class = 'dimmed_text';
}
if ($module->name == "forum") {
if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
$icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon'));
} else {
- $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon'));
+ $icon = $this->output->spacer('spacer');
}
$status = $plugin->get_status();
$row->attributes['class'] .= ' status-'.$status;
if ($updowncount > 1) {
$updown .= "<a href=\"$sesskeyurl&action=moveup&repos=".$typename."\">";
- $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a> ";
+ $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . "</a> ";
}
else {
$updown .= $spacer;
}
if ($updowncount < $totalrepositorytypes) {
$updown .= "<a href=\"$sesskeyurl&action=movedown&repos=".$typename."\">";
- $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
+ $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . "</a> ";
}
else {
$updown .= $spacer;
public function get_risk_icon($type) {
global $OUTPUT;
- $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type));
- $text = '<img src="' . $iconurl . '" alt="' . get_string($type . 'short', 'admin') . '" />';
+ $text = $OUTPUT->pix_icon('i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin'));
$action = new popup_action('click', $this->risksurl, 'docspopup');
$riskicon = $OUTPUT->action_link($this->risksurl, $text, $action, array('title'=>get_string($type, 'admin')));
foreach ($roles as $id => $name) {
if (isset($needed[$id])) {
$templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "prevent", "spanclass" => "allowed",
- "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "imageurl" => "");
+ "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
- $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
+ $templatecontext['icon'] = 't/delete';
+ $templatecontext['iconalt'] = get_string('delete');
}
$neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
}
if (isset($forbidden[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
$templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "unprohibit",
"spanclass" => "forbidden", "linkclass" => "unprohibitlink", "adminurl" => $adminurl->out(),
- "imageurl" => "");
+ "icon" => "", "iconalt" => "");
if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
- $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
+ $templatecontext['icon'] = 't/delete';
+ $templatecontext['iconalt'] = get_string('delete');
}
$forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
}
function get_action_icon($url, $icon, $alt, $tooltip) {
global $OUTPUT;
return '<a title="' . $tooltip . '" href="'. $url . '">' .
- '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
+ $OUTPUT->pix_icon('t/' . $icon, $alt) . '</a> ';
}
function get_spacer() {
global $OUTPUT;
- return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
+ return $OUTPUT->spacer();
}
$strgoto = get_string('gotoassignroles', 'core_role', $a);
$strcheck = get_string('checkuserspermissionshere', 'core_role', $a);
}
- echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' .
- $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
- echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' .
- $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
+ echo ' <a title="' . $strgoto . '" href="' . $raurl . '">' . $OUTPUT->pix_icon('t/edit', 'core', $stredit) . '</a> ';
+ echo ' <a title="' . $strcheck . '" href="' . $churl . '">' . $OUTPUT->pix_icon('t/preview', 'core', $strcheckpermissions) . '</a> ';
echo "</p>\n";
}
}
//$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));
$ADMIN->add('backups', $temp);
+
+ // Create a page for general restore configuration and defaults.
+ $temp = new admin_settingpage('restoregeneralsettings', new lang_string('generalrestoredefaults', 'backup'));
+
+ // General restore defaults.
+ $temp->add(new admin_setting_heading('generalsettings', new lang_string('generalrestoresettings', 'backup'), ''));
+
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_users',
+ new lang_string('generalusers', 'backup'), new lang_string('configrestoreusers', 'backup'),
+ array('value' => 1, 'locked' => 0)));
+ // Can not use actual constants here because we'd need to include 100 of backup/restore files.
+ $options = [
+ 0/*backup::ENROL_NEVER*/ => get_string('rootsettingenrolments_never', 'backup'),
+ 1/*backup::ENROL_WITHUSERS*/ => get_string('rootsettingenrolments_withusers', 'backup'),
+ 2/*backup::ENROL_ALWAYS*/ => get_string('rootsettingenrolments_always', 'backup'),
+ ];
+ $temp->add(new admin_setting_configselect_with_lock('restore/restore_general_enrolments',
+ new lang_string('generalenrolments', 'backup'), new lang_string('configrestoreenrolments', 'backup'),
+ array('value' => 1/*backup::ENROL_WITHUSERS*/, 'locked' => 0), $options));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_role_assignments',
+ new lang_string('generalroleassignments', 'backup'),
+ new lang_string('configrestoreroleassignments', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_activities',
+ new lang_string('generalactivities', 'backup'),
+ new lang_string('configrestoreactivities', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_blocks',
+ new lang_string('generalblocks', 'backup'),
+ new lang_string('configrestoreblocks', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_filters',
+ new lang_string('generalfilters', 'backup'),
+ new lang_string('configrestorefilters', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_comments',
+ new lang_string('generalcomments', 'backup'),
+ new lang_string('configrestorecomments', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_badges',
+ new lang_string('generalbadges', 'backup'),
+ new lang_string('configrestorebadges', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_calendarevents',
+ new lang_string('generalcalendarevents', 'backup'),
+ new lang_string('configrestorecalendarevents', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_userscompletion',
+ new lang_string('generaluserscompletion', 'backup'),
+ new lang_string('configrestoreuserscompletion', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_logs',
+ new lang_string('generallogs', 'backup'),
+ new lang_string('configrestorelogs', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_histories',
+ new lang_string('generalhistories', 'backup'),
+ new lang_string('configrestorehistories', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_groups',
+ new lang_string('generalgroups', 'backup'), new lang_string('configrestoregroups', 'backup'),
+ array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
+ new lang_string('generalcompetencies', 'backup'),
+ new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
+
+ // Restore defaults when merging into another course.
+ $temp->add(new admin_setting_heading('mergerestoredefaults', new lang_string('mergerestoredefaults', 'backup'), ''));
+
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_overwrite_conf',
+ new lang_string('setting_overwrite_conf', 'backup'),
+ new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
+
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_fullname',
+ new lang_string('setting_overwrite_course_fullname', 'backup'),
+ new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_shortname',
+ new lang_string('setting_overwrite_course_shortname', 'backup'),
+ new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_startdate',
+ new lang_string('setting_overwrite_course_startdate', 'backup'),
+ new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
+
+ // Restore defaults when replacing course contents.
+ $temp->add(new admin_setting_heading('replacerestoredefaults', new lang_string('replacerestoredefaults', 'backup'), ''));
+
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_overwrite_conf',
+ new lang_string('setting_overwrite_conf', 'backup'),
+ new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
+
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_fullname',
+ new lang_string('setting_overwrite_course_fullname', 'backup'),
+ new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_shortname',
+ new lang_string('setting_overwrite_course_shortname', 'backup'),
+ new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
+ $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_startdate',
+ new lang_string('setting_overwrite_course_startdate', 'backup'),
+ new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
+
+ $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_roles_and_enrolments',
+ new lang_string('setting_keep_roles_and_enrolments', 'backup'),
+ new lang_string('config_keep_roles_and_enrolments', 'backup'), array('value' => 0, 'locked' => 0),
+ array(1 => get_string('yes'), 0 => get_string('no'))));
+ $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_groups_and_groupings',
+ new lang_string('setting_keep_groups_and_groupings', 'backup'),
+ new lang_string('config_keep_groups_and_groupings', 'backup'), array('value' => 0, 'locked' => 0),
+ array(1 => get_string('yes'), 0 => get_string('no'))));
+
+ $ADMIN->add('backups', $temp);
+
}
// Make enable control. This is a POST request (using a form control rather
// than just a link) because it makes a database change.
- $enablecontrol = html_writer::tag('form', html_writer::div(
- html_writer::empty_tag('input', array('type' => 'hidden',
- 'name' => 'sesskey', 'value' => sesskey())) .
- html_writer::empty_tag('input', array('type' => 'hidden',
- 'name' => 'plugin', 'value' => $plugin)) .
- html_writer::empty_tag('input', array('type' => 'hidden',
- 'name' => 'action', 'value' => $enabledaction)) .
- html_writer::empty_tag('input', array('type' => 'image',
- 'src' => $OUTPUT->pix_url('t/' . $enabledaction), 'alt' => $enabledstr,
- 'title' => $enabledstr))
- ), array(
- 'method' => 'post', 'action' => './'));
+ $params = array('sesskey' => sesskey(), 'plugin' => $plugin, 'action' => $enabledaction);
+ $url = new moodle_url('/' . $CFG->admin . '/tool/availabilityconditions/', $params);
+ $enablecontrol = html_writer::link($url, $OUTPUT->pix_icon('t/' . $enabledaction, $enabledstr));
$table->add_data(array($namespan, $version, $enablecontrol));
}
When I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"
# Check the icon is there (it should be a Hide icon, meaning is currently visible).
- Then "input[title=Hide]" "css_element" should exist in the "Restriction by date" "table_row"
+ Then "Hide" "icon" should exist in the "Restriction by date" "table_row"
# Click the icon. It should toggle to hidden (title=Show).
- And I click on "input[title=Hide]" "css_element" in the "Restriction by date" "table_row"
- And "input[title=Show]" "css_element" should exist in the "Restriction by date" "table_row"
+ And I click on "Hide" "icon" in the "Restriction by date" "table_row"
+ And "Show" "icon" should exist in the "Restriction by date" "table_row"
# Toggle it back to visible (title=Hide).
- And I click on "input[title=Show]" "css_element" in the "Restriction by date" "table_row"
- And "input[title=Hide]" "css_element" should exist in the "Restriction by date" "table_row"
+ And I click on "Show" "icon" in the "Restriction by date" "table_row"
+ And "Hide" "icon" should exist in the "Restriction by date" "table_row"
# OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
- And I click on "input[title=Hide]" "css_element" in the "Restriction by grade" "table_row"
+ And I click on "Hide" "icon" in the "Restriction by grade" "table_row"
And I am on site homepage
And I follow "Course 1"
And I turn editing mode on
if ($handle = @opendir($path)) {
while (($file = readdir($handle)) !== false) {
$matches = array();
- if (preg_match('~(.+?)(?:-24|-32|-48|-64|-72|-80|-96|-128|-256)?\.(?:gif|png)$~',
+ if (preg_match('~(.+?)(?:-24|-32|-48|-64|-72|-80|-96|-128|-256)?\.(?:svg|gif|png)$~',
$file, $matches)) {
$key = $matches[1];
$icons[$key] = $key;
$editurl = new \moodle_url('/admin/tool/filetypes/edit.php',
array('oldextension' => $extension));
$editbutton = html_writer::link($editurl, $this->pix_icon('t/edit',
- get_string('edita', '', s($extension))));
+ get_string('edita', 'moodle', s($extension))));
$deleteurl = new \moodle_url('/admin/tool/filetypes/delete.php',
array('extension' => $extension));
$deletebutton = html_writer::link($deleteurl, $this->pix_icon('t/delete',
Then I should see "Froggy file" in the "application/x-frog" "table_row"
And I should see "document" in the "application/x-frog" "table_row"
And I should see "frog" in the "application/x-frog" "table_row"
- And "//img[contains(@src, 'archive')]" "xpath_element" should exist in the "application/x-frog" "table_row"
Scenario: Update an existing file type
Given I log in as "admin"
And I navigate to "File types" node in "Site administration > Server"
And I click on "Edit 7z" "link"
And I set the following fields to these values:
- | File icon | document |
+ | Type groups | document |
And I press "Save changes"
- When I follow "Restore 7z to Moodle defaults"
+ And I follow "Restore 7z to Moodle defaults"
And I press "Yes"
- Then "//img[contains(@src, 'archive')]" "xpath_element" should exist in the "7z" "table_row"
+ Then "//*[contains(text(), 'archive')]" "xpath_element" should exist in the "7z" "table_row"
@javascript @_file_upload
Scenario: Create a resource activity which contains a customised file type
And I set the field "Show type" to "1"
And I press "Save and return to course"
Then I should see "Froggy file"
- And the "src" attribute of ".modtype_resource a img" "css_element" should contain "archive"
if (isset($enabled[$store])) {
$aurl = new moodle_url($url, array('action' => 'disable', 'store' => $store));
$hideshow = "<a href=\"$aurl\">";
- $hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strdisable\" /></a>";
+ $hideshow .= $OUTPUT->pix_icon('t/hide', $strdisable) . '</a>';
$isenabled = true;
$displayname = "<span>$name</span>";
} else {
if (isset($available[$store])) {
$aurl = new moodle_url($url, array('action' => 'enable', 'store' => $store));
$hideshow = "<a href=\"$aurl\">";
- $hideshow .= "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strenable\" /></a>";
+ $hideshow .= $OUTPUT->pix_icon('t/show', $strenable) . '</a>';
$isenabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
} else {
if ($PAGE->theme->resolve_image_location('icon', $store, false)) {
$icon = $OUTPUT->pix_icon('icon', '', $store, array('class' => 'icon pluginicon'));
} else {
- $icon = $OUTPUT->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon'));
+ $icon = $OUTPUT->spacer();
}
// Up/down link (only if store is enabled).
if ($updowncount > 1) {
$aurl = new moodle_url($url, array('action' => 'up', 'store' => $store));
$updown .= "<a href=\"$aurl\">";
- $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"$strup\" class=\"iconsmall\" /></a> ";
+ $updown .= $OUTPUT->pix_icon('t/up', $strup) . '</a> ';
} else {
- $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" /> ";
+ $updown .= $OUTPUT->spacer();
}
if ($updowncount < $storecount) {
$aurl = new moodle_url($url, array('action' => 'down', 'store' => $store));
$updown .= "<a href=\"$aurl\">";
- $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"$strdown\" class=\"iconsmall\" /></a>";
+ $updown .= $OUTPUT->pix_icon('t/down', $strdown) . '</a> ';
} else {
- $updown .= "<img src=\"" . $OUTPUT->pix_url('spacer') . "\" class=\"iconsmall\" alt=\"\" />";
+ $updown .= $OUTPUT->spacer();
}
++$updowncount;
}
'pagecontextid' => $pagecontextid));
$frameworksurl = new moodle_url('/admin/tool/lp/competencyframeworks.php', array('pagecontextid' => $pagecontextid));
-$PAGE->navigation->override_active_url($frameworksurl);
$PAGE->set_context($pagecontext);
+$PAGE->navigation->override_active_url($frameworksurl);
$PAGE->set_pagelayout('admin');
$PAGE->set_url($url);
$PAGE->navbar->add($framework->get('shortname'), $url);
