Version 15.117

This commit is contained in:
Antonio Cañas Vargas 2016-01-18 00:33:52 +01:00
parent abe455b5f4
commit 29e3945601
8 changed files with 32 additions and 39 deletions

View File

@ -1840,25 +1840,23 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:left; text-align:left;
vertical-align:middle; vertical-align:middle;
} }
.MSG_TXT {color:#404040; font-size:13pt;}
.MSG_TXT {font-family:"Courier New","DejaVu LGC Sans Mono","Bitstream Vera Sans Mono",monospace; color:#404040; font-size:12pt;} .MSG_TIT {color:#4D88A1; font-size:13pt;}
.MSG_TIT_NEW {color:#4D88A1; font-size:13pt; font-weight:bold;}
.MSG_TIT {color:#4D88A1; font-size:12pt;} .MSG_TIT_REM {color:#AFC4CC; font-size:13pt;}
.MSG_TIT_NEW {color:#4D88A1; font-size:12pt; font-weight:bold;}
.MSG_TIT_REM {color:#AFC4CC; font-size:12pt;}
.MSG_TIT_BG .MSG_TIT_BG
{ {
background-image:linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); background-image:linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%);
background-repeat:no-repeat; background-repeat:no-repeat;
color:#4D88A1; color:#4D88A1;
font-size:12pt; font-size:13pt;
} }
.MSG_TIT_BG_NEW .MSG_TIT_BG_NEW
{ {
background-image:linear-gradient(#f5ffd7 0,#f5ffd7 80%,white 100%); background-image:linear-gradient(#f5ffd7 0,#f5ffd7 80%,white 100%);
background-repeat:no-repeat; background-repeat:no-repeat;
color:#4D88A1; color:#4D88A1;
font-size:12pt; font-size:13pt;
font-weight:bold; font-weight:bold;
} }
.MSG_TIT_BG_REM .MSG_TIT_BG_REM
@ -1866,7 +1864,7 @@ a:hover img.CENTRE_PHOTO_SHOW
background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%); background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%);
background-repeat:no-repeat; background-repeat:no-repeat;
color:#AFC4CC; color:#AFC4CC;
font-size:12pt; font-size:13pt;
} }
.MSG_AUT {color:#4D88A1; font-size:11pt;} .MSG_AUT {color:#4D88A1; font-size:11pt;}
.MSG_AUT_LIGHT {color:#AFC4CC; font-size:11pt;} .MSG_AUT_LIGHT {color:#AFC4CC; font-size:11pt;}

View File

@ -122,13 +122,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.116.1 (2016-01-17)" #define Log_PLATFORM_VERSION "SWAD 15.117 (2016-01-17)"
#define CSS_FILE "swad15.115.css" #define CSS_FILE "swad15.117.css"
#define JS_FILE "swad15.115.js" #define JS_FILE "swad15.117.js"
// 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 sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.117: Jan 17, 2016 Change in styles of messages, forums, surveys and tests. (192872 lines)
Version 15.116.1: Jan 17, 2016 Help when writing social posts or comments. (192877 lines) Version 15.116.1: Jan 17, 2016 Help when writing social posts or comments. (192877 lines)
Version 15.116: Jan 17, 2016 Optimization in the query to get timeline. (192878 lines) Version 15.116: Jan 17, 2016 Optimization in the query to get timeline. (192878 lines)
Version 15.115.2: Jan 17, 2016 Code refactoring in timeline. (192860 lines) Version 15.115.2: Jan 17, 2016 Code refactoring in timeline. (192860 lines)

View File

@ -1213,8 +1213,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
/***** Write post content *****/ /***** Write post content *****/
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>"
"</td>" "</td>"
"<td class=\"MSG_TXT LEFT_TOP\">" "<td class=\"MSG_TXT LEFT_TOP\">");
"<tt>");
if (Enabled) if (Enabled)
{ {
strncpy (Content,OriginalContent,Cns_MAX_BYTES_LONG_TEXT); strncpy (Content,OriginalContent,Cns_MAX_BYTES_LONG_TEXT);
@ -1223,8 +1222,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
} }
else else
fprintf (Gbl.F.Out,"%s",Txt_This_post_has_been_banned_probably_for_not_satisfy_the_rules_of_the_forums); fprintf (Gbl.F.Out,"%s",Txt_This_post_has_been_banned_probably_for_not_satisfy_the_rules_of_the_forums);
fprintf (Gbl.F.Out,"</tt>" fprintf (Gbl.F.Out,"<br />&nbsp;"
"<br />&nbsp;"
"</td>" "</td>"
"</tr>"); "</tr>");

View File

@ -2831,9 +2831,8 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages,
Msg_GetMsgContent (MsgCod,Content); Msg_GetMsgContent (MsgCod,Content);
if (Content[0]) if (Content[0])
{ {
fprintf (Gbl.F.Out,"<tt>");
Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,true,false); Msg_WriteMsgContent (Content,Cns_MAX_BYTES_LONG_TEXT,true,false);
fprintf (Gbl.F.Out,"</tt><br />&nbsp;"); fprintf (Gbl.F.Out,"<br />&nbsp;");
} }
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");

View File

@ -2960,7 +2960,7 @@ static void Svy_WriteQstStem (const char *Stem)
HeadingRigorousHTML,LengthHeading,false); HeadingRigorousHTML,LengthHeading,false);
/* Write the stem */ /* Write the stem */
fprintf (Gbl.F.Out,"<tt>%s</tt>",HeadingRigorousHTML); fprintf (Gbl.F.Out,"%s",HeadingRigorousHTML);
/* Free memory allocated for the stem */ /* Free memory allocated for the stem */
free ((void *) HeadingRigorousHTML); free ((void *) HeadingRigorousHTML);
@ -3027,9 +3027,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,struct SurveyQuestion *Sv
NumAns + 1); NumAns + 1);
/* Write the text of the answer */ /* Write the text of the answer */
fprintf (Gbl.F.Out,"<td class=\"TEST_EDI LEFT_TOP\">" fprintf (Gbl.F.Out,"<td class=\"TEST_EDI LEFT_TOP\">%s</td>",
"<tt>%s</tt>"
"</td>",
Answer); Answer);
/* Show stats of this answer */ /* Show stats of this answer */

View File

@ -2719,7 +2719,7 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
case Tst_ANS_INT: case Tst_ANS_INT:
Tst_CheckIfNumberOfAnswersIsOne (); Tst_CheckIfNumberOfAnswersIsOne ();
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\"><tt>(%ld)</tt></span>", fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\">(%ld)</span>",
Tst_GetIntAnsFromStr (row[1])); Tst_GetIntAnsFromStr (row[1]));
break; break;
case Tst_ANS_FLOAT: case Tst_ANS_FLOAT:
@ -2733,17 +2733,15 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
FloatNum[i] = Tst_GetFloatAnsFromStr (row[1]); FloatNum[i] = Tst_GetFloatAnsFromStr (row[1]);
} }
fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\"><tt>([%lg; %lg])</tt></span>", fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\">([%lg; %lg])</span>",
FloatNum[0],FloatNum[1]); FloatNum[0],FloatNum[1]);
break; break;
case Tst_ANS_TRUE_FALSE: case Tst_ANS_TRUE_FALSE:
Tst_CheckIfNumberOfAnswersIsOne (); Tst_CheckIfNumberOfAnswersIsOne ();
row = mysql_fetch_row (mysql_res); row = mysql_fetch_row (mysql_res);
fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\">" fprintf (Gbl.F.Out,"<span class=\"TEST_EDI\">(");
"<tt>(");
Tst_WriteAnsTF (row[1][0]); Tst_WriteAnsTF (row[1][0]);
fprintf (Gbl.F.Out,")</tt>" fprintf (Gbl.F.Out,")</span>");
"</span>");
break; break;
case Tst_ANS_UNIQUE_CHOICE: case Tst_ANS_UNIQUE_CHOICE:
case Tst_ANS_MULTIPLE_CHOICE: case Tst_ANS_MULTIPLE_CHOICE:

View File

@ -500,7 +500,8 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
/***** Print XML tree *****/ /***** Print XML tree *****/
Lay_WriteTitle (Txt_XML_file_content); Lay_WriteTitle (Txt_XML_file_content);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">" fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<textarea cols=\"60\" rows=\"4\">"); "<textarea cols=\"60\" rows=\"5\""
" spellcheck=\"false\" readonly>");
XML_PrintTree (RootElem); XML_PrintTree (RootElem);
fprintf (Gbl.F.Out,"</textarea>" fprintf (Gbl.F.Out,"</textarea>"
"</div>"); "</div>");
@ -1104,17 +1105,17 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
switch (Gbl.Test.AnswerType) switch (Gbl.Test.AnswerType)
{ {
case Tst_ANS_INT: case Tst_ANS_INT:
fprintf (Gbl.F.Out,"<span class=\"%s\"><tt>(%ld)</tt></span>", fprintf (Gbl.F.Out,"<span class=\"%s\">(%ld)</span>",
ClassStem,Gbl.Test.Answer.Integer); ClassStem,Gbl.Test.Answer.Integer);
break; break;
case Tst_ANS_FLOAT: case Tst_ANS_FLOAT:
fprintf (Gbl.F.Out,"<span class=\"%s\"><tt>([%lg; %lg])</tt></span>", fprintf (Gbl.F.Out,"<span class=\"%s\">([%lg; %lg])</span>",
ClassStem,Gbl.Test.Answer.FloatingPoint[0],Gbl.Test.Answer.FloatingPoint[1]); ClassStem,Gbl.Test.Answer.FloatingPoint[0],Gbl.Test.Answer.FloatingPoint[1]);
break; break;
case Tst_ANS_TRUE_FALSE: case Tst_ANS_TRUE_FALSE:
fprintf (Gbl.F.Out,"<span class=\"%s\"><tt>(",ClassStem); fprintf (Gbl.F.Out,"<span class=\"%s\">(",ClassStem);
Tst_WriteAnsTF (Gbl.Test.Answer.TF); Tst_WriteAnsTF (Gbl.Test.Answer.TF);
fprintf (Gbl.F.Out,")</tt></span>"); fprintf (Gbl.F.Out,")</span>");
break; break;
case Tst_ANS_UNIQUE_CHOICE: case Tst_ANS_UNIQUE_CHOICE:
case Tst_ANS_MULTIPLE_CHOICE: case Tst_ANS_MULTIPLE_CHOICE:
@ -1172,14 +1173,14 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
/* Write the text and the feedback of the answer */ /* Write the text and the feedback of the answer */
fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_TOP\">"
"<p class=\"%s\">" "<div class=\"%s\">"
"<tt>%s</tt>" "%s"
"</p>", "</div>",
ClassStem,AnswerText); ClassStem,AnswerText);
if (AnswerFeedbackLength) if (AnswerFeedbackLength)
fprintf (Gbl.F.Out,"<p class=\"TEST_EDI_LIGHT\">" fprintf (Gbl.F.Out,"<div class=\"TEST_EDI_LIGHT\">"
"<tt>%s</tt>" "%s"
"</p>", "</div>",
AnswerFeedback); AnswerFeedback);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");