Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.180.5

This commit is contained in:
Antonio Cañas Vargas 2016-04-05 14:32:02 +02:00
parent 72334113b7
commit 8c9dc4f3c3
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css/swad15.178.2.css
View File

@ -1728,7 +1728,7 @@ a:hover img.CENTRE_PHOTO_SHOW
.ANS {color:#404040; font-size:13pt; font-weight:bold;}
.ANS_OK {color:#008000; font-size:13pt; font-weight:bold;}
.ANS_BAD {color:red; font-size:13pt; font-weight:bold;}
.ANS_STR {width:308px;}
.ANS_STR {width:630px;}
.TEST_SUBTITLE
{
margin:10px;

3
swad_changelog.h
View File

@ -131,13 +131,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.180.4 (2016-04-05)"
#define Log_PLATFORM_VERSION "SWAD 15.180.5 (2016-04-05)"
#define CSS_FILE "swad15.178.2.css"
#define JS_FILE "swad15.178.2.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.180.5: Apr 05, 2016 Changes in layout of editor of question. (198512 lines)
Version 15.180.4: Apr 05, 2016 Fixed bug in images in test questions. (198512 lines)
Version 15.180.3: Apr 05, 2016 Changed layout of confirm / reject registration. (198482 lines)
Version 15.180.2: Apr 05, 2016 Contextual link to remove one survey question. (198459 lines)

56
swad_test.c
View File

@ -4555,18 +4555,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td class=\"LEFT_TOP\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td></td>"
"<td class=\"%s LEFT_MIDDLE\">"
"%s"
"</td>"
"<td class=\"%s LEFT_MIDDLE\">"
"%s"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Answer,
The_ClassForm[Gbl.Prefs.Theme],Txt_Feedback);
"<table class=\"CELLS_PAD_2\">");
OptionsDisabled = Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
Gbl.Test.AnswerType != Tst_ANS_MULTIPLE_CHOICE &&
Gbl.Test.AnswerType != Tst_ANS_TEXT;
@ -4574,11 +4563,13 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
NumOpt < Tst_MAX_OPTIONS_PER_QUESTION;
NumOpt++)
{
Gbl.RowEvenOdd = NumOpt % 2;
/* Selectors and label with the letter of the answer */
fprintf (Gbl.F.Out,"<tr>"
"<td rowspan=\"2\" class=\"%s LEFT_TOP\">"
"<td rowspan=\"3\" class=\"%s LEFT_TOP COLOR%u\">"
"<input type=\"radio\" name=\"AnsUni\" value=\"%u\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],Gbl.RowEvenOdd,
NumOpt);
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4595,8 +4586,11 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
'a' + (char) NumOpt);
/* Answer text */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
"<div class=\"%s\">%s:</div>"
"<textarea name=\"AnsStr%u\" class=\"ANS_STR\" rows=\"5\"",
Gbl.RowEvenOdd,
The_ClassForm[Gbl.Prefs.Theme],Txt_Answer,
NumOpt);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4604,11 +4598,28 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
if (Gbl.Test.Answer.Options[NumOpt].Text)
fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[NumOpt].Text);
fprintf (Gbl.F.Out,"</textarea>"
"</td>");
"</td>"
"</tr>");
/* Image */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
sprintf (ParamAction,"ImgAct%u",NumOpt);
sprintf (ParamFile,"FileImg%u",NumOpt);
Tst_PutFormToEditQstImage (&Gbl.Test.Answer.Options[NumOpt].Image,
"TEST_IMG_EDIT_ONE_ANS",
ParamAction,ParamFile,OptionsDisabled);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Feedback */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"LEFT_TOP COLOR%u\">"
"<div class=\"%s\">%s:</div>"
"<textarea name=\"FbStr%u\" class=\"ANS_STR\" rows=\"5\"",
Gbl.RowEvenOdd,
The_ClassForm[Gbl.Prefs.Theme],Txt_Feedback,
NumOpt);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4619,17 +4630,6 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
fprintf (Gbl.F.Out,"</textarea>"
"</td>"
"</tr>");
/* Image */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"LEFT_TOP\">");
sprintf (ParamAction,"ImgAct%u",NumOpt);
sprintf (ParamFile,"FileImg%u",NumOpt);
Tst_PutFormToEditQstImage (&Gbl.Test.Answer.Options[NumOpt].Image,
"TEST_IMG_EDIT_ONE_ANS",
ParamAction,ParamFile,OptionsDisabled);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
fprintf (Gbl.F.Out,"</table>"
"</td>"