From 5843c57acfb947e7172a687d9572d5743cc1444e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 6 Sep 2015 11:36:34 +0200 Subject: [PATCH] Version 14.127.1 --- swad_assignment.c | 5 +++-- swad_attendance.c | 2 +- swad_changelog.h | 3 ++- swad_info.c | 18 +++++++----------- swad_survey.c | 23 ++++++++++------------- swad_test.c | 24 +++++++----------------- 6 files changed, 30 insertions(+), 45 deletions(-) diff --git a/swad_assignment.c b/swad_assignment.c index 1f7979238..143dd24ce 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -334,8 +334,9 @@ static void Asg_ShowOneAssignment (long AsgCod) if (Gbl.CurrentCrs.Grps.NumGrps) Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (&Asg); - fprintf (Gbl.F.Out,"

" - "%s

" + fprintf (Gbl.F.Out,"

" + "%s" + "

" "" "", Asg.Hidden ? "DAT_LIGHT" : diff --git a/swad_attendance.c b/swad_attendance.c index 74bc9d9de..d45dc9334 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -358,7 +358,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt if (Gbl.CurrentCrs.Grps.NumGrps) Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Att); - fprintf (Gbl.F.Out,"
%s
", + fprintf (Gbl.F.Out,"
%s
", Att->Hidden ? "DAT_LIGHT" : "DAT", Txt); diff --git a/swad_changelog.h b/swad_changelog.h index 40b4df63f..2a4560c54 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.127 (2015/09/05)" +#define Log_PLATFORM_VERSION "SWAD 14.127.1 (2015/09/06)" // 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 14.127.1: Sep 06, 2015 Justify alignment is no longer used. (184259 lines) Version 14.127: Sep 05, 2015 Changes in styles. (184273 lines) Version 14.126.2: Sep 05, 2015 Changes in styles. (184250 lines) Version 14.126.1: Sep 05, 2015 Changes in styles. (184213 lines) diff --git a/swad_info.c b/swad_info.c index d850fe0a1..dd5177b9f 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1577,8 +1577,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType) Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); fprintf (Gbl.F.Out,"" - "" - "

"); + ""); /***** Convert to respectful HTML and insert links *****/ Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, @@ -1589,8 +1588,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType) fprintf (Gbl.F.Out,"%s",TxtHTML); /***** Finish table *****/ - fprintf (Gbl.F.Out,"

" - "" + fprintf (Gbl.F.Out,"" ""); Lay_EndRoundFrameTable (); } @@ -1746,22 +1744,20 @@ int Inf_WritePlainTextIntoHTMLBuffer (Inf_InfoType_t InfoType,char **HTMLBuffer) Txt_INFO_TITLE[InfoType]); // Page title /***** Write plain text into text buffer *****/ - fprintf (FileHTMLTmp,"" - "" - "

"); + fprintf (FileHTMLTmp,"

\n"); /* Convert to respectful HTML and insert links */ Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, - TxtHTML,Cns_MAX_BYTES_LONG_TEXT,false); // Convert from HTML to recpectful HTML + TxtHTML,Cns_MAX_BYTES_LONG_TEXT,false); // Convert from HTML to recpectful HTML Str_InsertLinkInURLs (TxtHTML,Cns_MAX_BYTES_LONG_TEXT,60); // Insert links /* Write text */ fprintf (FileHTMLTmp,"%s",TxtHTML); /***** Write end of page into file *****/ - fprintf (FileHTMLTmp,"

\n" - "\n" - "\n"); + fprintf (FileHTMLTmp,"
\n" + "\n" + "\n"); /***** Compute length of file *****/ Length = (size_t) ftell (FileHTMLTmp); diff --git a/swad_survey.c b/swad_survey.c index fb7166a27..4504e836e 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -135,7 +135,7 @@ static unsigned Svy_GetQstIndFromQstCod (long QstCod); static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod); static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst); static void Svy_WriteParamEditQst (struct SurveyQuestion *SvyQst); -static void Svy_WriteQstStem (const char *Stem,const char *TextStyle); +static void Svy_WriteQstStem (const char *Stem); static void Svy_WriteAnswersOfAQst (struct Survey *Svy,struct SurveyQuestion *SvyQst); static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs); static void Svy_ReceiveAndStoreUserAnswersToASurvey (long SvyCod); @@ -484,7 +484,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML Str_InsertLinkInURLs (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links - fprintf (Gbl.F.Out,"

" + fprintf (Gbl.F.Out,"

" "%s" "

" "" @@ -3016,14 +3016,15 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ /* Write the question type (row[2]) */ SvyQst->AnswerType = Svy_ConvertFromStrAnsTypDBToAnsTyp (row[2]); fprintf (Gbl.F.Out,"" - "%s", + "%s" + "", Gbl.RowEvenOdd, Txt_SURVEY_STR_ANSWER_TYPES[SvyQst->AnswerType]); - /* Write the stem (row[3]) */ - Svy_WriteQstStem (row[3],"TEST_EDI"); - - /* Write the answers of this question */ + /* Write the stem (row[3]) and the answers of this question */ + fprintf (Gbl.F.Out,"", + Gbl.RowEvenOdd); + Svy_WriteQstStem (row[3]); Svy_WriteAnswersOfAQst (Svy,SvyQst); fprintf (Gbl.F.Out,"" ""); @@ -3090,7 +3091,7 @@ static void Svy_WriteParamEditQst (struct SurveyQuestion *SvyQst) /****************** Write the heading of a survey question *******************/ /*****************************************************************************/ -static void Svy_WriteQstStem (const char *Stem,const char *TextStyle) +static void Svy_WriteQstStem (const char *Stem) { unsigned long LengthHeading; char *HeadingRigorousHTML; @@ -3104,11 +3105,7 @@ static void Svy_WriteQstStem (const char *Stem,const char *TextStyle) HeadingRigorousHTML,LengthHeading,false); /* Write the stem */ - fprintf (Gbl.F.Out,"" - "
" - "%s" - "
", - TextStyle,Gbl.RowEvenOdd,HeadingRigorousHTML); + fprintf (Gbl.F.Out,"%s",HeadingRigorousHTML); /* Free memory allocated for the stem */ free ((void *) HeadingRigorousHTML); diff --git a/swad_test.c b/swad_test.c index 8e63b3fb1..7f0fd1cec 100644 --- a/swad_test.c +++ b/swad_test.c @@ -983,7 +983,7 @@ void Tst_WriteQstStem (const char *Stem,const char *ClassStem) StemRigorousHTML,StemLength,false); /***** Write the stem *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s" "
", ClassStem,StemRigorousHTML); @@ -1014,7 +1014,7 @@ void Tst_WriteQstFeedback (const char *Feedback,const char *ClassFeedback) FeedbackRigorousHTML,FeedbackLength,false); /***** Write the feedback *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s" "
", ClassFeedback,FeedbackRigorousHTML); @@ -2768,19 +2768,14 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod) /* Write the text of the answer */ fprintf (Gbl.F.Out,"" - "
" "%s" - "
" "", Answer); /* Write the text of the feedback */ fprintf (Gbl.F.Out,""); if (LengthFeedback) - fprintf (Gbl.F.Out,"
" - "%s" - "
", - Feedback); + fprintf (Gbl.F.Out,"%s",Feedback); fprintf (Gbl.F.Out,"" ""); @@ -3055,9 +3050,7 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle) /***** Write the option text *****/ fprintf (Gbl.F.Out,"" - "
" "%s" - "
" "" "", Gbl.Test.Answer.Options[NumOpt].Text); @@ -3219,16 +3212,14 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, /* Answer text and feedback */ fprintf (Gbl.F.Out,"" - "
" + "
" "%s" "
", Gbl.Test.Answer.Options[Indexes[NumOpt]].Text); if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback) if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback[0]) - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s" "
", Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback); @@ -3425,15 +3416,14 @@ static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res, /* Answer text and feedback */ fprintf (Gbl.F.Out,"" - "
" + "
" "%s" "
", Gbl.Test.Answer.Options[NumOpt].Text); if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK) if (Gbl.Test.Answer.Options[NumOpt].Feedback) if (Gbl.Test.Answer.Options[NumOpt].Feedback[0]) - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "%s" "
", Gbl.Test.Answer.Options[NumOpt].Feedback);