diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php index 3a521866e9..8e1c7299e5 100644 --- a/main/exercice/fill_blanks.class.php +++ b/main/exercice/fill_blanks.class.php @@ -40,7 +40,7 @@ if(!class_exists('FillBlanks')): class FillBlanks extends Question { - static $typePicture = 'fill_in_blanks.png'; + static $typePicture = 'fill_in_blanks.gif'; static $explanationLangVar = 'FillBlanks'; /** diff --git a/main/exercice/freeanswer.class.php b/main/exercice/freeanswer.class.php index 69f2948c45..7a8fd13279 100644 --- a/main/exercice/freeanswer.class.php +++ b/main/exercice/freeanswer.class.php @@ -32,7 +32,7 @@ if(!class_exists('FreeAnswer')): class FreeAnswer extends Question { - static $typePicture = 'open_answer.png'; + static $typePicture = 'open_answer.gif'; static $explanationLangVar = 'freeAnswer'; /** diff --git a/main/exercice/hotspot.class.php b/main/exercice/hotspot.class.php index 330b6addd3..6e9ea0c607 100644 --- a/main/exercice/hotspot.class.php +++ b/main/exercice/hotspot.class.php @@ -40,7 +40,7 @@ if(!class_exists('HotSpot')): class HotSpot extends Question { - static $typePicture = 'hotspot.png'; + static $typePicture = 'hotspot.gif'; static $explanationLangVar = 'Hotspot'; diff --git a/main/exercice/matching.class.php b/main/exercice/matching.class.php index 5f141ed8a4..4e7fd915cc 100644 --- a/main/exercice/matching.class.php +++ b/main/exercice/matching.class.php @@ -41,7 +41,7 @@ if(!class_exists('Matching')): class Matching extends Question { - static $typePicture = 'matching.png'; + static $typePicture = 'matching.gif'; static $explanationLangVar = 'Matching'; /** diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php index e1fba8ef34..0930ddf4f6 100644 --- a/main/exercice/multiple_answer.class.php +++ b/main/exercice/multiple_answer.class.php @@ -39,7 +39,7 @@ if(!class_exists('MultipleAnswer')): class MultipleAnswer extends Question { - static $typePicture = 'mcma.png'; + static $typePicture = 'mcma.gif'; static $explanationLangVar = 'MultipleSelect'; /** diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php index 7b86206d1d..0982143e78 100644 --- a/main/exercice/question.class.php +++ b/main/exercice/question.class.php @@ -22,7 +22,7 @@ * File containing the Question class. * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: question.class.php 10800 2007-01-19 13:24:39Z elixir_julian $ +* @version $Id: question.class.php 10862 2007-01-24 09:03:15Z elixir_inter $ */ @@ -794,30 +794,32 @@ abstract class Question */ static function display_type_menu () { - ?> - - '; + + echo '
'; foreach(self::$questionTypes as $i=>$a_type) { - include_once($a_type[0]); + + // include the class of the type + include_once($a_type[0]); + + // get the picture of the type and the langvar which describes it eval('$img = '.$a_type[1].'::$typePicture;'); eval('$explanation = get_lang('.$a_type[1].'::$explanationLangVar);'); echo ' -
- + '; + } - echo ' -
'.get_lang('ChooseQuestionType').'
'; + echo '
'; } } diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php index de6be8e12d..36ec25399c 100644 --- a/main/exercice/unique_answer.class.php +++ b/main/exercice/unique_answer.class.php @@ -40,7 +40,7 @@ if(!class_exists('UniqueAnswer')): class UniqueAnswer extends Question { - static $typePicture = 'mcua.png'; + static $typePicture = 'mcua.gif'; static $explanationLangVar = 'UniqueSelect'; /** diff --git a/main/img/fill_in_blanks.gif b/main/img/fill_in_blanks.gif new file mode 100644 index 0000000000..9b71d861f4 Binary files /dev/null and b/main/img/fill_in_blanks.gif differ diff --git a/main/img/fill_in_blanks.png b/main/img/fill_in_blanks.png deleted file mode 100644 index b058ad1ee5..0000000000 Binary files a/main/img/fill_in_blanks.png and /dev/null differ diff --git a/main/img/hotspot.gif b/main/img/hotspot.gif new file mode 100644 index 0000000000..19bc301054 Binary files /dev/null and b/main/img/hotspot.gif differ diff --git a/main/img/hotspot.png b/main/img/hotspot.png deleted file mode 100644 index 6392fd3916..0000000000 Binary files a/main/img/hotspot.png and /dev/null differ diff --git a/main/img/matching.gif b/main/img/matching.gif new file mode 100644 index 0000000000..d22b6597d9 Binary files /dev/null and b/main/img/matching.gif differ diff --git a/main/img/matching.png b/main/img/matching.png deleted file mode 100644 index b545fee560..0000000000 Binary files a/main/img/matching.png and /dev/null differ diff --git a/main/img/mcma.gif b/main/img/mcma.gif new file mode 100644 index 0000000000..044509bda1 Binary files /dev/null and b/main/img/mcma.gif differ diff --git a/main/img/mcma.png b/main/img/mcma.png deleted file mode 100644 index fbae91e0f2..0000000000 Binary files a/main/img/mcma.png and /dev/null differ diff --git a/main/img/mcua.gif b/main/img/mcua.gif new file mode 100644 index 0000000000..46810343ed Binary files /dev/null and b/main/img/mcua.gif differ diff --git a/main/img/mcua.png b/main/img/mcua.png deleted file mode 100644 index e65213eef8..0000000000 Binary files a/main/img/mcua.png and /dev/null differ diff --git a/main/img/open_answer.gif b/main/img/open_answer.gif new file mode 100644 index 0000000000..27db7b20a4 Binary files /dev/null and b/main/img/open_answer.gif differ diff --git a/main/img/open_answer.png b/main/img/open_answer.png deleted file mode 100644 index c593f5e2b0..0000000000 Binary files a/main/img/open_answer.png and /dev/null differ