From b5d0cafc6fe6fdf0692fa4fb0ea6e1872179d5d7 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Wed, 16 Dec 2009 21:50:45 +0000 Subject: [PATCH] MDL-20787 final switch to new $OUTPUT->pix_url() - yay! --- admin/blocks.php | 4 +- admin/filters.php | 4 +- admin/lang.php | 8 +- admin/mnet/access_control.php | 2 +- admin/mnet/enr_courses.php | 2 +- admin/modules.php | 6 +- admin/qtypes.php | 4 +- admin/report/configlog/index.php | 2 +- admin/roles/lib.php | 2 +- admin/roles/manage.php | 4 +- admin/roles/usersroles.php | 4 +- admin/user.php | 2 +- admin/user/user_bulk_display.php | 2 +- admin/user/user_bulk_enrol.php | 2 +- .../block_activity_modules.php | 4 +- blocks/admin/block_admin.php | 42 +++++----- blocks/admin_tree/block_admin_tree.php | 8 +- blocks/course_list/block_course_list.php | 4 +- .../course_summary/block_course_summary.php | 2 +- .../block_global_navigation_tree.php | 6 +- blocks/loancalc/block_loancalc.php | 2 +- blocks/messages/block_messages.php | 2 +- blocks/mnet_hosts/block_mnet_hosts.php | 2 +- blocks/online_users/block_online_users.php | 2 +- blocks/participants/block_participants.php | 2 +- blocks/rss_client/managefeeds.php | 4 +- .../block_settings_navigation_tree.php | 6 +- .../site_main_menu/block_site_main_menu.php | 14 ++-- .../block_social_activities.php | 14 ++-- blocks/tags/block_tags.php | 2 +- blog/external_blogs.php | 8 +- blog/locallib.php | 6 +- blog/rsslib.php | 2 +- calendar/lib.php | 40 +++++----- calendar/view.php | 2 +- course/category.php | 24 +++--- course/format/topics/format.php | 20 ++--- course/format/weeks/format.php | 16 ++-- course/index.php | 12 +-- course/info.php | 4 +- course/lib.php | 56 +++++++------- course/modedit.php | 2 +- course/pending.php | 2 +- course/recent.php | 2 +- course/report/log/lib.php | 4 +- course/report/outline/index.php | 2 +- course/report/outline/lib.php | 2 +- course/report/participation/lib.php | 2 +- course/report/progress/index.php | 4 +- course/report/progress/lib.php | 2 +- course/report/stats/lib.php | 2 +- course/resources.php | 4 +- course/search.php | 14 ++-- course/user.php | 2 +- enrol/manual/enrol.php | 4 +- files/draftfiles.php | 10 +-- files/index.php | 14 ++-- grade/edit/tree/lib.php | 6 +- grade/export/keymanager.php | 4 +- grade/import/keymanager.php | 4 +- grade/lib.php | 30 ++++---- grade/report/grader/lib.php | 10 +-- group/groupings.php | 6 +- index.php | 2 +- lib/adminlib.php | 42 +++++----- lib/ajax/ajaxlib.php | 30 ++++---- lib/configonlylib.php | 2 +- lib/deprecatedlib.php | 2 +- lib/filelib.php | 12 +-- lib/form/modgrade.php | 2 +- lib/formslib.php | 6 +- lib/googleapi.php | 2 +- lib/listlib.php | 4 +- lib/navigationlib.php | 76 +++++++++---------- lib/outputcomponents.php | 8 +- lib/outputrenderers.php | 6 -- lib/portfoliolib.php | 4 +- lib/questionlib.php | 6 +- lib/rsslib.php | 4 +- lib/tablelib.php | 16 ++-- lib/upgradelib.php | 2 +- lib/weblib.php | 25 ++++-- message/lib.php | 6 +- mod/assignment/lib.php | 4 +- .../type/online/assignment.class.php | 4 +- .../type/upload/assignment.class.php | 12 +-- .../type/uploadsingle/assignment.class.php | 4 +- mod/chat/lib.php | 4 +- mod/data/field.php | 4 +- mod/data/field/file/field.class.php | 4 +- mod/data/lib.php | 10 +-- mod/data/preset.php | 2 +- mod/feedback/delete_template.php | 2 +- mod/feedback/edit.php | 36 ++++----- mod/feedback/lib.php | 2 +- mod/feedback/mapcourse.php | 2 +- mod/folder/locallib.php | 4 +- mod/forum/index.php | 4 +- mod/forum/lib.php | 16 ++-- mod/glossary/editcategories.php | 4 +- mod/glossary/lib.php | 16 ++-- mod/glossary/view.php | 2 +- mod/hotpot/index.php | 4 +- mod/hotpot/lib.php | 2 +- mod/lesson/renderer.php | 8 +- mod/quiz/editlib.php | 10 +-- mod/quiz/lib.php | 12 +-- mod/quiz/locallib.php | 4 +- mod/quiz/styles.php | 3 - mod/quiz/summary.php | 2 +- mod/quiz/tabs.php | 4 +- mod/resource/index.php | 2 +- mod/scorm/datamodels/aicclib.php | 18 ++--- mod/scorm/datamodels/scorm_12lib.php | 18 ++--- mod/scorm/datamodels/scorm_13lib.php | 18 ++--- mod/scorm/lib.php | 8 +- mod/scorm/loadSCO.php | 2 +- mod/scorm/locallib.php | 2 +- mod/scorm/report.php | 4 +- mod/url/index.php | 2 +- mod/wiki/ewiki/plugins/moodle/downloads.php | 2 +- question/category_class.php | 2 +- question/contextmove_form.php | 2 +- question/contextmoveq_form.php | 2 +- question/editlib.php | 8 +- question/type/multianswer/questiontype.php | 4 +- question/type/questiontype.php | 4 +- repository/alfresco/repository.class.php | 4 +- repository/boxnet/repository.class.php | 2 +- repository/filepicker.php | 2 +- repository/filesystem/repository.class.php | 4 +- repository/lib.php | 20 ++--- repository/local/repository.class.php | 4 +- repository/mahara/repository.class.php | 4 +- repository/merlot/repository.class.php | 2 +- repository/s3/repository.class.php | 4 +- repository/url/repository.class.php | 2 +- repository/webdav/repository.class.php | 4 +- repository/wikimedia/repository.class.php | 2 +- search/query.php | 2 +- tag/coursetags_edit.php | 2 +- theme/base/layout/embedded.php | 2 +- theme/base/layout/general.php | 2 +- theme/base/layout/home.php | 2 +- theme/standard/layout/embedded.php | 2 +- theme/standard/layout/frametop.php | 2 +- theme/standard/layout/home.php | 2 +- theme/standard/layout/minimal.php | 2 +- theme/standard/layout/normal.php | 2 +- user/index.php | 8 +- user/message.html | 2 +- user/pix.php | 4 +- user/portfolio.php | 4 +- user/portfoliologs.php | 4 +- user/profile/index.php | 26 +++---- user/selector/lib.php | 2 +- user/view.php | 2 +- 157 files changed, 576 insertions(+), 576 deletions(-) delete mode 100644 mod/quiz/styles.php diff --git a/admin/blocks.php b/admin/blocks.php index d75e698a2f..66789755ed 100644 --- a/admin/blocks.php +++ b/admin/blocks.php @@ -168,10 +168,10 @@ if ($blocks[$blockid]->visible) { $visible = ''. - ''.$strhide.''; + ''.$strhide.''; } else { $visible = ''. - ''.$strshow.''; + ''.$strshow.''; $class = ' class="dimmed_text"'; // Leading space required! } diff --git a/admin/filters.php b/admin/filters.php index 763adffe37..9249be943b 100644 --- a/admin/filters.php +++ b/admin/filters.php @@ -233,7 +233,7 @@ function action_url($filterpath, $action) { function action_icon($url, $icon, $straction) { global $CFG, $OUTPUT; return '' . - '' . $straction . ' '; + '' . $straction . ' '; } function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) { @@ -256,7 +256,7 @@ function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) // Re-order $updown = ''; - $spacer = ' '; + $spacer = ' '; if ($filterinfo->active != TEXTFILTER_DISABLED) { if (!$isfirstrow) { $updown .= action_icon(action_url($filter, 'up'), 'up', get_string('up')); diff --git a/admin/lang.php b/admin/lang.php index 1bb3f04d92..b80df3dd60 100644 --- a/admin/lang.php +++ b/admin/lang.php @@ -611,9 +611,9 @@ if (LANG_DISPLAY_MISSING_LINKS) { $missingtarget = ''; $missingnext = ''. - ''.$strnext.''; + ''.$strnext.''; $missingprev = ''. - ''.$strprev.''; + ''.$strprev.''; } } else { // the string is translated in the pack being processed @@ -624,9 +624,9 @@ if (LANG_DISPLAY_MISSING_LINKS) { $missingtarget = ''; $missingnext = ''. - ''.$strnext.''; + ''.$strnext.''; $missingprev = ''. - ''.$strprev.''; + ''.$strprev.''; } } } diff --git a/admin/mnet/access_control.php b/admin/mnet/access_control.php index 6d0fb49f46..6008680d0d 100644 --- a/admin/mnet/access_control.php +++ b/admin/mnet/access_control.php @@ -151,7 +151,7 @@ foreach ($columns as $column) { } else { $columndir = $dir == "ASC" ? "DESC" : "ASC"; $columnicon = $dir == "ASC" ? "down" : "up"; - $columnicon = " old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; + $columnicon = " pix_url('t/' . $columnicon) . "\" alt=\"\" />"; } $headings[$column] = "".$string[$column]."$columnicon"; } diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index aa8a8aab74..8901d446c7 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -32,7 +32,7 @@ echo '
' . ''; - $icon = "old_icon_url('i/course') . "\"". + $icon = "pix_url('i/course') . "\"". " class=\"icon\" alt=\"".get_string("course")."\" />"; foreach ($courses as $course) { diff --git a/admin/modules.php b/admin/modules.php index c6af968d66..6642d96434 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -129,7 +129,7 @@ foreach ($modulebyname as $modulename => $module) { // took out hspace="\10\", because it does not validate. don't know what to replace with. - $icon = "old_icon_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; + $icon = "pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />"; $delete = "name&sesskey=".sesskey()."\">$strdelete"; @@ -151,11 +151,11 @@ if ($module->visible) { $visible = "name&sesskey=".sesskey()."\" title=\"$strhide\">". - "old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" />"; + "pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" />"; $class = ""; } else { $visible = "name&sesskey=".sesskey()."\" title=\"$strshow\">". - "old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" />"; + "pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" />"; $class = " class=\"dimmed_text\""; } if ($module->name == "forum") { diff --git a/admin/qtypes.php b/admin/qtypes.php index f09612a026..be03869b26 100644 --- a/admin/qtypes.php +++ b/admin/qtypes.php @@ -229,7 +229,7 @@ $rowclass = 'dimmed_text'; } } else { - $icons = ''; + $icons = ''; } // Move icons. @@ -282,7 +282,7 @@ function icon_html($action, $qtypename, $icon, $alt, $tip) { $html = '
'; $html .= ''; $html .= ''; + '" src="' . $OUTPUT->pix_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>'; $html .= '
'; return $html; } diff --git a/admin/report/configlog/index.php b/admin/report/configlog/index.php index 86dc289370..2d2f9ad9c9 100644 --- a/admin/report/configlog/index.php +++ b/admin/report/configlog/index.php @@ -46,7 +46,7 @@ foreach ($columns as $column=>$strcolumn) { } else { $columnicon = $dir == 'ASC' ? 'down':'up'; } - $columnicon = " old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; + $columnicon = " pix_url('t/' . $columnicon) . "\" alt=\"\" />"; } $hcolumns[$column] = "".$strcolumn."$columnicon"; diff --git a/admin/roles/lib.php b/admin/roles/lib.php index 76fd7af06d..5e96bc121e 100644 --- a/admin/roles/lib.php +++ b/admin/roles/lib.php @@ -421,7 +421,7 @@ abstract class capability_table_with_risks extends capability_table_base { function get_risk_icon($type) { global $OUTPUT; 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, '' . get_string($type . 'short', 'admin') . ''); $link->add_action(new popup_action('click', $link->url, 'docspopup')); diff --git a/admin/roles/manage.php b/admin/roles/manage.php index 633c8ae529..623a503e4d 100755 --- a/admin/roles/manage.php +++ b/admin/roles/manage.php @@ -274,9 +274,9 @@ function get_action_icon($url, $icon, $alt, $tooltip) { global $OUTPUT; return '' . - '' . $alt . ' '; + '' . $alt . ' '; } function get_spacer() { global $OUTPUT; - return ' '; + return ' '; } diff --git a/admin/roles/usersroles.php b/admin/roles/usersroles.php index b7d3aa66d6..0fddff7a90 100644 --- a/admin/roles/usersroles.php +++ b/admin/roles/usersroles.php @@ -201,9 +201,9 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname) { $strcheck = get_string('checkuserspermissionshere', 'role', $a); } echo ' ' . $stredit . ' '; + $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /> '; echo ' ' . $strcheckpermissions . ' '; + $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /> '; echo "

\n"; } } diff --git a/admin/user.php b/admin/user.php index 4b78f94669..ad8a4ab92b 100644 --- a/admin/user.php +++ b/admin/user.php @@ -140,7 +140,7 @@ } else { $columnicon = $dir == "ASC" ? "down":"up"; } - $columnicon = " old_icon_url('t/' . $columnicon) . "\" alt=\"\" />"; + $columnicon = " pix_url('t/' . $columnicon) . "\" alt=\"\" />"; } $$column = "".$string[$column]."$columnicon"; diff --git a/admin/user/user_bulk_display.php b/admin/user/user_bulk_display.php index 1530eedddf..58c11b725c 100755 --- a/admin/user/user_bulk_display.php +++ b/admin/user/user_bulk_display.php @@ -56,7 +56,7 @@ foreach ($columns as $column) { $columndir = 'asc'; } else { $columndir = $dir == 'asc' ? 'desc' : 'asc'; - $columnicon = ' '; + $columnicon = ' '; } $table->head[] = ''.$strtitle.''.$columnicon; $table->align[] = 'left'; diff --git a/admin/user/user_bulk_enrol.php b/admin/user/user_bulk_enrol.php index 859a715d3f..48ab6f2da4 100644 --- a/admin/user/user_bulk_enrol.php +++ b/admin/user/user_bulk_enrol.php @@ -61,7 +61,7 @@ foreach ($columns as $column) { $columndir = 'asc'; } else { $columndir = ($dir == 'asc') ? 'desc' : 'asc'; - $columnicon = ' '; + $columnicon = ' '; } $table->head[] = ''.$strtitle.''.$columnicon; $table->align[] = 'left'; diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php index 3b8a820699..498992667d 100644 --- a/blocks/activity_modules/block_activity_modules.php +++ b/blocks/activity_modules/block_activity_modules.php @@ -51,10 +51,10 @@ class block_activity_modules extends block_list { foreach ($modfullnames as $modname => $modfullname) { if ($modname === 'resources') { $this->content->items[] = ''.$modfullname.''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } else { $this->content->items[] = ''.$modfullname.''; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } } diff --git a/blocks/admin/block_admin.php b/blocks/admin/block_admin.php index ec7b4a2775..f07f47fe4d 100644 --- a/blocks/admin/block_admin.php +++ b/blocks/admin/block_admin.php @@ -32,7 +32,7 @@ class block_admin extends block_list { /// Course editing on/off if ($course->id !== SITEID and has_capability('moodle/course:update', $this->page->context)) { - $this->content->icons[]=''; + $this->content->icons[]=''; if ($this->page->user_is_editing()) { $this->content->items[]=''.get_string('turneditingoff').''; } else { @@ -40,17 +40,17 @@ class block_admin extends block_list { } $this->content->items[]=''.get_string('settings').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Assign roles to the course if ($course->id != SITEID) { if (has_capability('moodle/role:assign', $this->page->context)) { $this->content->items[]=''.get_string('assignroles', 'role').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } else if (get_overridable_roles($this->page->context, ROLENAME_ORIGINAL)) { $this->content->items[]=''.get_string('overridepermissions', 'role').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -75,7 +75,7 @@ class block_admin extends block_list { if ($reportavailable) { $this->content->items[]=''.get_string('grades').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -83,7 +83,7 @@ class block_admin extends block_list { if (!empty($CFG->enableoutcomes)) { if ($course->id!==SITEID and has_capability('moodle/course:update', $this->page->context)) { $this->content->items[]=''.get_string('outcomes', 'grades').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -92,11 +92,11 @@ class block_admin extends block_list { if (has_capability('moodle/course:managemetacourse', $this->page->context)) { $strchildcourses = get_string('childcourses'); $this->content->items[]=''.$strchildcourses.''; - $this->content->icons[]=''; + $this->content->icons[]=''; } else if (has_capability('moodle/role:assign', $this->page->context)) { $strchildcourses = get_string('childcourses'); $this->content->items[]=''.$strchildcourses.''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -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)) { $strgroups = get_string('groups'); $this->content->items[]=''.$strgroups.''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Backup this course if ($course->id!==SITEID and has_capability('moodle/site:backup', $this->page->context)) { $this->content->items[]=''.get_string('backup').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Restore to this course if ($course->id !== SITEID and has_capability('moodle/site:restore', $this->page->context)) { $this->content->items[]=''.get_string('restore').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Import data from other courses if ($course->id !== SITEID and has_capability('moodle/site:import', $this->page->context)) { $this->content->items[]=''.get_string('import').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Reset this course if ($course->id!==SITEID and has_capability('moodle/course:reset', $this->page->context)) { $this->content->items[]=''.get_string('reset').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// View course reports if ($course->id !== SITEID and has_capability('moodle/site:viewreports', $this->page->context)) { // basic capability for listing of reports $this->content->items[]=''.get_string('reports').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Manage questions @@ -161,7 +161,7 @@ class block_admin extends block_list { if ($questionlink) { $this->content->items[]=''.get_string('questions', 'quiz').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } @@ -170,13 +170,13 @@ class block_admin extends block_list { $editabletypes = repository::get_editable_types($this->page->context); if ($course->id !== SITEID && has_capability('moodle/course:update', $this->page->context) && !empty($editabletypes)) { $this->content->items[]=''.get_string('repositories').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Manage files if ($course->id !== SITEID and has_capability('moodle/course:managefiles', $this->page->context)) { $this->content->items[]=''.get_string('files').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } /// Authorize hooks @@ -189,24 +189,24 @@ class block_admin extends block_list { } } $this->content->items[] = $paymenturl; - $this->content->icons[] = ''; + $this->content->icons[] = ''; } /// Unenrol link if (empty($course->metacourse) && ($course->id!==SITEID)) { if (has_capability('moodle/legacy:guest', $this->page->context, NULL, false)) { // Are a guest now $this->content->items[]=''.get_string('enrolme', '', format_string($course->shortname)).''; - $this->content->icons[]=''; + $this->content->icons[]=''; } 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[]=''.get_string('unenrolme', '', format_string($course->shortname)).''; - $this->content->icons[]=''; + $this->content->icons[]=''; } } /// Link to the user own profile (except guests) if (!isguestuser() and isloggedin()) { $this->content->items[]=''.get_string('profile').''; - $this->content->icons[]=''; + $this->content->icons[]=''; } return $this->content; diff --git a/blocks/admin_tree/block_admin_tree.php b/blocks/admin_tree/block_admin_tree.php index a0d9ed7333..5351f210b4 100644 --- a/blocks/admin_tree/block_admin_tree.php +++ b/blocks/admin_tree/block_admin_tree.php @@ -35,7 +35,7 @@ class block_admin_tree extends block_base { $strfolderopened = s(get_string('folderopened')); $this->tempcontent .= '
'; - $this->tempcontent .= ''.$strfolderopened.' '; + $this->tempcontent .= ''.$strfolderopened.' '; $this->tempcontent .= $visiblename.'
'."\n"; $this->currentdepth++; $this->divcounter++; @@ -61,7 +61,7 @@ class block_admin_tree extends block_base { if ($content->is_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) { // show hidden pages in tree if hidden page active @@ -75,7 +75,7 @@ class block_admin_tree extends block_base { if ($content->is_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) { 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_function_call('admin_tree.init', 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'))); $this->content = new object(); diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index f2363f47dd..010f9147c7 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -24,7 +24,7 @@ class block_course_list extends block_list { $this->content->icons = array(); $this->content->footer = ''; - $icon = "old_icon_url('i/course') . "\"". + $icon = "pix_url('i/course') . "\"". " class=\"icon\" alt=\"".get_string("coursecategory")."\" />"; $adminseesall = true; @@ -116,7 +116,7 @@ class block_course_list extends block_list { return; } - $icon = ''.get_string('course').''; + $icon = ''.get_string('course').''; // only for logged in users! if (!isloggedin() || isguestuser()) { diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php index 5605632e49..38ea88709b 100644 --- a/blocks/course_summary/block_course_summary.php +++ b/blocks/course_summary/block_course_summary.php @@ -35,7 +35,7 @@ class block_course_summary extends block_base { } else { $editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->page->course->id; } - $this->content->text .= "
old_icon_url('t/edit') . "\" alt=\"".get_string('edit')."\" />
"; + $this->content->text .= "
pix_url('t/edit') . "\" alt=\"".get_string('edit')."\" />
"; } $this->content->footer = ''; diff --git a/blocks/global_navigation_tree/block_global_navigation_tree.php b/blocks/global_navigation_tree/block_global_navigation_tree.php index 175d9bc298..b71955c751 100644 --- a/blocks/global_navigation_tree/block_global_navigation_tree.php +++ b/blocks/global_navigation_tree/block_global_navigation_tree.php @@ -163,7 +163,7 @@ class block_global_navigation_tree extends block_tree { $reloadicon->link->url = $this->page->url; $reloadicon->link->url->param('regenerate','navigation'); $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->title = get_string('reload'); $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->url = $this->page->url; 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->title = $toggleblockdisplay; $moveicon->link->url->param('undock', $this->instance->id); } else { - $moveicon->image->src = $OUTPUT->old_icon_url('t/movetosidetab'); + $moveicon->image->src = $OUTPUT->pix_url('t/movetosidetab'); $moveicon->image->alt = $togglesidetabdisplay; $moveicon->image->title = $togglesidetabdisplay; $moveicon->link->url->param('dock', $this->instance->id); diff --git a/blocks/loancalc/block_loancalc.php b/blocks/loancalc/block_loancalc.php index 7ba2401840..4416ad9bc1 100644 --- a/blocks/loancalc/block_loancalc.php +++ b/blocks/loancalc/block_loancalc.php @@ -11,7 +11,7 @@ class block_loancalc extends block_base { function get_content() { global $CFG, $OUTPUT; - $calc = $OUTPUT->old_icon_url('i/calc'); + $calc = $OUTPUT->pix_url('i/calc'); $this->content->text = '