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

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

View file

@ -431,7 +431,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
echo '<div class="quizpagedelete">';
echo '<a title="' . get_string('removeemptypage', 'quiz') . '" href="' .
$pageurl->out_action(array('deleteemptypage' => $i - 1)) .
'"><img src="' . $OUTPUT->old_icon_url('t/delete') . '" ' .
'"><img src="' . $OUTPUT->pix_url('t/delete') . '" ' .
'class="iconsmall" alt="' . $strremove . '" /></a>';
echo '</div>';
}
@ -492,7 +492,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
}
echo "<a title=\"$strmoveup\" href=\"" .
$pageurl->out_action(array('up' => $question->id)) . "\"><img
src=\"" . $OUTPUT->old_icon_url('t/up') . "\" class=\"iconsmall
src=\"" . $OUTPUT->pix_url('t/up') . "\" class=\"iconsmall
$upbuttonclass\" alt=\"$strmoveup\" /></a>";
}
@ -501,7 +501,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
if (!$hasattempts) {
echo "<a title=\"$strmovedown\" href=\"" .
$pageurl->out_action(array('down' => $question->id)) . "\"><img
src=\"" . $OUTPUT->old_icon_url('t/down') . "\" class=\"iconsmall\"" .
src=\"" . $OUTPUT->pix_url('t/down') . "\" class=\"iconsmall\"" .
" alt=\"$strmovedown\" /></a>";
}
}
@ -510,7 +510,7 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete = true,
if (!$hasattempts) {
echo "<a title=\"$strremove\" href=\"" .
$pageurl->out_action(array('remove' => $question->id)) . "\">
<img src=\"" . $OUTPUT->old_icon_url('t/delete') . "\" " .
<img src=\"" . $OUTPUT->pix_url('t/delete') . "\" " .
"class=\"iconsmall\" alt=\"$strremove\" /></a>";
}
}
@ -910,7 +910,7 @@ function print_random_option_icon($question) {
$icon = 'nosubcat';
$tooltip = get_string('randomnosubcat', 'quiz');
}
echo '<img src="' . $OUTPUT->old_icon_url('i/' . $icon) . '" alt="' .
echo '<img src="' . $OUTPUT->pix_url('i/' . $icon) . '" alt="' .
$tooltip . '" title="' . $tooltip . '" class="uihint" />';
}

View file

@ -838,7 +838,7 @@ function quiz_print_recent_mod_activity($activity, $courseid, $detail, $modnames
if ($detail) {
$modname = $modnames[$activity->type];
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\" />";
echo "<a href=\"$CFG->wwwroot/mod/quiz/view.php?id={$activity->cmid}\">{$activity->name}</a>";
echo '</div>';
@ -1454,26 +1454,26 @@ function quiz_extend_settings_navigation($settings, $module) {
if (has_capability('mod/quiz:view', $PAGE->cm->context)) {
$url = new moodle_url($CFG->wwwroot.'/mod/quiz/view.php', array('id'=>$PAGE->cm->id));
$quiznav->add(get_string('info', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/info'));
$quiznav->add(get_string('info', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/info'));
}
if (has_capability('mod/quiz:viewreports', $PAGE->cm->context)) {
$url = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', array('q'=>$quiz->id));
$reportkey = $quiznav->add(get_string('results', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/report'));
$reportkey = $quiznav->add(get_string('results', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/report'));
require_once($CFG->dirroot.'/mod/quiz/report/reportlib.php');
$reportlist = quiz_report_list($PAGE->cm->context);
foreach ($reportlist as $report) {
$url = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', array('q'=>$quiz->id, 'mode'=>$report));
$quiznav->get($reportkey)->add(get_string($report, 'quiz_'.$report), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('i/item'));
$quiznav->get($reportkey)->add(get_string($report, 'quiz_'.$report), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('i/item'));
}
}
if (has_capability('mod/quiz:preview', $PAGE->cm->context)) {
$url = new moodle_url($CFG->wwwroot.'/mod/quiz/startattempt.php', array('cmid'=>$PAGE->cm->id, 'sesskey'=>sesskey()));
$quiznav->add(get_string('preview', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/preview'));
$quiznav->add(get_string('preview', 'quiz'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/preview'));
}
if (has_capability('mod/quiz:manage', $PAGE->cm->context)) {
$url = new moodle_url($CFG->wwwroot.'/mod/quiz/edit.php', array('cmid'=>$PAGE->cm->id));
$quiznav->add(get_string('edit'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->old_icon_url('t/edit'));
$quiznav->add(get_string('edit'), $url, navigation_node::TYPE_SETTING, null, null, $OUTPUT->pix_url('t/edit'));
}
if (has_capability('moodle/course:manageactivities', $PAGE->cm->context)) {

View file

@ -790,7 +790,7 @@ function quiz_question_edit_button($cmid, $question, $returnurl, $contentbeforei
$questionparams = array('returnurl' => $returnurl, 'cmid' => $cmid, 'id' => $question->id);
$questionurl = new moodle_url("$CFG->wwwroot/question/question.php", $questionparams);
return '<a title="' . $action . '" href="' . $questionurl->out() . '">' . $contentbeforeicon .
'<img src="' . $OUTPUT->old_icon_url($icon) . '" alt="' . $action . '" /></a>';
'<img src="' . $OUTPUT->pix_url($icon) . '" alt="' . $action . '" /></a>';
} else {
return $contentbeforeicon;
}
@ -824,7 +824,7 @@ function quiz_question_preview_button($quiz, $question, $label = false) {
// Build the icon.
$image = new html_image();
$image->src = $OUTPUT->old_icon_url('t/preview');
$image->src = $OUTPUT->pix_url('t/preview');
$image->add_class('iconsmall');
$image->alt = $strpreviewquestion;

View file

@ -1,3 +0,0 @@
#quiznavigation .qnbutton.flagged {
background-image: url('<?php echo $PAGE->theme->old_icon_url('i/ne_red_mark') ?>');
}

View file

@ -98,7 +98,7 @@ foreach ($attemptobj->get_question_iterator() as $number => $question) {
}
$flag = '';
if ($attemptobj->is_question_flagged($question->id)) {
$flag = ' <img src="' . $OUTPUT->old_icon_url('i/flagged') . '" alt="' .
$flag = ' <img src="' . $OUTPUT->pix_url('i/flagged') . '" alt="' .
get_string('flagged', 'question') . '" class="questionflag" />';
}
$row = array('<a href="' . s($attemptobj->attempt_url($question->id)) . '">' . $number . $flag . '</a>',

View file

@ -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&amp;sesskey=" . sesskey(), "<img src=\"" . $OUTPUT->old_icon_url('t/preview') . "\" class=\"iconsmall\" alt=\"$strpreview\" /> $strpreview", $strpreview);
$row[] = new tabobject('preview', "$CFG->wwwroot/mod/quiz/startattempt.php?cmid=$cm->id&amp;sesskey=" . sesskey(), "<img src=\"" . $OUTPUT->pix_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", "<img src=\"" . $OUTPUT->old_icon_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit);
$row[] = new tabobject('edit', "$CFG->wwwroot/mod/quiz/edit.php?cmid=$cm->id", "<img src=\"" . $OUTPUT->pix_url('t/edit') . "\" class=\"iconsmall\" alt=\"$stredit\" /> $stredit",$stredit);
}
if ($currenttab == 'info' && count($row) == 1) {