From 0c3c54934a17e2c0fb185b4ce8e78317a9c8db47 Mon Sep 17 00:00:00 2001 From: Petr Skoda Date: Thu, 12 Aug 2010 19:01:28 +0000 Subject: [PATCH] MDL-23784 converted question types to use new pix API and locations --- lib/questionlib.php | 5 ++--- question/type/calculated/{ => pix}/icon.gif | Bin question/type/calculatedmulti/{ => pix}/icon.gif | Bin question/type/calculatedsimple/{ => pix}/icon.gif | Bin question/type/description/{ => pix}/icon.gif | Bin question/type/essay/{ => pix}/icon.gif | Bin question/type/match/{ => pix}/icon.gif | Bin question/type/missingtype/{ => pix}/icon.gif | Bin question/type/multianswer/{ => pix}/icon.gif | Bin question/type/multianswer/questiontype.php | 2 +- question/type/multichoice/{ => pix}/icon.gif | Bin question/type/numerical/{ => pix}/icon.gif | Bin question/type/random/{ => pix}/icon.gif | Bin question/type/randomsamatch/{ => pix}/icon.gif | Bin question/type/shortanswer/{ => pix}/icon.gif | Bin question/type/truefalse/{ => pix}/icon.gif | Bin 16 files changed, 3 insertions(+), 4 deletions(-) rename question/type/calculated/{ => pix}/icon.gif (100%) rename question/type/calculatedmulti/{ => pix}/icon.gif (100%) rename question/type/calculatedsimple/{ => pix}/icon.gif (100%) rename question/type/description/{ => pix}/icon.gif (100%) rename question/type/essay/{ => pix}/icon.gif (100%) rename question/type/match/{ => pix}/icon.gif (100%) rename question/type/missingtype/{ => pix}/icon.gif (100%) rename question/type/multianswer/{ => pix}/icon.gif (100%) rename question/type/multichoice/{ => pix}/icon.gif (100%) rename question/type/numerical/{ => pix}/icon.gif (100%) rename question/type/random/{ => pix}/icon.gif (100%) rename question/type/randomsamatch/{ => pix}/icon.gif (100%) rename question/type/shortanswer/{ => pix}/icon.gif (100%) rename question/type/truefalse/{ => pix}/icon.gif (100%) diff --git a/lib/questionlib.php b/lib/questionlib.php index c05efd2f44a..c359637786e 100644 --- a/lib/questionlib.php +++ b/lib/questionlib.php @@ -1834,15 +1834,14 @@ function question_apply_penalty_and_timelimit(&$question, &$state, $attempt, $cm * @param boolean $return If true the functions returns the link as a string */ function print_question_icon($question, $return = false) { - global $QTYPES, $CFG; + global $QTYPES, $CFG, $OUTPUT; if (array_key_exists($question->qtype, $QTYPES)) { $namestr = $QTYPES[$question->qtype]->local_name(); } else { $namestr = 'missingtype'; } - $html = '' . + $html = '<img src=pix_url('icon', 'qtype_'.$question->qtype) . '" alt="' . $namestr . '" title="' . $namestr . '" />'; if ($return) { return $html; diff --git a/question/type/calculated/icon.gif b/question/type/calculated/pix/icon.gif similarity index 100% rename from question/type/calculated/icon.gif rename to question/type/calculated/pix/icon.gif diff --git a/question/type/calculatedmulti/icon.gif b/question/type/calculatedmulti/pix/icon.gif similarity index 100% rename from question/type/calculatedmulti/icon.gif rename to question/type/calculatedmulti/pix/icon.gif diff --git a/question/type/calculatedsimple/icon.gif b/question/type/calculatedsimple/pix/icon.gif similarity index 100% rename from question/type/calculatedsimple/icon.gif rename to question/type/calculatedsimple/pix/icon.gif diff --git a/question/type/description/icon.gif b/question/type/description/pix/icon.gif similarity index 100% rename from question/type/description/icon.gif rename to question/type/description/pix/icon.gif diff --git a/question/type/essay/icon.gif b/question/type/essay/pix/icon.gif similarity index 100% rename from question/type/essay/icon.gif rename to question/type/essay/pix/icon.gif diff --git a/question/type/match/icon.gif b/question/type/match/pix/icon.gif similarity index 100% rename from question/type/match/icon.gif rename to question/type/match/pix/icon.gif diff --git a/question/type/missingtype/icon.gif b/question/type/missingtype/pix/icon.gif similarity index 100% rename from question/type/missingtype/icon.gif rename to question/type/missingtype/pix/icon.gif diff --git a/question/type/multianswer/icon.gif b/question/type/multianswer/pix/icon.gif similarity index 100% rename from question/type/multianswer/icon.gif rename to question/type/multianswer/pix/icon.gif diff --git a/question/type/multianswer/questiontype.php b/question/type/multianswer/questiontype.php index 35f51e88d09..9f1b47e9df5 100644 --- a/question/type/multianswer/questiontype.php +++ b/question/type/multianswer/questiontype.php @@ -302,7 +302,7 @@ class embedded_cloze_qtype extends default_questiontype { // adding an icon with alt to warn user this is a fill in the gap question // MDL-7497 if (!empty($USER->screenreader)) { - echo "wwwroot/question/type/$question->qtype/icon.gif\" ". + echo "pix_url('icon', 'qtype_'.$question->qtype)."\" ". "class=\"icon\" alt=\"".get_string('clozeaid','qtype_multichoice')."\" /> "; } diff --git a/question/type/multichoice/icon.gif b/question/type/multichoice/pix/icon.gif similarity index 100% rename from question/type/multichoice/icon.gif rename to question/type/multichoice/pix/icon.gif diff --git a/question/type/numerical/icon.gif b/question/type/numerical/pix/icon.gif similarity index 100% rename from question/type/numerical/icon.gif rename to question/type/numerical/pix/icon.gif diff --git a/question/type/random/icon.gif b/question/type/random/pix/icon.gif similarity index 100% rename from question/type/random/icon.gif rename to question/type/random/pix/icon.gif diff --git a/question/type/randomsamatch/icon.gif b/question/type/randomsamatch/pix/icon.gif similarity index 100% rename from question/type/randomsamatch/icon.gif rename to question/type/randomsamatch/pix/icon.gif diff --git a/question/type/shortanswer/icon.gif b/question/type/shortanswer/pix/icon.gif similarity index 100% rename from question/type/shortanswer/icon.gif rename to question/type/shortanswer/pix/icon.gif diff --git a/question/type/truefalse/icon.gif b/question/type/truefalse/pix/icon.gif similarity index 100% rename from question/type/truefalse/icon.gif rename to question/type/truefalse/pix/icon.gif