moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-20787 final switch to new $OUTPUT->pix_url() - yay!

Browse source
This commit is contained in:
Petr Skoda 2009-12-16 21:50:45 +00:00
parent cb1e046d6e
commit b5d0cafc6f
157 changed files with 576 additions and 576 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/adminlib.php
View file

@ -4755,14 +4755,14 @@ class admin_setting_manageauths extends admin_setting {
// hide/show link
if (in_array($auth, $authsenabled)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
$enabled = true;
$displayname = "<span>$name</span>";
}
else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
$enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
@ -4773,17 +4773,17 @@ class admin_setting_manageauths extends admin_setting {
if ($enabled) {
if ($updowncount > 1) {
$updown .= "<a href=\"$url&amp;action=up&amp;auth=$auth\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
}
else {
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
$updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
}
if ($updowncount < $authcount) {
$updown .= "<a href=\"$url&amp;action=down&amp;auth=$auth\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
}
else {
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
$updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
}
++ $updowncount;
}
@ -4919,14 +4919,14 @@ class admin_setting_manageeditors extends admin_setting {
// hide/show link
if (in_array($editor, $active_editors)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"disable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\"><input type=\"checkbox\" checked /></a>";
$enabled = true;
$displayname = "<span>$name</span>";
}
else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"enable\" /></a>";
// $hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\"><input type=\"checkbox\" /></a>";
$enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>";
@ -4937,17 +4937,17 @@ class admin_setting_manageeditors extends admin_setting {
if ($enabled) {
if ($updowncount > 1) {
$updown .= "<a href=\"$url&amp;action=up&amp;editor=$editor\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
}
else {
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
$updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />&nbsp;";
}
if ($updowncount < $editorcount) {
$updown .= "<a href=\"$url&amp;action=down&amp;editor=$editor\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
}
else {
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
$updown .= "<img src=\"" . $OUTPUT->pix_url('spacer.gif') . "\" class=\"icon\" alt=\"\" />";
}
++ $updowncount;
}
@ -5123,13 +5123,13 @@ class admin_setting_manageportfolio extends admin_setting {
foreach ($instances as $i) {
$row = '';
$row .= '<a href="' . $this->baseurl . '&edit=' . $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/edit') . '" alt="' . get_string('edit') . '" /></a>' . "\n";
$row .= '<a href="' . $this->baseurl . '&delete=' . $i->get('id') . '"><img src="' . $OUTPUT->old_icon_url('t/delete') . '" alt="' . get_string('delete') . '" /></a>' . "\n";
$row .= '<a href="' . $this->baseurl . '&edit=' . $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/edit') . '" alt="' . get_string('edit') . '" /></a>' . "\n";
$row .= '<a href="' . $this->baseurl . '&delete=' . $i->get('id') . '"><img src="' . $OUTPUT->pix_url('t/delete') . '" alt="' . get_string('delete') . '" /></a>' . "\n";
if (array_key_exists($i->get('plugin'), $insane) || array_key_exists($i->get('id'), $insaneinstances)) {
$row .= '<img src="' . $OUTPUT->old_icon_url('t/show') . '" alt="' . get_string('hidden', 'portfolio') . '" />' . "\n";
$row .= '<img src="' . $OUTPUT->pix_url('t/show') . '" alt="' . get_string('hidden', 'portfolio') . '" />' . "\n";
} else {
$row .= ' <a href="' . $this->baseurl . '&hide=' . $i->get('id') . '"><img src="' .
$OUTPUT->old_icon_url('t/' . ($i->get('visible') ? 'hide' : 'show')) . '" alt="' . get_string($i->get('visible') ? 'hide' : 'show') . '" /></a>' . "\n";
$OUTPUT->pix_url('t/' . ($i->get('visible') ? 'hide' : 'show')) . '" alt="' . get_string($i->get('visible') ? 'hide' : 'show') . '" /></a>' . "\n";
}
$table->data[] = array($i->get('name'), $i->get_name() . ' (' . $i->get('plugin') . ')', $row);
if (!in_array($i->get('plugin'), $alreadyplugins)) {
@ -6018,7 +6018,7 @@ class admin_setting_managerepository extends admin_setting {
$hidetitle = $i->get_visible() ? get_string('clicktohide', 'repository') : get_string('clicktoshow', 'repository');
$hiddenshow = ' <a href="' . $this->baseurl . '&amp;hide=' . $i->get_typename() . '">'
.'<img src="' . $OUTPUT->old_icon_url('i/' . ($i->get_visible() ? 'hide' : 'show')) . '"'
.'<img src="' . $OUTPUT->pix_url('i/' . ($i->get_visible() ? 'hide' : 'show')) . '"'
.' alt="' . $hidetitle . '" '
.' title="' . $hidetitle . '" />'
.'</a>' . "\n";
@ -6030,14 +6030,14 @@ class admin_setting_managerepository extends admin_setting {
$spacer->width = 15;
if ($updowncount > 1) {
$updown .= "<a href=\"$this->baseurl&amp;move=up&amp;type=".$i->get_typename()."\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
}
else {
$updown .= $OUTPUT->spacer($spacer);
}
if ($updowncount < count($instances)) {
$updown .= "<a href=\"$this->baseurl&amp;move=down&amp;type=".$i->get_typename()."\">";
$updown .= "<img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" alt=\"down\" /></a>";
$updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
}
else {
$updown .= $OUTPUT->spacer($spacer);
@ -6381,11 +6381,11 @@ class admin_setting_managewebserviceprotocols extends admin_setting {
// hide/show link
if (in_array($protocol, $active_protocols)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;webservice=$protocol\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strdisable\" /></a>";
$displayname = "<span>$name</span>";
} else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;webservice=$protocol\">";
$hideshow .= "<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
$hideshow .= "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strenable\" /></a>";
$displayname = "<span class=\"dimmed_text\">$name</span>";
}

30
lib/ajax/ajaxlib.php
View file

@ -41,7 +41,7 @@ function setup_core_javascript(page_requirements_manager $requires) {
$config = array(
'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above.
'sesskey' => sesskey(),
'loadingicon' => $OUTPUT->old_icon_url('i/loading_small', 'moodle', false),
'loadingicon' => $OUTPUT->pix_url('i/loading_small', 'moodle')->out_raw(),
'themerev' => theme_get_revision(),
'theme' => $PAGE->theme->name,
);
@ -1363,22 +1363,22 @@ class jsportal {
$output .= " main.portal.strings['resource']='".get_string('resource')."';\n";
$output .= " main.portal.strings['activity']='".get_string('activity')."';\n";
$output .= " main.portal.strings['sesskey']='".sesskey()."';\n";
$output .= " main.portal.icons['spacerimg']='".$OUTPUT->old_icon_url('spaces')."';\n";
$output .= " main.portal.icons['marker']='".$OUTPUT->old_icon_url('i/marker')."';\n";
$output .= " main.portal.icons['ihide']='".$OUTPUT->old_icon_url('i/hide')."';\n";
$output .= " main.portal.icons['move_2d']='".$OUTPUT->old_icon_url('i/move_2d')."';\n";
$output .= " main.portal.icons['show']='".$OUTPUT->old_icon_url('t/show')."';\n";
$output .= " main.portal.icons['hide']='".$OUTPUT->old_icon_url('t/hide')."';\n";
$output .= " main.portal.icons['delete']='".$OUTPUT->old_icon_url('t/delete')."';\n";
$output .= " main.portal.icons['groupn']='".$OUTPUT->old_icon_url('t/groupn')."';\n";
$output .= " main.portal.icons['groups']='".$OUTPUT->old_icon_url('t/groups')."';\n";
$output .= " main.portal.icons['groupv']='".$OUTPUT->old_icon_url('t/groupv')."';\n";
$output .= " main.portal.icons['spacerimg']='".$OUTPUT->pix_url('spaces')."';\n";
$output .= " main.portal.icons['marker']='".$OUTPUT->pix_url('i/marker')."';\n";
$output .= " main.portal.icons['ihide']='".$OUTPUT->pix_url('i/hide')."';\n";
$output .= " main.portal.icons['move_2d']='".$OUTPUT->pix_url('i/move_2d')."';\n";
$output .= " main.portal.icons['show']='".$OUTPUT->pix_url('t/show')."';\n";
$output .= " main.portal.icons['hide']='".$OUTPUT->pix_url('t/hide')."';\n";
$output .= " main.portal.icons['delete']='".$OUTPUT->pix_url('t/delete')."';\n";
$output .= " main.portal.icons['groupn']='".$OUTPUT->pix_url('t/groupn')."';\n";
$output .= " main.portal.icons['groups']='".$OUTPUT->pix_url('t/groups')."';\n";
$output .= " main.portal.icons['groupv']='".$OUTPUT->pix_url('t/groupv')."';\n";
if (right_to_left()) {
$output .= " main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/right')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/left')."';\n";
$output .= " main.portal.icons['backwards']='".$OUTPUT->pix_url('t/right')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->pix_url('t/left')."';\n";
} else {
$output .= " main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/left')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/right')."';\n";
$output .= " main.portal.icons['backwards']='".$OUTPUT->pix_url('t/left')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->pix_url('t/right')."';\n";
}
$output .= " onloadobj.load();\n";

2
lib/configonlylib.php
View file

@ -41,7 +41,7 @@ function min_optional_param($name, $default, $type) {
$value = $_GET[$name];
} else if (isset($_GET['amp;'.$name])) {
// very, very, very ugly hack, unforunately $OUTPUT->old_icon_url() is not used properly in javascript code :-(
// very, very, very ugly hack, unforunately $OUTPUT->pix_url() is not used properly in javascript code :-(
$value = $_GET['amp;'.$name];
}
switch($type) {

2
lib/deprecatedlib.php
View file

@ -2869,7 +2869,7 @@ function print_arrow($direction='up', $strsort=null, $return=false) {
$strsort = get_string('sort' . $sortdir, 'grades');
}
$return = ' <img src="'.$OUTPUT->old_icon_url('t/' . $direction) . '" alt="'.$strsort.'" /> ';
$return = ' <img src="'.$OUTPUT->pix_url('t/' . $direction) . '" alt="'.$strsort.'" /> ';
if ($return) {
return $return;

12
lib/filelib.php
View file

@ -566,7 +566,7 @@ function file_get_draft_area_files($draftitemid, $filepath = '/') {
$icon = mimeinfo_from_type('icon', $file->get_mimetype());
$icon = str_replace('.gif', '', $icon);
$item->icon = $OUTPUT->old_icon_url('f/' . $icon);
$item->icon = $OUTPUT->pix_url('f/' . $icon);
if ($icon == 'zip') {
$item->type = 'zip';
@ -576,7 +576,7 @@ function file_get_draft_area_files($draftitemid, $filepath = '/') {
if ($file->is_directory()) {
$item->filesize = 0;
$item->icon = $OUTPUT->old_icon_url('f/folder');
$item->icon = $OUTPUT->pix_url('f/folder');
$item->type = 'folder';
$foldername = explode('/', trim($item->filepath, '/'));
$item->fullname = trim(array_pop($foldername), '/');
@ -1275,12 +1275,12 @@ function mimeinfo_from_icon($element, $icon, $all=false) {
/**
* Returns the relative icon path for a given mime type
*
* This function should be used in conjuction with $OUTPUT->old_icon_url to produce
* This function should be used in conjuction with $OUTPUT->pix_url to produce
* a return the full path to an icon.
*
* <code>
* $mimetype = 'image/jpg';
* $icon = $OUTPUT->old_icon_url(file_mimetype_icon($mimetype));
* $icon = $OUTPUT->pix_url(file_mimetype_icon($mimetype));
* echo '<img src="'.$icon.'" alt="'.$mimetype.'" />';
* </code>
*
@ -1303,12 +1303,12 @@ function file_mimetype_icon($mimetype, $size=null) {
/**
* Returns the relative icon path for a given file name
*
* This function should be used in conjuction with $OUTPUT->old_icon_url to produce
* This function should be used in conjuction with $OUTPUT->pix_url to produce
* a return the full path to an icon.
*
* <code>
* $filename = 'jpg';
* $icon = $OUTPUT->old_icon_url(file_extension_icon($filename));
* $icon = $OUTPUT->pix_url(file_extension_icon($filename));
* echo '<img src="'.$icon.'" alt="blah" />';
* </code>
*

2
lib/form/modgrade.php
View file

@ -62,7 +62,7 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_select{
$grades[$i] = $i;
}
$this->load($grades);
$linkobject = '<span class="helplink"><img height="17" width="17" alt="'.$strscales.'" src="'.$OUTPUT->old_icon_url('help') . '" /></span>';
$linkobject = '<span class="helplink"><img height="17" width="17" alt="'.$strscales.'" src="'.$OUTPUT->pix_url('help') . '" /></span>';
$this->setHelpButton(array('/course/scales.php?id='. $COURSE->id .'&amp;list=true', 'ratingscales',
$linkobject, 400, 500, $strscales, 'none', true), 'link_to_popup_window');
return $result;

6
lib/formslib.php
View file

@ -1090,9 +1090,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
}else {
$this->updateAttributes(array('class'=>'mform'));
}
$this->_reqHTML = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->old_icon_url('req') .'" />';
$this->_advancedHTML = '<img class="adv" title="'.get_string('advancedelement', 'form').'" alt="'.get_string('advancedelement', 'form').'" src="'.$OUTPUT->old_icon_url('adv') .'" />';
$this->setRequiredNote(get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->old_icon_url('req') .'" />'));
$this->_reqHTML = '<img class="req" title="'.get_string('requiredelement', 'form').'" alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />';
$this->_advancedHTML = '<img class="adv" title="'.get_string('advancedelement', 'form').'" alt="'.get_string('advancedelement', 'form').'" src="'.$OUTPUT->pix_url('adv') .'" />';
$this->setRequiredNote(get_string('somefieldsrequired', 'form', '<img alt="'.get_string('requiredelement', 'form').'" src="'.$OUTPUT->pix_url('req') .'" />'));
//(Help file doesn't add anything) helpbutton('requiredelement', get_string('requiredelement', 'form'), 'moodle', true, false, '', true));
}

2
lib/googleapi.php
View file

@ -325,7 +325,7 @@ class google_docs {
'url' => "{$gdoc->link[0]->attributes()->href}",
'source' => $source,
'date' => usertime(strtotime($gdoc->updated)),
'thumbnail' => $OUTPUT->old_icon_url(file_extension_icon($title, 32))
'thumbnail' => $OUTPUT->pix_url(file_extension_icon($title, 32))
);
}
}

4
lib/listlib.php
View file

@ -603,12 +603,12 @@ class list_item {
function image_icon($action, $url, $icon) {
global $OUTPUT;
return '<a title="' . $action .'" href="'.$url.'">
<img src="' . $OUTPUT->old_icon_url('t/'.$icon) . '" class="iconsmall" alt="' . $action. '" /></a> ';
<img src="' . $OUTPUT->pix_url('t/'.$icon) . '" class="iconsmall" alt="' . $action. '" /></a> ';
}
function image_spacer() {
global $OUTPUT;
return '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" />';
return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
}
/**

76
lib/navigationlib.php
View file

@ -135,7 +135,7 @@ class navigation_node {
* $properties['text'] = 'This is a new nav item';
* $properties['short'] = 'This is a new nav item';
* $properties['action'] = moodle_url($CFG->wwwroot.'/course/category.php');
* $properties['icon'] = $OUTPUT->old_icon_url('i/course');
* $properties['icon'] = $OUTPUT->pix_url('i/course');
* $properties['type'] = navigation_node::TYPE_COURSE;
* $properties['key'] = 'newitem';
* $PAGE->navigation->newitem = $properties;
@ -1092,7 +1092,7 @@ class global_navigation extends navigation_node {
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
$icon = $OUTPUT->pix_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
@ -1103,7 +1103,7 @@ class global_navigation extends navigation_node {
$url = new moodle_url('/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
}
if ($module->icon!=='') {
$icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
$icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
}
}
$this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
@ -1154,7 +1154,7 @@ class global_navigation extends navigation_node {
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
$icon = $OUTPUT->pix_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
@ -1165,7 +1165,7 @@ class global_navigation extends navigation_node {
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
}
if ($module->icon!=='') {
$icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
$icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
}
}
$path = $keys;
@ -1364,7 +1364,7 @@ class global_navigation extends navigation_node {
$category = $this->find_child($categoryid);
}
if ($category!==false) {
$coursekey = $category->add($course->fullname, $url, self::TYPE_COURSE, $course->shortname, $course->id, $OUTPUT->old_icon_url('i/course'));
$coursekey = $category->add($course->fullname, $url, self::TYPE_COURSE, $course->shortname, $course->id, $OUTPUT->pix_url('i/course'));
if (!$course->visible) {
$category->get($course->id)->hidden = true;
}
@ -1404,7 +1404,7 @@ class global_navigation extends navigation_node {
return;
}
$url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id));
$keys[] = $this->add_to_path($keys, $course->id, $course->fullname, $course->shortname, self::TYPE_COURSE, $url, $OUTPUT->old_icon_url('i/course'));
$keys[] = $this->add_to_path($keys, $course->id, $course->fullname, $course->shortname, self::TYPE_COURSE, $url, $OUTPUT->pix_url('i/course'));
$currentcourse = $this->find_child($course->id, self::TYPE_COURSE);
if ($currentcourse!==false){
$currentcourse->make_active();
@ -1419,7 +1419,7 @@ class global_navigation extends navigation_node {
if ($participants) {
$participants->mainnavonly = true;
$url = new moodle_url($CFG->wwwroot.'/user/index.php?id='.$course->id);
$participants->add(get_string('participantslist'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/users'));
$participants->add(get_string('participantslist'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/users'));
require_once($CFG->dirroot.'/blog/lib.php');
@ -1446,7 +1446,7 @@ class global_navigation extends navigation_node {
// View course reports
if (has_capability('moodle/site:viewreports', $this->context)) { // basic capability for listing of reports
$reportkey = $currentcourse->add(get_string('reports'), new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)), self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/stats'));
$reportkey = $currentcourse->add(get_string('reports'), new moodle_url($CFG->wwwroot.'/course/report.php', array('id'=>$course->id)), self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/stats'));
$reportnav = $currentcourse->get($reportkey);
if ($reportnav) {
$coursereports = get_plugin_list('coursereport');
@ -2026,7 +2026,7 @@ class limited_global_navigation extends global_navigation {
$icon = null;
if (!in_array($module->modname, $resources)) {
if ($module->icon=='') {
$icon = $OUTPUT->old_icon_url('icon', $module->modname);
$icon = $OUTPUT->pix_url('icon', $module->modname);
}
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY;
@ -2037,7 +2037,7 @@ class limited_global_navigation extends global_navigation {
$url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
}
if ($module->icon!=='') {
$icon = $OUTPUT->old_icon_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
$icon = $OUTPUT->pix_url(preg_replace('#\.(png|gif)$#i','',$module->icon));
}
}
$this->add_to_path($keys, $module->id, $module->name, $module->name, $type, $url, $icon);
@ -2428,7 +2428,7 @@ class settings_navigation extends navigation_node {
$realuser = session_get_realuser();
// Add the informative return to original user link
$url = new moodle_url($CFG->wwwroot.'/course/loginas.php',array('id'=>$this->page->course->id, 'return'=>1,'sesskey'=>sesskey()));
$this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/left'));
$this->add(get_string('returntooriginaluser', 'moodle', fullname($realuser, true)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/left'));
}
// Make sure the first child doesnt have proceed with hr set to true
@ -2553,7 +2553,7 @@ class settings_navigation extends navigation_node {
$this->load_administration_settings($reference, $branch);
}
} else {
$reference->icon = $OUTPUT->old_icon_url('i/settings');
$reference->icon = $OUTPUT->pix_url('i/settings');
}
}
}
@ -2657,7 +2657,7 @@ class settings_navigation extends navigation_node {
$url->param('edit', 'on');
$editstring = get_string('turneditingon');
}
$coursenode->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
$coursenode->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/edit'));
if ($this->page->user_is_editing()) {
// Add `add` resources|activities branches
@ -2740,16 +2740,16 @@ class settings_navigation extends navigation_node {
// Add the course settings link
$url = new moodle_url($CFG->wwwroot.'/course/edit.php', array('id'=>$course->id));
$coursenode->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
$coursenode->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/settings'));
}
// Add assign or override roles if allowed
if (has_capability('moodle/role:assign', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$course->context->id));
$coursenode->add(get_string('assignroles', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
$coursenode->add(get_string('assignroles', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/roles'));
} else if (get_overridable_roles($course->context, ROLENAME_ORIGINAL)) {
$url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php', array('contextid'=>$course->context->id));
$coursenode->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/roles'));
$coursenode->add(get_string('overridepermissions', 'role'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/roles'));
}
// Add view grade report is permitted
@ -2771,22 +2771,22 @@ class settings_navigation extends navigation_node {
}
if ($reportavailable) {
$url = new moodle_url($CFG->wwwroot.'/grade/report/index.php', array('id'=>$course->id));
$coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/grades'));
$coursenode->add(get_string('grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/grades'));
}
// Add outcome if permitted
if (!empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/grade/edit/outcome/course.php', array('id'=>$course->id));
$coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/outcomes'));
$coursenode->add(get_string('outcomes', 'grades'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/outcomes'));
}
// Add meta course links
if ($course->metacourse) {
if (has_capability('moodle/course:managemetacourse', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/importstudents.php', array('id'=>$course->id));
$coursenode->add(get_string('childcourses'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
$coursenode->add(get_string('childcourses'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/course'));
} else if (has_capability('moodle/role:assign', $course->context)) {
$key = $coursenode->add(get_string('childcourses'), null, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/course'));
$key = $coursenode->add(get_string('childcourses'), null, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/course'));
$coursenode->get($key)->hidden = true;;
}
}
@ -2794,31 +2794,31 @@ class settings_navigation extends navigation_node {
// Manage groups in this course
if (($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/group/index.php', array('id'=>$course->id));
$coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/group'));
$coursenode->add(get_string('groups'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/group'));
}
// Backup this course
if (has_capability('moodle/site:backup', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/backup/backup.php', array('id'=>$course->id));
$coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/backup'));
$coursenode->add(get_string('backup'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/backup'));
}
// Restore to this course
if (has_capability('moodle/site:restore', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id, 'wdir'=>'/backupdata'));
$coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
$coursenode->add(get_string('restore'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/restore'));
}
// Import data from other courses
if (has_capability('moodle/site:import', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id));
$coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/restore'));
$coursenode->add(get_string('import'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/restore'));
}
// Reset this course
if (has_capability('moodle/course:reset', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/reset.php', array('id'=>$course->id));
$coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/return'));
$coursenode->add(get_string('reset'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/return'));
}
// Manage questions
@ -2836,7 +2836,7 @@ class settings_navigation extends navigation_node {
}
if (isset($questionlink)) {
$url = new moodle_url($questionlink, array('courseid'=>$course->id));
$coursenode->add(get_string('questions','quiz'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/questions'));
$coursenode->add(get_string('questions','quiz'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/questions'));
}
// Repository Instances
@ -2844,25 +2844,25 @@ class settings_navigation extends navigation_node {
$editabletypes = repository::get_editable_types($this->context);
if (has_capability('moodle/course:update', $this->context) && !empty($editabletypes)) {
$url = new moodle_url($CFG->wwwroot.'/repository/manage_instances.php', array('contextid'=>$this->context->id));
$coursenode->add(get_string('repositories'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/repository'));
$coursenode->add(get_string('repositories'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/repository'));
}
// Manage files
if (has_capability('moodle/course:managefiles', $this->context)) {
$url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id));
$coursenode->add(get_string('files'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/files'));
$coursenode->add(get_string('files'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/files'));
}
// Authorize hooks
if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
require_once($CFG->dirroot.'/enrol/authorize/const.php');
$url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id));
$coursenode->add(get_string('payments'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
$coursenode->add(get_string('payments'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/payment'));
if (has_capability('enrol/authorize:managepayments', $this->page->context)) {
$cnt = $DB->count_records('enrol_authorize', array('status'=>AN_STATUS_AUTH, 'courseid'=>$course->id));
if ($cnt) {
$url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id,'status'=>AN_STATUS_AUTH));
$coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/payment'));
$coursenode->add(get_string('paymentpending', 'moodle', $cnt), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/payment'));
}
}
}
@ -2871,17 +2871,17 @@ class settings_navigation extends navigation_node {
if (empty($course->metacourse)) {
if (has_capability('moodle/legacy:guest', $this->context, NULL, false)) { // Are a guest now
$url = new moodle_url($CFG->wwwroot.'/course/enrol.php', array('id'=>$course->id));
$coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
$coursenode->add(get_string('enrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
} else if (has_capability('moodle/role:unassignself', $this->context, NULL, false) && get_user_roles($this->context, 0, false)) { // Have some role
$url = new moodle_url($CFG->wwwroot.'/course/unenrol.php', array('id'=>$course->id));
$coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
$coursenode->add(get_string('unenrolme', '', format_string($course->shortname)), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
}
}
// Link to the user own profile (except guests)
if (!isguestuser() and isloggedin()) {
$url = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$USER->id, 'course'=>$course->id));
$coursenode->add(get_string('profile'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/user'));
$coursenode->add(get_string('profile'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/user'));
}
// Switch roles
@ -2911,7 +2911,7 @@ class settings_navigation extends navigation_node {
$SESSION->returnurl = serialize($returnurl);
foreach ($roles as $key=>$name) {
$url = new moodle_url($CFG->wwwroot.'/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>$key, 'returnurl'=>'1'));
$this->get($switchroleskey)->add($name, $url, self::TYPE_SETTING, null, $key, $OUTPUT->old_icon_url('i/roles'));
$this->get($switchroleskey)->add($name, $url, self::TYPE_SETTING, null, $key, $OUTPUT->pix_url('i/roles'));
}
}
// Return we are done
@ -3236,17 +3236,17 @@ class settings_navigation extends navigation_node {
$url->param('edit', 'on');
$editstring = get_string('turneditingon');
}
$this->get($frontpage)->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/edit'));
$this->get($frontpage)->add($editstring, $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/edit'));
// Add the course settings link
$url = new moodle_url($CFG->wwwroot.'/admin/settings.php', array('section'=>'frontpagesettings'));
$this->get($frontpage)->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/settings'));
$this->get($frontpage)->add(get_string('settings'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/settings'));
}
//Participants
if (has_capability('moodle/site:viewparticipants', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/user/index.php?contextid='.$course->context->id);
$this->get($frontpage)->add(get_string('participants'), $url, self::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/users'));
$this->get($frontpage)->add(get_string('participants'), $url, self::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/users'));
}
}

8
lib/outputcomponents.php
View file

@ -1923,7 +1923,7 @@ class moodle_user_picture extends moodle_html_component {
$this->image->src = new moodle_url(get_file_url($this->user->id.'/'.$file.'.jpg', null, 'user'));
} else { // Print default user pictures (use theme version if available)
$this->add_class('defaultuserpic');
$this->image->src = $OUTPUT->old_icon_url('u/' . $file);
$this->image->src = $OUTPUT->pix_url('u/' . $file);
}
if ($this->alttext) {
@ -2040,7 +2040,7 @@ class moodle_help_icon extends labelled_html_component {
if ($image instanceof moodle_url) {
$this->image->src = $image->out();
} else if ($image === true) {
$this->image->src = $OUTPUT->old_icon_url('help');
$this->image->src = $OUTPUT->pix_url('help');
} else if (is_string($image)) {
$this->image->src = $image;
}
@ -2056,7 +2056,7 @@ class moodle_help_icon extends labelled_html_component {
if (!($this->image instanceof html_image)) {
$this->image = new html_image();
}
$this->image->src = $OUTPUT->old_icon_url('help');
$this->image->src = $OUTPUT->pix_url('help');
}
parent::prepare();
@ -2233,7 +2233,7 @@ class block_contents extends moodle_html_component {
/**
* A (possibly empty) array of editing controls. Each element of this array
* should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption).
* $icon is the icon name. Fed to $OUTPUT->old_icon_url.
* $icon is the icon name. Fed to $OUTPUT->pix_url.
* @var array
*/
public $controls = array();

6
lib/outputrenderers.php
View file

@ -149,12 +149,6 @@ class renderer_base {
return $classes;
}
/** OBSOLETED: to be removed soon */
public function old_icon_url($iconname, $component='moodle', $escaped=true) {
$url = $this->page->theme->pix_url($iconname, $component);
return $url->out(false, array(), $escaped);
}
/**
* Return the moodle_url for an image
*

4
lib/portfoliolib.php
View file

@ -341,11 +341,11 @@ class portfolio_add_button {
break;
case PORTFOLIO_ADD_ICON_FORM:
$formoutput .= $selectoutput;
$formoutput .= "\n" . '<input type="image" src="' . $OUTPUT->old_icon_url('t/portfolio') . '" alt=' . $addstr .'" />';
$formoutput .= "\n" . '<input type="image" src="' . $OUTPUT->pix_url('t/portfolio') . '" alt=' . $addstr .'" />';
$formoutput .= "\n" . '</form>';
break;
case PORTFOLIO_ADD_ICON_LINK:
$linkoutput .= '"><img src="' . $OUTPUT->old_icon_url('t/portfolio') . '" alt=' . $addstr .'" /></a>';
$linkoutput .= '"><img src="' . $OUTPUT->pix_url('t/portfolio') . '" alt=' . $addstr .'" /></a>';
break;
case PORTFOLIO_ADD_TEXT_LINK:
$linkoutput .= '">' . $addstr .'</a>';

6
lib/questionlib.php
View file

@ -1468,7 +1468,7 @@ function question_get_feedback_image($fraction, $selected=true) {
$size = 'small';
}
$class = question_get_feedback_class($fraction);
return '<img src="' . $OUTPUT->old_icon_url('i/' . $icons[$class] . '_' . $size) .
return '<img src="' . $OUTPUT->pix_url('i/' . $icons[$class] . '_' . $size) .
'" alt="' . get_string($class, 'quiz') . '" class="icon" />';
}
@ -2099,8 +2099,8 @@ function question_init_qengine_js() {
global $CFG, $PAGE, $OUTPUT;
$config = array(
'actionurl' => $CFG->wwwroot . '/question/toggleflag.php',
'flagicon' => $OUTPUT->old_icon_url('i/flagged'),
'unflagicon' => $OUTPUT->old_icon_url('i/unflagged'),
'flagicon' => $OUTPUT->pix_url('i/flagged'),
'unflagicon' => $OUTPUT->pix_url('i/unflagged'),
'flagtooltip' => get_string('clicktoflag', 'question'),
'unflagtooltip' => get_string('clicktounflag', 'question'),
'flaggedalt' => get_string('flagged', 'question'),

4
lib/rsslib.php
View file

@ -42,7 +42,7 @@ function rss_get_link($courseid, $userid, $modulename, $id, $tooltiptext='') {
}
$rsspath = rss_get_url($courseid, $userid, $modulename, $id);
$rsspix = $OUTPUT->old_icon_url('i/rss');
$rsspix = $OUTPUT->pix_url('i/rss');
return '<a href="'. $rsspath .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a>';
@ -214,7 +214,7 @@ function rss_standard_header($title = NULL, $link = NULL, $description = NULL) {
*/
//write image info
$rsspix = $OUTPUT->old_icon_url('i/rsssitelogo');
$rsspix = $OUTPUT->pix_url('i/rsssitelogo');
//write the info
$result .= rss_start_tag('image', 2, true);

16
lib/tablelib.php
View file

@ -1025,11 +1025,11 @@ class flexible_table {
if($this->is_collapsible) {
if(!empty($this->sess->collapse[$column])) {
// some headers contain < br/> tags, do not include in title
$icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_SHOW].'='.$column.'"><img src="'.$OUTPUT->old_icon_url('t/switch_plus') . '" title="'.get_string('show').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('show').'" /></a>';
$icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_SHOW].'='.$column.'"><img src="'.$OUTPUT->pix_url('t/switch_plus') . '" title="'.get_string('show').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('show').'" /></a>';
}
else if($this->headers[$index] !== NULL) {
// some headers contain < br/> tags, do not include in title
$icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_HIDE].'='.$column.'"><img src="'.$OUTPUT->old_icon_url('t/switch_minus') . '" title="'.get_string('hide').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('hide').'" /></a>';
$icon_hide = ' <a href="'.$this->baseurl.$this->request[TABLE_VAR_HIDE].'='.$column.'"><img src="'.$OUTPUT->pix_url('t/switch_minus') . '" title="'.get_string('hide').' '.strip_tags($this->headers[$index]).'" alt="'.get_string('hide').'" /></a>';
}
}
@ -1048,22 +1048,22 @@ class flexible_table {
if($primary_sort_column == 'firstname') {
$lsortorder = get_string('asc');
if($primary_sort_order == SORT_ASC) {
$icon_sort_first = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
$icon_sort_first = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
$fsortorder = get_string('asc');
}
else {
$icon_sort_first = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
$icon_sort_first = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
$fsortorder = get_string('desc');
}
}
else if($primary_sort_column == 'lastname') {
$fsortorder = get_string('asc');
if($primary_sort_order == SORT_ASC) {
$icon_sort_last = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
$icon_sort_last = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
$lsortorder = get_string('asc');
}
else {
$icon_sort_last = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
$icon_sort_last = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
$lsortorder = get_string('desc');
}
} else {
@ -1083,11 +1083,11 @@ class flexible_table {
if($this->is_sortable($column)) {
if($primary_sort_column == $column) {
if($primary_sort_order == SORT_ASC) {
$icon_sort = ' <img src="'.$OUTPUT->old_icon_url('t/down') . '" alt="'.get_string('asc').'" />';
$icon_sort = ' <img src="'.$OUTPUT->pix_url('t/down') . '" alt="'.get_string('asc').'" />';
$localsortorder = get_string('asc');
}
else {
$icon_sort = ' <img src="'.$OUTPUT->old_icon_url('t/up') . '" alt="'.get_string('desc').'" />';
$icon_sort = ' <img src="'.$OUTPUT->pix_url('t/up') . '" alt="'.get_string('desc').'" />';
$localsortorder = get_string('desc');
}
} else {

2
lib/upgradelib.php
View file

@ -1025,7 +1025,7 @@ function print_upgrade_reload($url) {
echo "<br />";
echo '<div class="continuebutton">';
echo '<a href="'.$url.'" title="'.get_string('reload').'" ><img src="'.$OUTPUT->old_icon_url('i/reload') . '" alt="" /> '.get_string('reload').'</a>';
echo '<a href="'.$url.'" title="'.get_string('reload').'" ><img src="'.$OUTPUT->pix_url('i/reload') . '" alt="" /> '.get_string('reload').'</a>';
echo '</div><br />';
}

25
lib/weblib.php
View file

@ -478,7 +478,7 @@ class moodle_url {
* @return string
*/
public function __toString() {
$this->out(false, null, true);
return $this->out(false, null, true);
}
/**
@ -508,6 +508,15 @@ class moodle_url {
return $uri;
}
/**
* Returns url in raw form without any escaping,
* useful especially when including urls and images in javascript.
* @return string
*/
public function out_raw() {
$this->out(false, null, false);
}
/**
* Return a URL relative to $CFG->wwwroot.
*
@ -1560,7 +1569,7 @@ function replace_smilies(&$text) {
$alttext = get_string($image, 'pix');
$alttext = preg_replace('/^\[\[(.*)\]\]$/', '$1', $alttext); /// Clean alttext in case there isn't lang string for it.
$e[$lang][] = $emoticon;
$img[$lang][] = '<img alt="'. $alttext .'" width="15" height="15" src="'. $OUTPUT->old_icon_url('s/' . $image) . '" />';
$img[$lang][] = '<img alt="'. $alttext .'" width="15" height="15" src="'. $OUTPUT->pix_url('s/' . $image) . '" />';
}
}
@ -1608,7 +1617,7 @@ function get_emoticons_list_for_help_file() {
$output = '<ul id="emoticonlist">';
foreach ($items as $item) {
$item = explode('{:}', $item);
$output .= '<li><img src="' . $OUTPUT->old_icon_url('s/' . $item[1]) . '" alt="' .
$output .= '<li><img src="' . $OUTPUT->pix_url('s/' . $item[1]) . '" alt="' .
$item[0] . '" /><code>' . $item[0] . '</code></li>';
}
$output .= '</ul>';
@ -2124,7 +2133,7 @@ function print_collapsible_region_start($classes, $id, $caption, $userpref = fal
$output .= '</div><div id="' . $id . '_inner" class="collapsibleregioninner">';
$PAGE->requires->js_function_call('new collapsible_region',
array($id, $userpref, get_string('clicktohideshow'),
$OUTPUT->old_icon_url('t/collapsed'), $OUTPUT->old_icon_url('t/expanded')));
$OUTPUT->pix_url('t/collapsed'), $OUTPUT->pix_url('t/expanded')));
if ($return) {
return $output;
@ -2480,7 +2489,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid
$class = 'activity '.$mod->modname;
$class .= ($cmid == $mod->id) ? ' selected' : '';
$menu[] = '<li class="'.$class.'">'.
'<img src="'.$OUTPUT->old_icon_url('icon', $mod->modname) . '" alt="" />'.
'<img src="'.$OUTPUT->pix_url('icon', $mod->modname) . '" alt="" />'.
'<a href="'.$CFG->wwwroot.'/mod/'.$url.'">'.$mod->name.'</a></li>';
}
@ -2527,7 +2536,7 @@ function print_grade_menu($courseid, $name, $current, $includenograde=true, $ret
}
$output .= $OUTPUT->select(html_select::make($grades, $name, $current, false));
$linkobject = '<span class="helplink"><img class="iconhelp" alt="'.$strscales.'" src="'.$OUTPUT->old_icon_url('help') . '" /></span>';
$linkobject = '<span class="helplink"><img class="iconhelp" alt="'.$strscales.'" src="'.$OUTPUT->pix_url('help') . '" /></span>';
$link = html_link::make('/course/scales.php?id='. $courseid .'&list=true', $linkobject);
$link->add_action(new popup_action('click', $link->url, 'ratingscales', array('height' => 400, 'width' => 500)));
$link->title = $strscales;
@ -2618,7 +2627,7 @@ function editorhelpbutton(){
$alttag = join (', ', $titles);
$paramstring = join('&', $urlparams);
$linkobject = '<img alt="'.$alttag.'" class="iconhelp" src="'.$OUTPUT->old_icon_url('help') . '" />';
$linkobject = '<img alt="'.$alttag.'" class="iconhelp" src="'.$OUTPUT->pix_url('help') . '" />';
$link = html_link::make(s('/lib/form/editorhelp.php?'.$paramstring), $linkobject);
$link->add_action(new popup_action('click', $link->url, 'popup', array('height' => 400, 'width' => 500)));
$link->title = $alttag;
@ -2646,7 +2655,7 @@ function emoticonhelpbutton($form, $field, $return = false) {
$SESSION->inserttextform = $form;
$SESSION->inserttextfield = $field;
$helpicon = moodle_help_icon::make('emoticons2', get_string('helpemoticons'), 'moodle', true);
$helpicon->image->src = $OUTPUT->old_icon_url('s/smiley');
$helpicon->image->src = $OUTPUT->pix_url('s/smiley');
$helpicon->image->add_class('emoticon');
$helpicon->style = "margin-left:3px; padding-right:1px;width:15px;height:15px;";
$help = $OUTPUT->help_icon($helpicon);