Merge pull request #379 from ilosada/7309

New icons for questions types - refs #7309
1.9.x
Yannick Warnier 11 years ago
commit 78818df822
  1. 2
      main/exercice/fill_blanks.class.php
  2. 2
      main/exercice/freeanswer.class.php
  3. 2
      main/exercice/global_multiple_answer.class.php
  4. 2
      main/exercice/hotspot.class.php
  5. 2
      main/exercice/matching.class.php
  6. 2
      main/exercice/multiple_answer.class.php
  7. 2
      main/exercice/multiple_answer_combination.class.php
  8. 2
      main/exercice/multiple_answer_combination_true_false.class.php
  9. 2
      main/exercice/multiple_answer_true_false.class.php
  10. 8
      main/exercice/question.class.php
  11. 2
      main/exercice/unique_answer.class.php
  12. 2
      main/exercice/unique_answer_no_option.class.php
  13. BIN
      main/img/audio_question.png
  14. BIN
      main/img/database.png
  15. BIN
      main/img/fill_in_blanks.gif
  16. BIN
      main/img/hotspot.gif
  17. BIN
      main/img/icons/128/audio_question.png
  18. BIN
      main/img/icons/128/database.png
  19. BIN
      main/img/icons/128/fill_in_blanks.png
  20. BIN
      main/img/icons/128/hotspot.png
  21. BIN
      main/img/icons/128/matching.png
  22. BIN
      main/img/icons/128/mcma.png
  23. BIN
      main/img/icons/128/mcmac.png
  24. BIN
      main/img/icons/128/mcmaco.png
  25. BIN
      main/img/icons/128/mcmagl.png
  26. BIN
      main/img/icons/128/mcmao.png
  27. BIN
      main/img/icons/128/mcua.png
  28. BIN
      main/img/icons/128/mcuao.png
  29. BIN
      main/img/icons/128/open_answer.png
  30. BIN
      main/img/icons/16/audio_question.png
  31. BIN
      main/img/icons/16/database.png
  32. BIN
      main/img/icons/16/fill_in_blanks.png
  33. BIN
      main/img/icons/16/hotspot.png
  34. BIN
      main/img/icons/16/matching.png
  35. BIN
      main/img/icons/16/mcma.png
  36. BIN
      main/img/icons/16/mcmac.png
  37. BIN
      main/img/icons/16/mcmaco.png
  38. BIN
      main/img/icons/16/mcmagl.png
  39. BIN
      main/img/icons/16/mcmao.png
  40. BIN
      main/img/icons/16/mcua.png
  41. BIN
      main/img/icons/16/mcuao.png
  42. BIN
      main/img/icons/16/open_answer.png
  43. BIN
      main/img/icons/22/audio_question.png
  44. BIN
      main/img/icons/22/database.png
  45. BIN
      main/img/icons/22/fill_in_blanks.png
  46. BIN
      main/img/icons/22/hotspot.png
  47. BIN
      main/img/icons/22/matching.png
  48. BIN
      main/img/icons/22/mcma.png
  49. BIN
      main/img/icons/22/mcmac.png
  50. BIN
      main/img/icons/22/mcmaco.png
  51. BIN
      main/img/icons/22/mcmagl.png
  52. BIN
      main/img/icons/22/mcmao.png
  53. BIN
      main/img/icons/22/mcua.png
  54. BIN
      main/img/icons/22/mcuao.png
  55. BIN
      main/img/icons/22/open_answer.png
  56. BIN
      main/img/icons/32/audio_question.png
  57. BIN
      main/img/icons/32/database.png
  58. BIN
      main/img/icons/32/fill_in_blanks.gif
  59. BIN
      main/img/icons/32/fill_in_blanks.png
  60. BIN
      main/img/icons/32/hotspot.gif
  61. BIN
      main/img/icons/32/hotspot.png
  62. BIN
      main/img/icons/32/matching.gif
  63. BIN
      main/img/icons/32/matching.png
  64. BIN
      main/img/icons/32/mcma.gif
  65. BIN
      main/img/icons/32/mcma.png
  66. BIN
      main/img/icons/32/mcmac.gif
  67. BIN
      main/img/icons/32/mcmac.png
  68. BIN
      main/img/icons/32/mcmaco.gif
  69. BIN
      main/img/icons/32/mcmaco.png
  70. BIN
      main/img/icons/32/mcmagl.gif
  71. BIN
      main/img/icons/32/mcmagl.png
  72. BIN
      main/img/icons/32/mcmao.gif
  73. BIN
      main/img/icons/32/mcmao.png
  74. BIN
      main/img/icons/32/mcua.gif
  75. BIN
      main/img/icons/32/mcua.png
  76. BIN
      main/img/icons/32/mcuao.gif
  77. BIN
      main/img/icons/32/mcuao.png
  78. BIN
      main/img/icons/32/open_answer.gif
  79. BIN
      main/img/icons/32/open_answer.png
  80. BIN
      main/img/icons/48/audio_question.png
  81. BIN
      main/img/icons/48/database.png
  82. BIN
      main/img/icons/48/fill_in_blanks.png
  83. BIN
      main/img/icons/48/hotspot.png
  84. BIN
      main/img/icons/48/matching.png
  85. BIN
      main/img/icons/48/mcma.png
  86. BIN
      main/img/icons/48/mcmac.png
  87. BIN
      main/img/icons/48/mcmaco.png
  88. BIN
      main/img/icons/48/mcmagl.png
  89. BIN
      main/img/icons/48/mcmao.png
  90. BIN
      main/img/icons/48/mcua.png
  91. BIN
      main/img/icons/48/mcuao.png
  92. BIN
      main/img/icons/48/open_answer.png
  93. BIN
      main/img/icons/64/audio_question.png
  94. BIN
      main/img/icons/64/database.png
  95. BIN
      main/img/icons/64/fill_in_blanks.png
  96. BIN
      main/img/icons/64/hotspot.png
  97. BIN
      main/img/icons/64/matching.png
  98. BIN
      main/img/icons/64/mcma.png
  99. BIN
      main/img/icons/64/mcmac.png
  100. BIN
      main/img/icons/64/mcmaco.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -10,7 +10,7 @@
**/ **/
class FillBlanks extends Question class FillBlanks extends Question
{ {
static $typePicture = 'fill_in_blanks.gif'; static $typePicture = 'fill_in_blanks.png';
static $explanationLangVar = 'FillBlanks'; static $explanationLangVar = 'FillBlanks';
/** /**

@ -10,7 +10,7 @@
*/ */
class FreeAnswer extends Question class FreeAnswer extends Question
{ {
static $typePicture = 'open_answer.gif'; static $typePicture = 'open_answer.png';
static $explanationLangVar = 'FreeAnswer'; static $explanationLangVar = 'FreeAnswer';
/** /**

@ -6,7 +6,7 @@
*/ */
class GlobalMultipleAnswer extends Question class GlobalMultipleAnswer extends Question
{ {
static $typePicture = 'mcmagl.gif'; static $typePicture = 'mcmagl.png';
static $explanationLangVar = 'GlobalMultipleAnswer'; static $explanationLangVar = 'GlobalMultipleAnswer';
/** /**

@ -12,7 +12,7 @@
**/ **/
class HotSpot extends Question class HotSpot extends Question
{ {
static $typePicture = 'hotspot.gif'; static $typePicture = 'hotspot.png';
static $explanationLangVar = 'HotSpot'; static $explanationLangVar = 'HotSpot';
function HotSpot() { function HotSpot() {

@ -13,7 +13,7 @@
*/ */
class Matching extends Question class Matching extends Question
{ {
static $typePicture = 'matching.gif'; static $typePicture = 'matching.png';
static $explanationLangVar = 'Matching'; static $explanationLangVar = 'Matching';
/** /**

@ -12,7 +12,7 @@
**/ **/
class MultipleAnswer extends Question class MultipleAnswer extends Question
{ {
static $typePicture = 'mcma.gif'; static $typePicture = 'mcma.png';
static $explanationLangVar = 'MultipleSelect'; static $explanationLangVar = 'MultipleSelect';
/** /**

@ -12,7 +12,7 @@
class MultipleAnswerCombination extends Question class MultipleAnswerCombination extends Question
{ {
static $typePicture = 'mcmac.gif'; static $typePicture = 'mcmac.png';
static $explanationLangVar = 'MultipleSelectCombination'; static $explanationLangVar = 'MultipleSelectCombination';
/** /**

@ -11,7 +11,7 @@
**/ **/
class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination class MultipleAnswerCombinationTrueFalse extends MultipleAnswerCombination
{ {
static $typePicture = 'mcmaco.gif'; static $typePicture = 'mcmaco.png';
static $explanationLangVar = 'MultipleAnswerCombinationTrueFalse'; static $explanationLangVar = 'MultipleAnswerCombinationTrueFalse';
var $options; var $options;

@ -11,7 +11,7 @@
*/ */
class MultipleAnswerTrueFalse extends Question class MultipleAnswerTrueFalse extends Question
{ {
static $typePicture = 'mcmao.gif'; static $typePicture = 'mcmao.png';
static $explanationLangVar = 'MultipleAnswerTrueFalse'; static $explanationLangVar = 'MultipleAnswerTrueFalse';
public $options; public $options;

@ -1397,9 +1397,9 @@ abstract class Question
if ($objExercise->exercise_was_added_in_lp == true) { if ($objExercise->exercise_was_added_in_lp == true) {
$img = pathinfo($img); $img = pathinfo($img);
$img = $img['filename'].'_na.'.$img['extension']; $img = $img['filename'].'_na.'.$img['extension'];
echo Display::return_icon($img,$explanation); echo Display::return_icon($img, $explanation, null, ICON_SIZE_BIG);
} else { } else {
echo '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.Display::return_icon($img, $explanation).'</a>'; echo '<a href="admin.php?'.api_get_cidreq().'&newQuestion=yes&answerType='.$i.'">'.Display::return_icon($img, $explanation, null, ICON_SIZE_BIG).'</a>';
} }
echo '</div>'; echo '</div>';
echo '</li>'; echo '</li>';
@ -1408,14 +1408,14 @@ abstract class Question
echo '<li>'; echo '<li>';
echo '<div class="icon_image_content">'; echo '<div class="icon_image_content">';
if ($objExercise->exercise_was_added_in_lp == true) { if ($objExercise->exercise_was_added_in_lp == true) {
echo Display::return_icon('database_na.png', get_lang('GetExistingQuestion')); echo Display::return_icon('database_na.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
} else { } else {
if ($feedback_type==1) { if ($feedback_type==1) {
echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&type=1&fromExercise='.$exerciseId.'">'; echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&type=1&fromExercise='.$exerciseId.'">';
} else { } else {
echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&fromExercise='.$exerciseId.'">'; echo $url = '<a href="question_pool.php?'.api_get_cidreq().'&fromExercise='.$exerciseId.'">';
} }
echo Display::return_icon('database.png', get_lang('GetExistingQuestion')); echo Display::return_icon('database.png', get_lang('GetExistingQuestion'), null, ICON_SIZE_BIG);
} }
echo '</a>'; echo '</a>';
echo '</div></li>'; echo '</div></li>';

@ -15,7 +15,7 @@
class UniqueAnswer extends Question class UniqueAnswer extends Question
{ {
static $typePicture = 'mcua.gif'; static $typePicture = 'mcua.png';
static $explanationLangVar = 'UniqueSelect'; static $explanationLangVar = 'UniqueSelect';
/** /**

@ -12,7 +12,7 @@
*/ */
class UniqueAnswerNoOption extends Question class UniqueAnswerNoOption extends Question
{ {
static $typePicture = 'mcuao.gif'; static $typePicture = 'mcuao.png';
static $explanationLangVar = 'UniqueAnswerNoOption'; static $explanationLangVar = 'UniqueAnswerNoOption';
/** /**

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 565 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 574 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 652 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 520 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 761 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 827 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 795 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 683 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 801 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 918 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 792 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 836 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 688 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 676 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 770 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 687 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 910 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 961 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 604 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 846 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 823 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 973 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 794 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 935 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 875 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save