moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +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

4
admin/blocks.php
View file

@ -168,10 +168,10 @@
if ($blocks[$blockid]->visible) { if ($blocks[$blockid]->visible) {
$visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'. $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>'; '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
} else { } else {
$visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'. $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>'; '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
$class = ' class="dimmed_text"'; // Leading space required! $class = ' class="dimmed_text"'; // Leading space required!
} }

4
admin/filters.php
View file

@ -233,7 +233,7 @@ function action_url($filterpath, $action) {
function action_icon($url, $icon, $straction) { function action_icon($url, $icon, $straction) {
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
return '<a href="' . $url . '" title="' . $straction . '">' . return '<a href="' . $url . '" title="' . $straction . '">' .
'<img src="' . $OUTPUT->old_icon_url('t/' . $icon) . '" alt="' . $straction . '" /></a> '; '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" alt="' . $straction . '" /></a> ';
} }
function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) { function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) {
@ -256,7 +256,7 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings)
// Re-order // Re-order
$updown = ''; $updown = '';
$spacer = '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" /> '; $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
if ($filterinfo->active != TEXTFILTER_DISABLED) { if ($filterinfo->active != TEXTFILTER_DISABLED) {
if (!$isfirstrow) { if (!$isfirstrow) {
$updown .= action_icon(action_url($filter, 'up'), 'up', get_string('up')); $updown .= action_icon(action_url($filter, 'up'), 'up', get_string('up'));

8
admin/lang.php
View file

@ -611,9 +611,9 @@
if (LANG_DISPLAY_MISSING_LINKS) { if (LANG_DISPLAY_MISSING_LINKS) {
$missingtarget = '<a name="missing'.$missingcounter.'"></a>'; $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
$missingnext = '<a href="#missing'.($missingcounter+1).'">'. $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
'<img src="' . $OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>'; '<img src="' . $OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
$missingprev = '<a href="#missing'.($missingcounter-1).'">'. $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
'<img src="' . $OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>'; '<img src="' . $OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
} }
} else { } else {
// the string is translated in the pack being processed // the string is translated in the pack being processed
@ -624,9 +624,9 @@
if (LANG_DISPLAY_MISSING_LINKS) { if (LANG_DISPLAY_MISSING_LINKS) {
$missingtarget = '<a name="missing'.$missingcounter.'"></a>'; $missingtarget = '<a name="missing'.$missingcounter.'"></a>';
$missingnext = '<a href="#missing'.($missingcounter+1).'">'. $missingnext = '<a href="#missing'.($missingcounter+1).'">'.
'<img src="' . $OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>'; '<img src="' . $OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strnext.'" /></a>';
$missingprev = '<a href="#missing'.($missingcounter-1).'">'. $missingprev = '<a href="#missing'.($missingcounter-1).'">'.
'<img src="' . $OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>'; '<img src="' . $OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strprev.'" /></a>';
} }
} }
} }

2
admin/mnet/access_control.php
View file

@ -151,7 +151,7 @@ foreach ($columns as $column) {
} else { } else {
$columndir = $dir == "ASC" ? "DESC" : "ASC"; $columndir = $dir == "ASC" ? "DESC" : "ASC";
$columnicon = $dir == "ASC" ? "down" : "up"; $columnicon = $dir == "ASC" ? "down" : "up";
$columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
} }
$headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon"; $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
} }

2
admin/mnet/enr_courses.php
View file

@ -32,7 +32,7 @@
echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->' echo '<div id="trustedhosts"><!-- See theme/standard/styles_layout.css #trustedhosts .generaltable for rules -->'
. '<table class="generaltable">'; . '<table class="generaltable">';
$icon = "<img src=\"" . $OUTPUT->old_icon_url('i/course') . "\"". $icon = "<img src=\"" . $OUTPUT->pix_url('i/course') . "\"".
" class=\"icon\" alt=\"".get_string("course")."\" />"; " class=\"icon\" alt=\"".get_string("course")."\" />";
foreach ($courses as $course) { foreach ($courses as $course) {

6
admin/modules.php
View file

@ -129,7 +129,7 @@
foreach ($modulebyname as $modulename => $module) { foreach ($modulebyname as $modulename => $module) {
// took out hspace="\10\", because it does not validate. don't know what to replace with. // took out hspace="\10\", because it does not validate. don't know what to replace with.
$icon = "<img src=\"" . $OUTPUT->old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
$delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>"; $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";
@ -151,11 +151,11 @@
if ($module->visible) { if ($module->visible) {
$visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">". $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
"<img src=\"" . $OUTPUT->old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>"; "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
$class = ""; $class = "";
} else { } else {
$visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">". $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
"<img src=\"" . $OUTPUT->old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>"; "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
$class = " class=\"dimmed_text\""; $class = " class=\"dimmed_text\"";
} }
if ($module->name == "forum") { if ($module->name == "forum") {

4
admin/qtypes.php
View file

@ -229,7 +229,7 @@
$rowclass = 'dimmed_text'; $rowclass = 'dimmed_text';
} }
} else { } else {
$icons = '<img src="' . $OUTPUT->old_icon_url('spacer') . '" alt="" class="spacer" />'; $icons = '<img src="' . $OUTPUT->pix_url('spacer') . '" alt="" class="spacer" />';
} }
// Move icons. // Move icons.
@ -282,7 +282,7 @@ function icon_html($action, $qtypename, $icon, $alt, $tip) {
$html = ' <form action="' . admin_url('qtypes.php') . '" method="post"><div>'; $html = ' <form action="' . admin_url('qtypes.php') . '" method="post"><div>';
$html .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />'; $html .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
$html .= '<input type="image" name="' . $action . '" value="' . $qtypename . $html .= '<input type="image" name="' . $action . '" value="' . $qtypename .
'" src="' . $OUTPUT->old_icon_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>'; '" src="' . $OUTPUT->pix_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>';
$html .= '</div></form>'; $html .= '</div></form>';
return $html; return $html;
} }

2
admin/report/configlog/index.php
View file

@ -46,7 +46,7 @@ foreach ($columns as $column=>$strcolumn) {
} else { } else {
$columnicon = $dir == 'ASC' ? 'down':'up'; $columnicon = $dir == 'ASC' ? 'down':'up';
} }
$columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
} }
$hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon"; $hcolumns[$column] = "<a href=\"index.php?sort=$column&amp;dir=$columndir&amp;page=$page&amp;perpage=$perpage\">".$strcolumn."</a>$columnicon";

2
admin/roles/lib.php
View file

@ -421,7 +421,7 @@ abstract class capability_table_with_risks extends capability_table_base {
function get_risk_icon($type) { function get_risk_icon($type) {
global $OUTPUT; global $OUTPUT;
if (!isset($this->riskicons[$type])) { if (!isset($this->riskicons[$type])) {
$iconurl = $OUTPUT->old_icon_url('i/' . str_replace('risk', 'risk_', $type)); $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type));
$link = html_link::make($this->risksurl, '<img src="' . $iconurl . '" alt="' . get_string($type . 'short', 'admin') . '" />'); $link = html_link::make($this->risksurl, '<img src="' . $iconurl . '" alt="' . get_string($type . 'short', 'admin') . '" />');
$link->add_action(new popup_action('click', $link->url, 'docspopup')); $link->add_action(new popup_action('click', $link->url, 'docspopup'));

4
admin/roles/manage.php
View file

@ -274,9 +274,9 @@
function get_action_icon($url, $icon, $alt, $tooltip) { function get_action_icon($url, $icon, $alt, $tooltip) {
global $OUTPUT; global $OUTPUT;
return '<a title="' . $tooltip . '" href="'. $url . '">' . return '<a title="' . $tooltip . '" href="'. $url . '">' .
'<img src="' . $OUTPUT->old_icon_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> '; '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
} }
function get_spacer() { function get_spacer() {
global $OUTPUT; global $OUTPUT;
return '<img src="' . $OUTPUT->old_icon_url('spacer') . '" class="iconsmall" alt="" /> '; return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
} }

4
admin/roles/usersroles.php
View file

@ -201,9 +201,9 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname) {
$strcheck = get_string('checkuserspermissionshere', 'role', $a); $strcheck = get_string('checkuserspermissionshere', 'role', $a);
} }
echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' . echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' .
$OUTPUT->old_icon_url('t/edit') . '" alt="' . $stredit . '" /></a> '; $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' . echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' .
$OUTPUT->old_icon_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> '; $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
echo "</p>\n"; echo "</p>\n";
} }
} }

2
admin/user.php
View file

@ -140,7 +140,7 @@
} else { } else {
$columnicon = $dir == "ASC" ? "down":"up"; $columnicon = $dir == "ASC" ? "down":"up";
} }
$columnicon = " <img src=\"" . $OUTPUT->old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
} }
$$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon"; $$column = "<a href=\"user.php?sort=$column&amp;dir=$columndir\">".$string[$column]."</a>$columnicon";

2
admin/user/user_bulk_display.php
View file

@ -56,7 +56,7 @@ foreach ($columns as $column) {
$columndir = 'asc'; $columndir = 'asc';
} else { } else {
$columndir = $dir == 'asc' ? 'desc' : 'asc'; $columndir = $dir == 'asc' ? 'desc' : 'asc';
$columnicon = ' <img src="'.$OUTPUT->old_icon_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'f" alt="" />'; $columnicon = ' <img src="'.$OUTPUT->pix_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'f" alt="" />';
} }
$table->head[] = '<a href="user_bulk_display.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon; $table->head[] = '<a href="user_bulk_display.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon;
$table->align[] = 'left'; $table->align[] = 'left';

2
admin/user/user_bulk_enrol.php
View file

@ -61,7 +61,7 @@ foreach ($columns as $column) {
$columndir = 'asc'; $columndir = 'asc';
} else { } else {
$columndir = ($dir == 'asc') ? 'desc' : 'asc'; $columndir = ($dir == 'asc') ? 'desc' : 'asc';
$columnicon = ' <img src="'.$OUTPUT->old_icon_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'" alt="" />'; $columnicon = ' <img src="'.$OUTPUT->pix_url('t/'.($dir == 'asc' ? 'down' : 'up' )).'" alt="" />';
} }
$table->head[] = '<a href="user_bulk_enrol.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon; $table->head[] = '<a href="user_bulk_enrol.php?sort='.$column.'&amp;dir='.$columndir.'">'.$strtitle.'</a>'.$columnicon;
$table->align[] = 'left'; $table->align[] = 'left';

4
blocks/activity_modules/block_activity_modules.php
View file

@ -51,10 +51,10 @@ class block_activity_modules extends block_list {
foreach ($modfullnames as $modname => $modfullname) { foreach ($modfullnames as $modname => $modfullname) {
if ($modname === 'resources') { if ($modname === 'resources') {
$this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/resources.php?id='.$course->id.'">'.$modfullname.'</a>'; $this->content->items[] = '<a href="'.$CFG->wwwroot.'/course/resources.php?id='.$course->id.'">'.$modfullname.'</a>';
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('f/html') . '" class="icon" alt="" />';
} else { } else {
$this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$modfullname.'</a>'; $this->content->items[] = '<a href="'.$CFG->wwwroot.'/mod/'.$modname.'/index.php?id='.$course->id.'">'.$modfullname.'</a>';
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('icon', $modname) . '" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('icon', $modname) . '" class="icon" alt="" />';
} }
} }

42
blocks/admin/block_admin.php
View file

@ -32,7 +32,7 @@ class block_admin extends block_list {
/// Course editing on/off /// Course editing on/off
if ($course->id !== SITEID and has_capability('moodle/course:update', $this->page->context)) { if ($course->id !== SITEID and has_capability('moodle/course:update', $this->page->context)) {
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/edit') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/edit') . '" class="icon" alt="" />';
if ($this->page->user_is_editing()) { if ($this->page->user_is_editing()) {
$this->content->items[]='<a href="view.php?id='.$course->id.'&amp;edit=off&amp;sesskey='.sesskey().'">'.get_string('turneditingoff').'</a>'; $this->content->items[]='<a href="view.php?id='.$course->id.'&amp;edit=off&amp;sesskey='.sesskey().'">'.get_string('turneditingoff').'</a>';
} else { } else {
@ -40,17 +40,17 @@ class block_admin extends block_list {
} }
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/edit.php?id='.$course->id.'">'.get_string('settings').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/edit.php?id='.$course->id.'">'.get_string('settings').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/settings') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/settings') . '" class="icon" alt="" />';
} }
/// Assign roles to the course /// Assign roles to the course
if ($course->id != SITEID) { if ($course->id != SITEID) {
if (has_capability('moodle/role:assign', $this->page->context)) { if (has_capability('moodle/role:assign', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$this->page->context->id.'">'.get_string('assignroles', 'role').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$this->page->context->id.'">'.get_string('assignroles', 'role').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/roles') . '" class="icon" alt="" />';
} else if (get_overridable_roles($this->page->context, ROLENAME_ORIGINAL)) { } else if (get_overridable_roles($this->page->context, ROLENAME_ORIGINAL)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$this->page->context->id.'">'.get_string('overridepermissions', 'role').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/override.php?contextid='.$this->page->context->id.'">'.get_string('overridepermissions', 'role').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/roles') . '" class="icon" alt="" />';
} }
} }
@ -75,7 +75,7 @@ class block_admin extends block_list {
if ($reportavailable) { if ($reportavailable) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/report/index.php?id='.$course->id.'">'.get_string('grades').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/report/index.php?id='.$course->id.'">'.get_string('grades').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/grades') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/grades') . '" class="icon" alt="" />';
} }
} }
@ -83,7 +83,7 @@ class block_admin extends block_list {
if (!empty($CFG->enableoutcomes)) { if (!empty($CFG->enableoutcomes)) {
if ($course->id!==SITEID and has_capability('moodle/course:update', $this->page->context)) { if ($course->id!==SITEID and has_capability('moodle/course:update', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$course->id.'">'.get_string('outcomes', 'grades').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/grade/edit/outcome/course.php?id='.$course->id.'">'.get_string('outcomes', 'grades').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/outcomes') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/outcomes') . '" class="icon" alt="" />';
} }
} }
@ -92,11 +92,11 @@ class block_admin extends block_list {
if (has_capability('moodle/course:managemetacourse', $this->page->context)) { if (has_capability('moodle/course:managemetacourse', $this->page->context)) {
$strchildcourses = get_string('childcourses'); $strchildcourses = get_string('childcourses');
$this->content->items[]='<a href="importstudents.php?id='.$course->id.'">'.$strchildcourses.'</a>'; $this->content->items[]='<a href="importstudents.php?id='.$course->id.'">'.$strchildcourses.'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/course') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/course') . '" class="icon" alt="" />';
} else if (has_capability('moodle/role:assign', $this->page->context)) { } else if (has_capability('moodle/role:assign', $this->page->context)) {
$strchildcourses = get_string('childcourses'); $strchildcourses = get_string('childcourses');
$this->content->items[]='<span class="dimmed_text">'.$strchildcourses.'</span>'; $this->content->items[]='<span class="dimmed_text">'.$strchildcourses.'</span>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/course') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/course') . '" class="icon" alt="" />';
} }
} }
@ -105,37 +105,37 @@ class block_admin extends block_list {
if (($course->id!==SITEID) && ($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $this->page->context)) { if (($course->id!==SITEID) && ($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $this->page->context)) {
$strgroups = get_string('groups'); $strgroups = get_string('groups');
$this->content->items[]='<a title="'.$strgroups.'" href="'.$CFG->wwwroot.'/group/index.php?id='.$course->id.'">'.$strgroups.'</a>'; $this->content->items[]='<a title="'.$strgroups.'" href="'.$CFG->wwwroot.'/group/index.php?id='.$course->id.'">'.$strgroups.'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/group') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/group') . '" class="icon" alt="" />';
} }
/// Backup this course /// Backup this course
if ($course->id!==SITEID and has_capability('moodle/site:backup', $this->page->context)) { if ($course->id!==SITEID and has_capability('moodle/site:backup', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$course->id.'">'.get_string('backup').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/backup/backup.php?id='.$course->id.'">'.get_string('backup').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/backup') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/backup') . '" class="icon" alt="" />';
} }
/// Restore to this course /// Restore to this course
if ($course->id !== SITEID and has_capability('moodle/site:restore', $this->page->context)) { if ($course->id !== SITEID and has_capability('moodle/site:restore', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'&amp;wdir=/backupdata">'.get_string('restore').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'&amp;wdir=/backupdata">'.get_string('restore').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/restore') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/restore') . '" class="icon" alt="" />';
} }
/// Import data from other courses /// Import data from other courses
if ($course->id !== SITEID and has_capability('moodle/site:import', $this->page->context)) { if ($course->id !== SITEID and has_capability('moodle/site:import', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/import.php?id='.$course->id.'">'.get_string('import').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/import.php?id='.$course->id.'">'.get_string('import').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/restore') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/restore') . '" class="icon" alt="" />';
} }
/// Reset this course /// Reset this course
if ($course->id!==SITEID and has_capability('moodle/course:reset', $this->page->context)) { if ($course->id!==SITEID and has_capability('moodle/course:reset', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/reset.php?id='.$course->id.'">'.get_string('reset').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/reset.php?id='.$course->id.'">'.get_string('reset').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/return') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/return') . '" class="icon" alt="" />';
} }
/// View course reports /// View course reports
if ($course->id !== SITEID and has_capability('moodle/site:viewreports', $this->page->context)) { // basic capability for listing of reports if ($course->id !== SITEID and has_capability('moodle/site:viewreports', $this->page->context)) { // basic capability for listing of reports
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/report.php?id='.$course->id.'">'.get_string('reports').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/report.php?id='.$course->id.'">'.get_string('reports').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/stats') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/stats') . '" class="icon" alt="" />';
} }
/// Manage questions /// Manage questions
@ -161,7 +161,7 @@ class block_admin extends block_list {
if ($questionlink) { if ($questionlink) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/question/'.$questionlink. $this->content->items[]='<a href="'.$CFG->wwwroot.'/question/'.$questionlink.
'?courseid='.$course->id.'">'.get_string('questions', 'quiz').'</a>'; '?courseid='.$course->id.'">'.get_string('questions', 'quiz').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/questions') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/questions') . '" class="icon" alt="" />';
} }
} }
@ -170,13 +170,13 @@ class block_admin extends block_list {
$editabletypes = repository::get_editable_types($this->page->context); $editabletypes = repository::get_editable_types($this->page->context);
if ($course->id !== SITEID && has_capability('moodle/course:update', $this->page->context) && !empty($editabletypes)) { if ($course->id !== SITEID && has_capability('moodle/course:update', $this->page->context) && !empty($editabletypes)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/repository/manage_instances.php?contextid='.$this->page->context->id.'">'.get_string('repositories').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/repository/manage_instances.php?contextid='.$this->page->context->id.'">'.get_string('repositories').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/repository') . '" alt=""/>'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/repository') . '" alt=""/>';
} }
/// Manage files /// Manage files
if ($course->id !== SITEID and has_capability('moodle/course:managefiles', $this->page->context)) { if ($course->id !== SITEID and has_capability('moodle/course:managefiles', $this->page->context)) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'">'.get_string('files').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/files/index.php?id='.$course->id.'">'.get_string('files').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/files') . '" class="icon" alt=""/>'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/files') . '" class="icon" alt=""/>';
} }
/// Authorize hooks /// Authorize hooks
@ -189,24 +189,24 @@ class block_admin extends block_list {
} }
} }
$this->content->items[] = $paymenturl; $this->content->items[] = $paymenturl;
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('i/payment') . '" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('i/payment') . '" class="icon" alt="" />';
} }
/// Unenrol link /// Unenrol link
if (empty($course->metacourse) && ($course->id!==SITEID)) { if (empty($course->metacourse) && ($course->id!==SITEID)) {
if (has_capability('moodle/legacy:guest', $this->page->context, NULL, false)) { // Are a guest now if (has_capability('moodle/legacy:guest', $this->page->context, NULL, false)) { // Are a guest now
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/enrol.php?id='.$course->id.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/enrol.php?id='.$course->id.'">'.get_string('enrolme', '', format_string($course->shortname)).'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" class="icon" alt="" />';
} else if (has_capability('moodle/role:unassignself', $this->page->context, NULL, false) and get_user_roles($this->page->context, $USER->id, false)) { // Have some role } else if (has_capability('moodle/role:unassignself', $this->page->context, NULL, false) and get_user_roles($this->page->context, $USER->id, false)) { // Have some role
$this->content->items[]='<a href="'.$CFG->wwwroot.'/course/unenrol.php?id='.$course->id.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/course/unenrol.php?id='.$course->id.'">'.get_string('unenrolme', '', format_string($course->shortname)).'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" class="icon" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" class="icon" alt="" />';
} }
} }
/// Link to the user own profile (except guests) /// Link to the user own profile (except guests)
if (!isguestuser() and isloggedin()) { if (!isguestuser() and isloggedin()) {
$this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>'; $this->content->items[]='<a href="'.$CFG->wwwroot.'/user/view.php?id='.$USER->id.'&amp;course='.$course->id.'">'.get_string('profile').'</a>';
$this->content->icons[]='<img src="'.$OUTPUT->old_icon_url('i/user') . '" alt="" />'; $this->content->icons[]='<img src="'.$OUTPUT->pix_url('i/user') . '" alt="" />';
} }
return $this->content; return $this->content;

8
blocks/admin_tree/block_admin_tree.php
View file

@ -35,7 +35,7 @@ class block_admin_tree extends block_base {
$strfolderopened = s(get_string('folderopened')); $strfolderopened = s(get_string('folderopened'));
$this->tempcontent .= '<div class="depth'.$this->currentdepth.'"><a name="d'.$this->divcounter.'">'; $this->tempcontent .= '<div class="depth'.$this->currentdepth.'"><a name="d'.$this->divcounter.'">';
$this->tempcontent .= '<img id="vh_div'.$this->divcounter.'indicator" src="'.$OUTPUT->old_icon_url('i/open') . '" alt="'.$strfolderopened.'" /> '; $this->tempcontent .= '<img id="vh_div'.$this->divcounter.'indicator" src="'.$OUTPUT->pix_url('i/open') . '" alt="'.$strfolderopened.'" /> ';
$this->tempcontent .= $visiblename.'</a></div><div id="vh_div'.$this->divcounter.'">'."\n"; $this->tempcontent .= $visiblename.'</a></div><div id="vh_div'.$this->divcounter.'">'."\n";
$this->currentdepth++; $this->currentdepth++;
$this->divcounter++; $this->divcounter++;
@ -61,7 +61,7 @@ class block_admin_tree extends block_base {
if ($content->is_hidden()) { if ($content->is_hidden()) {
$class .= ' hidden'; $class .= ' hidden';
} }
$this->create_item($content->visiblename, $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$content->name,$OUTPUT->old_icon_url('i/item'), $class); $this->create_item($content->visiblename, $CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section='.$content->name,$OUTPUT->pix_url('i/item'), $class);
} }
} else if ($content instanceof admin_externalpage) { } else if ($content instanceof admin_externalpage) {
// show hidden pages in tree if hidden page active // show hidden pages in tree if hidden page active
@ -75,7 +75,7 @@ class block_admin_tree extends block_base {
if ($content->is_hidden()) { if ($content->is_hidden()) {
$class .= ' hidden'; $class .= ' hidden';
} }
$this->create_item($content->visiblename, $content->url, $OUTPUT->old_icon_url('i/item'), $class); $this->create_item($content->visiblename, $content->url, $OUTPUT->pix_url('i/item'), $class);
} }
} else if ($content instanceof admin_category) { } else if ($content instanceof admin_category) {
if ($content->check_access() and !$content->is_hidden()) { if ($content->check_access() and !$content->is_hidden()) {
@ -141,7 +141,7 @@ class block_admin_tree extends block_base {
$this->page->requires->js('blocks/admin_tree/admintree.js'); $this->page->requires->js('blocks/admin_tree/admintree.js');
$this->page->requires->js_function_call('admin_tree.init', $this->page->requires->js_function_call('admin_tree.init',
array($this->divcounter - 1, $this->expandnodes, array($this->divcounter - 1, $this->expandnodes,
$OUTPUT->old_icon_url('i/open'), $OUTPUT->old_icon_url('i/closed'), $OUTPUT->pix_url('i/open'), $OUTPUT->pix_url('i/closed'),
get_string('folderopened'), get_string('folderclosed'))); get_string('folderopened'), get_string('folderclosed')));
$this->content = new object(); $this->content = new object();

4
blocks/course_list/block_course_list.php
View file

@ -24,7 +24,7 @@ class block_course_list extends block_list {
$this->content->icons = array(); $this->content->icons = array();
$this->content->footer = ''; $this->content->footer = '';
$icon = "<img src=\"" . $OUTPUT->old_icon_url('i/course') . "\"". $icon = "<img src=\"" . $OUTPUT->pix_url('i/course') . "\"".
" class=\"icon\" alt=\"".get_string("coursecategory")."\" />"; " class=\"icon\" alt=\"".get_string("coursecategory")."\" />";
$adminseesall = true; $adminseesall = true;
@ -116,7 +116,7 @@ class block_course_list extends block_list {
return; return;
} }
$icon = '<img src="'.$OUTPUT->old_icon_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />'; $icon = '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
// only for logged in users! // only for logged in users!
if (!isloggedin() || isguestuser()) { if (!isloggedin() || isguestuser()) {

2
blocks/course_summary/block_course_summary.php
View file

@ -35,7 +35,7 @@ class block_course_summary extends block_base {
} else { } else {
$editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->page->course->id; $editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->page->course->id;
} }
$this->content->text .= "<div class=\"editbutton\"><a href=\"$editpage\"><img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" alt=\"".get_string('edit')."\" /></a></div>"; $this->content->text .= "<div class=\"editbutton\"><a href=\"$editpage\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" alt=\"".get_string('edit')."\" /></a></div>";
} }
$this->content->footer = ''; $this->content->footer = '';

6
blocks/global_navigation_tree/block_global_navigation_tree.php
View file

@ -163,7 +163,7 @@ class block_global_navigation_tree extends block_tree {
$reloadicon->link->url = $this->page->url; $reloadicon->link->url = $this->page->url;
$reloadicon->link->url->param('regenerate','navigation'); $reloadicon->link->url->param('regenerate','navigation');
$reloadicon->link->add_class('customcommand'); $reloadicon->link->add_class('customcommand');
$reloadicon->image->src = $OUTPUT->old_icon_url('t/reload'); $reloadicon->image->src = $OUTPUT->pix_url('t/reload');
$reloadicon->alt = get_string('reload'); $reloadicon->alt = get_string('reload');
$reloadicon->title = get_string('reload'); $reloadicon->title = get_string('reload');
$this->content->footer .= $OUTPUT->action_icon($reloadicon); $this->content->footer .= $OUTPUT->action_icon($reloadicon);
@ -175,12 +175,12 @@ class block_global_navigation_tree extends block_tree {
$moveicon->link->add_classes('moveto customcommand requiresjs'); $moveicon->link->add_classes('moveto customcommand requiresjs');
$moveicon->link->url = $this->page->url; $moveicon->link->url = $this->page->url;
if ($this->docked) { if ($this->docked) {
$moveicon->image->src = $OUTPUT->old_icon_url('t/movetoblock'); $moveicon->image->src = $OUTPUT->pix_url('t/movetoblock');
$moveicon->image->alt = $toggleblockdisplay; $moveicon->image->alt = $toggleblockdisplay;
$moveicon->image->title = $toggleblockdisplay; $moveicon->image->title = $toggleblockdisplay;
$moveicon->link->url->param('undock', $this->instance->id); $moveicon->link->url->param('undock', $this->instance->id);
} else { } else {
$moveicon->image->src = $OUTPUT->old_icon_url('t/movetosidetab'); $moveicon->image->src = $OUTPUT->pix_url('t/movetosidetab');
$moveicon->image->alt = $togglesidetabdisplay; $moveicon->image->alt = $togglesidetabdisplay;
$moveicon->image->title = $togglesidetabdisplay; $moveicon->image->title = $togglesidetabdisplay;
$moveicon->link->url->param('dock', $this->instance->id); $moveicon->link->url->param('dock', $this->instance->id);

2
blocks/loancalc/block_loancalc.php
View file

@ -11,7 +11,7 @@ class block_loancalc extends block_base {
function get_content() { function get_content() {
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
$calc = $OUTPUT->old_icon_url('i/calc'); $calc = $OUTPUT->pix_url('i/calc');
$this->content->text = ' $this->content->text = '
<script type="text/javascript"> <script type="text/javascript">

2
blocks/messages/block_messages.php
View file

@ -47,7 +47,7 @@ class block_messages extends block_base {
$this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'" title="'.$timeago.'">'; $this->content->text .= '<li class="listentry"><div class="user"><a href="'.$CFG->wwwroot.'/user/view.php?id='.$user->id.'&amp;course='.SITEID.'" title="'.$timeago.'">';
$this->content->text .= $OUTPUT->user_picture(moodle_user_picture::make($user, SITEID)); $this->content->text .= $OUTPUT->user_picture(moodle_user_picture::make($user, SITEID));
$this->content->text .= fullname($user).'</a></div>'; $this->content->text .= fullname($user).'</a></div>';
$this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>'; $this->content->text .= '<div class="message"><a href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\'; return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'.$OUTPUT->pix_url('t/message') . '" alt="" />&nbsp;'.$user->count.'</a>';
$this->content->text .= '</div></li>'; $this->content->text .= '</div></li>';
} }
$this->content->text .= '</ul>'; $this->content->text .= '</ul>';

2
blocks/mnet_hosts/block_mnet_hosts.php
View file

@ -82,7 +82,7 @@ class block_mnet_hosts extends block_list {
if ($hosts) { if ($hosts) {
foreach ($hosts as $host) { foreach ($hosts as $host) {
$icon = '<img src="'.$OUTPUT->old_icon_url('i/'.$host->application.'_host') . '"'. $icon = '<img src="'.$OUTPUT->pix_url('i/'.$host->application.'_host') . '"'.
' class="icon" alt="'.get_string('server', 'block_mnet_hosts').'" />'; ' class="icon" alt="'.get_string('server', 'block_mnet_hosts').'" />';
$this->content->icons[]=$icon; $this->content->icons[]=$icon;

2
blocks/online_users/block_online_users.php
View file

@ -154,7 +154,7 @@ class block_online_users extends block_base {
} }
if ($canshowicon and ($USER->id != $user->id) and $user->username != 'guest') { // Only when logged in and messaging active etc if ($canshowicon and ($USER->id != $user->id) and $user->username != 'guest') { // Only when logged in and messaging active etc
$this->content->text .= '<div class="message"><a title="'.get_string('messageselectadd').'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\';return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">' $this->content->text .= '<div class="message"><a title="'.get_string('messageselectadd').'" href="'.$CFG->wwwroot.'/message/discussion.php?id='.$user->id.'" onclick="this.target=\'message_'.$user->id.'\';return openpopup(\'/message/discussion.php?id='.$user->id.'\', \'message_'.$user->id.'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'
.'<img class="iconsmall" src="'.$OUTPUT->old_icon_url('t/message') . '" alt="'. get_string('messageselectadd') .'" /></a></div>'; .'<img class="iconsmall" src="'.$OUTPUT->pix_url('t/message') . '" alt="'. get_string('messageselectadd') .'" /></a></div>';
} }
$this->content->text .= "</li>\n"; $this->content->text .= "</li>\n";
} }

2
blocks/participants/block_participants.php
View file

@ -37,7 +37,7 @@ class block_participants extends block_list {
$this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'. $this->content->items[] = '<a title="'.get_string('listofallpeople').'" href="'.
$CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>'; $CFG->wwwroot.'/user/index.php?contextid='.$currentcontext->id.'">'.get_string('participants').'</a>';
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('i/users') . '" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('i/users') . '" class="icon" alt="" />';
return $this->content; return $this->content;
} }

4
blocks/rss_client/managefeeds.php
View file

@ -120,14 +120,14 @@ foreach($feeds as $feed) {
$editaction = new moodle_action_icon(); $editaction = new moodle_action_icon();
$editaction->link->url = $CFG->wwwroot .'/blocks/rss_client/editfeed.php?rssid=' . $feed->id . $extraparams; $editaction->link->url = $CFG->wwwroot .'/blocks/rss_client/editfeed.php?rssid=' . $feed->id . $extraparams;
$editaction->link->title = get_string('edit'); $editaction->link->title = get_string('edit');
$editaction->image->src = $OUTPUT->old_icon_url('t/edit'); $editaction->image->src = $OUTPUT->pix_url('t/edit');
$editaction->image->alt = get_string('edit'); $editaction->image->alt = get_string('edit');
$deleteaction = new moodle_action_icon(); $deleteaction = new moodle_action_icon();
$deleteaction->link->url = $CFG->wwwroot .'/blocks/rss_client/managefeeds.php?deleterssid=' . $feed->id . $deleteaction->link->url = $CFG->wwwroot .'/blocks/rss_client/managefeeds.php?deleterssid=' . $feed->id .
'&sesskey=' . sesskey() . $extraparams; '&sesskey=' . sesskey() . $extraparams;
$deleteaction->link->title = get_string('delete'); $deleteaction->link->title = get_string('delete');
$deleteaction->image->src = $OUTPUT->old_icon_url('t/delete'); $deleteaction->image->src = $OUTPUT->pix_url('t/delete');
$deleteaction->image->alt = get_string('delete'); $deleteaction->image->alt = get_string('delete');
$deleteaction->link->add_confirm_action(get_string('deletefeedconfirm', 'block_rss_client')); $deleteaction->link->add_confirm_action(get_string('deletefeedconfirm', 'block_rss_client'));

6
blocks/settings_navigation_tree/block_settings_navigation_tree.php
View file

@ -145,7 +145,7 @@ class block_settings_navigation_tree extends block_tree {
$url->param('regenerate','navigation'); $url->param('regenerate','navigation');
$reloadicon->link->url = $url; $reloadicon->link->url = $url;
$reloadicon->link->add_class('customcommand'); $reloadicon->link->add_class('customcommand');
$reloadicon->image->src = $OUTPUT->old_icon_url('t/reload'); $reloadicon->image->src = $OUTPUT->pix_url('t/reload');
$reloadicon->alt = get_string('reload'); $reloadicon->alt = get_string('reload');
$reloadicon->title = get_string('reload'); $reloadicon->title = get_string('reload');
@ -158,12 +158,12 @@ class block_settings_navigation_tree extends block_tree {
$moveicon->link->add_classes('moveto customcommand requiresjs'); $moveicon->link->add_classes('moveto customcommand requiresjs');
$moveicon->link->url = $this->page->url; $moveicon->link->url = $this->page->url;
if ($this->docked) { if ($this->docked) {
$moveicon->image->src = $OUTPUT->old_icon_url('t/movetoblock'); $moveicon->image->src = $OUTPUT->pix_url('t/movetoblock');
$moveicon->image->alt = $toggleblockdisplay; $moveicon->image->alt = $toggleblockdisplay;
$moveicon->image->title = $toggleblockdisplay; $moveicon->image->title = $toggleblockdisplay;
$moveicon->link->url->param('undock', $this->instance->id); $moveicon->link->url->param('undock', $this->instance->id);
} else { } else {
$moveicon->image->src = $OUTPUT->old_icon_url('t/movetosidetab'); $moveicon->image->src = $OUTPUT->pix_url('t/movetosidetab');
$moveicon->image->alt = $togglesidetabdisplay; $moveicon->image->alt = $togglesidetabdisplay;
$moveicon->image->title = $togglesidetabdisplay; $moveicon->image->title = $togglesidetabdisplay;
$moveicon->link->url->param('dock', $this->instance->id); $moveicon->link->url->param('dock', $this->instance->id);

14
blocks/site_main_menu/block_site_main_menu.php
View file

@ -50,9 +50,9 @@ class block_site_main_menu extends block_list {
' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>'; ' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>';
//Accessibility: incidental image - should be empty Alt text //Accessibility: incidental image - should be empty Alt text
if (!empty($cm->icon)) { if (!empty($cm->icon)) {
$icon = $OUTPUT->old_icon_url($cm->icon); $icon = $OUTPUT->pix_url($cm->icon);
} else { } else {
$icon = $OUTPUT->old_icon_url('icon', $cm->modname); $icon = $OUTPUT->pix_url('icon', $cm->modname);
} }
$this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
} }
@ -80,7 +80,7 @@ class block_site_main_menu extends block_list {
$editbuttons = ''; $editbuttons = '';
if ($ismoving) { if ($ismoving) {
$this->content->icons[] = '<img src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" alt="" />'; $this->content->icons[] = '<img src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" alt="" />';
$this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)'; $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
} }
@ -110,7 +110,7 @@ class block_site_main_menu extends block_list {
continue; continue;
} }
$this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'. $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
'<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>'; '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
$this->content->icons[] = ''; $this->content->icons[] = '';
} }
$instancename = $modinfo->cms[$modnumber]->name; $instancename = $modinfo->cms[$modnumber]->name;
@ -122,9 +122,9 @@ class block_site_main_menu extends block_list {
$extra = ''; $extra = '';
} }
if (!empty($modinfo->cms[$modnumber]->icon)) { if (!empty($modinfo->cms[$modnumber]->icon)) {
$icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon); $icon = $OUTPUT->pix_url($modinfo->cms[$modnumber]->icon);
} else { } else {
$icon = $OUTPUT->old_icon_url('icon', $mod->modname); $icon = $OUTPUT->pix_url('icon', $mod->modname);
} }
if ($mod->modname == 'label') { if ($mod->modname == 'label') {
@ -142,7 +142,7 @@ class block_site_main_menu extends block_list {
if ($ismoving) { if ($ismoving) {
$this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'. $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
'<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>'; '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
$this->content->icons[] = ''; $this->content->icons[] = '';
} }

14
blocks/social_activities/block_social_activities.php
View file

@ -52,9 +52,9 @@ class block_social_activities extends block_list {
' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>'; ' href="'.$CFG->wwwroot.'/mod/'.$cm->modname.'/view.php?id='.$cm->id.'">'.$instancename.'</a>';
//Accessibility: incidental image - should be empty Alt text //Accessibility: incidental image - should be empty Alt text
if (!empty($cm->icon)) { if (!empty($cm->icon)) {
$icon = $OUTPUT->old_icon_url($cm->icon); $icon = $OUTPUT->pix_url($cm->icon);
} else { } else {
$icon = $OUTPUT->old_icon_url('icon', $cm->modname); $icon = $OUTPUT->pix_url('icon', $cm->modname);
} }
$this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />'; $this->content->icons[] = '<img src="'.$icon.'" class="icon" alt="" />';
} }
@ -89,7 +89,7 @@ class block_social_activities extends block_list {
$editbuttons = ''; $editbuttons = '';
if ($ismoving) { if ($ismoving) {
$this->content->icons[] = '&nbsp;<img align="bottom" src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" alt="" />'; $this->content->icons[] = '&nbsp;<img align="bottom" src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" alt="" />';
$this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)'; $this->content->items[] = $USER->activitycopyname.'&nbsp;(<a href="'.$CFG->wwwroot.'/course/mod.php?cancelcopy=true&amp;sesskey='.sesskey().'">'.$strcancel.'</a>)';
} }
@ -119,7 +119,7 @@ class block_social_activities extends block_list {
continue; continue;
} }
$this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'. $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
'<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>'; '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
$this->content->icons[] = ''; $this->content->icons[] = '';
} }
$instancename = $modinfo->cms[$modnumber]->name; $instancename = $modinfo->cms[$modnumber]->name;
@ -131,9 +131,9 @@ class block_social_activities extends block_list {
$extra = ''; $extra = '';
} }
if (!empty($modinfo->cms[$modnumber]->icon)) { if (!empty($modinfo->cms[$modnumber]->icon)) {
$icon = $OUTPUT->old_icon_url($modinfo->cms[$modnumber]->icon); $icon = $OUTPUT->pix_url($modinfo->cms[$modnumber]->icon);
} else { } else {
$icon = $OUTPUT->old_icon_url('icon', $mod->modname); $icon = $OUTPUT->pix_url('icon', $mod->modname);
} }
if ($mod->modname == 'label') { if ($mod->modname == 'label') {
@ -151,7 +151,7 @@ class block_social_activities extends block_list {
if ($ismoving) { if ($ismoving) {
$this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'. $this->content->items[] = '<a title="'.$strmovefull.'" href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
'<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->old_icon_url('movehere') . '" alt="'.$strmovehere.'" /></a>'; '<img style="height:16px; width:80px; border:0px" src="'.$OUTPUT->pix_url('movehere') . '" alt="'.$strmovehere.'" /></a>';
$this->content->icons[] = ''; $this->content->icons[] = '';
} }

2
blocks/tags/block_tags.php
View file

@ -234,7 +234,7 @@ class block_tags extends block_base {
$arrowtitle = get_string('arrowtitle', $tagslang); $arrowtitle = get_string('arrowtitle', $tagslang);
$coursetaghelpbutton = $OUTPUT->help_icon(moodle_help_icon::make('addtags', 'adding tags', $tagslang)); $coursetaghelpbutton = $OUTPUT->help_icon(moodle_help_icon::make('addtags', 'adding tags', $tagslang));
$sesskey = sesskey(); $sesskey = sesskey();
$arrowright = $OUTPUT->old_icon_url('t/arrow_left'); $arrowright = $OUTPUT->pix_url('t/arrow_left');
$this->content->footer .= <<<EOT $this->content->footer .= <<<EOT
<hr /> <hr />
<form action="{$CFG->wwwroot}/tag/coursetags_add.php" method="post" id="coursetag" <form action="{$CFG->wwwroot}/tag/coursetags_add.php" method="post" id="coursetag"

8
blog/external_blogs.php
View file

@ -72,12 +72,12 @@ if (!empty($blogs)) {
$table->head = array(get_string('name'), get_string('url'), get_string('timefetched', 'blog'), get_string('valid', 'blog'), get_string('actions')); $table->head = array(get_string('name'), get_string('url'), get_string('timefetched', 'blog'), get_string('valid', 'blog'), get_string('actions'));
foreach ($blogs as $blog) { foreach ($blogs as $blog) {
$validicon = html_image::make($OUTPUT->old_icon_url('i/tick_green_big')); $validicon = html_image::make($OUTPUT->pix_url('i/tick_green_big'));
$validicon->alt = get_string('feedisvalid', 'blog'); $validicon->alt = get_string('feedisvalid', 'blog');
$validicon->title = get_string('feedisvalid', 'blog'); $validicon->title = get_string('feedisvalid', 'blog');
if ($blog->failedlastsync) { if ($blog->failedlastsync) {
$validicon->src = $OUTPUT->old_icon_url('i/cross_red_big'); $validicon->src = $OUTPUT->pix_url('i/cross_red_big');
$validicon->alt = get_string('feedisinvalid', 'blog'); $validicon->alt = get_string('feedisinvalid', 'blog');
$validicon->title = get_string('feedisinvalid', 'blog'); $validicon->title = get_string('feedisinvalid', 'blog');
} }
@ -85,13 +85,13 @@ if (!empty($blogs)) {
$editicon = new moodle_action_icon; $editicon = new moodle_action_icon;
$editicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blog_edit.php', array('id' => $blog->id)); $editicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blog_edit.php', array('id' => $blog->id));
$editicon->link->title = get_string('editexternalblog', 'blog'); $editicon->link->title = get_string('editexternalblog', 'blog');
$editicon->image->src = $OUTPUT->old_icon_url('t/edit'); $editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->alt = get_string('editexternalblog', 'blog'); $editicon->image->alt = get_string('editexternalblog', 'blog');
$deleteicon = new moodle_action_icon; $deleteicon = new moodle_action_icon;
$deleteicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blogs.php', array('delete' => $blog->id, 'sesskey' => sesskey())); $deleteicon->link->url = new moodle_url($CFG->wwwroot.'/blog/external_blogs.php', array('delete' => $blog->id, 'sesskey' => sesskey()));
$deleteicon->link->title = get_string('deleteexternalblog', 'blog'); $deleteicon->link->title = get_string('deleteexternalblog', 'blog');
$deleteicon->image->src = $OUTPUT->old_icon_url('t/delete'); $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
$deleteicon->image->alt = get_string('deleteexternalblog', 'blog'); $deleteicon->image->alt = get_string('deleteexternalblog', 'blog');
$deleteicon->add_confirm_action(get_string('externalblogdeleteconfirm', 'blog')); $deleteicon->add_confirm_action(get_string('externalblogdeleteconfirm', 'blog'));
$icons = $OUTPUT->action_icon($editicon) . $OUTPUT->action_icon($deleteicon); $icons = $OUTPUT->action_icon($editicon) . $OUTPUT->action_icon($deleteicon);

6
blog/locallib.php
View file

@ -239,7 +239,7 @@ class blog_entry {
if ($contextrec->contextlevel == CONTEXT_COURSE) { if ($contextrec->contextlevel == CONTEXT_COURSE) {
$associcon = new moodle_action_icon(); $associcon = new moodle_action_icon();
$associcon->link->url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id' => $contextrec->instanceid)); $associcon->link->url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id' => $contextrec->instanceid));
$associcon->image->src = $OUTPUT->old_icon_url('i/course'); $associcon->image->src = $OUTPUT->pix_url('i/course');
$associcon->linktext = $DB->get_field('course', 'shortname', array('id' => $contextrec->instanceid)); $associcon->linktext = $DB->get_field('course', 'shortname', array('id' => $contextrec->instanceid));
$assocstr .= $OUTPUT->action_icon($associcon); $assocstr .= $OUTPUT->action_icon($associcon);
$hascourseassocs = true; $hascourseassocs = true;
@ -262,7 +262,7 @@ class blog_entry {
$associcon = new moodle_action_icon(); $associcon = new moodle_action_icon();
$associcon->link->url = new moodle_url($CFG->wwwroot.'/mod/'.$modname.'/view.php', array('id' => $modinfo->id)); $associcon->link->url = new moodle_url($CFG->wwwroot.'/mod/'.$modname.'/view.php', array('id' => $modinfo->id));
$associcon->image->src = $OUTPUT->old_icon_url('icon', $modname); $associcon->image->src = $OUTPUT->pix_url('icon', $modname);
$associcon->linktext = $DB->get_field($modname, 'name', array('id' => $modinfo->instance)); $associcon->linktext = $DB->get_field($modname, 'name', array('id' => $modinfo->instance));
$assocstr .= $OUTPUT->action_icon($associcon); $assocstr .= $OUTPUT->action_icon($associcon);
$assocstr .= ', '; $assocstr .= ', ';
@ -499,7 +499,7 @@ class blog_entry {
$type = mimeinfo_from_type("type", $mimetype); $type = mimeinfo_from_type("type", $mimetype);
$image = new html_image(); $image = new html_image();
$image->src = $OUTPUT->old_icon_url("/f/$icon"); $image->src = $OUTPUT->pix_url("/f/$icon");
$image->add_class('icon'); $image->add_class('icon');
$image->alt = $filename; $image->alt = $filename;

2
blog/rsslib.php
View file

@ -35,7 +35,7 @@ function blog_rss_print_link($filtertype, $filterselect, $tagid=0, $tooltiptext=
} }
$path .= '/rss.xml'; $path .= '/rss.xml';
$rsspix = $OUTPUT->old_icon_url('i/rss'); $rsspix = $OUTPUT->pix_url('i/rss');
require_once($CFG->libdir.'/filelib.php'); require_once($CFG->libdir.'/filelib.php');
$path = get_file_url($path, null, 'rssfile'); $path = get_file_url($path, null, 'rssfile');

40
calendar/lib.php
View file

@ -247,20 +247,20 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
} }
$event = $events[$eventid]; $event = $events[$eventid];
if(!empty($event->modulename)) { if(!empty($event->modulename)) {
$popupicon = $OUTPUT->old_icon_url('icon', $event->modulename) . ''; $popupicon = $OUTPUT->pix_url('icon', $event->modulename) . '';
$popupalt = $event->modulename; $popupalt = $event->modulename;
} else if ($event->courseid == SITEID) { // Site event } else if ($event->courseid == SITEID) { // Site event
$popupicon = $OUTPUT->old_icon_url('c/site'); $popupicon = $OUTPUT->pix_url('c/site');
$popupalt = ''; $popupalt = '';
} else if ($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event } else if ($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event
$popupicon = $OUTPUT->old_icon_url('c/course'); $popupicon = $OUTPUT->pix_url('c/course');
$popupalt = ''; $popupalt = '';
} else if ($event->groupid) { // Group event } else if ($event->groupid) { // Group event
$popupicon = $OUTPUT->old_icon_url('c/group'); $popupicon = $OUTPUT->pix_url('c/group');
$popupalt = ''; $popupalt = '';
} else if ($event->userid) { // User event } else if ($event->userid) { // User event
$popupicon = $OUTPUT->old_icon_url('c/user'); $popupicon = $OUTPUT->pix_url('c/user');
$popupalt = ''; $popupalt = '';
} }
$popupcontent .= '<div><img class="icon" src="'.$popupicon.'" alt="'.$popupalt.'" /><a href="'.$dayhref.'#event_'.$event->id.'">'.format_string($event->name, true).'</a></div>'; $popupcontent .= '<div><img class="icon" src="'.$popupicon.'" alt="'.$popupalt.'" /><a href="'.$dayhref.'#event_'.$event->id.'">'.format_string($event->name, true).'</a></div>';
@ -505,7 +505,7 @@ function calendar_add_event_metadata($event) {
$modulename = get_string('modulename', $event->modulename); $modulename = get_string('modulename', $event->modulename);
$eventtype = get_string($event->eventtype, $event->modulename); $eventtype = get_string($event->eventtype, $event->modulename);
$icon = $OUTPUT->old_icon_url('icon', $event->modulename) . ''; $icon = $OUTPUT->pix_url('icon', $event->modulename) . '';
$event->icon = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />'; $event->icon = '<img height="16" width="16" src="'.$icon.'" alt="'.$eventtype.'" title="'.$modulename.'" style="vertical-align: middle;" />';
$event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>'; $event->referer = '<a href="'.$CFG->wwwroot.'/mod/'.$event->modulename.'/view.php?id='.$module->id.'">'.$event->name.'</a>';
@ -514,18 +514,18 @@ function calendar_add_event_metadata($event) {
} else if($event->courseid == SITEID) { // Site event } else if($event->courseid == SITEID) { // Site event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />'; $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/site') . '" alt="'.get_string('globalevent', 'calendar').'" style="vertical-align: middle;" />';
$event->cssclass = 'event_global'; $event->cssclass = 'event_global';
} else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event } else if($event->courseid != 0 && $event->courseid != SITEID && $event->groupid == 0) { // Course event
calendar_get_course_cached($coursecache, $event->courseid); calendar_get_course_cached($coursecache, $event->courseid);
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />'; $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/course') . '" alt="'.get_string('courseevent', 'calendar').'" style="vertical-align: middle;" />';
$event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$coursecache[$event->courseid]->fullname.'</a>'; $event->courselink = '<a href="'.$CFG->wwwroot.'/course/view.php?id='.$event->courseid.'">'.$coursecache[$event->courseid]->fullname.'</a>';
$event->cssclass = 'event_course'; $event->cssclass = 'event_course';
} else if ($event->groupid) { // Group event } else if ($event->groupid) { // Group event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />'; $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/group') . '" alt="'.get_string('groupevent', 'calendar').'" style="vertical-align: middle;" />';
$event->cssclass = 'event_group'; $event->cssclass = 'event_group';
} else if($event->userid) { // User event } else if($event->userid) { // User event
$event->icon = '<img height="16" width="16" src="'.$OUTPUT->old_icon_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />'; $event->icon = '<img height="16" width="16" src="'.$OUTPUT->pix_url('c/user') . '" alt="'.get_string('userevent', 'calendar').'" style="vertical-align: middle;" />';
$event->cssclass = 'event_user'; $event->cssclass = 'event_user';
} }
return $event; return $event;
@ -590,11 +590,11 @@ function calendar_print_event($event, $showactions=true) {
$deletelink = ''; // deleting activities directly from calendar is dangerous/confusing - see MDL-11843 $deletelink = ''; // deleting activities directly from calendar is dangerous/confusing - see MDL-11843
} }
echo ' <a href="'.$editlink.'"><img echo ' <a href="'.$editlink.'"><img
src="'.$OUTPUT->old_icon_url('t/edit') . '" alt="'.get_string('tt_editevent', 'calendar').'" src="'.$OUTPUT->pix_url('t/edit') . '" alt="'.get_string('tt_editevent', 'calendar').'"
title="'.get_string('tt_editevent', 'calendar').'" /></a>'; title="'.get_string('tt_editevent', 'calendar').'" /></a>';
if ($deletelink) { if ($deletelink) {
echo ' <a href="'.$deletelink.'"><img echo ' <a href="'.$deletelink.'"><img
src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="'.get_string('tt_deleteevent', 'calendar').'" src="'.$OUTPUT->pix_url('t/delete') . '" alt="'.get_string('tt_deleteevent', 'calendar').'"
title="'.get_string('tt_deleteevent', 'calendar').'" /></a>'; title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
} }
echo '</div>'; echo '</div>';
@ -848,17 +848,17 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
$content .= '<tr>'; $content .= '<tr>';
if($SESSION->cal_show_global) { if($SESSION->cal_show_global) {
$content .= '<td class="eventskey event_global" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>'; $content .= '<td class="eventskey event_global" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_hideglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_hideglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
} else { } else {
$content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>'; $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showglobal', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showglobal'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_showglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showglobal'.$getvars.'" title="'.get_string('tt_showglobal', 'calendar').'">'.get_string('global', 'calendar').'</a></td>'."\n";
} }
if($SESSION->cal_show_course) { if($SESSION->cal_show_course) {
$content .= '<td class="eventskey event_course" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>'; $content .= '<td class="eventskey event_course" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidecourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_hidecourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_hidecourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n";
} else { } else {
$content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_showcourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>'; $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_showcourse', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showcourses'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_showcourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showcourses'.$getvars.'" title="'.get_string('tt_showcourse', 'calendar').'">'.get_string('course', 'calendar').'</a></td>'."\n";
} }
@ -870,10 +870,10 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
if($groupevents) { if($groupevents) {
// This course MIGHT have group events defined, so show the filter // This course MIGHT have group events defined, so show the filter
if($SESSION->cal_show_groups) { if($SESSION->cal_show_groups) {
$content .= '<td class="eventskey event_group" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>'; $content .= '<td class="eventskey event_group" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hidegroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_hidegroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_hidegroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n";
} else { } else {
$content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showgroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>'; $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showgroups', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showgroups'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_showgroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showgroups'.$getvars.'" title="'.get_string('tt_showgroups', 'calendar').'">'.get_string('group', 'calendar').'</a></td>'."\n";
} }
} else { } else {
@ -881,10 +881,10 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL, $courses
$content .= '<td style="width: 11px;"></td><td>&nbsp;</td>'."\n"; $content .= '<td style="width: 11px;"></td><td>&nbsp;</td>'."\n";
} }
if($SESSION->cal_show_user) { if($SESSION->cal_show_user) {
$content .= '<td class="eventskey event_user" style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>'; $content .= '<td class="eventskey event_user" style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.get_string('hide').'" title="'.get_string('tt_hideuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_hideuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_hideuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n";
} else { } else {
$content .= '<td style="width: 11px;"><img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>'; $content .= '<td style="width: 11px;"><img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.get_string('show').'" title="'.get_string('tt_showuser', 'calendar').'" style="cursor:pointer" onclick="location.href='."'".CALENDAR_URL.'set.php?var=showuser'.$getvars."'".'" /></td>';
$content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_showuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n"; $content .= '<td><a href="'.CALENDAR_URL.'set.php?var=showuser'.$getvars.'" title="'.get_string('tt_showuser', 'calendar').'">'.get_string('user', 'calendar').'</a></td>'."\n";
} }
} }

2
calendar/view.php
View file

@ -191,7 +191,7 @@ if (!empty($CFG->enablecalendarexport)) {
$usernameencoded = urlencode($USER->username); $usernameencoded = urlencode($USER->username);
echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">" echo "<a href=\"export_execute.php?preset_what=all&amp;preset_time=recentupcoming&amp;username=$usernameencoded&amp;authtoken=$authtoken\">"
.'<img src="'.$OUTPUT->old_icon_url('i/ical') . '" height="14" width="36" ' .'<img src="'.$OUTPUT->pix_url('i/ical') . '" height="14" width="36" '
.'alt="'.get_string('ical', 'calendar').'" ' .'alt="'.get_string('ical', 'calendar').'" '
.'title="'.get_string('quickdownloadcalendar', 'calendar').'" />' .'title="'.get_string('quickdownloadcalendar', 'calendar').'" />'
.'</a>'; .'</a>';

24
course/category.php
View file

@ -324,7 +324,7 @@
echo '<td>'; echo '<td>';
if (has_capability('moodle/course:update', $coursecontext)) { if (has_capability('moodle/course:update', $coursecontext)) {
echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'. echo '<a title="'.$strsettings.'" href="'.$CFG->wwwroot.'/course/edit.php?id='.$acourse->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.$stredit.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.$stredit.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -332,14 +332,14 @@
// role assignment link // role assignment link
if (has_capability('moodle/role:assign', $coursecontext)) { if (has_capability('moodle/role:assign', $coursecontext)) {
echo '<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">'. echo '<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> '; '<img src="'.$OUTPUT->pix_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
if (can_delete_course($acourse->id)) { if (can_delete_course($acourse->id)) {
echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'. echo '<a title="'.$strdelete.'" href="delete.php?id='.$acourse->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -349,11 +349,11 @@
if (!empty($acourse->visible)) { if (!empty($acourse->visible)) {
echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page. echo '<a title="'.$strhide.'" href="category.php?id='.$category->id.'&amp;page='.$page.
'&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.sesskey().'">'. '&amp;perpage='.$perpage.'&amp;hide='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a> ';
} else { } else {
echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page. echo '<a title="'.$strshow.'" href="category.php?id='.$category->id.'&amp;page='.$page.
'&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.sesskey().'">'. '&amp;perpage='.$perpage.'&amp;show='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a> ';
} }
} else { } else {
echo $spacer; echo $spacer;
@ -361,7 +361,7 @@
if (has_capability('moodle/site:backup', $coursecontext)) { if (has_capability('moodle/site:backup', $coursecontext)) {
echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'. echo '<a title="'.$strbackup.'" href="../backup/backup.php?id='.$acourse->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/backup') . '" class="iconsmall" alt="'.$strbackup.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/backup') . '" class="iconsmall" alt="'.$strbackup.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -369,7 +369,7 @@
if (has_capability('moodle/site:restore', $coursecontext)) { if (has_capability('moodle/site:restore', $coursecontext)) {
echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id. echo '<a title="'.$strrestore.'" href="../files/index.php?id='.$acourse->id.
'&amp;wdir=/backupdata">'. '&amp;wdir=/backupdata">'.
'<img src="'.$OUTPUT->old_icon_url('t/restore') . '" class="iconsmall" alt="'.$strrestore.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/restore') . '" class="iconsmall" alt="'.$strrestore.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -378,7 +378,7 @@
if ($up) { if ($up) {
echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page. echo '<a title="'.$strmoveup.'" href="category.php?id='.$category->id.'&amp;page='.$page.
'&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.sesskey().'">'. '&amp;perpage='.$perpage.'&amp;moveup='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$strmoveup.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$strmoveup.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -386,7 +386,7 @@
if ($down) { if ($down) {
echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page. echo '<a title="'.$strmovedown.'" href="category.php?id='.$category->id.'&amp;page='.$page.
'&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.sesskey().'">'. '&amp;perpage='.$perpage.'&amp;movedown='.$acourse->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$strmovedown.'" /></a> '; '<img src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$strmovedown.'" /></a> ';
} else { } else {
echo $spacer; echo $spacer;
} }
@ -404,15 +404,15 @@
if (!empty($acourse->guest)) { if (!empty($acourse->guest)) {
echo '<a href="view.php?id='.$acourse->id.'"><img title="'. echo '<a href="view.php?id='.$acourse->id.'"><img title="'.
$strallowguests.'" class="icon" src="'. $strallowguests.'" class="icon" src="'.
$OUTPUT->old_icon_url('i/guest') . '" alt="'.$strallowguests.'" /></a>'; $OUTPUT->pix_url('i/guest') . '" alt="'.$strallowguests.'" /></a>';
} }
if (!empty($acourse->password)) { if (!empty($acourse->password)) {
echo '<a href="view.php?id='.$acourse->id.'"><img title="'. echo '<a href="view.php?id='.$acourse->id.'"><img title="'.
$strrequireskey.'" class="icon" src="'. $strrequireskey.'" class="icon" src="'.
$OUTPUT->old_icon_url('i/key') . '" alt="'.$strrequireskey.'" /></a>'; $OUTPUT->pix_url('i/key') . '" alt="'.$strrequireskey.'" /></a>';
} }
if (!empty($acourse->summary)) { if (!empty($acourse->summary)) {
$link = html_link::make("/course/info.php?id=$acourse->id", '<img alt="'.get_string('info').'" class="icon" src="'.$OUTPUT->old_icon_url('i/info') . '" />'); $link = html_link::make("/course/info.php?id=$acourse->id", '<img alt="'.get_string('info').'" class="icon" src="'.$OUTPUT->pix_url('i/info') . '" />');
$link->add_action(new popup_action('click', $link->url, 'courseinfo')); $link->add_action(new popup_action('click', $link->url, 'courseinfo'));
$link->title = $strsummary; $link->title = $strsummary;
echo $OUTPUT->link($link); echo $OUTPUT->link($link);

20
course/format/topics/format.php
View file

@ -109,7 +109,7 @@ if ($thissection->summary or $thissection->sequence or $PAGE->user_is_editing())
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $coursecontext)) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', $coursecontext)) {
echo '<a title="'.$streditsummary.'" '. echo '<a title="'.$streditsummary.'" '.
' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" '. ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->pix_url('t/edit') . '" '.
' class="icon edit" alt="'.$streditsummary.'" /></a>'; ' class="icon edit" alt="'.$streditsummary.'" /></a>';
} }
echo '</div>'; echo '</div>';
@ -184,36 +184,36 @@ while ($section <= $course->numsections) {
if ($displaysection == $section) { // Show the zoom boxes if ($displaysection == $section) { // Show the zoom boxes
echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'. echo '<a href="view.php?id='.$course->id.'&amp;topic=0#section-'.$section.'" title="'.$strshowalltopics.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/all') . '" class="icon" alt="'.$strshowalltopics.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/all') . '" class="icon" alt="'.$strshowalltopics.'" /></a><br />';
} else { } else {
$strshowonlytopic = get_string("showonlytopic", "", $section); $strshowonlytopic = get_string("showonlytopic", "", $section);
echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'. echo '<a href="view.php?id='.$course->id.'&amp;topic='.$section.'" title="'.$strshowonlytopic.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/one') . '" class="icon" alt="'.$strshowonlytopic.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/one') . '" class="icon" alt="'.$strshowonlytopic.'" /></a><br />';
} }
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
if ($course->marker == $section) { // Show the "light globe" on/off if ($course->marker == $section) { // Show the "light globe" on/off
echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$OUTPUT->old_icon_url('i/marked') . '" alt="'.$strmarkedthistopic.'" /></a><br />'; echo '<a href="view.php?id='.$course->id.'&amp;marker=0&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkedthistopic.'">'.'<img src="'.$OUTPUT->pix_url('i/marked') . '" alt="'.$strmarkedthistopic.'" /></a><br />';
} else { } else {
echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$OUTPUT->old_icon_url('i/marker') . '" alt="'.$strmarkthistopic.'" /></a><br />'; echo '<a href="view.php?id='.$course->id.'&amp;marker='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strmarkthistopic.'">'.'<img src="'.$OUTPUT->pix_url('i/marker') . '" alt="'.$strmarkthistopic.'" /></a><br />';
} }
if ($thissection->visible) { // Show the hide/show eye if ($thissection->visible) { // Show the hide/show eye
echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopichide.'">'. echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopichide.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon hide" alt="'.$strtopichide.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon hide" alt="'.$strtopichide.'" /></a><br />';
} else { } else {
echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopicshow.'">'. echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strtopicshow.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon hide" alt="'.$strtopicshow.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon hide" alt="'.$strtopicshow.'" /></a><br />';
} }
if ($section > 1) { // Add a arrow to move section up if ($section > 1) { // Add a arrow to move section up
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'. echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
} }
if ($section < $course->numsections) { // Add a arrow to move section down if ($section < $course->numsections) { // Add a arrow to move section down
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'. echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
} }
} }
echo '</div>'; echo '</div>';
@ -232,7 +232,7 @@ while ($section <= $course->numsections) {
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'. echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />'; '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
} }
echo '</div>'; echo '</div>';

16
course/format/weeks/format.php
View file

@ -99,7 +99,7 @@
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo '<p><a title="'.$streditsummary.'" '. echo '<p><a title="'.$streditsummary.'" '.
' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" '. ' href="editsection.php?id='.$thissection->id.'"><img src="'.$OUTPUT->pix_url('t/edit') . '" '.
' class="icon edit" alt="'.$streditsummary.'" /></a></p>'; ' class="icon edit" alt="'.$streditsummary.'" /></a></p>';
} }
echo '</div>'; echo '</div>';
@ -180,29 +180,29 @@
if ($displaysection == $section) { if ($displaysection == $section) {
echo '<a href="view.php?id='.$course->id.'&amp;week=0#section-'.$section.'" title="'.$strshowallweeks.'">'. echo '<a href="view.php?id='.$course->id.'&amp;week=0#section-'.$section.'" title="'.$strshowallweeks.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/all') . '" class="icon wkall" alt="'.$strshowallweeks.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/all') . '" class="icon wkall" alt="'.$strshowallweeks.'" /></a><br />';
} else { } else {
$strshowonlyweek = get_string("showonlyweek", "", $section); $strshowonlyweek = get_string("showonlyweek", "", $section);
echo '<a href="view.php?id='.$course->id.'&amp;week='.$section.'" title="'.$strshowonlyweek.'">'. echo '<a href="view.php?id='.$course->id.'&amp;week='.$section.'" title="'.$strshowonlyweek.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/one') . '" class="icon wkone" alt="'.$strshowonlyweek.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/one') . '" class="icon wkone" alt="'.$strshowonlyweek.'" /></a><br />';
} }
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
if ($thissection->visible) { // Show the hide/show eye if ($thissection->visible) { // Show the hide/show eye
echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekhide.'">'. echo '<a href="view.php?id='.$course->id.'&amp;hide='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekhide.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/hide') . '" class="icon hide" alt="'.$strweekhide.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon hide" alt="'.$strweekhide.'" /></a><br />';
} else { } else {
echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekshow.'">'. echo '<a href="view.php?id='.$course->id.'&amp;show='.$section.'&amp;sesskey='.sesskey().'#section-'.$section.'" title="'.$strweekshow.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/show') . '" class="icon hide" alt="'.$strweekshow.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon hide" alt="'.$strweekshow.'" /></a><br />';
} }
if ($section > 1) { // Add a arrow to move section up if ($section > 1) { // Add a arrow to move section up
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'. echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=-1&amp;sesskey='.sesskey().'#section-'.($section-1).'" title="'.$strmoveup.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('t/up') . '" class="icon up" alt="'.$strmoveup.'" /></a><br />';
} }
if ($section < $course->numsections) { // Add a arrow to move section down if ($section < $course->numsections) { // Add a arrow to move section down
echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'. echo '<a href="view.php?id='.$course->id.'&amp;random='.rand(1,10000).'&amp;section='.$section.'&amp;move=1&amp;sesskey='.sesskey().'#section-'.($section+1).'" title="'.$strmovedown.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />'; '<img src="'.$OUTPUT->pix_url('t/down') . '" class="icon down" alt="'.$strmovedown.'" /></a><br />';
} }
} }
echo '</div>'; echo '</div>';
@ -222,7 +222,7 @@
if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) { if ($PAGE->user_is_editing() && has_capability('moodle/course:update', get_context_instance(CONTEXT_COURSE, $course->id))) {
echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'. echo ' <a title="'.$streditsummary.'" href="editsection.php?id='.$thissection->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />'; '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="icon edit" alt="'.$streditsummary.'" /></a><br /><br />';
} }
echo '</div>'; echo '</div>';

12
course/index.php
View file

@ -327,28 +327,28 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
if (has_capability('moodle/category:manage', $category->context)) { if (has_capability('moodle/category:manage', $category->context)) {
echo '<a title="'.$str->edit.'" href="editcategory.php?id='.$category->id.'"><img'. echo '<a title="'.$str->edit.'" href="editcategory.php?id='.$category->id.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.$str->edit.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.$str->edit.'" /></a> ';
echo '<a title="'.$str->delete.'" href="index.php?delete='.$category->id.'&amp;sesskey='.sesskey().'"><img'. echo '<a title="'.$str->delete.'" href="index.php?delete='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
' src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$str->delete.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$str->delete.'" /></a> ';
if (!empty($category->visible)) { if (!empty($category->visible)) {
echo '<a title="'.$str->hide.'" href="index.php?hide='.$category->id.'&amp;sesskey='.sesskey().'"><img'. echo '<a title="'.$str->hide.'" href="index.php?hide='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
' src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" alt="'.$str->hide.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$str->hide.'" /></a> ';
} else { } else {
echo '<a title="'.$str->show.'" href="index.php?show='.$category->id.'&amp;sesskey='.sesskey().'"><img'. echo '<a title="'.$str->show.'" href="index.php?show='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
' src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" alt="'.$str->show.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$str->show.'" /></a> ';
} }
if ($up) { if ($up) {
echo '<a title="'.$str->moveup.'" href="index.php?moveup='.$category->id.'&amp;sesskey='.sesskey().'"><img'. echo '<a title="'.$str->moveup.'" href="index.php?moveup='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
' src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" alt="'.$str->moveup.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" alt="'.$str->moveup.'" /></a> ';
} else { } else {
echo $str->spacer; echo $str->spacer;
} }
if ($down) { if ($down) {
echo '<a title="'.$str->movedown.'" href="index.php?movedown='.$category->id.'&amp;sesskey='.sesskey().'"><img'. echo '<a title="'.$str->movedown.'" href="index.php?movedown='.$category->id.'&amp;sesskey='.sesskey().'"><img'.
' src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" alt="'.$str->movedown.'" /></a> '; ' src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" alt="'.$str->movedown.'" /></a> ';
} else { } else {
echo $str->spacer; echo $str->spacer;
} }

4
course/info.php
View file

@ -47,11 +47,11 @@
echo $OUTPUT->box_start('generalbox icons'); echo $OUTPUT->box_start('generalbox icons');
if ($course->guest) { if ($course->guest) {
$strallowguests = get_string('allowguests'); $strallowguests = get_string('allowguests');
echo "<div><img alt=\"\" class=\"icon guest\" src=\"" . $OUTPUT->old_icon_url('i/guest') . "\" />&nbsp;$strallowguests</div>"; echo "<div><img alt=\"\" class=\"icon guest\" src=\"" . $OUTPUT->pix_url('i/guest') . "\" />&nbsp;$strallowguests</div>";
} }
if ($course->password) { if ($course->password) {
$strrequireskey = get_string('requireskey'); $strrequireskey = get_string('requireskey');
echo "<div><img alt=\"\" class=\"icon key\" src=\"" . $OUTPUT->old_icon_url('i/key') . "\" />&nbsp;$strrequireskey</div>"; echo "<div><img alt=\"\" class=\"icon key\" src=\"" . $OUTPUT->pix_url('i/key') . "\" />&nbsp;$strrequireskey</div>";
} }
echo $OUTPUT->box_end(); echo $OUTPUT->box_end();
} }

56
course/lib.php
View file

@ -1343,7 +1343,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if ($ismoving) { if ($ismoving) {
echo '<a title="'.$strmovefull.'"'. echo '<a title="'.$strmovefull.'"'.
' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'. ' href="'.$CFG->wwwroot.'/course/mod.php?moveto='.$mod->id.'&amp;sesskey='.sesskey().'">'.
'<img class="movetarget" src="'.$OUTPUT->old_icon_url('movehere') . '" '. '<img class="movetarget" src="'.$OUTPUT->pix_url('movehere') . '" '.
' alt="'.$strmovehere.'" /></a><br /> ' alt="'.$strmovehere.'" /></a><br />
'; ';
} }
@ -1383,12 +1383,12 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if (!empty($customicon)) { if (!empty($customicon)) {
if (substr($customicon, 0, 4) === 'mod/') { if (substr($customicon, 0, 4) === 'mod/') {
list($modname, $iconname) = explode('/', substr($customicon, 4), 2); list($modname, $iconname) = explode('/', substr($customicon, 4), 2);
$icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon), $modname); $icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon), $modname);
} else { } else {
$icon = $OUTPUT->old_icon_url(str_replace(array('.gif', '.png'), '', $customicon)); $icon = $OUTPUT->pix_url(str_replace(array('.gif', '.png'), '', $customicon));
} }
} else { } else {
$icon = $OUTPUT->old_icon_url('icon', $mod->modname); $icon = $OUTPUT->pix_url('icon', $mod->modname);
} }
//Accessibility: for files get description via icon, this is very ugly hack! //Accessibility: for files get description via icon, this is very ugly hack!
@ -1506,7 +1506,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
} }
} }
if ($completionicon) { if ($completionicon) {
$imgsrc = $OUTPUT->old_icon_url('i/completion-'.$completionicon); $imgsrc = $OUTPUT->pix_url('i/completion-'.$completionicon);
$imgalt = get_string('completion-alt-'.$completionicon,'completion'); $imgalt = get_string('completion-alt-'.$completionicon,'completion');
if ($completion==COMPLETION_TRACKING_MANUAL && !$isediting) { if ($completion==COMPLETION_TRACKING_MANUAL && !$isediting) {
$imgtitle = get_string('completion-title-'.$completionicon,'completion'); $imgtitle = get_string('completion-title-'.$completionicon,'completion');
@ -1570,7 +1570,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
if ($ismoving) { if ($ismoving) {
echo '<li><a title="'.$strmovefull.'"'. echo '<li><a title="'.$strmovefull.'"'.
' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'. ' href="'.$CFG->wwwroot.'/course/mod.php?movetosection='.$section->id.'&amp;sesskey='.sesskey().'">'.
'<img class="movetarget" src="'.$OUTPUT->old_icon_url('movehere') . '" '. '<img class="movetarget" src="'.$OUTPUT->pix_url('movehere') . '" '.
' alt="'.$strmovehere.'" /></a></li> ' alt="'.$strmovehere.'" /></a></li>
'; ';
} }
@ -1952,7 +1952,7 @@ function print_category_info($category, $depth, $showcourses = false) {
} }
if ($showcourses and $coursecount) { if ($showcourses and $coursecount) {
$catimage = '<img src="'.$OUTPUT->old_icon_url('i/course') . '" alt="" />'; $catimage = '<img src="'.$OUTPUT->pix_url('i/course') . '" alt="" />';
} else { } else {
$catimage = "&nbsp;"; $catimage = "&nbsp;";
} }
@ -1996,23 +1996,23 @@ function print_category_info($category, $depth, $showcourses = false) {
echo '</td><td align="right" valign="top" class="course info">'; echo '</td><td align="right" valign="top" class="course info">';
if ($course->guest ) { if ($course->guest ) {
echo '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'; echo '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
echo '<img alt="'.$strallowguests.'" src="'.$OUTPUT->old_icon_url('i/guest') . '" /></a>'; echo '<img alt="'.$strallowguests.'" src="'.$OUTPUT->pix_url('i/guest') . '" /></a>';
} else { } else {
echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />'; echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
} }
if ($course->password) { if ($course->password) {
echo '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'; echo '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
echo '<img alt="'.$strrequireskey.'" src="'.$OUTPUT->old_icon_url('i/key') . '" /></a>'; echo '<img alt="'.$strrequireskey.'" src="'.$OUTPUT->pix_url('i/key') . '" /></a>';
} else { } else {
echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />'; echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
} }
if ($course->summary) { if ($course->summary) {
$link = html_link::make('/course/info.php?id='.$course->id, '<img alt="'.$strsummary.'" src="'.$OUTPUT->old_icon_url('i/info') . '" />'); $link = html_link::make('/course/info.php?id='.$course->id, '<img alt="'.$strsummary.'" src="'.$OUTPUT->pix_url('i/info') . '" />');
$link->add_action(new popup_action('click', $link->url, 'courseinfo', array('height' => 400, 'width' => 500))); $link->add_action(new popup_action('click', $link->url, 'courseinfo', array('height' => 400, 'width' => 500)));
$link->title = $strsummary; $link->title = $strsummary;
echo $OUTPUT->link($link); echo $OUTPUT->link($link);
} else { } else {
echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->old_icon_url('spacer') . '" />'; echo '<img alt="" style="width:18px;height:16px;" src="'.$OUTPUT->pix_url('spacer') . '" />';
} }
echo '</td></tr>'; echo '</td></tr>';
} }
@ -2215,7 +2215,7 @@ function print_course($course, $highlightterms = '') {
if ($ra->hidden == 0 || $canseehidden) { if ($ra->hidden == 0 || $canseehidden) {
$fullname = fullname($ra->user, $canviewfullnames); $fullname = fullname($ra->user, $canviewfullnames);
if ($ra->hidden == 1) { if ($ra->hidden == 1) {
$status = " <img src=\"" . $OUTPUT->old_icon_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>"; $status = " <img src=\"" . $OUTPUT->pix_url('t/show') . "\" title=\"".get_string('userhashiddenassignments', 'role')."\" alt=\"".get_string('hiddenassign')."\" class=\"hide-show-image\"/>";
} else { } else {
$status = ''; $status = '';
} }
@ -2423,7 +2423,7 @@ function print_remote_host($host, $width="100%") {
echo '<div class="coursebox clearfix">'; echo '<div class="coursebox clearfix">';
echo '<div class="info">'; echo '<div class="info">';
echo '<div class="name">'; echo '<div class="name">';
echo '<img src="'.$OUTPUT->old_icon_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />'; echo '<img src="'.$OUTPUT->pix_url('i/mnethost') . '" class="icon" alt="'.get_string('course').'" />';
echo '<a title="'.s($host['name']).'" href="'.s($host['url']).'">' echo '<a title="'.s($host['name']).'" href="'.s($host['url']).'">'
. s($host['name']).'</a> - '; . s($host['name']).'</a> - ';
echo $host['count'] . ' ' . get_string('courses'); echo $host['count'] . ' ' . get_string('courses');
@ -2859,12 +2859,12 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
if ($mod->visible) { if ($mod->visible) {
$hideshow = '<a class="editing_hide" title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id. $hideshow = '<a class="editing_hide" title="'.$str->hide.'" href="'.$path.'/mod.php?hide='.$mod->id.
'&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/hide') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" '.
' alt="'.$str->hide.'" /></a>'."\n"; ' alt="'.$str->hide.'" /></a>'."\n";
} else { } else {
$hideshow = '<a class="editing_show" title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id. $hideshow = '<a class="editing_show" title="'.$str->show.'" href="'.$path.'/mod.php?show='.$mod->id.
'&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/show') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" '.
' alt="'.$str->show.'" /></a>'."\n"; ' alt="'.$str->show.'" /></a>'."\n";
} }
} else { } else {
@ -2875,17 +2875,17 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
if ($mod->groupmode == SEPARATEGROUPS) { if ($mod->groupmode == SEPARATEGROUPS) {
$grouptitle = $str->groupsseparate; $grouptitle = $str->groupsseparate;
$groupclass = 'editing_groupsseparate'; $groupclass = 'editing_groupsseparate';
$groupimage = $OUTPUT->old_icon_url('t/groups') . ''; $groupimage = $OUTPUT->pix_url('t/groups') . '';
$grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=0&amp;sesskey='.$sesskey; $grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=0&amp;sesskey='.$sesskey;
} else if ($mod->groupmode == VISIBLEGROUPS) { } else if ($mod->groupmode == VISIBLEGROUPS) {
$grouptitle = $str->groupsvisible; $grouptitle = $str->groupsvisible;
$groupclass = 'editing_groupsvisible'; $groupclass = 'editing_groupsvisible';
$groupimage = $OUTPUT->old_icon_url('t/groupv') . ''; $groupimage = $OUTPUT->pix_url('t/groupv') . '';
$grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=1&amp;sesskey='.$sesskey; $grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=1&amp;sesskey='.$sesskey;
} else { } else {
$grouptitle = $str->groupsnone; $grouptitle = $str->groupsnone;
$groupclass = 'editing_groupsnone'; $groupclass = 'editing_groupsnone';
$groupimage = $OUTPUT->old_icon_url('t/groupn') . ''; $groupimage = $OUTPUT->pix_url('t/groupn') . '';
$grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=2&amp;sesskey='.$sesskey; $grouplink = $path.'/mod.php?id='.$mod->id.'&amp;groupmode=2&amp;sesskey='.$sesskey;
} }
if ($mod->groupmodelink) { if ($mod->groupmodelink) {
@ -2905,16 +2905,16 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
if ($moveselect) { if ($moveselect) {
$move = '<a class="editing_move" title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id. $move = '<a class="editing_move" title="'.$str->move.'" href="'.$path.'/mod.php?copy='.$mod->id.
'&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/move') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/move') . '" class="iconsmall" '.
' alt="'.$str->move.'" /></a>'."\n"; ' alt="'.$str->move.'" /></a>'."\n";
} else { } else {
$move = '<a class="editing_moveup" title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id. $move = '<a class="editing_moveup" title="'.$str->moveup.'" href="'.$path.'/mod.php?id='.$mod->id.
'&amp;move=-1&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;move=-1&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/up') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/up') . '" class="iconsmall" '.
' alt="'.$str->moveup.'" /></a>'."\n". ' alt="'.$str->moveup.'" /></a>'."\n".
'<a class="editing_movedown" title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id. '<a class="editing_movedown" title="'.$str->movedown.'" href="'.$path.'/mod.php?id='.$mod->id.
'&amp;move=1&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;move=1&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/down') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/down') . '" class="iconsmall" '.
' alt="'.$str->movedown.'" /></a>'."\n"; ' alt="'.$str->movedown.'" /></a>'."\n";
} }
} else { } else {
@ -2935,20 +2935,20 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
if ($indent > 0) { if ($indent > 0) {
$leftright .= '<a class="editing_moveleft" title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id. $leftright .= '<a class="editing_moveleft" title="'.$str->moveleft.'" href="'.$path.'/mod.php?id='.$mod->id.
'&amp;indent=-1&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;indent=-1&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url($leftarrow).'" class="iconsmall" '. ' src="'.$OUTPUT->pix_url($leftarrow).'" class="iconsmall" '.
' alt="'.$str->moveleft.'" /></a>'."\n"; ' alt="'.$str->moveleft.'" /></a>'."\n";
} }
if ($indent >= 0) { if ($indent >= 0) {
$leftright .= '<a class="editing_moveright" title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id. $leftright .= '<a class="editing_moveright" title="'.$str->moveright.'" href="'.$path.'/mod.php?id='.$mod->id.
'&amp;indent=1&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;indent=1&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url($rightarrow).'" class="iconsmall" '. ' src="'.$OUTPUT->pix_url($rightarrow).'" class="iconsmall" '.
' alt="'.$str->moveright.'" /></a>'."\n"; ' alt="'.$str->moveright.'" /></a>'."\n";
} }
} }
if (has_capability('moodle/course:managegroups', $modcontext)){ if (has_capability('moodle/course:managegroups', $modcontext)){
$context = get_context_instance(CONTEXT_MODULE, $mod->id); $context = get_context_instance(CONTEXT_MODULE, $mod->id);
$assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='. $assign = '<a class="editing_assign" title="'.$str->assign.'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.
$context->id.'"><img src="'.$OUTPUT->old_icon_url('i/roles') . '" alt="'.$str->assign.'" class="iconsmall"/></a>'; $context->id.'"><img src="'.$OUTPUT->pix_url('i/roles') . '" alt="'.$str->assign.'" class="iconsmall"/></a>';
} else { } else {
$assign = ''; $assign = '';
} }
@ -2956,11 +2956,11 @@ function make_editing_buttons($mod, $absolute=false, $moveselect=true, $indent=-
return '<span class="commands">'."\n".$leftright.$move. return '<span class="commands">'."\n".$leftright.$move.
'<a class="editing_update" title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id. '<a class="editing_update" title="'.$str->update.'" href="'.$path.'/mod.php?update='.$mod->id.
'&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" '.
' alt="'.$str->update.'" /></a>'."\n". ' alt="'.$str->update.'" /></a>'."\n".
'<a class="editing_delete" title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id. '<a class="editing_delete" title="'.$str->delete.'" href="'.$path.'/mod.php?delete='.$mod->id.
'&amp;sesskey='.$sesskey.$section.'"><img'. '&amp;sesskey='.$sesskey.$section.'"><img'.
' src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" '. ' src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" '.
' alt="'.$str->delete.'" /></a>'."\n".$hideshow.$groupmode."\n".$assign.'</span>'; ' alt="'.$str->delete.'" /></a>'."\n".$hideshow.$groupmode."\n".$assign.'</span>';
} }

2
course/modedit.php
View file

@ -620,7 +620,7 @@
$helpicon->page = 'mods'; $helpicon->page = 'mods';
$helpicon->text = $pageheading; $helpicon->text = $pageheading;
$helpicon->module = $module->name; $helpicon->module = $module->name;
echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->old_icon_url('icon', $module->name)); echo $OUTPUT->heading_with_help($helpicon, $OUTPUT->pix_url('icon', $module->name));
$mform->display(); $mform->display();

2
course/pending.php
View file

@ -107,7 +107,7 @@ if (empty($pending)) {
// Loop over requested courses. // Loop over requested courses.
$keyicon = new html_image(); $keyicon = new html_image();
$keyicon->src = $OUTPUT->old_icon_url('i/key'); $keyicon->src = $OUTPUT->pix_url('i/key');
$keyicon->alt = $strrequireskey; $keyicon->alt = $strrequireskey;
$keyicon->add_class('icon'); $keyicon->add_class('icon');
$keyicon = $OUTPUT->image($keyicon); $keyicon = $OUTPUT->image($keyicon);

2
course/recent.php
View file

@ -246,7 +246,7 @@ if (!empty($activities)) {
$name = format_string($cm->name); $name = format_string($cm->name);
$modfullname = $modnames[$cm->modname]; $modfullname = $modnames[$cm->modname];
$image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />"; $image = "<img src=\"" . $OUTPUT->pix_url('icon', $cm->modname) . "\" class=\"icon\" alt=\"$modfullname\" />";
echo "<h4>$image $modfullname". echo "<h4>$image $modfullname".
" <a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name</a></h4>"; " <a href=\"$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id\" $linkformat>$name</a></h4>";
} }

4
course/report/log/lib.php
View file

@ -560,12 +560,12 @@ function log_report_extend_navigation($navigation, $course, $context) {
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
if (has_capability('coursereport/log:view', $context)) { if (has_capability('coursereport/log:view', $context)) {
$url = new moodle_url($CFG->wwwroot.'/course/report/log/index.php', array('id'=>$course->id)); $url = new moodle_url($CFG->wwwroot.'/course/report/log/index.php', array('id'=>$course->id));
$navigation->add(get_string('log:view', 'coursereport_log'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add(get_string('log:view', 'coursereport_log'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
if (has_capability('coursereport/log:viewlive', $context)) { if (has_capability('coursereport/log:viewlive', $context)) {
$livelogs = get_string('livelogs'); $livelogs = get_string('livelogs');
$link = html_link::make('/course/report/log/live.php?id='. $course->id, $livelogs); $link = html_link::make('/course/report/log/live.php?id='. $course->id, $livelogs);
$link->add_action(new popup_action('click', $link->url, 'livelog', array('height' => 500, 'width' => 800))); $link->add_action(new popup_action('click', $link->url, 'livelog', array('height' => 500, 'width' => 800)));
$navigation->add($livelogs, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add($livelogs, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
} }

2
course/report/outline/index.php
View file

@ -107,7 +107,7 @@
$activitycell = new html_table_cell(); $activitycell = new html_table_cell();
$activitycell->add_class('activity'); $activitycell->add_class('activity');
$activityicon = html_image::make($OUTPUT->old_icon_url('icon', $cm->modname)); $activityicon = html_image::make($OUTPUT->pix_url('icon', $cm->modname));
$activityicon->add_class('icon'); $activityicon->add_class('icon');
$activityicon->alt = $modulename; $activityicon->alt = $modulename;

2
course/report/outline/lib.php
View file

@ -35,6 +35,6 @@ function outline_report_extend_navigation($navigation, $course, $context) {
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
if (has_capability('coursereport/outline:view', $context)) { if (has_capability('coursereport/outline:view', $context)) {
$url = new moodle_url($CFG->wwwroot.'/course/report/outline/index.php', array('id'=>$course->id)); $url = new moodle_url($CFG->wwwroot.'/course/report/outline/index.php', array('id'=>$course->id));
$navigation->add(get_string( 'activityreport' ), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add(get_string( 'activityreport' ), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
} }

2
course/report/participation/lib.php
View file

@ -35,6 +35,6 @@ function participation_report_extend_navigation($navigation, $course, $context)
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
if (has_capability('coursereport/participation:view', $context)) { if (has_capability('coursereport/participation:view', $context)) {
$url = new moodle_url($CFG->wwwroot.'/course/report/participation/index.php', array('id'=>$course->id)); $url = new moodle_url($CFG->wwwroot.'/course/report/participation/index.php', array('id'=>$course->id));
$navigation->add(get_string('participationreport'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add(get_string('participationreport'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
} }

4
course/report/progress/index.php
View file

@ -198,7 +198,7 @@ foreach($activities as $activity) {
print '<th scope="col" class="'.$activity->datepassedclass.'">'. print '<th scope="col" class="'.$activity->datepassedclass.'">'.
'<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname. '<a href="'.$CFG->wwwroot.'/mod/'.$activity->modname.
'/view.php?id='.$activity->id.'">'. '/view.php?id='.$activity->id.'">'.
'<img src="'.$OUTPUT->old_icon_url('icon', $activity->modname).'/icon.gif" alt="'. '<img src="'.$OUTPUT->pix_url('icon', $activity->modname).'/icon.gif" alt="'.
get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'. get_string('modulename',$activity->modname).'" /> <span class="completion-activityname">'.
format_string($activity->name).'</span></a>'; format_string($activity->name).'</span></a>';
if($activity->completionexpected) { if($activity->completionexpected) {
@ -267,7 +267,7 @@ foreach($progress->users as $user) {
print $sep.csv_quote($describe).$sep.csv_quote($date); print $sep.csv_quote($describe).$sep.csv_quote($date);
} else { } else {
print '<td class="completion-progresscell '.$activity->datepassedclass.'">'. print '<td class="completion-progresscell '.$activity->datepassedclass.'">'.
'<img src="'.$OUTPUT->old_icon_url('i/'.$completionicon). '<img src="'.$OUTPUT->pix_url('i/'.$completionicon).
'" alt="'.$describe.'" title="'.$fulldescribe.'" /></td>'; '" alt="'.$describe.'" title="'.$fulldescribe.'" /></td>';
} }
} }

2
course/report/progress/lib.php
View file

@ -35,6 +35,6 @@ function progress_report_extend_navigation($navigation, $course, $context) {
global $CFG, $OUTPUT; global $CFG, $OUTPUT;
if (has_capability('coursereport/progress:view', $context)) { if (has_capability('coursereport/progress:view', $context)) {
$url = new moodle_url($CFG->wwwroot.'/course/report/progress/index.php', array('course'=>$course->id)); $url = new moodle_url($CFG->wwwroot.'/course/report/progress/index.php', array('course'=>$course->id));
$navigation->add(get_string('completionreport','completion'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add(get_string('completionreport','completion'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
} }

2
course/report/stats/lib.php
View file

@ -87,7 +87,7 @@ function stats_report_extend_navigation($navigation, $course, $context) {
if (has_capability('coursereport/stats:view', $context)) { if (has_capability('coursereport/stats:view', $context)) {
if (!empty($CFG->enablestats)) { if (!empty($CFG->enablestats)) {
$url = new moodle_url($CFG->wwwroot.'/course/report/stats/index.php', array('id'=>$course->id)); $url = new moodle_url($CFG->wwwroot.'/course/report/stats/index.php', array('id'=>$course->id));
$navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report')); $navigation->add(get_string('stats'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
} }
} }
} }

4
course/resources.php
View file

@ -125,9 +125,9 @@ foreach ($cms as $cm) {
$extra = empty($cm->extra) ? '' : $cm->extra; $extra = empty($cm->extra) ? '' : $cm->extra;
if (!empty($cm->icon)) { if (!empty($cm->icon)) {
$icon = '<img src="'.$OUTPUT->old_icon_url($cm->icon).'" class="activityicon" alt="" /> '; $icon = '<img src="'.$OUTPUT->pix_url($cm->icon).'" class="activityicon" alt="" /> ';
} else { } else {
$icon = '<img src="'.$OUTPUT->old_icon_url('icon', $cm->modname).'" class="activityicon" alt="" /> '; $icon = '<img src="'.$OUTPUT->pix_url('icon', $cm->modname).'" class="activityicon" alt="" /> ';
} }
$class = $cm->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed $class = $cm->visible ? '' : 'class="dimmed"'; // hidden modules are dimmed

14
course/search.php
View file

@ -300,42 +300,42 @@
// checks whether user can update course settings // checks whether user can update course settings
if (has_capability('moodle/course:update', $coursecontext)) { if (has_capability('moodle/course:update', $coursecontext)) {
echo "<a title=\"".get_string("settings")."\" href=\"$CFG->wwwroot/course/edit.php?id=$course->id\">\n<img". echo "<a title=\"".get_string("settings")."\" href=\"$CFG->wwwroot/course/edit.php?id=$course->id\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"".get_string("settings")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"".get_string("settings")."\" /></a>\n ";
} }
// checks whether user can do role assignment // checks whether user can do role assignment
if (has_capability('moodle/role:assign', $coursecontext)) { if (has_capability('moodle/role:assign', $coursecontext)) {
echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">'; echo'<a title="'.get_string('assignroles', 'role').'" href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?contextid='.$coursecontext->id.'">';
echo '<img src="'.$OUTPUT->old_icon_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ' . "\n"; echo '<img src="'.$OUTPUT->pix_url('i/roles') . '" class="iconsmall" alt="'.get_string('assignroles', 'role').'" /></a> ' . "\n";
} }
// checks whether user can delete course // checks whether user can delete course
if (has_capability('moodle/course:delete', $coursecontext)) { if (has_capability('moodle/course:delete', $coursecontext)) {
echo "<a title=\"".get_string("delete")."\" href=\"delete.php?id=$course->id\">\n<img". echo "<a title=\"".get_string("delete")."\" href=\"delete.php?id=$course->id\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"".get_string("delete")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"".get_string("delete")."\" /></a>\n ";
} }
// checks whether user can change visibility // checks whether user can change visibility
if (has_capability('moodle/course:visibility', $coursecontext)) { if (has_capability('moodle/course:visibility', $coursecontext)) {
if (!empty($course->visible)) { if (!empty($course->visible)) {
echo "<a title=\"".get_string("hide")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;hide=$course->id&amp;sesskey=".sesskey()."\">\n<img". echo "<a title=\"".get_string("hide")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;hide=$course->id&amp;sesskey=".sesskey()."\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/hide') . "\" class=\"iconsmall\" alt=\"".get_string("hide")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"".get_string("hide")."\" /></a>\n ";
} else { } else {
echo "<a title=\"".get_string("show")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;show=$course->id&amp;sesskey=".sesskey()."\">\n<img". echo "<a title=\"".get_string("show")."\" href=\"search.php?search=$encodedsearch&amp;perpage=$perpage&amp;page=$page&amp;show=$course->id&amp;sesskey=".sesskey()."\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/show') . "\" class=\"iconsmall\" alt=\"".get_string("show")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"".get_string("show")."\" /></a>\n ";
} }
} }
// checks whether user can do site backup // checks whether user can do site backup
if (has_capability('moodle/site:backup', $coursecontext)) { if (has_capability('moodle/site:backup', $coursecontext)) {
echo "<a title=\"".get_string("backup")."\" href=\"../backup/backup.php?id=$course->id\">\n<img". echo "<a title=\"".get_string("backup")."\" href=\"../backup/backup.php?id=$course->id\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/backup') . "\" class=\"iconsmall\" alt=\"".get_string("backup")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/backup') . "\" class=\"iconsmall\" alt=\"".get_string("backup")."\" /></a>\n ";
} }
// checks whether user can do restore // checks whether user can do restore
if (has_capability('moodle/site:restore', $coursecontext)) { if (has_capability('moodle/site:restore', $coursecontext)) {
echo "<a title=\"".get_string("restore")."\" href=\"../files/index.php?id=$course->id&amp;wdir=/backupdata\">\n<img". echo "<a title=\"".get_string("restore")."\" href=\"../files/index.php?id=$course->id&amp;wdir=/backupdata\">\n<img".
" src=\"" . $OUTPUT->old_icon_url('t/restore') . "\" class=\"iconsmall\" alt=\"".get_string("restore")."\" /></a>\n "; " src=\"" . $OUTPUT->pix_url('t/restore') . "\" class=\"iconsmall\" alt=\"".get_string("restore")."\" /></a>\n ";
} }
echo "</td>\n</tr>\n"; echo "</td>\n</tr>\n";

2
course/user.php
View file

@ -367,7 +367,7 @@ echo $OUTPUT->footer();
function print_outline_row($mod, $instance, $result) { function print_outline_row($mod, $instance, $result) {
global $OUTPUT; global $OUTPUT;
$image = "<img src=\"" . $OUTPUT->old_icon_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />"; $image = "<img src=\"" . $OUTPUT->pix_url('icon', $mod->modname) . "\" class=\"icon\" alt=\"$mod->modfullname\" />";
echo "<tr>"; echo "<tr>";
echo "<td valign=\"top\">$image</td>"; echo "<td valign=\"top\">$image</td>";

4
enrol/manual/enrol.php
View file

@ -388,11 +388,11 @@ function get_access_icons($course) {
if (!empty($course->guest)) { if (!empty($course->guest)) {
$str .= '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'; $str .= '<a title="'.$strallowguests.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
$str .= '<img class="accessicon" alt="'.$strallowguests.'" src="'.$OUTPUT->old_icon_url('i/guest') . '" /></a>&nbsp;&nbsp;'; $str .= '<img class="accessicon" alt="'.$strallowguests.'" src="'.$OUTPUT->pix_url('i/guest') . '" /></a>&nbsp;&nbsp;';
} }
if (!empty($course->password)) { if (!empty($course->password)) {
$str .= '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">'; $str .= '<a title="'.$strrequireskey.'" href="'.$CFG->wwwroot.'/course/view.php?id='.$course->id.'">';
$str .= '<img class="accessicon" alt="'.$strrequireskey.'" src="'.$OUTPUT->old_icon_url('i/key') . '" /></a>'; $str .= '<img class="accessicon" alt="'.$strrequireskey.'" src="'.$OUTPUT->pix_url('i/key') . '" /></a>';
} }
return $str; return $str;

10
files/draftfiles.php
View file

@ -132,7 +132,7 @@ $strdelete = get_string('delete');
if ($parent) { if ($parent) {
echo '<div class="folder">'; echo '<div class="folder">';
echo '<a href="draftfiles.php?itemid='.$itemid.'&amp;filepath='.$parent->get_filepath().'&amp;subdirs='.$subdirs.'&amp;maxbytes='.$maxbytes.'"><img src="'.$OUTPUT->old_icon_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>'; echo '<a href="draftfiles.php?itemid='.$itemid.'&amp;filepath='.$parent->get_filepath().'&amp;subdirs='.$subdirs.'&amp;maxbytes='.$maxbytes.'"><img src="'.$OUTPUT->pix_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>';
echo '</div>'; echo '</div>';
} }
@ -150,16 +150,16 @@ foreach ($files as $file) {
$dirname = explode('/', trim($filepath, '/')); $dirname = explode('/', trim($filepath, '/'));
$dirname = array_pop($dirname); $dirname = array_pop($dirname);
echo '<div class="folder">'; echo '<div class="folder">';
echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($dirname)."</a> "; echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($dirname)."</a> ";
echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>"; echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";
echo '</div>'; echo '</div>';
} }
} else { } else {
$viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$itemid".$filepath.$filename, false, false); $viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$itemid".$filepath.$filename, false, false);
echo '<div class="file">'; echo '<div class="file">';
echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> "; echo "<a href=\"$viewurl\"><img src=\"" . $OUTPUT->pix_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename)." ($filesize)</a> ";
echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";; echo "<a href=\"draftfiles.php?itemid=$itemid&amp;filepath=$filepath&amp;delete=$filenameurl&amp;subdirs=$subdirs&amp;maxbytes=$maxbytes\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>";;
echo '</div>'; echo '</div>';
} }
} }

14
files/index.php
View file

@ -254,7 +254,7 @@ function displaydir($file_info) {
echo "<tr class=\"folder\">"; echo "<tr class=\"folder\">";
print_cell(); print_cell();
print_cell('left', '<a href="index.php?'.$params.'"><img src="'.$OUTPUT->old_icon_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>', 'name'); print_cell('left', '<a href="index.php?'.$params.'"><img src="'.$OUTPUT->pix_url('f/parent') . '" class="icon" alt="" />&nbsp;'.get_string('parentfolder').'</a>', 'name');
print_cell(); print_cell();
print_cell(); print_cell();
print_cell(); print_cell();
@ -279,11 +279,11 @@ function displaydir($file_info) {
echo "<tr class=\"folder\">"; echo "<tr class=\"folder\">";
print_cell(); print_cell();
print_cell("left", "<a href=\"index.php?$params\"><img src=\"" . $OUTPUT->old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($filename)."</a>", 'name'); print_cell("left", "<a href=\"index.php?$params\"><img src=\"" . $OUTPUT->pix_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" />&nbsp;".s($filename)."</a>", 'name');
print_cell("right", $filesize, 'size'); print_cell("right", $filesize, 'size');
print_cell("right", $filedate, 'date'); print_cell("right", $filedate, 'date');
if ($parentwritable) { if ($parentwritable) {
print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command'); print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
} else { } else {
print_cell(); print_cell();
} }
@ -292,13 +292,13 @@ function displaydir($file_info) {
} else { } else {
if ($downloadurl = $child_info->get_url(true)) { if ($downloadurl = $child_info->get_url(true)) {
$downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" /></a>"; $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"" . $OUTPUT->pix_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
} else { } else {
$downloadurl = ''; $downloadurl = '';
} }
if ($viewurl = $child_info->get_url()) { if ($viewurl = $child_info->get_url()) {
$link = html_link::make($viewurl, "display", "<img src=\"" . $OUTPUT->old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strfile\" />&nbsp;"); $link = html_link::make($viewurl, "display", "<img src=\"" . $OUTPUT->pix_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strfile\" />&nbsp;");
$link->add_action(new popup_action('click', $link->url, 'display', array('height' => 480, 'width' => 640))); $link->add_action(new popup_action('click', $link->url, 'display', array('height' => 480, 'width' => 640)));
$viewurl = "&nbsp;".$OUTPUT->link($link); $viewurl = "&nbsp;".$OUTPUT->link($link);
} else { } else {
@ -309,11 +309,11 @@ function displaydir($file_info) {
echo "<tr class=\"file\">"; echo "<tr class=\"file\">";
print_cell(); print_cell();
print_cell("left", "<img src=\"" . $OUTPUT->old_icon_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name'); print_cell("left", "<img src=\"" . $OUTPUT->pix_url(file_mimetype_icon($mimetype)) . "\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($filename).$downloadurl.$viewurl, 'name');
print_cell("right", $filesize, 'size'); print_cell("right", $filesize, 'size');
print_cell("right", $filedate, 'date'); print_cell("right", $filedate, 'date');
if ($parentwritable) { if ($parentwritable) {
print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command'); print_cell("right", "<a href=\"index.php?$params&amp;sesskey=".sesskey()."&amp;delete=1\"><img src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a>", 'command');
} else { } else {
print_cell(); print_cell();
} }

6
grade/edit/tree/lib.php
View file

@ -137,7 +137,7 @@ class grade_edit_tree {
if ($this->element_deletable($element)) { if ($this->element_deletable($element)) {
$actionicon = new moodle_action_icon(); $actionicon = new moodle_action_icon();
$actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'delete', 'eid' => $eid, 'sesskey' => sesskey())); $actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'delete', 'eid' => $eid, 'sesskey' => sesskey()));
$actionicon->image->src = $OUTPUT->old_icon_url('t/delete'); $actionicon->image->src = $OUTPUT->pix_url('t/delete');
$actionicon->image->alt = get_string('delete'); $actionicon->image->alt = get_string('delete');
$actionicon->image->title = get_string('delete'); $actionicon->image->title = get_string('delete');
$actionicon->image->add_class('iconsmall'); $actionicon->image->add_class('iconsmall');
@ -146,7 +146,7 @@ class grade_edit_tree {
$actionicon = new moodle_action_icon(); $actionicon = new moodle_action_icon();
$actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'moveselect', 'eid' => $eid, 'sesskey' => sesskey())); $actionicon->link->url = new moodle_url('index.php', array('id' => $COURSE->id, 'action' => 'moveselect', 'eid' => $eid, 'sesskey' => sesskey()));
$actionicon->image->src = $OUTPUT->old_icon_url('t/move'); $actionicon->image->src = $OUTPUT->pix_url('t/move');
$actionicon->image->alt = get_string('move'); $actionicon->image->alt = get_string('move');
$actionicon->image->title = get_string('move'); $actionicon->image->title = get_string('move');
$actionicon->image->add_class('iconsmall'); $actionicon->image->add_class('iconsmall');
@ -224,7 +224,7 @@ class grade_edit_tree {
$moveicon->link->url->params($first); $moveicon->link->url->params($first);
} }
$moveicon->image->add_class('movetarget'); $moveicon->image->add_class('movetarget');
$moveicon->image->src = $OUTPUT->old_icon_url('movehere'); $moveicon->image->src = $OUTPUT->pix_url('movehere');
$moveicon->image->alt = $strmovehere; $moveicon->image->alt = $strmovehere;
$moveicon->image->title = $strmovehere; $moveicon->image->title = $strmovehere;

4
grade/export/keymanager.php
View file

@ -61,13 +61,13 @@ if ($keys) {
$icon->image->add_class('iconsmall'); $icon->image->add_class('iconsmall');
$editicon = clone($icon); $editicon = clone($icon);
$editicon->image->src = $OUTPUT->old_icon_url('t/edit'); $editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->title = $stredit; $editicon->image->title = $stredit;
$editicon->image->alt = $stredit; $editicon->image->alt = $stredit;
$buttons = $OUTPUT->action_icon($editicon); $buttons = $OUTPUT->action_icon($editicon);
$deleteicon = clone($icon); $deleteicon = clone($icon);
$deleteicon->image->src = $OUTPUT->old_icon_url('t/delete'); $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
$deleteicon->image->title = $strdelete; $deleteicon->image->title = $strdelete;
$deleteicon->image->alt = $strdelete; $deleteicon->image->alt = $strdelete;
$deleteicon->link->url->param('delete', 1); $deleteicon->link->url->param('delete', 1);

4
grade/import/keymanager.php
View file

@ -58,13 +58,13 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A
$icon->image->add_class('iconsmall'); $icon->image->add_class('iconsmall');
$editicon = clone($icon); $editicon = clone($icon);
$editicon->image->src = $OUTPUT->old_icon_url('t/edit'); $editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->title = $stredit; $editicon->image->title = $stredit;
$editicon->image->alt = $stredit; $editicon->image->alt = $stredit;
$buttons = $OUTPUT->action_icon($editicon); $buttons = $OUTPUT->action_icon($editicon);
$deleteicon = clone($icon); $deleteicon = clone($icon);
$deleteicon->image->src = $OUTPUT->old_icon_url('t/delete'); $deleteicon->image->src = $OUTPUT->pix_url('t/delete');
$deleteicon->image->title = $strdelete; $deleteicon->image->title = $strdelete;
$deleteicon->image->alt = $strdelete; $deleteicon->image->alt = $strdelete;
$deleteicon->link->url->param('delete', 1); $deleteicon->link->url->param('delete', 1);

30
grade/lib.php
View file

@ -1222,7 +1222,7 @@ class grade_structure {
if ($element['object']->is_calculated()) { if ($element['object']->is_calculated()) {
$strcalc = get_string('calculatedgrade', 'grades'); $strcalc = get_string('calculatedgrade', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/calc') . '" class="icon itemicon" title="'. return '<img src="'.$OUTPUT->pix_url('i/calc') . '" class="icon itemicon" title="'.
s($strcalc).'" alt="'.s($strcalc).'"/>'; s($strcalc).'" alt="'.s($strcalc).'"/>';
} else if (($is_course or $is_category) and ($is_scale or $is_value)) { } else if (($is_course or $is_category) and ($is_scale or $is_value)) {
@ -1234,18 +1234,18 @@ class grade_structure {
case GRADE_AGGREGATE_WEIGHTED_MEAN2: case GRADE_AGGREGATE_WEIGHTED_MEAN2:
case GRADE_AGGREGATE_EXTRACREDIT_MEAN: case GRADE_AGGREGATE_EXTRACREDIT_MEAN:
$stragg = get_string('aggregation', 'grades'); $stragg = get_string('aggregation', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/agg_mean') . '" ' . return '<img src="'.$OUTPUT->pix_url('i/agg_mean') . '" ' .
'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>'; 'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
case GRADE_AGGREGATE_SUM: case GRADE_AGGREGATE_SUM:
$stragg = get_string('aggregation', 'grades'); $stragg = get_string('aggregation', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/agg_sum') . '" ' . return '<img src="'.$OUTPUT->pix_url('i/agg_sum') . '" ' .
'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>'; 'class="icon itemicon" title="'.s($stragg).'" alt="'.s($stragg).'"/>';
} }
} }
} else if ($element['object']->itemtype == 'mod') { } else if ($element['object']->itemtype == 'mod') {
$strmodname = get_string('modulename', $element['object']->itemmodule); $strmodname = get_string('modulename', $element['object']->itemmodule);
return '<img src="'.$OUTPUT->old_icon_url('icon', return '<img src="'.$OUTPUT->pix_url('icon',
$element['object']->itemmodule) . '" ' . $element['object']->itemmodule) . '" ' .
'class="icon itemicon" title="' .s($strmodname). 'class="icon itemicon" title="' .s($strmodname).
'" alt="' .s($strmodname).'"/>'; '" alt="' .s($strmodname).'"/>';
@ -1253,12 +1253,12 @@ class grade_structure {
} else if ($element['object']->itemtype == 'manual') { } else if ($element['object']->itemtype == 'manual') {
if ($element['object']->is_outcome_item()) { if ($element['object']->is_outcome_item()) {
$stroutcome = get_string('outcome', 'grades'); $stroutcome = get_string('outcome', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('i/outcomes') . '" ' . return '<img src="'.$OUTPUT->pix_url('i/outcomes') . '" ' .
'class="icon itemicon" title="'.s($stroutcome). 'class="icon itemicon" title="'.s($stroutcome).
'" alt="'.s($stroutcome).'"/>'; '" alt="'.s($stroutcome).'"/>';
} else { } else {
$strmanual = get_string('manualitem', 'grades'); $strmanual = get_string('manualitem', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('t/manual_item') . '" '. return '<img src="'.$OUTPUT->pix_url('t/manual_item') . '" '.
'class="icon itemicon" title="'.s($strmanual). 'class="icon itemicon" title="'.s($strmanual).
'" alt="'.s($strmanual).'"/>'; '" alt="'.s($strmanual).'"/>';
} }
@ -1267,7 +1267,7 @@ class grade_structure {
case 'category': case 'category':
$strcat = get_string('category', 'grades'); $strcat = get_string('category', 'grades');
return '<img src="'.$OUTPUT->old_icon_url('f/folder') . '" class="icon itemicon" ' . return '<img src="'.$OUTPUT->pix_url('f/folder') . '" class="icon itemicon" ' .
'title="'.s($strcat).'" alt="'.s($strcat).'" />'; 'title="'.s($strcat).'" alt="'.s($strcat).'" />';
} }
@ -1459,7 +1459,7 @@ class grade_structure {
$url = $gpr->add_url_params($url); $url = $gpr->add_url_params($url);
$editicon = new moodle_action_icon(); $editicon = new moodle_action_icon();
$editicon->link->url = $url; $editicon->link->url = $url;
$editicon->image->src = $OUTPUT->old_icon_url('t/edit'); $editicon->image->src = $OUTPUT->pix_url('t/edit');
$editicon->image->alt = $stredit; $editicon->image->alt = $stredit;
$editicon->image->title = $stredit; $editicon->image->title = $stredit;
$editicon->image->add_class('iconsmall'); $editicon->image->add_class('iconsmall');
@ -1508,13 +1508,13 @@ class grade_structure {
} }
$hideicon->link->url->param('action', 'show'); $hideicon->link->url->param('action', 'show');
$hideicon->image->src = $OUTPUT->old_icon_url('t/' . $icon); $hideicon->image->src = $OUTPUT->pix_url('t/' . $icon);
$hideicon->image->alt = $strshow; $hideicon->image->alt = $strshow;
$hideicon->image->title = $tooltip; $hideicon->image->title = $tooltip;
} else { } else {
$hideicon->link->url->param('action', 'hide'); $hideicon->link->url->param('action', 'hide');
$hideicon->image->src = $OUTPUT->old_icon_url('t/hide'); $hideicon->image->src = $OUTPUT->pix_url('t/hide');
$hideicon->image->alt = $strhide; $hideicon->image->alt = $strhide;
$hideicon->image->title = $strhide; $hideicon->image->title = $strhide;
} }
@ -1553,7 +1553,7 @@ class grade_structure {
$strnonunlockable = get_string('nonunlockableverbose', 'grades', $strparamobj); $strnonunlockable = get_string('nonunlockableverbose', 'grades', $strparamobj);
$lockicon = new html_image(); $lockicon = new html_image();
$lockicon->image->src = $OUTPUT->old_icon_url('t/unlock_gray'); $lockicon->image->src = $OUTPUT->pix_url('t/unlock_gray');
$lockicon->image->alt = s($strnonunlockable); $lockicon->image->alt = s($strnonunlockable);
$lockicon->image->title = s($strnonunlockable); $lockicon->image->title = s($strnonunlockable);
$lockicon->image->add_class('iconsmall'); $lockicon->image->add_class('iconsmall');
@ -1575,7 +1575,7 @@ class grade_structure {
} }
$lockicon->link->url->param('action', 'unlock'); $lockicon->link->url->param('action', 'unlock');
$lockicon->link->add_class('lock'); $lockicon->link->add_class('lock');
$lockicon->image->src = $OUTPUT->old_icon_url('t/'.$icon); $lockicon->image->src = $OUTPUT->pix_url('t/'.$icon);
$lockicon->image->alt = $strunlock; $lockicon->image->alt = $strunlock;
$lockicon->image->title = $tooltip; $lockicon->image->title = $tooltip;
$action = $OUTPUT->action_icon($lockicon); $action = $OUTPUT->action_icon($lockicon);
@ -1588,7 +1588,7 @@ class grade_structure {
$lockicon->link->url->param('action', 'lock'); $lockicon->link->url->param('action', 'lock');
$lockicon->link->add_class('lock'); $lockicon->link->add_class('lock');
$lockicon->image->src = $OUTPUT->old_icon_url('t/lock'); $lockicon->image->src = $OUTPUT->pix_url('t/lock');
$lockicon->image->alt = $strlock; $lockicon->image->alt = $strlock;
$lockicon->image->title = $strlock; $lockicon->image->title = $strlock;
$action = $OUTPUT->action_icon($lockicon); $action = $OUTPUT->action_icon($lockicon);
@ -1633,7 +1633,7 @@ class grade_structure {
array('courseid' => $this->courseid, 'id' => $object->id)); array('courseid' => $this->courseid, 'id' => $object->id));
$calcicon->link->url = $gpr->add_url_params($calcicon->link->url); $calcicon->link->url = $gpr->add_url_params($calcicon->link->url);
$calcicon->image->src = $OUTPUT->old_icon_url($icon); $calcicon->image->src = $OUTPUT->pix_url($icon);
$calcicon->add_class('iconsmall'); $calcicon->add_class('iconsmall');
$calcicon->alt = $streditcalculation; $calcicon->alt = $streditcalculation;
$calcicon->title = $streditcalculation; $calcicon->title = $streditcalculation;
@ -2267,7 +2267,7 @@ function grade_button($type, $courseid, $object) {
$icon->link->url = new moodle_url('edit.php', array('courseid' => $courseid, 'id' => $object->id)); $icon->link->url = new moodle_url('edit.php', array('courseid' => $courseid, 'id' => $object->id));
} }
$icon->image->src = $OUTPUT->old_icon_url('t/'.$type); $icon->image->src = $OUTPUT->pix_url('t/'.$type);
$icon->image->add_class('iconsmall'); $icon->image->add_class('iconsmall');
$icon->image->title = ${'str'.$type}; $icon->image->title = ${'str'.$type};
$icon->image->alt = ${'str'.$type}; $icon->image->alt = ${'str'.$type};

10
grade/report/grader/lib.php
View file

@ -503,7 +503,7 @@ class grade_report_grader extends grade_report {
$string = ${'str' . $showhide}; $string = ${'str' . $showhide};
$toggleicon = new moodle_action_icon(); $toggleicon = new moodle_action_icon();
$toggleicon->image->src = $OUTPUT->old_icon_url($imagename); $toggleicon->image->src = $OUTPUT->pix_url($imagename);
$toggleicon->image->add_class('iconsmall'); $toggleicon->image->add_class('iconsmall');
$toggleicon->alt = $string; $toggleicon->alt = $string;
$toggleicon->title = $string; $toggleicon->title = $string;
@ -617,7 +617,7 @@ class grade_report_grader extends grade_report {
$userreporticon = new moodle_action_icon(); $userreporticon = new moodle_action_icon();
$userreporticon->link->url = new moodle_url($CFG->wwwroot.'/grade/report/user/index.php', array('userid' => $user->id, 'id' => $this->course->id)); $userreporticon->link->url = new moodle_url($CFG->wwwroot.'/grade/report/user/index.php', array('userid' => $user->id, 'id' => $this->course->id));
$userreporticon->image->add_class('iconsmall'); $userreporticon->image->add_class('iconsmall');
$userreporticon->image->src = $OUTPUT->old_icon_url('t/grades'); $userreporticon->image->src = $OUTPUT->pix_url('t/grades');
$userreporticon->image->alt = $strgradesforuser; $userreporticon->image->alt = $strgradesforuser;
$userreportcell->text = $OUTPUT->action_icon($userreporticon); $userreportcell->text = $OUTPUT->action_icon($userreporticon);
$userrow->cells[] = $userreportcell; $userrow->cells[] = $userreportcell;
@ -1417,15 +1417,15 @@ class grade_report_grader extends grade_report {
$contractexpandicon = new moodle_action_icon(); $contractexpandicon = new moodle_action_icon();
$contractexpandicon->link->url = new moodle_url($this->gpr->get_return_url(null, array('target'=>$element['eid'], 'action'=>'switch_minus', 'sesskey'=>sesskey()))); $contractexpandicon->link->url = new moodle_url($this->gpr->get_return_url(null, array('target'=>$element['eid'], 'action'=>'switch_minus', 'sesskey'=>sesskey())));
$contractexpandicon->image->add_class('iconsmall'); $contractexpandicon->image->add_class('iconsmall');
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_minus'); $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_minus');
$contractexpandicon->image->alt = $strswitchminus; $contractexpandicon->image->alt = $strswitchminus;
if (in_array($element['object']->id, $this->collapsed['aggregatesonly'])) { if (in_array($element['object']->id, $this->collapsed['aggregatesonly'])) {
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_plus'); $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_plus');
$contractexpandicon->image->alt = $strswitchplus; $contractexpandicon->image->alt = $strswitchplus;
$contractexpandicon->link->url->param('action', 'switch_plus'); $contractexpandicon->link->url->param('action', 'switch_plus');
} elseif (in_array($element['object']->id, $this->collapsed['gradesonly'])) { } elseif (in_array($element['object']->id, $this->collapsed['gradesonly'])) {
$contractexpandicon->image->src = $OUTPUT->old_icon_url('t/switch_whole'); $contractexpandicon->image->src = $OUTPUT->pix_url('t/switch_whole');
$contractexpandicon->image->alt = $strswitchwhole; $contractexpandicon->image->alt = $strswitchwhole;
$contractexpandicon->link->url->param('action', 'switch_whole'); $contractexpandicon->link->url->param('action', 'switch_whole');
} }

6
group/groupings.php
View file

@ -82,11 +82,11 @@ if ($groupings = $DB->get_records('groupings', array('courseid'=>$course->id), '
$line[2] = $DB->count_records('course_modules', array('course'=>$course->id, 'groupingid'=>$grouping->id)); $line[2] = $DB->count_records('course_modules', array('course'=>$course->id, 'groupingid'=>$grouping->id));
$buttons = "<a title=\"$stredit\" href=\"grouping.php?id=$grouping->id\"><img". $buttons = "<a title=\"$stredit\" href=\"grouping.php?id=$grouping->id\"><img".
" src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /></a> "; " src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /></a> ";
$buttons .= "<a title=\"$strdelete\" href=\"grouping.php?id=$grouping->id&amp;delete=1\"><img". $buttons .= "<a title=\"$strdelete\" href=\"grouping.php?id=$grouping->id&amp;delete=1\"><img".
" src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a> "; " src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /></a> ";
$buttons .= "<a title=\"$strmanagegrping\" href=\"assign.php?id=$grouping->id\"><img". $buttons .= "<a title=\"$strmanagegrping\" href=\"assign.php?id=$grouping->id\"><img".
" src=\"" . $OUTPUT->old_icon_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /></a> "; " src=\"" . $OUTPUT->pix_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /></a> ";
$line[3] = $buttons; $line[3] = $buttons;
$data[] = $line; $data[] = $line;

2
index.php
View file

@ -125,7 +125,7 @@
if ($editing) { if ($editing) {
$streditsummary = get_string('editsummary'); $streditsummary = get_string('editsummary');
echo "<a title=\"$streditsummary\" ". echo "<a title=\"$streditsummary\" ".
" href=\"course/editsection.php?id=$section->id\"><img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" ". " href=\"course/editsection.php?id=$section->id\"><img src=\"" . $OUTPUT->pix_url('t/edit') . "\" ".
" class=\"iconsmall\" alt=\"$streditsummary\" /></a><br /><br />"; " class=\"iconsmall\" alt=\"$streditsummary\" /></a><br /><br />";
} }

42
lib/adminlib.php
View file

@ -4755,14 +4755,14 @@ class admin_setting_manageauths extends admin_setting {
// hide/show link // hide/show link
if (in_array($auth, $authsenabled)) { if (in_array($auth, $authsenabled)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\">"; $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>"; // $hideshow = "<a href=\"$url&amp;action=disable&amp;auth=$auth\"><input type=\"checkbox\" checked /></a>";
$enabled = true; $enabled = true;
$displayname = "<span>$name</span>"; $displayname = "<span>$name</span>";
} }
else { else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\">"; $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>"; // $hideshow = "<a href=\"$url&amp;action=enable&amp;auth=$auth\"><input type=\"checkbox\" /></a>";
$enabled = false; $enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>"; $displayname = "<span class=\"dimmed_text\">$name</span>";
@ -4773,17 +4773,17 @@ class admin_setting_manageauths extends admin_setting {
if ($enabled) { if ($enabled) {
if ($updowncount > 1) { if ($updowncount > 1) {
$updown .= "<a href=\"$url&amp;action=up&amp;auth=$auth\">"; $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 { 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) { if ($updowncount < $authcount) {
$updown .= "<a href=\"$url&amp;action=down&amp;auth=$auth\">"; $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 { 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; ++ $updowncount;
} }
@ -4919,14 +4919,14 @@ class admin_setting_manageeditors extends admin_setting {
// hide/show link // hide/show link
if (in_array($editor, $active_editors)) { if (in_array($editor, $active_editors)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\">"; $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>"; // $hideshow = "<a href=\"$url&amp;action=disable&amp;editor=$editor\"><input type=\"checkbox\" checked /></a>";
$enabled = true; $enabled = true;
$displayname = "<span>$name</span>"; $displayname = "<span>$name</span>";
} }
else { else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\">"; $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>"; // $hideshow = "<a href=\"$url&amp;action=enable&amp;editor=$editor\"><input type=\"checkbox\" /></a>";
$enabled = false; $enabled = false;
$displayname = "<span class=\"dimmed_text\">$name</span>"; $displayname = "<span class=\"dimmed_text\">$name</span>";
@ -4937,17 +4937,17 @@ class admin_setting_manageeditors extends admin_setting {
if ($enabled) { if ($enabled) {
if ($updowncount > 1) { if ($updowncount > 1) {
$updown .= "<a href=\"$url&amp;action=up&amp;editor=$editor\">"; $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 { 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) { if ($updowncount < $editorcount) {
$updown .= "<a href=\"$url&amp;action=down&amp;editor=$editor\">"; $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 { 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; ++ $updowncount;
} }
@ -5123,13 +5123,13 @@ class admin_setting_manageportfolio extends admin_setting {
foreach ($instances as $i) { foreach ($instances as $i) {
$row = ''; $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 . '&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->old_icon_url('t/delete') . '" alt="' . get_string('delete') . '" /></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)) { 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 { } else {
$row .= ' <a href="' . $this->baseurl . '&hide=' . $i->get('id') . '"><img src="' . $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); $table->data[] = array($i->get('name'), $i->get_name() . ' (' . $i->get('plugin') . ')', $row);
if (!in_array($i->get('plugin'), $alreadyplugins)) { 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'); $hidetitle = $i->get_visible() ? get_string('clicktohide', 'repository') : get_string('clicktoshow', 'repository');
$hiddenshow = ' <a href="' . $this->baseurl . '&amp;hide=' . $i->get_typename() . '">' $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 . '" ' .' alt="' . $hidetitle . '" '
.' title="' . $hidetitle . '" />' .' title="' . $hidetitle . '" />'
.'</a>' . "\n"; .'</a>' . "\n";
@ -6030,14 +6030,14 @@ class admin_setting_managerepository extends admin_setting {
$spacer->width = 15; $spacer->width = 15;
if ($updowncount > 1) { if ($updowncount > 1) {
$updown .= "<a href=\"$this->baseurl&amp;move=up&amp;type=".$i->get_typename()."\">"; $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 { else {
$updown .= $OUTPUT->spacer($spacer); $updown .= $OUTPUT->spacer($spacer);
} }
if ($updowncount < count($instances)) { if ($updowncount < count($instances)) {
$updown .= "<a href=\"$this->baseurl&amp;move=down&amp;type=".$i->get_typename()."\">"; $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 { else {
$updown .= $OUTPUT->spacer($spacer); $updown .= $OUTPUT->spacer($spacer);
@ -6381,11 +6381,11 @@ class admin_setting_managewebserviceprotocols extends admin_setting {
// hide/show link // hide/show link
if (in_array($protocol, $active_protocols)) { if (in_array($protocol, $active_protocols)) {
$hideshow = "<a href=\"$url&amp;action=disable&amp;webservice=$protocol\">"; $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>"; $displayname = "<span>$name</span>";
} else { } else {
$hideshow = "<a href=\"$url&amp;action=enable&amp;webservice=$protocol\">"; $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>"; $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( $config = array(
'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above. 'wwwroot' => $CFG->httpswwwroot, // Yes, really. See above.
'sesskey' => sesskey(), '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(), 'themerev' => theme_get_revision(),
'theme' => $PAGE->theme->name, 'theme' => $PAGE->theme->name,
); );
@ -1363,22 +1363,22 @@ class jsportal {
$output .= " main.portal.strings['resource']='".get_string('resource')."';\n"; $output .= " main.portal.strings['resource']='".get_string('resource')."';\n";
$output .= " main.portal.strings['activity']='".get_string('activity')."';\n"; $output .= " main.portal.strings['activity']='".get_string('activity')."';\n";
$output .= " main.portal.strings['sesskey']='".sesskey()."';\n"; $output .= " main.portal.strings['sesskey']='".sesskey()."';\n";
$output .= " main.portal.icons['spacerimg']='".$OUTPUT->old_icon_url('spaces')."';\n"; $output .= " main.portal.icons['spacerimg']='".$OUTPUT->pix_url('spaces')."';\n";
$output .= " main.portal.icons['marker']='".$OUTPUT->old_icon_url('i/marker')."';\n"; $output .= " main.portal.icons['marker']='".$OUTPUT->pix_url('i/marker')."';\n";
$output .= " main.portal.icons['ihide']='".$OUTPUT->old_icon_url('i/hide')."';\n"; $output .= " main.portal.icons['ihide']='".$OUTPUT->pix_url('i/hide')."';\n";
$output .= " main.portal.icons['move_2d']='".$OUTPUT->old_icon_url('i/move_2d')."';\n"; $output .= " main.portal.icons['move_2d']='".$OUTPUT->pix_url('i/move_2d')."';\n";
$output .= " main.portal.icons['show']='".$OUTPUT->old_icon_url('t/show')."';\n"; $output .= " main.portal.icons['show']='".$OUTPUT->pix_url('t/show')."';\n";
$output .= " main.portal.icons['hide']='".$OUTPUT->old_icon_url('t/hide')."';\n"; $output .= " main.portal.icons['hide']='".$OUTPUT->pix_url('t/hide')."';\n";
$output .= " main.portal.icons['delete']='".$OUTPUT->old_icon_url('t/delete')."';\n"; $output .= " main.portal.icons['delete']='".$OUTPUT->pix_url('t/delete')."';\n";
$output .= " main.portal.icons['groupn']='".$OUTPUT->old_icon_url('t/groupn')."';\n"; $output .= " main.portal.icons['groupn']='".$OUTPUT->pix_url('t/groupn')."';\n";
$output .= " main.portal.icons['groups']='".$OUTPUT->old_icon_url('t/groups')."';\n"; $output .= " main.portal.icons['groups']='".$OUTPUT->pix_url('t/groups')."';\n";
$output .= " main.portal.icons['groupv']='".$OUTPUT->old_icon_url('t/groupv')."';\n"; $output .= " main.portal.icons['groupv']='".$OUTPUT->pix_url('t/groupv')."';\n";
if (right_to_left()) { if (right_to_left()) {
$output .= " main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/right')."';\n"; $output .= " main.portal.icons['backwards']='".$OUTPUT->pix_url('t/right')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/left')."';\n"; $output .= " main.portal.icons['forwards']='".$OUTPUT->pix_url('t/left')."';\n";
} else { } else {
$output .= " main.portal.icons['backwards']='".$OUTPUT->old_icon_url('t/left')."';\n"; $output .= " main.portal.icons['backwards']='".$OUTPUT->pix_url('t/left')."';\n";
$output .= " main.portal.icons['forwards']='".$OUTPUT->old_icon_url('t/right')."';\n"; $output .= " main.portal.icons['forwards']='".$OUTPUT->pix_url('t/right')."';\n";
} }
$output .= " onloadobj.load();\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]; $value = $_GET[$name];
} else if (isset($_GET['amp;'.$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]; $value = $_GET['amp;'.$name];
} }
switch($type) { 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'); $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) { if ($return) {
return $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 = mimeinfo_from_type('icon', $file->get_mimetype());
$icon = str_replace('.gif', '', $icon); $icon = str_replace('.gif', '', $icon);
$item->icon = $OUTPUT->old_icon_url('f/' . $icon); $item->icon = $OUTPUT->pix_url('f/' . $icon);
if ($icon == 'zip') { if ($icon == 'zip') {
$item->type = 'zip'; $item->type = 'zip';
@ -576,7 +576,7 @@ function file_get_draft_area_files($draftitemid, $filepath = '/') {
if ($file->is_directory()) { if ($file->is_directory()) {
$item->filesize = 0; $item->filesize = 0;
$item->icon = $OUTPUT->old_icon_url('f/folder'); $item->icon = $OUTPUT->pix_url('f/folder');
$item->type = 'folder'; $item->type = 'folder';
$foldername = explode('/', trim($item->filepath, '/')); $foldername = explode('/', trim($item->filepath, '/'));
$item->fullname = trim(array_pop($foldername), '/'); $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 * 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. * a return the full path to an icon.
* *
* <code> * <code>
* $mimetype = 'image/jpg'; * $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.'" />'; * echo '<img src="'.$icon.'" alt="'.$mimetype.'" />';
* </code> * </code>
* *
@ -1303,12 +1303,12 @@ function file_mimetype_icon($mimetype, $size=null) {
/** /**
* Returns the relative icon path for a given file name * 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. * a return the full path to an icon.
* *
* <code> * <code>
* $filename = 'jpg'; * $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" />'; * echo '<img src="'.$icon.'" alt="blah" />';
* </code> * </code>
* *

2
lib/form/modgrade.php
View file

@ -62,7 +62,7 @@ class MoodleQuickForm_modgrade extends MoodleQuickForm_select{
$grades[$i] = $i; $grades[$i] = $i;
} }
$this->load($grades); $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', $this->setHelpButton(array('/course/scales.php?id='. $COURSE->id .'&amp;list=true', 'ratingscales',
$linkobject, 400, 500, $strscales, 'none', true), 'link_to_popup_window'); $linkobject, 400, 500, $strscales, 'none', true), 'link_to_popup_window');
return $result; return $result;

6
lib/formslib.php
View file

@ -1090,9 +1090,9 @@ class MoodleQuickForm extends HTML_QuickForm_DHTMLRulesTableless {
}else { }else {
$this->updateAttributes(array('class'=>'mform')); $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->_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->old_icon_url('adv') .'" />'; $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->old_icon_url('req') .'" />')); $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)); //(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}", 'url' => "{$gdoc->link[0]->attributes()->href}",
'source' => $source, 'source' => $source,
'date' => usertime(strtotime($gdoc->updated)), '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) { function image_icon($action, $url, $icon) {
global $OUTPUT; global $OUTPUT;
return '<a title="' . $action .'" href="'.$url.'"> 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() { function image_spacer() {
global $OUTPUT; 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['text'] = 'This is a new nav item';
* $properties['short'] = 'This is a new nav item'; * $properties['short'] = 'This is a new nav item';
* $properties['action'] = moodle_url($CFG->wwwroot.'/course/category.php'); * $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['type'] = navigation_node::TYPE_COURSE;
* $properties['key'] = 'newitem'; * $properties['key'] = 'newitem';
* $PAGE->navigation->newitem = $properties; * $PAGE->navigation->newitem = $properties;
@ -1092,7 +1092,7 @@ class global_navigation extends navigation_node {
$icon = null; $icon = null;
if (!in_array($module->modname, $resources)) { if (!in_array($module->modname, $resources)) {
if ($module->icon=='') { 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)); $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY; $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)); $url = new moodle_url('/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
} }
if ($module->icon!=='') { 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); $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; $icon = null;
if (!in_array($module->modname, $resources)) { if (!in_array($module->modname, $resources)) {
if ($module->icon=='') { 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)); $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY; $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)); $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
} }
if ($module->icon!=='') { 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; $path = $keys;
@ -1364,7 +1364,7 @@ class global_navigation extends navigation_node {
$category = $this->find_child($categoryid); $category = $this->find_child($categoryid);
} }
if ($category!==false) { 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) { if (!$course->visible) {
$category->get($course->id)->hidden = true; $category->get($course->id)->hidden = true;
} }
@ -1404,7 +1404,7 @@ class global_navigation extends navigation_node {
return; return;
} }
$url = new moodle_url($CFG->wwwroot.'/course/view.php', array('id'=>$course->id)); $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); $currentcourse = $this->find_child($course->id, self::TYPE_COURSE);
if ($currentcourse!==false){ if ($currentcourse!==false){
$currentcourse->make_active(); $currentcourse->make_active();
@ -1419,7 +1419,7 @@ class global_navigation extends navigation_node {
if ($participants) { if ($participants) {
$participants->mainnavonly = true; $participants->mainnavonly = true;
$url = new moodle_url($CFG->wwwroot.'/user/index.php?id='.$course->id); $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'); require_once($CFG->dirroot.'/blog/lib.php');
@ -1446,7 +1446,7 @@ class global_navigation extends navigation_node {
// View course reports // View course reports
if (has_capability('moodle/site:viewreports', $this->context)) { // basic capability for listing of 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); $reportnav = $currentcourse->get($reportkey);
if ($reportnav) { if ($reportnav) {
$coursereports = get_plugin_list('coursereport'); $coursereports = get_plugin_list('coursereport');
@ -2026,7 +2026,7 @@ class limited_global_navigation extends global_navigation {
$icon = null; $icon = null;
if (!in_array($module->modname, $resources)) { if (!in_array($module->modname, $resources)) {
if ($module->icon=='') { 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)); $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
$type = navigation_node::TYPE_ACTIVITY; $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)); $url = new moodle_url($CFG->wwwroot.'/mod/'.$module->modname.'/view.php', array('id'=>$module->id));
} }
if ($module->icon!=='') { 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); $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(); $realuser = session_get_realuser();
// Add the informative return to original user link // 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())); $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 // 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); $this->load_administration_settings($reference, $branch);
} }
} else { } 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'); $url->param('edit', 'on');
$editstring = get_string('turneditingon'); $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()) { if ($this->page->user_is_editing()) {
// Add `add` resources|activities branches // Add `add` resources|activities branches
@ -2740,16 +2740,16 @@ class settings_navigation extends navigation_node {
// Add the course settings link // Add the course settings link
$url = new moodle_url($CFG->wwwroot.'/course/edit.php', array('id'=>$course->id)); $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 // Add assign or override roles if allowed
if (has_capability('moodle/role:assign', $course->context)) { if (has_capability('moodle/role:assign', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php', array('contextid'=>$course->context->id)); $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)) { } 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)); $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 // Add view grade report is permitted
@ -2771,22 +2771,22 @@ class settings_navigation extends navigation_node {
} }
if ($reportavailable) { if ($reportavailable) {
$url = new moodle_url($CFG->wwwroot.'/grade/report/index.php', array('id'=>$course->id)); $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 // Add outcome if permitted
if (!empty($CFG->enableoutcomes) && has_capability('moodle/course:update', $course->context)) { 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)); $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 // Add meta course links
if ($course->metacourse) { if ($course->metacourse) {
if (has_capability('moodle/course:managemetacourse', $course->context)) { if (has_capability('moodle/course:managemetacourse', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/importstudents.php', array('id'=>$course->id)); $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)) { } 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;; $coursenode->get($key)->hidden = true;;
} }
} }
@ -2794,31 +2794,31 @@ class settings_navigation extends navigation_node {
// Manage groups in this course // Manage groups in this course
if (($course->groupmode || !$course->groupmodeforce) && has_capability('moodle/course:managegroups', $course->context)) { 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)); $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 // Backup this course
if (has_capability('moodle/site:backup', $course->context)) { if (has_capability('moodle/site:backup', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/backup/backup.php', array('id'=>$course->id)); $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 // Restore to this course
if (has_capability('moodle/site:restore', $course->context)) { if (has_capability('moodle/site:restore', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id, 'wdir'=>'/backupdata')); $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 // Import data from other courses
if (has_capability('moodle/site:import', $course->context)) { if (has_capability('moodle/site:import', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/import.php', array('id'=>$course->id)); $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 // Reset this course
if (has_capability('moodle/course:reset', $course->context)) { if (has_capability('moodle/course:reset', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/course/reset.php', array('id'=>$course->id)); $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 // Manage questions
@ -2836,7 +2836,7 @@ class settings_navigation extends navigation_node {
} }
if (isset($questionlink)) { if (isset($questionlink)) {
$url = new moodle_url($questionlink, array('courseid'=>$course->id)); $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 // Repository Instances
@ -2844,25 +2844,25 @@ class settings_navigation extends navigation_node {
$editabletypes = repository::get_editable_types($this->context); $editabletypes = repository::get_editable_types($this->context);
if (has_capability('moodle/course:update', $this->context) && !empty($editabletypes)) { 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)); $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 // Manage files
if (has_capability('moodle/course:managefiles', $this->context)) { if (has_capability('moodle/course:managefiles', $this->context)) {
$url = new moodle_url($CFG->wwwroot.'/files/index.php', array('id'=>$course->id)); $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 // Authorize hooks
if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) { if ($course->enrol == 'authorize' || (empty($course->enrol) && $CFG->enrol == 'authorize')) {
require_once($CFG->dirroot.'/enrol/authorize/const.php'); require_once($CFG->dirroot.'/enrol/authorize/const.php');
$url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id)); $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)) { if (has_capability('enrol/authorize:managepayments', $this->page->context)) {
$cnt = $DB->count_records('enrol_authorize', array('status'=>AN_STATUS_AUTH, 'courseid'=>$course->id)); $cnt = $DB->count_records('enrol_authorize', array('status'=>AN_STATUS_AUTH, 'courseid'=>$course->id));
if ($cnt) { if ($cnt) {
$url = new moodle_url($CFG->wwwroot.'/enrol/authorize/index.php', array('course'=>$course->id,'status'=>AN_STATUS_AUTH)); $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 (empty($course->metacourse)) {
if (has_capability('moodle/legacy:guest', $this->context, NULL, false)) { // Are a guest now 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)); $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 } 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)); $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) // Link to the user own profile (except guests)
if (!isguestuser() and isloggedin()) { if (!isguestuser() and isloggedin()) {
$url = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$USER->id, 'course'=>$course->id)); $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 // Switch roles
@ -2911,7 +2911,7 @@ class settings_navigation extends navigation_node {
$SESSION->returnurl = serialize($returnurl); $SESSION->returnurl = serialize($returnurl);
foreach ($roles as $key=>$name) { foreach ($roles as $key=>$name) {
$url = new moodle_url($CFG->wwwroot.'/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>$key, 'returnurl'=>'1')); $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 // Return we are done
@ -3236,17 +3236,17 @@ class settings_navigation extends navigation_node {
$url->param('edit', 'on'); $url->param('edit', 'on');
$editstring = get_string('turneditingon'); $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 // Add the course settings link
$url = new moodle_url($CFG->wwwroot.'/admin/settings.php', array('section'=>'frontpagesettings')); $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 //Participants
if (has_capability('moodle/site:viewparticipants', $course->context)) { if (has_capability('moodle/site:viewparticipants', $course->context)) {
$url = new moodle_url($CFG->wwwroot.'/user/index.php?contextid='.$course->context->id); $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')); $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) } else { // Print default user pictures (use theme version if available)
$this->add_class('defaultuserpic'); $this->add_class('defaultuserpic');
$this->image->src = $OUTPUT->old_icon_url('u/' . $file); $this->image->src = $OUTPUT->pix_url('u/' . $file);
} }
if ($this->alttext) { if ($this->alttext) {
@ -2040,7 +2040,7 @@ class moodle_help_icon extends labelled_html_component {
if ($image instanceof moodle_url) { if ($image instanceof moodle_url) {
$this->image->src = $image->out(); $this->image->src = $image->out();
} else if ($image === true) { } else if ($image === true) {
$this->image->src = $OUTPUT->old_icon_url('help'); $this->image->src = $OUTPUT->pix_url('help');
} else if (is_string($image)) { } else if (is_string($image)) {
$this->image->src = $image; $this->image->src = $image;
} }
@ -2056,7 +2056,7 @@ class moodle_help_icon extends labelled_html_component {
if (!($this->image instanceof html_image)) { if (!($this->image instanceof html_image)) {
$this->image = new html_image(); $this->image = new html_image();
} }
$this->image->src = $OUTPUT->old_icon_url('help'); $this->image->src = $OUTPUT->pix_url('help');
} }
parent::prepare(); 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 * A (possibly empty) array of editing controls. Each element of this array
* should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption). * 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 * @var array
*/ */
public $controls = array(); public $controls = array();

6
lib/outputrenderers.php
View file

@ -149,12 +149,6 @@ class renderer_base {
return $classes; 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 * Return the moodle_url for an image
* *

4
lib/portfoliolib.php
View file

@ -341,11 +341,11 @@ class portfolio_add_button {
break; break;
case PORTFOLIO_ADD_ICON_FORM: case PORTFOLIO_ADD_ICON_FORM:
$formoutput .= $selectoutput; $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>'; $formoutput .= "\n" . '</form>';
break; break;
case PORTFOLIO_ADD_ICON_LINK: 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; break;
case PORTFOLIO_ADD_TEXT_LINK: case PORTFOLIO_ADD_TEXT_LINK:
$linkoutput .= '">' . $addstr .'</a>'; $linkoutput .= '">' . $addstr .'</a>';

6
lib/questionlib.php
View file

@ -1468,7 +1468,7 @@ function question_get_feedback_image($fraction, $selected=true) {
$size = 'small'; $size = 'small';
} }
$class = question_get_feedback_class($fraction); $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" />'; '" alt="' . get_string($class, 'quiz') . '" class="icon" />';
} }
@ -2099,8 +2099,8 @@ function question_init_qengine_js() {
global $CFG, $PAGE, $OUTPUT; global $CFG, $PAGE, $OUTPUT;
$config = array( $config = array(
'actionurl' => $CFG->wwwroot . '/question/toggleflag.php', 'actionurl' => $CFG->wwwroot . '/question/toggleflag.php',
'flagicon' => $OUTPUT->old_icon_url('i/flagged'), 'flagicon' => $OUTPUT->pix_url('i/flagged'),
'unflagicon' => $OUTPUT->old_icon_url('i/unflagged'), 'unflagicon' => $OUTPUT->pix_url('i/unflagged'),
'flagtooltip' => get_string('clicktoflag', 'question'), 'flagtooltip' => get_string('clicktoflag', 'question'),
'unflagtooltip' => get_string('clicktounflag', 'question'), 'unflagtooltip' => get_string('clicktounflag', 'question'),
'flaggedalt' => get_string('flagged', '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); $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>'; 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 //write image info
$rsspix = $OUTPUT->old_icon_url('i/rsssitelogo'); $rsspix = $OUTPUT->pix_url('i/rsssitelogo');
//write the info //write the info
$result .= rss_start_tag('image', 2, true); $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($this->is_collapsible) {
if(!empty($this->sess->collapse[$column])) { if(!empty($this->sess->collapse[$column])) {
// some headers contain < br/> tags, do not include in title // 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) { else if($this->headers[$index] !== NULL) {
// some headers contain < br/> tags, do not include in title // 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') { if($primary_sort_column == 'firstname') {
$lsortorder = get_string('asc'); $lsortorder = get_string('asc');
if($primary_sort_order == SORT_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'); $fsortorder = get_string('asc');
} }
else { 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'); $fsortorder = get_string('desc');
} }
} }
else if($primary_sort_column == 'lastname') { else if($primary_sort_column == 'lastname') {
$fsortorder = get_string('asc'); $fsortorder = get_string('asc');
if($primary_sort_order == SORT_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'); $lsortorder = get_string('asc');
} }
else { 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'); $lsortorder = get_string('desc');
} }
} else { } else {
@ -1083,11 +1083,11 @@ class flexible_table {
if($this->is_sortable($column)) { if($this->is_sortable($column)) {
if($primary_sort_column == $column) { if($primary_sort_column == $column) {
if($primary_sort_order == SORT_ASC) { 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'); $localsortorder = get_string('asc');
} }
else { 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'); $localsortorder = get_string('desc');
} }
} else { } else {

2
lib/upgradelib.php
View file

@ -1025,7 +1025,7 @@ function print_upgrade_reload($url) {
echo "<br />"; echo "<br />";
echo '<div class="continuebutton">'; 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 />'; echo '</div><br />';
} }

25
lib/weblib.php
View file

@ -478,7 +478,7 @@ class moodle_url {
* @return string * @return string
*/ */
public function __toString() { public function __toString() {
$this->out(false, null, true); return $this->out(false, null, true);
} }
/** /**
@ -508,6 +508,15 @@ class moodle_url {
return $uri; 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. * Return a URL relative to $CFG->wwwroot.
* *
@ -1560,7 +1569,7 @@ function replace_smilies(&$text) {
$alttext = get_string($image, 'pix'); $alttext = get_string($image, 'pix');
$alttext = preg_replace('/^\[\[(.*)\]\]$/', '$1', $alttext); /// Clean alttext in case there isn't lang string for it. $alttext = preg_replace('/^\[\[(.*)\]\]$/', '$1', $alttext); /// Clean alttext in case there isn't lang string for it.
$e[$lang][] = $emoticon; $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">'; $output = '<ul id="emoticonlist">';
foreach ($items as $item) { foreach ($items as $item) {
$item = explode('{:}', $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>'; $item[0] . '" /><code>' . $item[0] . '</code></li>';
} }
$output .= '</ul>'; $output .= '</ul>';
@ -2124,7 +2133,7 @@ function print_collapsible_region_start($classes, $id, $caption, $userpref = fal
$output .= '</div><div id="' . $id . '_inner" class="collapsibleregioninner">'; $output .= '</div><div id="' . $id . '_inner" class="collapsibleregioninner">';
$PAGE->requires->js_function_call('new collapsible_region', $PAGE->requires->js_function_call('new collapsible_region',
array($id, $userpref, get_string('clicktohideshow'), 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) { if ($return) {
return $output; return $output;
@ -2480,7 +2489,7 @@ function navmenulist($course, $sections, $modinfo, $strsection, $strjumpto, $wid
$class = 'activity '.$mod->modname; $class = 'activity '.$mod->modname;
$class .= ($cmid == $mod->id) ? ' selected' : ''; $class .= ($cmid == $mod->id) ? ' selected' : '';
$menu[] = '<li class="'.$class.'">'. $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>'; '<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)); $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 = 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->add_action(new popup_action('click', $link->url, 'ratingscales', array('height' => 400, 'width' => 500)));
$link->title = $strscales; $link->title = $strscales;
@ -2618,7 +2627,7 @@ function editorhelpbutton(){
$alttag = join (', ', $titles); $alttag = join (', ', $titles);
$paramstring = join('&', $urlparams); $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 = 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->add_action(new popup_action('click', $link->url, 'popup', array('height' => 400, 'width' => 500)));
$link->title = $alttag; $link->title = $alttag;
@ -2646,7 +2655,7 @@ function emoticonhelpbutton($form, $field, $return = false) {
$SESSION->inserttextform = $form; $SESSION->inserttextform = $form;
$SESSION->inserttextfield = $field; $SESSION->inserttextfield = $field;
$helpicon = moodle_help_icon::make('emoticons2', get_string('helpemoticons'), 'moodle', true); $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->image->add_class('emoticon');
$helpicon->style = "margin-left:3px; padding-right:1px;width:15px;height:15px;"; $helpicon->style = "margin-left:3px; padding-right:1px;width:15px;height:15px;";
$help = $OUTPUT->help_icon($helpicon); $help = $OUTPUT->help_icon($helpicon);

6
message/lib.php
View file

@ -605,7 +605,7 @@ function message_contact_link($userid, $linktype='add', $return=false, $script="
$output = '<span class="'.$linktype.'">'. $output = '<span class="'.$linktype.'">'.
'<a href="'.$script.'&amp;'.$command.'='.$userid. '<a href="'.$script.'&amp;'.$command.'='.$userid.
'&amp;sesskey='.sesskey().'" title="'.s($string).'">'. '&amp;sesskey='.sesskey().'" title="'.s($string).'">'.
'<img src="'.$OUTPUT->old_icon_url($icon).'" class="iconsmall" alt="'.s($alttext).'" />'. '<img src="'.$OUTPUT->pix_url($icon).'" class="iconsmall" alt="'.s($alttext).'" />'.
$text.'</a></span>'; $text.'</a></span>';
if ($return) { if ($return) {
@ -636,9 +636,9 @@ function message_history_link($userid1, $userid2=0, $returnstr=false, $keywords=
} }
if ($linktext == 'icon') { // Icon only if ($linktext == 'icon') { // Icon only
$fulllink = '<img src="'.$OUTPUT->old_icon_url('t/log') . '" class="iconsmall" alt="'.$strmessagehistory.'" />'; $fulllink = '<img src="'.$OUTPUT->pix_url('t/log') . '" class="iconsmall" alt="'.$strmessagehistory.'" />';
} else if ($linktext == 'both') { // Icon and standard name } else if ($linktext == 'both') { // Icon and standard name
$fulllink = '<img src="'.$OUTPUT->old_icon_url('t/log') . '" class="iconsmall" alt="" />'; $fulllink = '<img src="'.$OUTPUT->pix_url('t/log') . '" class="iconsmall" alt="" />';
$fulllink .= '&nbsp;'.$strmessagehistory; $fulllink .= '&nbsp;'.$strmessagehistory;
} else if ($linktext) { // Custom name } else if ($linktext) { // Custom name
$fulllink = $linktext; $fulllink = $linktext;

4
mod/assignment/lib.php
View file

@ -1811,7 +1811,7 @@ class assignment_base {
$found = true; $found = true;
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
$output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>'; $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
if ($this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) { if ($this->portfolio_exportable() && has_capability('mod/assignment:exportownsubmission', $this->context)) {
$button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id()), '/mod/assignment/locallib.php'); $button->set_callback_options('assignment_portfolio_caller', array('id' => $this->cm->id, 'fileid' => $file->get_id()), '/mod/assignment/locallib.php');
$button->set_format_by_file($file); $button->set_format_by_file($file);
@ -2897,7 +2897,7 @@ function assignment_print_recent_mod_activity($activity, $courseid, $detail, $mo
if ($detail) { if ($detail) {
$modname = $modnames[$activity->type]; $modname = $modnames[$activity->type];
echo '<div class="title">'; echo '<div class="title">';
echo "<img src=\"" . $OUTPUT->old_icon_url('icon', 'assignment') . "\" ". echo "<img src=\"" . $OUTPUT->pix_url('icon', 'assignment') . "\" ".
"class=\"icon\" alt=\"$modname\">"; "class=\"icon\" alt=\"$modname\">";
echo "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}</a>"; echo "<a href=\"$CFG->wwwroot/mod/assignment/view.php?id={$activity->cmid}\">{$activity->name}</a>";
echo '</div>'; echo '</div>';

4
mod/assignment/type/online/assignment.class.php
View file

@ -198,7 +198,7 @@ class assignment_online extends assignment_base {
$popup = $OUTPUT->link($link); $popup = $OUTPUT->link($link);
$output = '<div class="files">'. $output = '<div class="files">'.
'<img src="'.$OUTPUT->old_icon_url('f/html') . '" class="icon" alt="html" />'. '<img src="'.$OUTPUT->pix_url('f/html') . '" class="icon" alt="html" />'.
$popup . $popup .
'</div>'; '</div>';
return $output; return $output;
@ -217,7 +217,7 @@ class assignment_online extends assignment_base {
$popup = $OUTPUT->link($link); $popup = $OUTPUT->link($link);
$output = '<div class="files">'. $output = '<div class="files">'.
'<img align="middle" src="'.$OUTPUT->old_icon_url('f/html') . '" height="16" width="16" alt="html" />'. '<img align="middle" src="'.$OUTPUT->pix_url('f/html') . '" height="16" width="16" alt="html" />'.
$popup . $popup .
'</div>'; '</div>';

12
mod/assignment/type/upload/assignment.class.php
View file

@ -291,7 +291,7 @@ class assignment_upload extends assignment_base {
$found = true; $found = true;
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
$output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a>&nbsp;'; $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a>&nbsp;';
} }
@ -350,13 +350,13 @@ class assignment_upload extends assignment_base {
$filename = $file->get_filename(); $filename = $file->get_filename();
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
$output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>'; $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'.s($filename).'</a>';
if ($candelete) { if ($candelete) {
$delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid={$submission->userid}&amp;mode=$mode&amp;offset=$offset"; $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid={$submission->userid}&amp;mode=$mode&amp;offset=$offset";
$output .= '<a href="'.$delurl.'">&nbsp;' $output .= '<a href="'.$delurl.'">&nbsp;'
.'<img title="'.$strdelete.'" src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="" /></a> '; .'<img title="'.$strdelete.'" src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="" /></a> ';
} }
if (has_capability('mod/assignment:exportownsubmission', $this->context)) { if (has_capability('mod/assignment:exportownsubmission', $this->context)) {
@ -412,13 +412,13 @@ class assignment_upload extends assignment_base {
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_response/'.$userid.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_response/'.$userid.'/'.$filename);
$output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.$filename.'</a>'; $output .= '<a href="'.$path.'" ><img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.$filename.'</a>';
if ($candelete) { if ($candelete) {
$delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid=$userid&amp;mode=$mode&amp;offset=$offset&amp;action=response"; $delurl = "$CFG->wwwroot/mod/assignment/delete.php?id={$this->cm->id}&amp;file=".rawurlencode($filename)."&amp;userid=$userid&amp;mode=$mode&amp;offset=$offset&amp;action=response";
$output .= '<a href="'.$delurl.'">&nbsp;' $output .= '<a href="'.$delurl.'">&nbsp;'
.'<img title="'.$strdelete.'" src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt=""/></a> '; .'<img title="'.$strdelete.'" src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt=""/></a> ';
} }
$output .= '&nbsp;'; $output .= '&nbsp;';
@ -1090,7 +1090,7 @@ class assignment_upload extends assignment_base {
$filename = $file->get_filename(); $filename = $file->get_filename();
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename); $link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename);
$node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url(file_mimetype_icon($mimetype))); $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url(file_mimetype_icon($mimetype)));
} }
} }
} }

4
mod/assignment/type/uploadsingle/assignment.class.php
View file

@ -22,7 +22,7 @@ class assignment_uploadsingle extends assignment_base {
$found = true; $found = true;
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$userid.'/'.$filename);
$output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a><br />'; $output .= '<a href="'.$path.'" ><img class="icon" src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" alt="'.$mimetype.'" />'.s($filename).'</a><br />';
} }
} }
@ -214,7 +214,7 @@ class assignment_uploadsingle extends assignment_base {
$filename = $file->get_filename(); $filename = $file->get_filename();
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename); $link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/assignment_submission/'.$USER->id.'/'.$filename);
$node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url(file_mimetype_icon($mimetype))); $node->get($filekey)->add($filename, $link, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url(file_mimetype_icon($mimetype)));
} }
} }
} }

4
mod/chat/lib.php
View file

@ -1268,7 +1268,7 @@ function chat_extend_navigation($navigation, $course, $module, $cm) {
foreach ($links as $link) { foreach ($links as $link) {
$link->add_action(new popup_action('click', $link->url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700))); $link->add_action(new popup_action('click', $link->url, 'chat'.$course->id.$cm->instance.$currentgroup, array('height' => 500, 'width' => 700)));
$link->title = get_string('modulename', 'chat'); $link->title = get_string('modulename', 'chat');
$navigation->add($link->title, $link, navigation_node::TYPE_ACTIVITY, null ,null, $OUTPUT->old_icon_url('c/group')); $navigation->add($link->title, $link, navigation_node::TYPE_ACTIVITY, null ,null, $OUTPUT->pix_url('c/group'));
} }
} }
@ -1278,7 +1278,7 @@ function chat_extend_navigation($navigation, $course, $module, $cm) {
$users = $navigation->get($userskey); $users = $navigation->get($userskey);
foreach ($chatusers as $chatuser) { foreach ($chatusers as $chatuser) {
$userlink = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$chatuser->id,'course'=>$course->id)); $userlink = new moodle_url($CFG->wwwroot.'/user/view.php', array('id'=>$chatuser->id,'course'=>$course->id));
$users->add(fullname($chatuser).' '.format_time(time() - $chatuser->lastmessageping), $userlink, navigation_node::TYPE_USER, null, null, $OUTPUT->old_icon_url('c/user')); $users->add(fullname($chatuser).' '.format_time(time() - $chatuser->lastmessageping), $userlink, navigation_node::TYPE_USER, null, null, $OUTPUT->pix_url('c/user'));
} }
} }
} }

4
mod/data/field.php
View file

@ -290,10 +290,10 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { ///
shorten_text($field->field->description, 30), shorten_text($field->field->description, 30),
'<a href="field.php?d='.$data->id.'&amp;mode=display&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'. '<a href="field.php?d='.$data->id.'&amp;mode=display&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>'. '<img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>'.
'&nbsp;'. '&nbsp;'.
'<a href="field.php?d='.$data->id.'&amp;mode=delete&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'. '<a href="field.php?d='.$data->id.'&amp;mode=delete&amp;fid='.$field->field->id.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>' '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>'
); );
} }

4
mod/data/field/file/field.class.php
View file

@ -60,7 +60,7 @@ class data_field_file extends data_field_base {
// Print icon if file already exists // Print icon if file already exists
$browser = get_file_browser(); $browser = get_file_browser();
$src = file_encode_url($CFG->wwwroot.'/pluginfile.php', $this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename()); $src = file_encode_url($CFG->wwwroot.'/pluginfile.php', $this->context->id.'/data_content/'.$content->id.'/'.$file->get_filename());
$str .= '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" class="icon" alt="'.$file->get_mimetype().'" />'. $str .= '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype())).'" class="icon" alt="'.$file->get_mimetype().'" />'.
'<a href="'.$src.'" >'.s($file->get_filename()).'</a>'; '<a href="'.$src.'" >'.s($file->get_filename()).'</a>';
} }
return $str; return $str;
@ -121,7 +121,7 @@ class data_field_file extends data_field_base {
$width = $this->field->param1 ? ' width = "'.s($this->field->param1).'" ':' '; $width = $this->field->param1 ? ' width = "'.s($this->field->param1).'" ':' ';
$height = $this->field->param2 ? ' height = "'.s($this->field->param2).'" ':' '; $height = $this->field->param2 ? ' height = "'.s($this->field->param2).'" ':' ';
$str = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())).'" height="16" width="16" alt="'.$file->get_mimetype().'" />&nbsp;'. $str = '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype())).'" height="16" width="16" alt="'.$file->get_mimetype().'" />&nbsp;'.
'<a href="'.$src.'" >'.s($name).'</a>'; '<a href="'.$src.'" >'.s($name).'</a>';
return $str; return $str;
} }

10
mod/data/lib.php
View file

@ -430,7 +430,7 @@ class data_field_base { // Base class for Database Field Types (see field/*/
global $OUTPUT; global $OUTPUT;
$str = '<a href="field.php?d='.$this->data->id.'&amp;fid='.$this->field->id.'&amp;mode=display&amp;sesskey='.sesskey().'">'; $str = '<a href="field.php?d='.$this->data->id.'&amp;fid='.$this->field->id.'&amp;mode=display&amp;sesskey='.sesskey().'">';
$str .= '<img src="'.$OUTPUT->old_icon_url('/field/' . $this->type . '/icon', 'data') . '" '; $str .= '<img src="'.$OUTPUT->pix_url('/field/' . $this->type . '/icon', 'data') . '" ';
$str .= 'height="'.$this->iconheight.'" width="'.$this->iconwidth.'" alt="'.$this->type.'" title="'.$this->type.'" /></a>'; $str .= 'height="'.$this->iconheight.'" width="'.$this->iconwidth.'" alt="'.$this->type.'" title="'.$this->type.'" /></a>';
return $str; return $str;
} }
@ -1223,9 +1223,9 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
$patterns[]='##delete##'; $patterns[]='##delete##';
if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) { if (has_capability('mod/data:manageentries', $context) or data_isowner($record->id)) {
$replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d=' $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/edit.php?d='
.$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>'; .$data->id.'&amp;rid='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/edit') . '" class="iconsmall" alt="'.get_string('edit').'" title="'.get_string('edit').'" /></a>';
$replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d=' $replacement[] = '<a href="'.$CFG->wwwroot.'/mod/data/view.php?d='
.$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>'; .$data->id.'&amp;delete='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.get_string('delete').'" title="'.get_string('delete').'" /></a>';
} else { } else {
$replacement[] = ''; $replacement[] = '';
$replacement[] = ''; $replacement[] = '';
@ -1236,7 +1236,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
$moreurl .= '&amp;filter=1'; $moreurl .= '&amp;filter=1';
} }
$patterns[]='##more##'; $patterns[]='##more##';
$replacement[] = '<a href="' . $moreurl . '"><img src="' . $OUTPUT->old_icon_url('i/search') . '" class="iconsmall" alt="' . get_string('more', 'data') . '" title="' . get_string('more', 'data') . '" /></a>'; $replacement[] = '<a href="' . $moreurl . '"><img src="' . $OUTPUT->pix_url('i/search') . '" class="iconsmall" alt="' . get_string('more', 'data') . '" title="' . get_string('more', 'data') . '" /></a>';
$patterns[]='##moreurl##'; $patterns[]='##moreurl##';
$replacement[] = $moreurl; $replacement[] = $moreurl;
@ -1268,7 +1268,7 @@ function data_print_template($template, $records, $data, $search='', $page=0, $r
$patterns[]='##approve##'; $patterns[]='##approve##';
if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){ if (has_capability('mod/data:approve', $context) && ($data->approval) && (!$record->approved)){
$replacement[] = '<span class="approve"><a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->old_icon_url('i/approve') . '" class="icon" alt="'.get_string('approve').'" /></a></span>'; $replacement[] = '<span class="approve"><a href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$data->id.'&amp;approve='.$record->id.'&amp;sesskey='.sesskey().'"><img src="'.$OUTPUT->pix_url('i/approve') . '" class="icon" alt="'.get_string('approve').'" /></a></span>';
} else { } else {
$replacement[] = ''; $replacement[] = '';
} }

2
mod/data/preset.php
View file

@ -394,7 +394,7 @@ foreach ($presets as $id => $preset) {
$dellink = ''; $dellink = '';
if ($preset->userid > 0 and ($preset->userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) { if ($preset->userid > 0 and ($preset->userid == $USER->id || has_capability('mod/data:manageuserpresets', $context))) {
$dellink = '&nbsp;<a href="preset.php?d='.$data->id.'&amp;action=confirmdelete&amp;fullname='.$fullname.'&amp;sesskey='.sesskey().'">'. $dellink = '&nbsp;<a href="preset.php?d='.$data->id.'&amp;action=confirmdelete&amp;fullname='.$fullname.'&amp;sesskey='.sesskey().'">'.
'<img src="'.$OUTPUT->old_icon_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.' '.$desc.'" /></a>'; '<img src="'.$OUTPUT->pix_url('t/delete') . '" class="iconsmall" alt="'.$strdelete.' '.$desc.'" /></a>';
} }
echo '<input type="radio" name="fullname" id="usepreset'.$i.'" value="'.$fullname.'" /><label for="usepreset'.$i++.'">'.$desc.'</label>'.$dellink.'<br />'; echo '<input type="radio" name="fullname" id="usepreset'.$i.'" value="'.$fullname.'" /><label for="usepreset'.$i++.'">'.$desc.'</label>'.$dellink.'<br />';

2
mod/feedback/delete_template.php
View file

@ -116,7 +116,7 @@ if($shoulddelete == 1) {
echo '<tr><td align="center">'.$template->name.'</td>'; echo '<tr><td align="center">'.$template->name.'</td>';
echo '<td align="center">'; echo '<td align="center">';
echo '<form action="'.$ME.'" method="post">'; echo '<form action="'.$ME.'" method="post">';
echo '<input title="'.get_string('delete_template','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/delete') . '" hspace="1" height="11" width="11" border="0" />'; echo '<input title="'.get_string('delete_template','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/delete') . '" hspace="1" height="11" width="11" border="0" />';
echo '<input type="hidden" name="deletetempl" value="'.$template->id.'" />'; echo '<input type="hidden" name="deletetempl" value="'.$template->id.'" />';
echo '<input type="hidden" name="shoulddelete" value="1" />'; echo '<input type="hidden" name="shoulddelete" value="1" />';
echo '<input type="hidden" name="id" value="'.$id.'" />'; echo '<input type="hidden" name="id" value="'.$id.'" />';

36
mod/feedback/edit.php
View file

@ -234,11 +234,11 @@ if($do_show == 'edit') {
echo '<td>'; echo '<td>';
$buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition); $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'"> echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->old_icon_url('movehere') . '" /> <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>'; </a>';
// echo '<form action="'.$ME.'" method="post"><fieldset>'; // echo '<form action="'.$ME.'" method="post"><fieldset>';
// echo '<input title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('movehere') . '" hspace="1" height="16" width="80" border="0" />'; // echo '<input title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" hspace="1" height="16" width="80" border="0" />';
// echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />'; // echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';
@ -270,12 +270,12 @@ if($do_show == 'edit') {
if($feedbackitem->position > 1){ if($feedbackitem->position > 1){
$buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveupitem='.$feedbackitem->id); $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveupitem='.$feedbackitem->id);
echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'"> echo '<a class="icon up" title="'.get_string('moveup_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/up') . '" /> <img alt="'.get_string('moveup_item','feedback').'" src="'.$OUTPUT->pix_url('t/up') . '" />
</a>'; </a>';
//print the button to move-up the item //print the button to move-up the item
// echo '<form action="'.$ME.'" method="post"><fieldset>'; // echo '<form action="'.$ME.'" method="post"><fieldset>';
// ///////echo '<input title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/up') . '" hspace="1" height="11" width="11" border="0" />'; // ///////echo '<input title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_moveup_button" title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/up') . '" />'; // echo '<input class="feedback_moveup_button" title="'.get_string('moveup_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/up') . '" />';
// echo '<input type="hidden" name="moveupitem" value="'.$feedbackitem->id.'" />'; // echo '<input type="hidden" name="moveupitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';
@ -287,12 +287,12 @@ if($do_show == 'edit') {
if($feedbackitem->position < $lastposition - 1){ if($feedbackitem->position < $lastposition - 1){
$buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movedownitem='.$feedbackitem->id); $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movedownitem='.$feedbackitem->id);
echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'"> echo '<a class="icon down" title="'.get_string('movedown_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/down') . '" /> <img alt="'.get_string('movedown_item','feedback').'" src="'.$OUTPUT->pix_url('t/down') . '" />
</a>'; </a>';
//print the button to move-down the item //print the button to move-down the item
// echo '<form action="'.$ME.'" method="post"><fieldset>'; // echo '<form action="'.$ME.'" method="post"><fieldset>';
// echo '<input title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/down') . '" hspace="1" height="11" width="11" border="0" />'; // echo '<input title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_movedown_button" title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/down') . '" />'; // echo '<input class="feedback_movedown_button" title="'.get_string('movedown_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/down') . '" />';
// echo '<input type="hidden" name="movedownitem" value="'.$feedbackitem->id.'" />'; // echo '<input type="hidden" name="movedownitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';
@ -303,11 +303,11 @@ if($do_show == 'edit') {
echo '<td>'; echo '<td>';
$buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveitem='.$feedbackitem->id); $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&moveitem='.$feedbackitem->id);
echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'"> echo '<a class="editing_move" title="'.get_string('move_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/move') . '" /> <img alt="'.get_string('move_item','feedback').'" src="'.$OUTPUT->pix_url('t/move') . '" />
</a>'; </a>';
// echo '<form action="'.$ME.'" method="post"><fieldset>'; // echo '<form action="'.$ME.'" method="post"><fieldset>';
// echo '<input title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/move') . '" hspace="1" height="11" width="11" border="0" />'; // echo '<input title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_move_button" title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/move') . '" />'; // echo '<input class="feedback_move_button" title="'.get_string('move_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/move') . '" />';
// echo '<input type="hidden" name="moveitem" value="'.$feedbackitem->id.'" />'; // echo '<input type="hidden" name="moveitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';
@ -317,11 +317,11 @@ if($do_show == 'edit') {
if($feedbackitem->typ != 'pagebreak') { if($feedbackitem->typ != 'pagebreak') {
$buttonlink = 'edit_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&itemid='.$feedbackitem->id.'&typ='.$feedbackitem->typ); $buttonlink = 'edit_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&itemid='.$feedbackitem->id.'&typ='.$feedbackitem->typ);
echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'"> echo '<a class="editing_update" title="'.get_string('edit_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/edit') . '" /> <img alt="'.get_string('edit_item','feedback').'" src="'.$OUTPUT->pix_url('t/edit') . '" />
</a>'; </a>';
// echo '<form action="edit_item.php" method="post"><fieldset>'; // echo '<form action="edit_item.php" method="post"><fieldset>';
// echo '<input title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/edit') . '" hspace="1" height="11" width="11" border="0" />'; // echo '<input title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" hspace="1" height="11" width="11" border="0" />';
// echo '<input class="feedback_edit_button" title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/edit') . '" />'; // echo '<input class="feedback_edit_button" title="'.get_string('edit_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/edit') . '" />';
// echo '<input type="hidden" name="itemid" value="'.$feedbackitem->id.'" />'; // echo '<input type="hidden" name="itemid" value="'.$feedbackitem->id.'" />';
// echo '<input type="hidden" name="typ" value="'.$feedbackitem->typ.'" />'; // echo '<input type="hidden" name="typ" value="'.$feedbackitem->typ.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
@ -360,11 +360,11 @@ if($do_show == 'edit') {
echo '<td>'; echo '<td>';
$buttonlink = 'delete_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&deleteitem='.$feedbackitem->id); $buttonlink = 'delete_item.php?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&deleteitem='.$feedbackitem->id);
echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'"> echo '<a class="icon delete" title="'.get_string('delete_item','feedback').'" href="'.$buttonlink.'">
<img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->old_icon_url('t/delete') . '" /> <img alt="'.get_string('delete_item','feedback').'" src="'.$OUTPUT->pix_url('t/delete') . '" />
</a>'; </a>';
//print the button to drop the item //print the button to drop the item
// echo '<form action="delete_item.php" method="post"><fieldset>'; // echo '<form action="delete_item.php" method="post"><fieldset>';
// echo '<input class="feedback_delete_button" title="'.get_string('delete_item','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('t/delete') . '" />'; // echo '<input class="feedback_delete_button" title="'.get_string('delete_item','feedback').'" type="image" src="'.$OUTPUT->pix_url('t/delete') . '" />';
// echo '<input type="hidden" name="deleteitem" value="'.$feedbackitem->id.'" />'; // echo '<input type="hidden" name="deleteitem" value="'.$feedbackitem->id.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';
@ -376,10 +376,10 @@ if($do_show == 'edit') {
echo '<td>'; echo '<td>';
$buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition); $buttonlink = $ME.'?'.htmlspecialchars(feedback_edit_get_default_query($id, $do_show).'&movehere='.$moveposition);
echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'"> echo '<a title="'.get_string('move_here','feedback').'" href="'.$buttonlink.'">
<img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->old_icon_url('movehere') . '" /> <img class="movetarget" alt="'.get_string('move_here','feedback').'" src="'.$OUTPUT->pix_url('movehere') . '" />
</a>'; </a>';
// echo '<form action="'.$ME.'" method="post"><fieldset>'; // echo '<form action="'.$ME.'" method="post"><fieldset>';
// echo '<input class="feedback_movehere_button" title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->old_icon_url('movehere') . '" />'; // echo '<input class="feedback_movehere_button" title="'.get_string('move_here','feedback').'" type="image" src="'.$OUTPUT->pix_url('movehere') . '" />';
// echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />'; // echo '<input type="hidden" name="movehere" value="'.$moveposition.'" />';
// feedback_edit_print_default_form_values($id, $do_show); // feedback_edit_print_default_form_values($id, $do_show);
// echo '</fieldset></form>'; // echo '</fieldset></form>';

2
mod/feedback/lib.php
View file

@ -329,7 +329,7 @@ function feedback_print_recent_mod_activity($activity, $courseid, $detail, $modn
if ($detail) { if ($detail) {
$modname = $modnames[$activity->type]; $modname = $modnames[$activity->type];
echo '<div class="title">'; echo '<div class="title">';
echo "<img src=\"" . $OUTPUT->old_icon_url('icon', $activity->type) . "\" ". echo "<img src=\"" . $OUTPUT->pix_url('icon', $activity->type) . "\" ".
"class=\"icon\" alt=\"$modname\" />"; "class=\"icon\" alt=\"$modname\" />";
echo "<a href=\"$CFG->wwwroot/mod/feedback/view.php?id={$activity->cmid}\">{$activity->name}</a>"; echo "<a href=\"$CFG->wwwroot/mod/feedback/view.php?id={$activity->cmid}\">{$activity->name}</a>";
echo '</div>'; echo '</div>';

2
mod/feedback/mapcourse.php
View file

@ -118,7 +118,7 @@ if($coursemap = feedback_get_courses_from_sitecourse_map($feedback->id)) {
$table->setup(); $table->setup();
foreach ($coursemap as $cmap) { foreach ($coursemap as $cmap) {
$table->add_data(array('<a href="'.htmlspecialchars('unmapcourse.php?id='.$id.'&cmapid='.$cmap->id).'"><img src="'.$OUTPUT->old_icon_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname)); $table->add_data(array('<a href="'.htmlspecialchars('unmapcourse.php?id='.$id.'&cmapid='.$cmap->id).'"><img src="'.$OUTPUT->pix_url('t/delete') . '" alt="Delete" /></a> ('.$cmap->shortname.') '.$cmap->fullname));
} }
$table->print_html(); $table->print_html();

4
mod/folder/locallib.php
View file

@ -81,8 +81,8 @@ function folder_get_file_link($file, $folder, $context) {
$path = '/'.$context->id.'/folder_content/'.$folder->revision.$file->get_filepath().$file->get_filename(); $path = '/'.$context->id.'/folder_content/'.$folder->revision.$file->get_filepath().$file->get_filename();
$viewurl = file_encode_url($urlbase, $path, false); $viewurl = file_encode_url($urlbase, $path, false);
$downloadurl = file_encode_url($urlbase, $path, true); $downloadurl = file_encode_url($urlbase, $path, true);
$downicon = $OUTPUT->old_icon_url('t/down'); $downicon = $OUTPUT->pix_url('t/down');
$mimeicon = $OUTPUT->old_icon_url(file_mimetype_icon($file->get_mimetype())); $mimeicon = $OUTPUT->pix_url(file_mimetype_icon($file->get_mimetype()));
$downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"$downicon\" class=\"iconsmall\" alt=\"$strdownload\" /></a>"; $downloadurl = "&nbsp;<a href=\"$downloadurl\" title=\"" . get_string('downloadfile') . "\"><img src=\"$downicon\" class=\"iconsmall\" alt=\"$strdownload\" /></a>";
return "<a href=\"$viewurl\" title=\"\"><img src=\"$mimeicon\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($file->get_filename()).'</a>'.$downloadurl; return "<a href=\"$viewurl\" title=\"\"><img src=\"$mimeicon\" class=\"icon\" alt=\"$strfile\" />&nbsp;".s($file->get_filename()).'</a>'.$downloadurl;

4
mod/forum/index.php
View file

@ -198,7 +198,7 @@ if ($generalforums) {
} else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) { } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
$unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>'; $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
$unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='. $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
$forum->id.'&amp;mark=read"><img src="'.$OUTPUT->old_icon_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>'; $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->pix_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
} else { } else {
$unreadlink = '<span class="read">0</span>'; $unreadlink = '<span class="read">0</span>';
} }
@ -325,7 +325,7 @@ if ($course->id != SITEID) { // Only real courses have learning forums
} else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) { } else if ($unread = forum_tp_count_forum_unread_posts($cm, $course)) {
$unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>'; $unreadlink = '<span class="unread"><a href="view.php?f='.$forum->id.'">'.$unread.'</a>';
$unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='. $unreadlink .= '<a title="'.$strmarkallread.'" href="markposts.php?f='.
$forum->id.'&amp;mark=read"><img src="'.$OUTPUT->old_icon_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>'; $forum->id.'&amp;mark=read"><img src="'.$OUTPUT->pix_url('t/clear') . '" alt="'.$strmarkallread.'" /></a></span>';
} else { } else {
$unreadlink = '<span class="read">0</span>'; $unreadlink = '<span class="read">0</span>';
} }

16
mod/forum/lib.php
View file

@ -3708,7 +3708,7 @@ function forum_print_discussion_header(&$post, $forum, $group=-1, $datestring=""
echo '</a>'; echo '</a>';
echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='. echo '<a title="'.$strmarkalldread.'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
$forum->id.'&amp;d='.$post->discussion.'&amp;mark=read&amp;returnpage=view.php">' . $forum->id.'&amp;d='.$post->discussion.'&amp;mark=read&amp;returnpage=view.php">' .
'<img src="'.$OUTPUT->old_icon_url('t/clear') . '" class="iconsmall" alt="'.$strmarkalldread.'" /></a>'; '<img src="'.$OUTPUT->pix_url('t/clear') . '" class="iconsmall" alt="'.$strmarkalldread.'" /></a>';
echo '</span>'; echo '</span>';
} else { } else {
echo '<span class="read">'; echo '<span class="read">';
@ -4354,7 +4354,7 @@ function forum_print_attachments($post, $cm, $type) {
foreach ($files as $file) { foreach ($files as $file) {
$filename = $file->get_filename(); $filename = $file->get_filename();
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$iconimage = '<img src="'.$OUTPUT->old_icon_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />'; $iconimage = '<img src="'.$OUTPUT->pix_url(file_mimetype_icon($mimetype)).'" class="icon" alt="'.$mimetype.'" />';
$path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/forum_attachment/'.$post->id.'/'.$filename); $path = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$context->id.'/forum_attachment/'.$post->id.'/'.$filename);
if ($type == 'html') { if ($type == 'html') {
@ -5651,7 +5651,7 @@ function forum_print_latest_discussions($course, $forum, $maxdiscussions=-1, $di
echo '&nbsp;<a title="'.get_string('markallread', 'forum'). echo '&nbsp;<a title="'.get_string('markallread', 'forum').
'" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='. '" href="'.$CFG->wwwroot.'/mod/forum/markposts.php?f='.
$forum->id.'&amp;mark=read&amp;returnpage=view.php">'. $forum->id.'&amp;mark=read&amp;returnpage=view.php">'.
'<img src="'.$OUTPUT->old_icon_url('t/clear') . '" class="iconsmall" alt="'.get_string('markallread', 'forum').'" /></a>'; '<img src="'.$OUTPUT->pix_url('t/clear') . '" class="iconsmall" alt="'.get_string('markallread', 'forum').'" /></a>';
} }
echo '</th>'; echo '</th>';
} }
@ -5886,7 +5886,7 @@ function forum_print_discussion($course, $cm, $forum, $discussion, $post, $mode,
echo '<div class="ratingsubmit">'; echo '<div class="ratingsubmit">';
echo '<input type="submit" id="forumpostratingsubmit" value="'.get_string('sendinratings', 'forum').'" />'; echo '<input type="submit" id="forumpostratingsubmit" value="'.get_string('sendinratings', 'forum').'" />';
if (ajaxenabled() && !empty($CFG->forum_ajaxrating)) { /// AJAX enabled, standard submission form if (ajaxenabled() && !empty($CFG->forum_ajaxrating)) { /// AJAX enabled, standard submission form
$PAGE->requires->js_function_call('add_menu_listeners', array($OUTPUT->old_icon_url('i/loading_small')))->on_dom_ready(); $PAGE->requires->js_function_call('add_menu_listeners', array($OUTPUT->pix_url('i/loading_small')))->on_dom_ready();
} }
if ($forum->scale < 0) { if ($forum->scale < 0) {
if ($scale = $DB->get_record("scale", array("id" => abs($forum->scale)))) { if ($scale = $DB->get_record("scale", array("id" => abs($forum->scale)))) {
@ -6199,7 +6199,7 @@ function forum_print_recent_mod_activity($activity, $courseid, $detail, $modname
echo '<div class="title">'; echo '<div class="title">';
if ($detail) { if ($detail) {
$aname = s($activity->name); $aname = s($activity->name);
echo "<img src=\"" . $OUTPUT->old_icon_url('icon', $activity->type) . "\" ". echo "<img src=\"" . $OUTPUT->pix_url('icon', $activity->type) . "\" ".
"class=\"icon\" alt=\"{$aname}\" />"; "class=\"icon\" alt=\"{$aname}\" />";
} }
echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d={$activity->content->discussion}" echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d={$activity->content->discussion}"
@ -7991,7 +7991,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
$navref->get($discussionkey)->mainnavonly = true; $navref->get($discussionkey)->mainnavonly = true;
foreach ($discussions as $discussion) { foreach ($discussions as $discussion) {
$icon = $OUTPUT->old_icon_url('i/feedback'); $icon = $OUTPUT->pix_url('i/feedback');
$url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$discussion->discussion)); $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$discussion->discussion));
$navref->get($discussionkey)->add($discussion->subject, $url, navigation_node::TYPE_SETTING, null, null, $icon); $navref->get($discussionkey)->add($discussion->subject, $url, navigation_node::TYPE_SETTING, null, null, $icon);
} }
@ -8019,7 +8019,7 @@ function forum_extend_navigation($navref, $course, $module, $cm) {
$recentkey = $navref->add(get_string('recentactivity').' ('.count($recentposts).')'); $recentkey = $navref->add(get_string('recentactivity').' ('.count($recentposts).')');
$navref->get($recentkey)->mainnavonly = true; $navref->get($recentkey)->mainnavonly = true;
foreach ($recentposts as $post) { foreach ($recentposts as $post) {
$icon = $OUTPUT->old_icon_url('i/feedback'); $icon = $OUTPUT->pix_url('i/feedback');
$url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$post->content->discussion)); $url = new moodle_url($CFG->wwwroot.'/mod/forum/discuss.php', array('d'=>$post->content->discussion));
$title = $post->content->subject."\n".userdate($post->timestamp, get_string('strftimerecent', 'langconfig'))."\n".$post->user->firstname.' '.$post->user->lastname; $title = $post->content->subject."\n".userdate($post->timestamp, get_string('strftimerecent', 'langconfig'))."\n".$post->user->firstname.' '.$post->user->lastname;
$navref->get($recentkey)->add($title, $url, navigation_node::TYPE_SETTING, null, null, $icon); $navref->get($recentkey)->add($title, $url, navigation_node::TYPE_SETTING, null, null, $icon);
@ -8141,7 +8141,7 @@ function forum_extend_settings_navigation($settingsnav, $module=null) {
$userid = $USER->id; $userid = $USER->id;
} }
$url = new moodle_url(rss_get_url($PAGE->course->id, $userid, "forum", $forumobject->id)); $url = new moodle_url(rss_get_url($PAGE->course->id, $userid, "forum", $forumobject->id));
$forum->add($string, $url, settings_navigation::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/rss')); $forum->add($string, $url, settings_navigation::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/rss'));
} }
return $forumkey; return $forumkey;

4
mod/glossary/editcategories.php
View file

@ -220,8 +220,8 @@ if ( $action ) {
</td> </td>
<td style="width:10%" align="center"><b> <td style="width:10%" align="center"><b>
<?php <?php
echo "<a href=\"editcategories.php?id=$cm->id&amp;action=delete&amp;mode=cat&amp;hook=$category->id\"><img alt=\"" . get_string("delete") . "\"src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" /></a> "; echo "<a href=\"editcategories.php?id=$cm->id&amp;action=delete&amp;mode=cat&amp;hook=$category->id\"><img alt=\"" . get_string("delete") . "\"src=\"" . $OUTPUT->pix_url('t/delete') . "\" class=\"iconsmall\" /></a> ";
echo "<a href=\"editcategories.php?id=$cm->id&amp;action=edit&amp;mode=cat&amp;hook=$category->id\"><img alt=\"" . get_string("edit") . "\" src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" /></a>"; echo "<a href=\"editcategories.php?id=$cm->id&amp;action=edit&amp;mode=cat&amp;hook=$category->id\"><img alt=\"" . get_string("edit") . "\" src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" /></a>";
?> ?>
</b></td> </b></td>
</tr> </tr>

Some files were not shown because too many files have changed in this diff Show more