Version 14.40.12

This commit is contained in:
Antonio Cañas Vargas 2014-12-26 14:45:14 +01:00
parent 6fff0dcbae
commit 0ac70ebd2f
3 changed files with 360 additions and 170 deletions

View File

@ -40,6 +40,7 @@
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 14.40.12 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173478 lines)
Version 14.40.11 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173288 lines) Version 14.40.11 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173288 lines)
Version 14.40.10 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173201 lines) Version 14.40.10 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (173201 lines)
Version 14.40.9 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (172986 lines) Version 14.40.9 :Dic 25, 2014 Changes in HTML and CSS to validate HTML5 in W3C validator. (172986 lines)

File diff suppressed because it is too large Load Diff

View File

@ -140,13 +140,15 @@ void TsI_ShowFormImportQstsFromXML (void)
Act_FormStart (ActImpTstQst); Act_FormStart (ActImpTstQst);
fprintf (Gbl.F.Out,"<table>" fprintf (Gbl.F.Out,"<table>"
"<tr>" "<tr>"
"<td align=\"right\" class=\"%s\">%s:<br /></td>" "<td class=\"%s\" style=\"text-align:right;\">"
"<td align=\"left\">" "%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />" "<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td colspan=\"2\" align=\"center\">" "<td colspan=\"2\" style=\"text-align:right;\">"
"<input type=\"submit\" value=\"%s\" accept=\"text/xml\" />" "<input type=\"submit\" value=\"%s\" accept=\"text/xml\" />"
"</td>" "</td>"
"</tr>" "</tr>"
@ -1004,7 +1006,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
/***** Put icon to indicate that a question does not exist in database *****/ /***** Put icon to indicate that a question does not exist in database *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td align=\"center\" valign=\"top\" class=\"BT%d\">" "<td class=\"BT%d\" style=\"text-align:center;\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s16x16.gif\""
" alt=\"\" title=\"%s\" class=\"ICON16x16\" />" " alt=\"\" title=\"%s\" class=\"ICON16x16\" />"
"</td>", "</td>",
@ -1016,14 +1018,16 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
Txt_New_question); Txt_New_question);
/***** Write number of question *****/ /***** Write number of question *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"top\" bgcolor=\"%s\" class=\"%s\">", fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;"
Gbl.ColorRows[Gbl.RowEvenOdd],ClassData); " vertical-align:top; background-color:%s;\">",
ClassData,Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!QuestionExists) if (!QuestionExists)
fprintf (Gbl.F.Out,"%u&nbsp;",++NumNonExistingQst); fprintf (Gbl.F.Out,"%u&nbsp;",++NumNonExistingQst);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write the question tags *****/ /***** Write the question tags *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\">", fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;"
" background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]); Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.Test.NumTags) if (Gbl.Test.NumTags)
{ {
@ -1033,8 +1037,14 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
NumTag < Gbl.Test.NumTags; NumTag < Gbl.Test.NumTags;
NumTag++) NumTag++)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" valign=\"top\" class=\"%s\">&nbsp;&#8226;&nbsp;</td>" "<td class=\"%s\" style=\"text-align:left;"
"<td align=\"left\" valign=\"top\" class=\"%s\">%s</td>" " vertical-align:top;\">"
"&nbsp;&#8226;&nbsp;"
"</td>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"%s"
"</td>"
"</tr>", "</tr>",
ClassData, ClassData,
ClassData,Gbl.Test.TagText[NumTag]); ClassData,Gbl.Test.TagText[NumTag]);
@ -1047,12 +1057,16 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write the question type *****/ /***** Write the question type *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"top\" bgcolor=\"%s\" class=\"%s\">%s&nbsp;</td>", fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:center;"
Gbl.ColorRows[Gbl.RowEvenOdd],ClassData, " vertical-align:top; background-color:%s;\">"
"%s&nbsp;"
"</td>",
ClassData,Gbl.ColorRows[Gbl.RowEvenOdd],
Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]); Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]);
/***** Write if shuffle is enabled *****/ /***** Write if shuffle is enabled *****/
fprintf (Gbl.F.Out,"<td align=\"center\" valign=\"top\" bgcolor=\"%s\">", fprintf (Gbl.F.Out,"<td style=\"text-align:center; vertical-align:top;"
" background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]); Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.Test.AnswerType == Tst_ANS_UNIQUE_CHOICE || if (Gbl.Test.AnswerType == Tst_ANS_UNIQUE_CHOICE ||
Gbl.Test.AnswerType == Tst_ANS_MULTIPLE_CHOICE) Gbl.Test.AnswerType == Tst_ANS_MULTIPLE_CHOICE)
@ -1067,7 +1081,8 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Write the stem and the answers *****/ /***** Write the stem and the answers *****/
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" bgcolor=\"%s\">", fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;"
" background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]); Gbl.ColorRows[Gbl.RowEvenOdd]);
Tst_WriteQstStem (Stem,ClassStem); Tst_WriteQstStem (Stem,ClassStem);
Tst_WriteQstFeedback (Feedback,"TEST_EDI_LIGHT"); Tst_WriteQstFeedback (Feedback,"TEST_EDI_LIGHT");
@ -1133,11 +1148,15 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Write the number of option */ /* Write the number of option */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\" class=\"%s\">%c)&nbsp;</td>", fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"%c)&nbsp;"
"</td>",
ClassData,'a' + (char) NumOpt); ClassData,'a' + (char) NumOpt);
/* Write the text and the feedback of the answer */ /* Write the text and the feedback of the answer */
fprintf (Gbl.F.Out,"<td align=\"left\" valign=\"top\">" fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:top;\">"
"<p class=\"%s\">" "<p class=\"%s\">"
"<tt>%s</tt>" "<tt>%s</tt>"
"</p>", "</p>",