From 9f1495aabce216e64052981edea33e27887bab5f Mon Sep 17 00:00:00 2001 From: Andrew Robert Nicols Date: Thu, 15 Mar 2012 11:45:57 +0000 Subject: [PATCH] MDL-32065 Allow feedback images to be themed --- mod/feedback/edit.php | 4 ++-- mod/feedback/item/multichoice/lib.php | 3 ++- mod/feedback/item/multichoicerated/lib.php | 3 ++- mod/feedback/{pics => pix/multichoice}/0.gif | Bin mod/feedback/{pics => pix/multichoice}/1.gif | Bin mod/feedback/{pics => pix/multichoice}/2.gif | Bin mod/feedback/{pics => pix/multichoice}/3.gif | Bin mod/feedback/{pics => pix/multichoice}/4.gif | Bin mod/feedback/{pics => pix/multichoice}/5.gif | Bin mod/feedback/{pics => pix/multichoice}/6.gif | Bin mod/feedback/{pics => pix/multichoice}/7.gif | Bin mod/feedback/{pics => pix/multichoice}/8.gif | Bin mod/feedback/{pics => pix/multichoice}/9.gif | Bin mod/feedback/{pics => pix}/notrequired.gif | Bin mod/feedback/{pics => pix}/required.gif | Bin 15 files changed, 6 insertions(+), 4 deletions(-) rename mod/feedback/{pics => pix/multichoice}/0.gif (100%) rename mod/feedback/{pics => pix/multichoice}/1.gif (100%) rename mod/feedback/{pics => pix/multichoice}/2.gif (100%) rename mod/feedback/{pics => pix/multichoice}/3.gif (100%) rename mod/feedback/{pics => pix/multichoice}/4.gif (100%) rename mod/feedback/{pics => pix/multichoice}/5.gif (100%) rename mod/feedback/{pics => pix/multichoice}/6.gif (100%) rename mod/feedback/{pics => pix/multichoice}/7.gif (100%) rename mod/feedback/{pics => pix/multichoice}/8.gif (100%) rename mod/feedback/{pics => pix/multichoice}/9.gif (100%) rename mod/feedback/{pics => pix}/notrequired.gif (100%) rename mod/feedback/{pics => pix}/required.gif (100%) diff --git a/mod/feedback/edit.php b/mod/feedback/edit.php index 0c5509fc702..43f87446587 100644 --- a/mod/feedback/edit.php +++ b/mod/feedback/edit.php @@ -315,12 +315,12 @@ if($do_show == 'edit') { // echo ''; // echo ''; $buttontitle = get_string('switch_item_to_not_required','feedback'); - $buttonimg = 'pics/required.gif'; + $buttonimg = $OUTPUT->pix_url('required', 'feedback'); } else { // echo ''; // echo ''; $buttontitle = get_string('switch_item_to_required','feedback'); - $buttonimg = 'pics/notrequired.gif'; + $buttonimg = $OUTPUT->pix_url('notrequired', 'feedback'); } $requiredurl = new moodle_url($url, array('switchitemrequired'=>$feedbackitem->id)); $buttonlink = $requiredurl->out(); diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php index 30402b26ecc..cb5cb8f1e42 100644 --- a/mod/feedback/item/multichoice/lib.php +++ b/mod/feedback/item/multichoice/lib.php @@ -195,6 +195,7 @@ class feedback_item_multichoice extends feedback_item_base { } function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { + global $OUTPUT; $sep_dec = get_string('separator_decimal', 'feedback'); if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; @@ -214,7 +215,7 @@ class feedback_item_multichoice extends feedback_item_base { $pixnr = 0; foreach($analysedVals as $val) { $intvalue = $pixnr % 10; - $pix = "pics/$intvalue.gif"; + $pix = $OUTPUT->pix_url('multichoice/' . $intvalue, 'feedback'); $pixnr++; $pixwidth = intval($val->quotient * FEEDBACK_MAX_PIX_LENGTH); $quotient = number_format(($val->quotient * 100), 2, $sep_dec, $sep_thous); diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php index 41764e9a463..e803cd62ec9 100644 --- a/mod/feedback/item/multichoicerated/lib.php +++ b/mod/feedback/item/multichoicerated/lib.php @@ -165,6 +165,7 @@ class feedback_item_multichoicerated extends feedback_item_base { } function print_analysed($item, $itemnr = '', $groupid = false, $courseid = false) { + global $OUTPUT; $sep_dec = get_string('separator_decimal', 'feedback'); if(substr($sep_dec, 0, 2) == '[['){ $sep_dec = FEEDBACK_DECIMAL; @@ -185,7 +186,7 @@ class feedback_item_multichoicerated extends feedback_item_base { $avg = 0.0; foreach($analysedVals as $val) { $intvalue = $pixnr % 10; - $pix = "pics/$intvalue.gif"; + $pix = $OUTPUT->pix_url('multichoice/' . $intvalue, 'feedback'); $pixnr++; $pixwidth = intval($val->quotient * FEEDBACK_MAX_PIX_LENGTH); diff --git a/mod/feedback/pics/0.gif b/mod/feedback/pix/multichoice/0.gif similarity index 100% rename from mod/feedback/pics/0.gif rename to mod/feedback/pix/multichoice/0.gif diff --git a/mod/feedback/pics/1.gif b/mod/feedback/pix/multichoice/1.gif similarity index 100% rename from mod/feedback/pics/1.gif rename to mod/feedback/pix/multichoice/1.gif diff --git a/mod/feedback/pics/2.gif b/mod/feedback/pix/multichoice/2.gif similarity index 100% rename from mod/feedback/pics/2.gif rename to mod/feedback/pix/multichoice/2.gif diff --git a/mod/feedback/pics/3.gif b/mod/feedback/pix/multichoice/3.gif similarity index 100% rename from mod/feedback/pics/3.gif rename to mod/feedback/pix/multichoice/3.gif diff --git a/mod/feedback/pics/4.gif b/mod/feedback/pix/multichoice/4.gif similarity index 100% rename from mod/feedback/pics/4.gif rename to mod/feedback/pix/multichoice/4.gif diff --git a/mod/feedback/pics/5.gif b/mod/feedback/pix/multichoice/5.gif similarity index 100% rename from mod/feedback/pics/5.gif rename to mod/feedback/pix/multichoice/5.gif diff --git a/mod/feedback/pics/6.gif b/mod/feedback/pix/multichoice/6.gif similarity index 100% rename from mod/feedback/pics/6.gif rename to mod/feedback/pix/multichoice/6.gif diff --git a/mod/feedback/pics/7.gif b/mod/feedback/pix/multichoice/7.gif similarity index 100% rename from mod/feedback/pics/7.gif rename to mod/feedback/pix/multichoice/7.gif diff --git a/mod/feedback/pics/8.gif b/mod/feedback/pix/multichoice/8.gif similarity index 100% rename from mod/feedback/pics/8.gif rename to mod/feedback/pix/multichoice/8.gif diff --git a/mod/feedback/pics/9.gif b/mod/feedback/pix/multichoice/9.gif similarity index 100% rename from mod/feedback/pics/9.gif rename to mod/feedback/pix/multichoice/9.gif diff --git a/mod/feedback/pics/notrequired.gif b/mod/feedback/pix/notrequired.gif similarity index 100% rename from mod/feedback/pics/notrequired.gif rename to mod/feedback/pix/notrequired.gif diff --git a/mod/feedback/pics/required.gif b/mod/feedback/pix/required.gif similarity index 100% rename from mod/feedback/pics/required.gif rename to mod/feedback/pix/required.gif