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.184.7

This commit is contained in:
Antonio Cañas Vargas 2016-04-07 10:23:28 +02:00
parent 2facb12a1d
commit 37b4a61269
3 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
css/swad15.178.2.css → css/swad15.184.7.css
View File

@ -1722,13 +1722,13 @@ a:hover img.CENTRE_PHOTO_SHOW
.STATUS_RED_LIGHT {color:#F98A8A; font-size:12pt;}
/********************************** Tests ************************************/
.TAG_SEL {width:347px;}
.TAG_TXT {width:347px;}
.STEM {width:700px;}
.TAG_SEL {box-sizing:border-box; width:346px;}
.TAG_TXT {box-sizing:border-box; width:346px;}
.STEM {box-sizing:border-box; width:700px;}
.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:630px;}
.ANS_STR {box-sizing:border-box; width:625px;}
.TEST_SUBTITLE
{
margin:10px;
@ -1749,6 +1749,20 @@ a:hover img.CENTRE_PHOTO_SHOW
.TEST_IMG_EDIT_LIST_ANS {width:225px; border-radius:2px; margin:5px 0;}
.TEST_IMG_EDIT_ONE_STEM {width:600px; border-radius:4px;}
.TEST_IMG_EDIT_ONE_ANS {width:450px; border-radius:4px;}
.TEST_EDI_ANS_LEFT_COL
{
box-sizing:border-box;
width:74px;
text-align:left;
vertical-align:top;
}
.TEST_EDI_ANS_RIGHT_COL
{
box-sizing:border-box;
width:630px;
text-align:left;
vertical-align:top;
}
/******************************* Time table **********************************/
#timetable

5
swad_changelog.h
View File

@ -132,13 +132,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.184.6 (2016-04-07)"
#define CSS_FILE "swad15.178.2.css"
#define Log_PLATFORM_VERSION "SWAD 15.184.7 (2016-04-07)"
#define CSS_FILE "swad15.184.7.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.184.7: Apr 07, 2016 Change in layout of edition of a test question. (198706 lines)
Version 15.184.6: Apr 07, 2016 Change in layout of edition of a test question. (198670 lines)
Version 15.184.5: Apr 07, 2016 Fixed bugs exporting/importing test questions. (198679 lines)
Version 15.184.4: Apr 06, 2016 Fixed minor bug in layout of test exam. (198676 lines)

42
swad_test.c
View File

@ -4382,6 +4382,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
unsigned NumTag;
bool TagNotFound;
bool OptionsDisabled;
bool AnswerHasContent;
char ParamAction[32];
char ParamFile[32];
char ParamTitle[32];
@ -4630,9 +4631,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
{
Gbl.RowEvenOdd = NumOpt % 2;
/* Selectors and label with the letter of the answer */
/***** Left column: selectors and letter of the answer *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s LEFT_TOP COLOR%u\">"
"<td class=\"%s TEST_EDI_ANS_LEFT_COL COLOR%u\">"
"<input type=\"radio\" name=\"AnsUni\" value=\"%u\"",
The_ClassForm[Gbl.Prefs.Theme],Gbl.RowEvenOdd,
NumOpt);
@ -4647,18 +4648,38 @@ 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," />&nbsp;%c)&nbsp;</td>",
fprintf (Gbl.F.Out," />"
"&nbsp;"
"<a href=\"\" class=\"%s\""
" onclick=\"toggleDisplay('answer_%u');return false;\" />"
"%c)"
"</a>"
"</td>",
The_ClassForm[Gbl.Prefs.Theme],
NumOpt,
'a' + (char) NumOpt);
/* Answer text */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP COLOR%u\">"
"<textarea name=\"AnsStr%u\" class=\"ANS_STR\" rows=\"5\"",
/***** 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;
fprintf (Gbl.F.Out,"<td class=\"TEST_EDI_ANS_RIGHT_COL COLOR%u\">"
"<div id=\"answer_%u\"",
Gbl.RowEvenOdd,
NumOpt);
if (!AnswerHasContent) // Answer does not have content
fprintf (Gbl.F.Out," style=\"display:none;\""); // Hide column
fprintf (Gbl.F.Out,">");
/* Answer text */
fprintf (Gbl.F.Out,"<textarea name=\"AnsStr%u\""
" class=\"ANS_STR\" rows=\"5\"",NumOpt);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out,">");
if (Gbl.Test.Answer.Options[NumOpt].Text)
if (AnswerHasContent)
fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[NumOpt].Text);
fprintf (Gbl.F.Out,"</textarea>");
@ -4683,8 +4704,11 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
if (Gbl.Test.Answer.Options[NumOpt].Feedback)
if (Gbl.Test.Answer.Options[NumOpt].Feedback[0])
fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[NumOpt].Feedback);
fprintf (Gbl.F.Out,"</textarea>"
"</td>"
fprintf (Gbl.F.Out,"</textarea>");
/* End of right column */
fprintf (Gbl.F.Out,"</div>"
"</td>"
"</tr>");
}
fprintf (Gbl.F.Out,"</table>"