From d47ae8c62c4cd1749bc03a95725324fed18f7f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 7 Apr 2016 14:40:50 +0200 Subject: [PATCH] Version 15.185.4 --- icon/contract64x64.png | Bin 0 -> 500 bytes icon/expand64x64.png | Bin 0 -> 587 bytes swad_changelog.h | 7 ++++- swad_file_browser.c | 12 ++++---- swad_test.c | 64 +++++++++++++++++++++++++++++++---------- swad_text.c | 40 +++++++++++++------------- 6 files changed, 81 insertions(+), 42 deletions(-) create mode 100644 icon/contract64x64.png create mode 100644 icon/expand64x64.png diff --git a/icon/contract64x64.png b/icon/contract64x64.png new file mode 100644 index 0000000000000000000000000000000000000000..55e2d068e98d3df4b16431f680caf532e8b1b53b GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_5;rX+877l!}s{b%+Ad7K3vk;M!Q z+`=Ht$S`Y;1W=H@#M9T6{Q(O*4~MJ(lfgTnkYtH#M2T~LZff$dNDhSw4TqqruraW@t~J=wCllBYHJRvMEFD; zY!R_*@_)d6upIqs528Xi!^)36JzHU9)d`$5UlS|fv zk|W`>IQLzbqRI4I4ykZt#Y4%vU?z$GB<5eZQ$fv9lS3i>kganp@6&q2)kj z^|}|Hmp}e1&RTz|%k(~jqa!cV^6Q$3MO<8sbM)oSlS5+vGskmW35ck+t&CUNRX;~F zENaTfBMgT*^wZ_Le{F4?)4TF9C)YmL3%d+T;+K}SzM6W8Rrq@wmqx5XalU9mjrf^6 z(%KhF4_?`u+Hf&;Lt*~Pgb?vJcdV5dM8eE>XHE^1+_{eSad^g zZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Fm2L_t(&-tCvYF9Ts5$3OS9bZaFd zB9U1A4+d9ntwp4`3W=y#O|}XHyTw+2fT1sg4FeJV3nUgXB02~LT)jMos+c7A+><_u zJfG=?yZe3e`+o0o2NsLPVzF2PF${ofYWz4b(mmK`a0BTTS0-h8JsSg0%N-*@PEN)B zBO*8-$#-#i>@mYdXaN!AWIw?x4oLibx&TFHS}TA=HV^7csof`0Y_Y&^7g1mKw!9c2 zw;a!$wJ zw`W|*zM02R z+;=UMs~IY0Ud7Q`_uSq=@bM7UlYKn9S5+CWWdqIZD{9f1%3jkanR@mbIuI^<4I2oT zeQ1HO*((V|MB`slNA`*&uUzTMv74y@$h3O+C@|VHbTG6(-fv($K>Fus42#8Lu~;ns ZhA%^;lz->KCV>C|002ovPDHLkV1l9q>+b*n literal 0 HcmV?d00001 diff --git a/swad_changelog.h b/swad_changelog.h index 36d5c7af7..8853e1726 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -132,13 +132,18 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.185.2 (2016-04-07)" +#define Log_PLATFORM_VERSION "SWAD 15.185.4 (2016-04-07)" #define CSS_FILE "swad15.184.7.css" #define JS_FILE "swad15.184.8.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 15.185.4: Apr 07, 2016 Change in edition of a test question. (198832 lines) + Version 15.185.3: Apr 07, 2016 Changed icons to expand / contract. (198801 lines) +Copy file icon/expand64x64.png to icon directory +Copy file icon/contract64x64.png to icon directory + Version 15.185.2: Apr 07, 2016 Change in title of take a test. (198797 lines) Version 15.185.1: Apr 07, 2016 Change in title of edition of test questions. (198776 lines) Version 15.185: Apr 07, 2016 Fixed bugs in edition of test questions. (198755 lines) diff --git a/swad_file_browser.c b/swad_file_browser.c index 4129afa7b..7092096ee 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -5339,8 +5339,8 @@ static void Brw_PutIconPasteOff (void) static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_t ExpandTree, const char *PathInTree,const char *FileName,const char *FileNameToShow) { - extern const char *Txt_Expand_FOLDER_X; - extern const char *Txt_Contract_FOLDER_X; + extern const char *Txt_Expand; + extern const char *Txt_Contract; char Anchor[32]; fprintf (Gbl.F.Out,"" @@ -5379,8 +5379,8 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ break; } Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName); - sprintf (Gbl.Title,Txt_Expand_FOLDER_X,FileNameToShow); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, @@ -5411,8 +5411,8 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,Brw_ExpandTree_ break; } Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName); - sprintf (Gbl.Title,Txt_Contract_FOLDER_X,FileNameToShow); - fprintf (Gbl.F.Out,"", Gbl.Prefs.IconsURL, diff --git a/swad_test.c b/swad_test.c index 47bc2a82d..e6d74a26f 100644 --- a/swad_test.c +++ b/swad_test.c @@ -1601,7 +1601,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, "" " %s" "" @@ -4372,6 +4372,8 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) extern const char *Txt_Real_number_between_A_and_B_2; extern const char *Txt_TF_QST[2]; extern const char *Txt_Shuffle; + extern const char *Txt_Expand; + extern const char *Txt_Contract; extern const char *Txt_Save; extern const char *Txt_Create_question; char Title[512]; @@ -4633,6 +4635,11 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) { Gbl.RowEvenOdd = NumOpt % 2; + AnswerHasContent = false; + if (Gbl.Test.Answer.Options[NumOpt].Text) + if (Gbl.Test.Answer.Options[NumOpt].Text[0]) + AnswerHasContent = true; + /***** Left column: selectors and letter of the answer *****/ fprintf (Gbl.F.Out,"" "" @@ -4650,23 +4657,50 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) fprintf (Gbl.F.Out," disabled=\"disabled\""); if (Gbl.Test.Answer.Options[NumOpt].Correct) fprintf (Gbl.F.Out," checked=\"checked\""); - fprintf (Gbl.F.Out," />" - " " - "" - "%c)" - "" - "", - The_ClassForm[Gbl.Prefs.Theme], - NumOpt, + fprintf (Gbl.F.Out," /> %c) ", 'a' + (char) NumOpt); - /***** Right column: content of the answer *****/ - AnswerHasContent = false; - if (Gbl.Test.Answer.Options[NumOpt].Text) - if (Gbl.Test.Answer.Options[NumOpt].Text[0]) - AnswerHasContent = true; + // Icon to expand + sprintf (Gbl.Title,"%s %c",Txt_Expand,'a' + (char) NumOpt); + fprintf (Gbl.F.Out,"
" + "" + "\"%s\"" + "" + "
", + NumOpt,NumOpt,NumOpt, + Gbl.Prefs.IconsURL, + Gbl.Title, + Gbl.Title); + // Icon to contract + sprintf (Gbl.Title,"%s %c",Txt_Contract,'a' + (char) NumOpt); + fprintf (Gbl.F.Out,"
" + "" + "\"%s\"" + "" + "
", + NumOpt,NumOpt,NumOpt, + Gbl.Prefs.IconsURL, + Gbl.Title, + Gbl.Title); + + fprintf (Gbl.F.Out,""); + + /***** Right column: content of the answer *****/ fprintf (Gbl.F.Out,"" "