From: tjhunt Date: Thu, 2 Jul 2009 10:06:39 +0000 (+0000) Subject: MDL-19690 - first 53 $CFG->pixpath to $OUTPUT->old_icon_url X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=4096752d1d44735009cb80c471b2ae23952916f9;p=moodle.git MDL-19690 - first 53 $CFG->pixpath to $OUTPUT->old_icon_url --- diff --git a/admin/mnet/enr_courses.php b/admin/mnet/enr_courses.php index 9c05838578..334a2096ec 100644 --- a/admin/mnet/enr_courses.php +++ b/admin/mnet/enr_courses.php @@ -32,7 +32,7 @@ echo '
' . ''; - $icon = "pixpath/i/course.gif\"". + $icon = "old_icon_url('i/course') . "\"". " class=\"icon\" alt=\"".get_string("course")."\" />"; foreach ($courses as $course) { diff --git a/admin/modules.php b/admin/modules.php index 143a68a10e..97646b5321 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -232,11 +232,11 @@ if ($module->visible) { $visible = "name&sesskey=".sesskey()."\" title=\"$strhide\">". - "pixpath/i/hide.gif\" class=\"icon\" alt=\"$strhide\" />"; + "old_icon_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" />"; $class = ""; } else { $visible = "name&sesskey=".sesskey()."\" title=\"$strshow\">". - "pixpath/i/show.gif\" class=\"icon\" alt=\"$strshow\" />"; + "old_icon_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" />"; $class = " class=\"dimmed_text\""; } if ($module->name == "forum") { diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php index ae1f5689e8..c3f6612704 100644 --- a/blocks/course_list/block_course_list.php +++ b/blocks/course_list/block_course_list.php @@ -13,7 +13,7 @@ class block_course_list extends block_list { } function get_content() { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; if($this->content !== NULL) { return $this->content; @@ -24,7 +24,7 @@ class block_course_list extends block_list { $this->content->icons = array(); $this->content->footer = ''; - $icon = "pixpath/i/course.gif\"". + $icon = "old_icon_url('i/course') . "\"". " class=\"icon\" alt=\"".get_string("coursecategory")."\" />"; $adminseesall = true; diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php index dcbf5d4661..18bcf6943c 100644 --- a/blocks/course_summary/block_course_summary.php +++ b/blocks/course_summary/block_course_summary.php @@ -13,7 +13,7 @@ class block_course_summary extends block_base { } function get_content() { - global $CFG; + global $CFG, $OUTPUT; if($this->content !== NULL) { return $this->content; @@ -33,7 +33,7 @@ class block_course_summary extends block_base { } else { $editpage = $CFG->wwwroot.'/course/edit.php?id='.$this->page->course->id; } - $this->content->text .= "
pixpath/t/edit.gif\" alt=\"".get_string('edit')."\" />
"; + $this->content->text .= "
old_icon_url('t/edit') . "\" alt=\"".get_string('edit')."\" />
"; } $this->content->footer = ''; diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php index 7a54fc2b39..b079c7d752 100644 --- a/blocks/tags/block_tags.php +++ b/blocks/tags/block_tags.php @@ -38,7 +38,7 @@ class block_tags extends block_base { function get_content() { - global $CFG, $SITE, $USER, $SCRIPT; + global $CFG, $SITE, $USER, $SCRIPT, $OUTPUT; if (empty($CFG->usetags)) { $this->content->text = ''; @@ -231,6 +231,7 @@ class block_tags extends block_base { $arrowtitle = get_string('arrowtitle', $tagslang); $coursetaghelpbutton = helpbutton('addtags', 'adding tags', $tagslang, TRUE, FALSE, '', TRUE); $sesskey = sesskey(); + $arrowright = $OUTPUT->old_icon_url('t/arrow_left'); $this->content->footer .= <<
diff --git a/course/info.php b/course/info.php index 7ced5175e2..826a339129 100644 --- a/course/info.php +++ b/course/info.php @@ -41,11 +41,11 @@ print_box_start('generalbox icons'); if ($course->guest) { $strallowguests = get_string('allowguests'); - echo "
\"\"pixpath/i/guest.gif\" /> $strallowguests
"; + echo "
\"\"old_icon_url('i/guest') . "\" /> $strallowguests
"; } if ($course->password) { $strrequireskey = get_string('requireskey'); - echo "
\"\"pixpath/i/key.gif\" /> $strrequireskey
"; + echo "
\"\"old_icon_url('i/key') . "\" /> $strrequireskey
"; } print_box_end(); } diff --git a/files/draftfiles.php b/files/draftfiles.php index 61befdb279..dc19cd25db 100644 --- a/files/draftfiles.php +++ b/files/draftfiles.php @@ -150,8 +150,8 @@ foreach ($files as $file) { $dirname = explode('/', trim($filepath, '/')); $dirname = array_pop($dirname); echo '
'; - echo "pixpath/f/folder.gif\" class=\"icon\" alt=\"$strfolder\" /> ".s($dirname)." "; - echo "pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" />"; + echo "old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" /> ".s($dirname)." "; + echo "old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" />"; echo '
'; } @@ -160,7 +160,7 @@ foreach ($files as $file) { $viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$itemid".$filepath.$filename, false, false); echo '
'; echo "pixpath/f/$icon\" class=\"icon\" alt=\"$strfile\" /> ".s($filename)." ($filesize) "; - echo "pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" />";; + echo "old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" />";; echo '
'; } } diff --git a/files/index.php b/files/index.php index d4006cd756..0a4946898d 100644 --- a/files/index.php +++ b/files/index.php @@ -283,11 +283,11 @@ function displaydir($file_info) { echo ""; print_cell(); - print_cell("left", "pixpath/f/folder.gif\" class=\"icon\" alt=\"$strfolder\" /> ".s($filename)."", 'name'); + print_cell("left", "old_icon_url('f/folder') . "\" class=\"icon\" alt=\"$strfolder\" /> ".s($filename)."", 'name'); print_cell("right", $filesize, 'size'); print_cell("right", $filedate, 'date'); if ($parentwritable) { - print_cell("right", "pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" />", 'command'); + print_cell("right", "old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" />", 'command'); } else { print_cell(); } @@ -297,14 +297,14 @@ function displaydir($file_info) { $icon = mimeinfo_from_type("icon", $mimetype); if ($downloadurl = $child_info->get_url(true)) { - $downloadurl = " pixpath/t/down.gif\" class=\"iconsmall\" alt=\"$strdownload\" />"; + $downloadurl = " old_icon_url('t/down') . "\" class=\"iconsmall\" alt=\"$strdownload\" />"; } else { $downloadurl = ''; } if ($viewurl = $child_info->get_url()) { $viewurl = " ".link_to_popup_window ($viewurl, "display", - "pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"$strfile\" /> ", + "old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strfile\" /> ", 480, 640, get_string('viewfileinpopup'), null, true); } else { $viewurl = ''; @@ -318,7 +318,7 @@ function displaydir($file_info) { print_cell("right", $filesize, 'size'); print_cell("right", $filedate, 'date'); if ($parentwritable) { - print_cell("right", "pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" />", 'command'); + print_cell("right", "old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" />", 'command'); } else { print_cell(); } diff --git a/grade/edit/outcome/index.php b/grade/edit/outcome/index.php index f6a7a9bb42..65cadb5cf0 100644 --- a/grade/edit/outcome/index.php +++ b/grade/edit/outcome/index.php @@ -170,10 +170,10 @@ if ($courseid and $outcomes = grade_outcome::fetch_all_local($courseid)) { $buttons = ""; $buttons .= "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; if ($outcome->can_delete()) { $buttons .= "id&action=delete&sesskey=".sesskey()."\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; } $line[] = $buttons; @@ -225,11 +225,11 @@ if ($outcomes = grade_outcome::fetch_all_global()) { $buttons = ""; if (has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM))) { $buttons .= "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; } if (has_capability('moodle/grade:manage', get_context_instance(CONTEXT_SYSTEM)) and $outcome->can_delete()) { $buttons .= "id&action=delete&sesskey=".sesskey()."\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; } $line[] = $buttons; diff --git a/grade/edit/scale/index.php b/grade/edit/scale/index.php index b2be6a6a93..95fca23760 100644 --- a/grade/edit/scale/index.php +++ b/grade/edit/scale/index.php @@ -103,10 +103,10 @@ if ($courseid and $scales = grade_scale::fetch_all_local($courseid)) { $buttons = ""; $buttons .= "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; if (!$used) { $buttons .= "id&action=delete&sesskey=".sesskey()."\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; } $line[] = $buttons; $data[] = $line; @@ -132,11 +132,11 @@ if ($scales = grade_scale::fetch_all_global()) { $buttons = ""; if (has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) { $buttons .= "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; } if (!$used and has_capability('moodle/course:managescales', get_context_instance(CONTEXT_SYSTEM))) { $buttons .= "id&action=delete&sesskey=".sesskey()."\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; } $line[] = $buttons; $data[] = $line; diff --git a/grade/export/keymanager.php b/grade/export/keymanager.php index e8ef67e7cc..828a32c33b 100644 --- a/grade/export/keymanager.php +++ b/grade/export/keymanager.php @@ -52,9 +52,9 @@ if ($keys) { $line[2] = empty($key->validuntil) ? get_string('always') : userdate($key->validuntil); $buttons = "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; $buttons .= "id&delete=1\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; $line[3] = $buttons; $data[] = $line; diff --git a/grade/import/keymanager.php b/grade/import/keymanager.php index c1460ac24e..28516c702c 100644 --- a/grade/import/keymanager.php +++ b/grade/import/keymanager.php @@ -52,9 +52,9 @@ if ($keys = $DB->get_records_select('user_private_key', "script='grade/import' A $line[2] = empty($key->validuntil) ? get_string('always') : userdate($key->validuntil); $buttons = "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; $buttons .= "id&delete=1\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; $line[3] = $buttons; $data[] = $line; diff --git a/group/groupings.php b/group/groupings.php index 09b2051457..6b6ffebc6d 100644 --- a/group/groupings.php +++ b/group/groupings.php @@ -57,11 +57,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)); $buttons = "id\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> "; $buttons .= "id&delete=1\">pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"$strdelete\" /> "; + " src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"$strdelete\" /> "; $buttons .= "id\">pixpath/i/group.gif\" class=\"icon\" alt=\"$strmanagegrping\" /> "; + " src=\"" . $OUTPUT->old_icon_url('i/group') . "\" class=\"icon\" alt=\"$strmanagegrping\" /> "; $line[3] = $buttons; $data[] = $line; diff --git a/index.php b/index.php index 0930fd5d2e..aee1d81e2e 100644 --- a/index.php +++ b/index.php @@ -162,7 +162,7 @@ if ($editing) { $streditsummary = get_string('editsummary'); echo "id\">pixpath/t/edit.gif\" ". + " href=\"course/editsection.php?id=$section->id\">old_icon_url('t/edit') . "\" ". " class=\"iconsmall\" alt=\"$streditsummary\" />

"; } diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php index 055a2b3846..ecc343e23a 100644 --- a/lib/form/filemanager.php +++ b/lib/form/filemanager.php @@ -94,7 +94,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element { } function _get_draftfiles($draftid, $suffix) { - global $USER, $CFG; + global $USER, $OUTPUT; $html = ''; if (!$context = get_context_instance(CONTEXT_USER, $USER->id)) { } @@ -121,8 +121,8 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element { $icon = mimeinfo_from_type('icon', $mimetype); $viewurl = file_encode_url("$CFG->wwwroot/draftfile.php", "/$contextid/user_draft/$draftid".$filepath.$filename, false, false); $html .= '
  • '; - $html .= "pixpath/f/$icon\" class=\"icon\" /> ".s($filename)." ($filesize) "; - $html .= "pixpath/t/delete.gif\" class=\"iconsmall\" />";; + $html .= "old_icon_url('f/' . $icon) . "\" class=\"icon\" /> ".s($filename)." ($filesize) "; + $html .= "old_icon_url('t/delete') . "\" class=\"iconsmall\" />";; $html .= '
    • '; } $html .= ''; diff --git a/lib/outputlib.php b/lib/outputlib.php index b085d3fe56..1c65c1909b 100644 --- a/lib/outputlib.php +++ b/lib/outputlib.php @@ -382,7 +382,7 @@ class theme_config { * @return string the URL for that icon. */ public function old_icon_url($iconname) { - return $this->if->old_icon_url($iconname); + return $this->get_icon_finder()->old_icon_url($iconname); } /** @@ -396,7 +396,7 @@ class theme_config { * @return string the URL for that icon. */ public function mod_icon_url($iconname, $module) { - return $this->if->mod_icon_url($iconname, $module); + return $this->get_icon_finder()->mod_icon_url($iconname, $module); } /** diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php index 255803ded9..92206dbf84 100644 --- a/mod/glossary/lib.php +++ b/mod/glossary/lib.php @@ -902,7 +902,7 @@ function glossary_print_entry_aliases($course, $cm, $glossary, $entry,$mode='', * @return string|void */ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$hook='', $type = 'print') { - global $USER, $CFG, $DB; + global $USER, $CFG, $DB, $OUTPUT; $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -940,7 +940,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h if ( $entry->sourceglossaryid ) { $icon = "minus.gif"; // graphical metaphor (minus) for deleting an imported entry } else { - $icon = "$CFG->pixpath/t/delete.gif"; + $icon = $OUTPUT->old_icon_url('t/delete'); } //Decide if an entry is editable: @@ -953,7 +953,7 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h $return .= $icon; $return .= "\" class=\"iconsmall\" alt=\"" . get_string("delete") .$altsuffix."\" /> "; - $return .= " id&id=$entry->id&mode=$mode&hook=".urlencode($hook)."\">pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" />"; + $return .= " id&id=$entry->id&mode=$mode&hook=".urlencode($hook)."\">old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"" . get_string("edit") .$altsuffix. "\" />"; } elseif ( $importedentry ) { $return .= " " . get_string("exportedentry","glossary") . ""; } @@ -1720,7 +1720,7 @@ function glossary_sort_entries ( $entry0, $entry1 ) { * @param object $comment */ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) { - global $CFG, $USER, $DB; + global $CFG, $USER, $DB, $OUTPUT; $context = get_context_instance(CONTEXT_MODULE, $cm->id); @@ -1757,11 +1757,11 @@ function glossary_print_comment($course, $cm, $glossary, $entry, $comment) { $ineditperiod = ((time() - $comment->timemodified < $CFG->maxeditingtime) || $glossary->editalways); if ( ($glossary->allowcomments && $ineditperiod && $USER->id == $comment->userid) || has_capability('mod/glossary:managecomments', $context)) { echo "id&action=edit\">\""pixpath/t/edit.gif\" class=\"iconsmall\" /> "; + alt=\"" . get_string("edit") . "\" src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" /> "; } if ( ($glossary->allowcomments && $USER->id == $comment->userid) || has_capability('mod/glossary:managecomments', $context) ) { echo "id&action=delete\">\""pixpath/t/delete.gif\" class=\"iconsmall\" />"; + alt=\"" . get_string("delete") . "\" src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" class=\"iconsmall\" />"; } echo ''; diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php index aa11734fe2..c133b47fe4 100644 --- a/mod/lesson/locallib.php +++ b/mod/lesson/locallib.php @@ -469,7 +469,7 @@ function lesson_print_time_remaining($starttime, $maxtime, $return = false) { * @return mixed boolean/string **/ function lesson_print_page_actions($cmid, $page, $printmove, $printaddpage = false, $return = false) { - global $CFG; + global $CFG, $OUTPUT; $context = get_context_instance(CONTEXT_MODULE, $cmid); $actions = array(); @@ -477,16 +477,16 @@ function lesson_print_page_actions($cmid, $page, $printmove, $printaddpage = fal if (has_capability('mod/lesson:edit', $context)) { if ($printmove) { $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&action=move&pageid=$page->id\"> - pixpath/t/move.gif\" class=\"iconsmall\" alt=\"".get_string('move')."\" />\n"; + old_icon_url('t/move') . "\" class=\"iconsmall\" alt=\"".get_string('move')."\" />\n"; } $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&action=editpage&pageid=$page->id\"> - pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"".get_string('update')."\" />\n"; + old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"".get_string('update')."\" />\n"; $actions[] = "wwwroot/mod/lesson/view.php?id=$cmid&pageid=$page->id\"> - pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"".get_string('preview')."\" />\n"; + old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"".get_string('preview')."\" />\n"; $actions[] = "wwwroot/mod/lesson/lesson.php?id=$cmid&sesskey=".sesskey()."&action=confirmdelete&pageid=$page->id\"> - pixpath/t/delete.gif\" class=\"iconsmall\" alt=\"".get_string('delete')."\" />\n"; + old_icon_url('t/delete') . "\" class=\"iconsmall\" alt=\"".get_string('delete')."\" />\n"; if ($printaddpage) { // Add page drop-down diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php index 65b09fe96e..c3a63daa5d 100644 --- a/mod/quiz/editlib.php +++ b/mod/quiz/editlib.php @@ -285,7 +285,7 @@ function quiz_move_question_down($layout, $questionid) { function quiz_print_question_list($quiz, $pageurl, $allowdelete = true, $reordertool = false, $quiz_qbanktool = false, $hasattempts = false) { - global $USER, $CFG, $QTYPES, $DB; + global $USER, $CFG, $QTYPES, $DB, $OUTPUT; $strorder = get_string('order'); $strquestionname = get_string('questionname', 'quiz'); $strgrade = get_string('grade'); @@ -492,7 +492,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true, } echo "out_action(array('up' => $question->id)) . "\">pixpath/t/up.gif\" class=\"iconsmall + src=\"" . $OUTPUT->old_icon_url('t/up') . "\" class=\"iconsmall $upbuttonclass\" alt=\"$strmoveup\" />"; } @@ -501,7 +501,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true, if (!$hasattempts) { echo "out_action(array('down' => $question->id)) . "\">pixpath/t/down.gif\" class=\"iconsmall\"" . + src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\"" . " alt=\"$strmovedown\" />"; } } @@ -510,7 +510,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true, if (!$hasattempts) { echo "out_action(array('remove' => $question->id)) . "\"> - pixpath/t/delete.gif\" " . + old_icon_url('t/delete') . "\" " . "class=\"iconsmall\" alt=\"$strremove\" />"; } } diff --git a/mod/quiz/locallib.php b/mod/quiz/locallib.php index b5510be11c..25fcb37dde 100644 --- a/mod/quiz/locallib.php +++ b/mod/quiz/locallib.php @@ -834,7 +834,7 @@ function quiz_question_edit_button($cmid, $question, $returnurl, $contentbeforei * @return the HTML for a preview question icon. */ function quiz_question_preview_button($quiz, $question, $label = false) { - global $CFG, $COURSE; + global $CFG, $COURSE, $OUTPUT; if (!question_has_capability_on($question, 'use', $question->category)) { return ''; } @@ -855,7 +855,7 @@ function quiz_question_preview_button($quiz, $question, $label = false) { // Build the icon. return link_to_popup_window('/question/preview.php?id=' . $question->id . '&quizid=' . $quiz->id, 'questionpreview', - "pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"$strpreviewquestion\" /> $strpreviewlabel", + "old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strpreviewquestion\" /> $strpreviewlabel", 0, 0, $strpreviewquestion, QUESTION_PREVIEW_POPUP_OPTIONS, true); } diff --git a/mod/quiz/tabs.php b/mod/quiz/tabs.php index bcb22d86d4..90a62c5968 100644 --- a/mod/quiz/tabs.php +++ b/mod/quiz/tabs.php @@ -40,10 +40,10 @@ if (has_capability('mod/quiz:viewreports', $context)) { } if (has_capability('mod/quiz:preview', $context)) { $strpreview = get_string('preview', 'quiz'); - $row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/startattempt.php?cmid=$cm->id&sesskey=" . sesskey(), "pixpath/t/preview.gif\" class=\"iconsmall\" alt=\"$strpreview\" /> $strpreview", $strpreview); + $row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/startattempt.php?cmid=$cm->id&sesskey=" . sesskey(), "old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strpreview\" /> $strpreview", $strpreview); } if (has_capability('mod/quiz:manage', $context)) { - $row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", "pixpath/t/edit.gif\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit); + $row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", "old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit); } if ($currenttab == 'info' && count($row) == 1) { diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php index eeb5f96edb..178c5e92c3 100644 --- a/question/type/multianswer/questiontype.php +++ b/question/type/multianswer/questiontype.php @@ -277,8 +277,8 @@ class embedded_cloze_qtype extends default_questiontype { } function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) { + global $QTYPES, $CFG, $USER, $OUTPUT; - global $QTYPES, $CFG, $USER; $readonly = empty($options->readonly) ? '' : 'readonly="readonly"'; $disabled = empty($options->readonly) ? '' : 'disabled="disabled"'; $formatoptions = new stdClass; @@ -456,7 +456,7 @@ class embedded_cloze_qtype extends default_questiontype { echo " "; if (!empty($feedback) && !empty($USER->screenreader)) { - echo "pixpath/i/feedback.gif\" alt=\"$feedback\" />"; + echo "old_icon_url('i/feedback') . "\" alt=\"$feedback\" />"; } echo $feedbackimg; break; @@ -483,7 +483,7 @@ class embedded_cloze_qtype extends default_questiontype { echo $outputoptions; echo ''; if (!empty($feedback) && !empty($USER->screenreader)) { - echo "pixpath/i/feedback.gif\" alt=\"$feedback\" />"; + echo "old_icon_url('i/feedback') . "\" alt=\"$feedback\" />"; } echo $feedbackimg; }else if ($wrapped->options->layout == 1 || $wrapped->options->layout == 2){ diff --git a/tag/coursetags_edit.php b/tag/coursetags_edit.php index fd454385b6..6420614b93 100644 --- a/tag/coursetags_edit.php +++ b/tag/coursetags_edit.php @@ -141,7 +141,7 @@ print_header_simple($title, '', $nav, '', '', false);