From d89cc0bc2b754d76eed15200a69763e2d52edf49 Mon Sep 17 00:00:00 2001 From: Julian Prud'homme Date: Wed, 14 Feb 2007 10:46:32 +0100 Subject: [PATCH] [svn r11107] Update to integrate new icons --- main/exercice/exercice.php | 8 ++++---- main/exercice/exercice_submit.php | 9 +++++---- main/exercice/exercise.lib.php | 14 +++++++------- main/exercice/question_pool.php | 4 ++-- main/img/PickFromQuestionsDb.gif | Bin 0 -> 1149 bytes main/img/show_test_results.gif | Bin 0 -> 205 bytes main/img/visio_meeting.gif | Bin 0 -> 1315 bytes main/inc/lib/add_course.lib.inc.php | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 main/img/PickFromQuestionsDb.gif create mode 100644 main/img/show_test_results.gif create mode 100644 main/img/visio_meeting.gif diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index 1357a91865..88364cbc9e 100644 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -24,7 +24,7 @@ * @author Olivier Brouckaert, original author * @author Denes Nagy, HotPotatoes integration * @author Wolfgang Schneider, code/html cleanup -* @version $Id: exercice.php 11105 2007-02-14 08:33:43Z elixir_julian $ +* @version $Id: exercice.php 11107 2007-02-14 09:46:32Z elixir_julian $ */ @@ -310,7 +310,7 @@ if($show == 'test'){ { //error_log('is_allowedToEdit and origin<> learnpath',0); echo "", - "\"new ".get_lang("NewEx")."", + "\"new ".get_lang("NewEx")."", //"\"new".get_lang("QuestionPool")." | ", //" | \"HotPotatoes\" ".get_lang("ImportHotPotatoesQuiz")."", @@ -427,7 +427,7 @@ if($show == 'test'){ ?> - +
@@ -925,7 +925,7 @@ $message = "

You attempt for the test #test# has been viewed/commented/correct '.get_lang("Show").' >>

'; + echo '

 '.get_lang("Show").' >>

'; }// end if($show == 'result') diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php index bc0fb22190..bbceea144d 100644 --- a/main/exercice/exercice_submit.php +++ b/main/exercice/exercice_submit.php @@ -35,7 +35,7 @@ * the administrator * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: exercice_submit.php 10957 2007-01-29 10:16:23Z elixir_julian $ +* @version $Id: exercice_submit.php 11107 2007-02-14 09:46:32Z elixir_julian $ */ @@ -485,7 +485,7 @@ $s="
- "; +
"; echo $s; /* */ @@ -528,8 +528,9 @@ foreach($questionList as $questionId) } } - $s=" - + + - @@ -147,10 +147,10 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false) { $s.=" - - "; @@ -160,10 +160,10 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false) elseif($answerType == MULTIPLE_ANSWER) { $s.=" - - "; @@ -284,7 +284,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false) if(!$onlyAnswers) { $s=" - diff --git a/main/exercice/question_pool.php b/main/exercice/question_pool.php index 8c095bcf99..15eb4f3dec 100644 --- a/main/exercice/question_pool.php +++ b/main/exercice/question_pool.php @@ -24,7 +24,7 @@ * One question can be in several exercises * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: question_pool.php 11057 2007-02-05 08:56:17Z elixir_julian $ +* @version $Id: question_pool.php 11107 2007-02-14 09:46:32Z elixir_julian $ */ // name of the language file that needs to be included @@ -297,7 +297,7 @@ if($is_allowedToEdit) { ?> - <?php echo get_lang('Reuse'); ?> + <?php echo get_lang('Reuse'); ?>|+0KoB3Yw?FipQ=5pY{g2OpoxeaLft{>Sb2taZArzGI_e6d%v|k|vP2}4 zlt@BH!`4)pdY&rcm?Mm;ql>2@&dlAk2$kRLMeOr@-@@0&kBGxZnnFw=%L@>kW3n?Y z<`N;=37_rmLOMmh;Nn(jABuBzr<+IF5UzR!_>!H%-Hp>>M)zPQG`LLy#yAh|`z`Og z5Q;4ojZSm^I?pyJlxI?mw9Lo(hyP|?2s?KlMWA`!yp{D;DZ(M&(Ts^YQ-%tSc#NPU zEtzQa16PMad{9)Y1qXpEc5y27q)<{WGMrrt0v$`Swj7%a96XBQWyN!_=3(w6#@akW z!g=`fRajV+gF^)tUP-X4LMJBDkX0B2AA_#8!#yJ0$jU^si5!sBsE2I^b(My=6@ysPs(~T77 zd=hJcR;Gx1;S$4DWpZXSISZxLtRJ|`9By-bx6j?0E!JapdF4cEM}j~gNEGh~g~CdH zm#9W0suj^|mNR>A*45Q9TY1bUOWDJ>Q(LrRu{gCINFp`Myc#^3EI6pE?YU8Pdlw+7xVXvS4wadGjD3XJ~) zCRf3%N~2P#g{F1%Igb^IYYMZF?z()(OQEgq%k~sFs`Vq zfRu+|>za96PRUH`{rpW|N)I=KEs{rKn0e>!cfynnN=81h!Ndxoi#n-Tw1&2X*FZhG z400&YB;;$!z?qLLMmd*e3c-Qp+UIrNS;q@)TW?QF=m zb0Po!{rL|Aia%Kxxfu8vbQpjDWCjCE)rXUwtM^*G)~UKb{Xh>>2B&Y-ERj{4;-;Hv zYfLKMyR(Gv`97Zni3gIV4T6UyjxY$dGk%`RsKFJaFx82NLF|U+*-0{t0xfG+S#ET@ z`|94dxd-eH-}<yX?NpvHwmPoX1|k2E{aNk%w1VHN-u0O$Vz01JNt8Jh+goB$%A10L}AQimc+$u366BumOIREj1{%P3H@F-gK3QPwC<#WqxhDo)KHRM8+) z*ep-Z6k6URRnr(-*f3SNI$DJ=QPCw;+b34lJ6nb+SJoa~+bdYtAzs`qS=cXH+9qJ$ zF=p}0INNSKW zX5|@i^(buVRA`DyY?3N%>NRNRXl80qY>g~!>@IHYIc?WdZ;(4|OgPkICJu3bA@trac^^hXLg7)e(rR3b7^>rQgz~MdW?5@c5r-% zb9#<$eUEy4d2fD@NP+Eje2{Q|k$ir8ae$J2e|&y`eRG18c7l$9gMe*;*o20IfryZX zh=qQNmtKnTV2kpBjhc##iDHlNRF?aVkBo|ror#f|j*pmfkL8SzpNo^4jFg*bm+_UC zl$My4mzkD@n(S?*{+*wkeWmoFqoAXuqNS&#rl_T=sH}>s^{K0vFS!^z9Y(9+M*)6l}z{M6Rd*4Wj_*!tYp)!5zO;oI8R-t^<$ z+}_~b-Q(rqgej{-R%GB?CI_7_CX>@2HRA^-&M@dak03rDV0SW;B04x9i000&M761SU z{s8|897wRB!GE@pB|FCO7&2qUA`+W8OqfMszGgM!ch8>3j`Kp!yLT@n$$RkbMIv@? zP?|DX+RSM~v(1~ES*%!z66>C$X5)6$L4+tym@7}706D>Q3mY~NEb()MOk50A?7&?z zbLUQ#D@T2VdY5j9Cx4B4q1&NKA1gCvu(;XsWJ{AEFlgz!A+^!5aWP8C;sSSz6e&%X z-2H(fl?hM${F2*&2T#{CVUjKhastK=6(tyCii~U=5;1Y&e6<^-brBvmQfQz6DzY(j zNV=GDQ-z8YA)8@$P+?&M15!STnLcA?%M~b3iUfhJB87z%6&8r%w}=>SGnlLBG`S0- z1BwsmCv13tJgvDJn{WYXA|%L<9g6)e8^Ijc1 zwuo9aU{XyrfcW48V;ihcK?Ra9v&#atb!QF>Bec*$2pmXofdmmGFhBtX1P}lKqTG|# zJDvPd2qBO_GDseK00~JVgdn*GFYu(r4?q6+qmMsNZWE0)_eALrJyhy*k0Gd>!V5Ir zbaRb2^rZC8JL|0TjWW?R6N@8yoYM;^l?bATA)2i6N-VLo0*WSnpdp7Kpu}R$K>VDe Z%`?5!63Z*D#4<}S%}jI7Jp%;<06Q=qnjZiF literal 0 HcmV?d00001 diff --git a/main/inc/lib/add_course.lib.inc.php b/main/inc/lib/add_course.lib.inc.php index 5fd38bab8d..8332928999 100644 --- a/main/inc/lib/add_course.lib.inc.php +++ b/main/inc/lib/add_course.lib.inc.php @@ -1494,7 +1494,7 @@ function fill_Db_course($courseDbName, $courseRepository, $language,$pictures_ar if(api_get_setting('service_visio','active')=='true'){ if(api_get_setting('service_visio','visioconference_url')) - api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio.gif','1','0','squaregrey.gif','NO','_self','interaction')"); + api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO_CONFERENCE . "','conference/index.php?type=conference','visio_meeting.gif','1','0','squaregrey.gif','NO','_self','interaction')"); if(api_get_setting('service_visio','visioclassroom_url')) api_sql_query("INSERT INTO `" . $tbl_course_homepage . "` VALUES ('', '" . TOOL_VISIO_CLASSROOM . "','conference/index.php?type=classroom','visio.gif','1','0','squaregrey.gif','NO','_self','authoring')"); }
+ $s="
".get_lang('Question')." "; $s.=$i; if($exerciseType == 2) $s.=' / '.$nbrQuestions; diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php index f8188f6fb8..fa15edc2da 100644 --- a/main/exercice/exercise.lib.php +++ b/main/exercice/exercise.lib.php @@ -23,7 +23,7 @@ * shows a question and its answers * @package dokeos.exercise * @author Olivier Brouckaert -* @version $Id: exercise.lib.php 10789 2007-01-18 19:18:27Z pcool $ +* @version $Id: exercise.lib.php 11107 2007-02-14 09:46:32Z elixir_julian $ */ @@ -49,7 +49,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false) $questionDescription=$objQuestionTmp->selectDescription(); $s="
"; +  "; $questionName=api_parse_tex($questionName); $s.=$questionName; $s.="
+ "; + "; $answer=api_parse_tex($answer); $s.=$answer; $s.="
+ "; + "; $answer = api_parse_tex($answer); $s.=$answer; $s.="
"; +  "; $questionName=api_parse_tex($questionName); $s.=$questionName; $s.="