diff --git a/swad_HTML.c b/swad_HTML.c index 35e7dfdd..0f68f1ea 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1502,7 +1502,7 @@ void HTM_IMG (const char *URL,const char *Icon,const char *Title, void HTM_BR (void) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -1511,5 +1511,11 @@ void HTM_BR (void) void HTM_Txt (const char *Txt) { - fprintf (Gbl.F.Out,"%s",Txt); + fputs (Txt,Gbl.F.Out); + } + +void HTM_TxtColon (const char *Txt) + { + HTM_Txt (Txt); + HTM_Txt (":"); } diff --git a/swad_HTML.h b/swad_HTML.h index c938bb36..68ed3c7f 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -150,5 +150,6 @@ void HTM_IMG (const char *URL,const char *Icon,const char *Title, void HTM_BR (void); void HTM_Txt (const char *Txt); +void HTM_TxtColon (const char *Txt); #endif diff --git a/swad_ID.c b/swad_ID.c index 7f50ec9e..e6bf99c4 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -607,7 +607,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"UsrID\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_ID); + HTM_TxtColon (Txt_ID); HTM_LABEL_End (); HTM_TD_End (); @@ -688,9 +688,8 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewID\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID - Txt_ID); // The first user's ID + HTM_TxtColon (UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID + Txt_ID); // The first user's ID HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_account.c b/swad_account.c index 97cff040..3fcbaf60 100644 --- a/swad_account.c +++ b/swad_account.c @@ -365,7 +365,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NewNick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Nickname); + HTM_TxtColon (Txt_Nickname); HTM_LABEL_End (); HTM_TD_End (); @@ -383,7 +383,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NewEmail\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Email); + HTM_TxtColon (Txt_Email); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_agenda.c b/swad_agenda.c index 1eb61a45..c2aa7532 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1501,7 +1501,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Event\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Event); + HTM_TxtColon (Txt_Event); HTM_LABEL_End (); HTM_TD_End (); @@ -1517,7 +1517,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Location\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Location); + HTM_TxtColon (Txt_Location); HTM_LABEL_End (); HTM_TD_End (); @@ -1537,7 +1537,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Description); + HTM_TxtColon (Txt_Description); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_announcement.c b/swad_announcement.c index 66d88fe2..a8627c29 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -338,7 +338,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, if (ShowAllAnnouncements) { /* Users' roles who can view this announcement */ - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); for (Role = Rol_UNK, SomeRolesAreSelected = false; Role <= Rol_TCH; Role++) @@ -455,7 +455,7 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"",Field,The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Label); + HTM_TxtColon (Label); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_assignment.c b/swad_assignment.c index ceaede0d..6a7d6284 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1169,7 +1169,7 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1187,12 +1187,12 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Upload_files_QUESTION); + HTM_TxtColon (Txt_Upload_files_QUESTION); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); HTM_LABEL_Begin ("class=\"DAT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Folder); + HTM_TxtColon (Txt_Folder); HTM_INPUT_TEXT ("Folder",Brw_MAX_CHARS_FOLDER,Asg.Folder,false, "size=\"30\""); HTM_LABEL_End (); @@ -1205,7 +1205,7 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Description); + HTM_TxtColon (Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1255,7 +1255,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Groups); + HTM_TxtColon (Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_attendance.c b/swad_attendance.c index 1ddc7b41..515d3e4f 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1105,7 +1105,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1124,7 +1124,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ComTchVisible\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Teachers_comment); + HTM_TxtColon (Txt_Teachers_comment); HTM_LABEL_End (); HTM_TD_End (); @@ -1144,7 +1144,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Description); + HTM_TxtColon (Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1194,7 +1194,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Groups); + HTM_TxtColon (Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -3248,7 +3248,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView, HTM_TD_Begin ("colspan=\"%u\" class=\"DAT_N_LINE_TOP RM\"", Gbl.Usrs.Listing.WithPhotos ? 4 : 3); - fprintf (Gbl.F.Out,"%s:",Txt_Number_of_users); + HTM_TxtColon (Txt_Number_of_users); HTM_TD_End (); for (NumAttEvent = 0, Total = 0; @@ -3607,7 +3607,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, CommentStd,Cns_MAX_BYTES_TEXT,false); HTM_DT_Begin (); - fprintf (Gbl.F.Out,"%s:",Txt_Student_comment); + HTM_TxtColon (Txt_Student_comment); HTM_DT_End (); HTM_DD_Begin (); HTM_Txt (CommentStd); @@ -3618,7 +3618,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, CommentTch,Cns_MAX_BYTES_TEXT,false); HTM_DT_Begin (); - fprintf (Gbl.F.Out,"%s:",Txt_Teachers_comment); + HTM_TxtColon (Txt_Teachers_comment); HTM_DT_End (); HTM_DD_Begin (); HTM_Txt (CommentTch); diff --git a/swad_centre.c b/swad_centre.c index 03a52d44..c5d854cf 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -415,7 +415,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthInsCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Institution); + HTM_TxtColon (Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -455,7 +455,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Centre); + HTM_TxtColon (Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -481,7 +481,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Short_name); + HTM_TxtColon (Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -508,7 +508,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Place); + HTM_TxtColon (Txt_Place); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -551,7 +551,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Web); + HTM_TxtColon (Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -584,7 +584,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Shortcut); + HTM_TxtColon (Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -607,7 +607,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_QR_code); + HTM_TxtColon (Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -622,7 +622,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users_of_the_centre); + HTM_TxtColon (Txt_Users_of_the_centre); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -635,7 +635,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Degrees); + HTM_TxtColon (Txt_Degrees); HTM_TD_End (); /* Form to go to see degrees of this centre */ @@ -657,7 +657,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Courses); + HTM_TxtColon (Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -742,9 +742,8 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - (Role == Rol_UNK) ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); diff --git a/swad_changelog.h b/swad_changelog.h index a4530b95..0c0e6f7d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.61 (2019-11-10)" +#define Log_PLATFORM_VERSION "SWAD 19.61.1 (2019-11-10)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia) + Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines) Version 19.61: Nov 10, 2019 Code refactoring in HTML text printing. (246298 lines) Version 19.60.3: Nov 09, 2019 Code refactoring in HTML select options. (246311 lines) Version 19.60.2: Nov 09, 2019 Code refactoring in HTML break lines. (246290 lines) diff --git a/swad_country.c b/swad_country.c index 5c60f719..aea317cc 100644 --- a/swad_country.c +++ b/swad_country.c @@ -323,7 +323,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Country); + HTM_TxtColon (Txt_Country); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N LM\""); @@ -341,7 +341,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Shortcut); + HTM_TxtColon (Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -364,7 +364,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_QR_code); + HTM_TxtColon (Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -379,7 +379,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users_of_the_country); + HTM_TxtColon (Txt_Users_of_the_country); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -393,7 +393,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Institutions); + HTM_TxtColon (Txt_Institutions); HTM_TD_End (); /* Form to go to see institutions of this country */ @@ -415,7 +415,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Centres); + HTM_TxtColon (Txt_Centres); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -428,8 +428,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - Txt_Degrees); + HTM_TxtColon (Txt_Degrees); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -442,7 +441,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Courses); + HTM_TxtColon (Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -487,9 +486,8 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - (Role == Rol_UNK) ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -1660,7 +1658,7 @@ static void Cty_ListCountriesForEdition (void) /* Language */ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%s:",Txt_STR_LANG_NAME[Lan]); + HTM_TxtColon (Txt_STR_LANG_NAME[Lan]); HTM_TD_End (); /* Name */ diff --git a/swad_course.c b/swad_course.c index 06dbd799..0f4d33b4 100644 --- a/swad_course.c +++ b/swad_course.c @@ -239,7 +239,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthDegCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Degree); + HTM_TxtColon (Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -281,7 +281,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Course); + HTM_TxtColon (Txt_Course); HTM_LABEL_End (); HTM_TD_End (); @@ -307,7 +307,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Short_name); + HTM_TxtColon (Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -334,7 +334,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCrsYear\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Year_OF_A_DEGREE); + HTM_TxtColon (Txt_Year_OF_A_DEGREE); HTM_LABEL_End (); HTM_TD_End (); @@ -367,7 +367,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"InsCrsCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Institutional_code); + HTM_TxtColon (Txt_Institutional_code); HTM_LABEL_End (); HTM_TD_End (); @@ -391,7 +391,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Internal_code); + HTM_TxtColon (Txt_Internal_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -405,7 +405,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Shortcut); + HTM_TxtColon (Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -428,7 +428,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_QR_code); + HTM_TxtColon (Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -451,7 +451,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Indicators); + HTM_TxtColon (Txt_Indicators); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -499,7 +499,7 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtColon (Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -2989,7 +2989,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TH_Begin (1,7,"LM"); - fprintf (Gbl.F.Out,"%s:",Gbl.Title); + HTM_TxtColon (Gbl.Title); HTM_TH_End (); HTM_TR_End (); diff --git a/swad_date.c b/swad_date.c index a0ac734c..9709dfed 100644 --- a/swad_date.c +++ b/swad_date.c @@ -436,7 +436,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** Start date-time *****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[Dat_START_TIME]); + HTM_TxtColon (Txt_START_END_TIME[Dat_START_TIME]); HTM_LABEL_End (); HTM_TD_End (); @@ -467,7 +467,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** End date-time *****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[Dat_END_TIME]); + HTM_TxtColon (Txt_START_END_TIME[Dat_END_TIME]); HTM_LABEL_End (); HTM_TD_End (); @@ -512,7 +512,7 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2], HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[StartEndTime]); + HTM_TxtColon (Txt_START_END_TIME[StartEndTime]); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_degree.c b/swad_degree.c index 18d12e86..2c8ab682 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -343,7 +343,7 @@ static void Deg_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCtrCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Centre); + HTM_TxtColon (Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -382,7 +382,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Degree); + HTM_TxtColon (Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -408,7 +408,7 @@ static void Deg_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Short_name); + HTM_TxtColon (Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -434,7 +434,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Web); + HTM_TxtColon (Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -466,7 +466,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Shortcut); + HTM_TxtColon (Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -489,7 +489,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_QR_code); + HTM_TxtColon (Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -504,7 +504,7 @@ static void Deg_Configuration (bool PrintView) /***** Number of courses *****/ HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Courses); + HTM_TxtColon (Txt_Courses); HTM_TD_End (); /* Form to go to see courses of this degree */ @@ -565,9 +565,8 @@ static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - (Role == Rol_UNK) ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); diff --git a/swad_enrolment.c b/swad_enrolment.c index bb18533e..aca8182c 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -920,7 +920,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"UsrsIDs\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_List_of_nicks_emails_or_IDs); + HTM_TxtColon (Txt_List_of_nicks_emails_or_IDs); HTM_LABEL_End (); HTM_TD_End (); @@ -2272,7 +2272,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeEnr\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Scope); + HTM_TxtColon (Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -2287,7 +2287,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_exam.c b/swad_exam.c index e5b6f565..cb0988d1 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1093,7 +1093,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"CrsName\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Course); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Course); HTM_LABEL_End (); HTM_TD_End (); @@ -1112,7 +1112,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Year\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Year_or_semester); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Year_or_semester); HTM_LABEL_End (); HTM_TD_End (); @@ -1140,7 +1140,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ExamSession\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Session); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Session); HTM_LABEL_End (); HTM_TD_End (); @@ -1158,7 +1158,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Exam_date); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Exam_date); HTM_TD_End (); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) @@ -1185,7 +1185,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Start_time); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Start_time); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",StyleNormal); @@ -1226,7 +1226,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Approximate_duration); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Approximate_duration); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",StyleNormal); @@ -1289,7 +1289,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Place\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Place_of_exam); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Place_of_exam); HTM_LABEL_End (); HTM_TD_End (); @@ -1316,7 +1316,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ExamMode\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Mode); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Mode); HTM_LABEL_End (); HTM_TD_End (); @@ -1343,7 +1343,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Structure\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam); HTM_LABEL_End (); HTM_TD_End (); @@ -1370,7 +1370,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"DocRequired\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Documentation_required); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Documentation_required); HTM_LABEL_End (); HTM_TD_End (); @@ -1397,7 +1397,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MatRequired\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Material_required); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Material_required); HTM_LABEL_End (); HTM_TD_End (); @@ -1424,7 +1424,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MatAllowed\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Material_allowed); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Material_allowed); HTM_LABEL_End (); HTM_TD_End (); @@ -1451,7 +1451,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"OtherInfo\" class=\"%s\"",StyleForm); - fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Other_information); + HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Other_information); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 9cfe5648..7e3fbfb6 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -9496,7 +9496,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Filename); + HTM_TxtColon (Txt_Filename); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9509,7 +9509,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Uploaded_by); + HTM_TxtColon (Txt_Uploaded_by); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9540,7 +9540,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_File_size); + HTM_TxtColon (Txt_File_size); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9553,7 +9553,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Date_of_creation); + HTM_TxtColon (Txt_Date_of_creation); HTM_TD_End (); HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\""); @@ -9570,7 +9570,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"PublicFile\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Availability); + HTM_TxtColon (Txt_Availability); HTM_LABEL_End (); HTM_TD_End (); @@ -9600,7 +9600,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"License\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_License); + HTM_TxtColon (Txt_License); HTM_LABEL_End (); HTM_TD_End (); @@ -9632,7 +9632,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_My_views); + HTM_TxtColon (Txt_My_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9646,7 +9646,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Identified_views); + HTM_TxtColon (Txt_Identified_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9663,7 +9663,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Public_views); + HTM_TxtColon (Txt_Public_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); diff --git a/swad_forum.c b/swad_forum.c index 23830d04..4b6980ab 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -3903,7 +3903,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Subject\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_Subject); + HTM_TxtColon (Txt_MSG_Subject); HTM_LABEL_End (); HTM_TD_End (); @@ -3921,7 +3921,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Content\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content); + HTM_TxtColon (Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_game.c b/swad_game.c index 440adf79..389516b0 100644 --- a/swad_game.c +++ b/swad_game.c @@ -1140,7 +1140,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1156,7 +1156,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Description); + HTM_TxtColon (Txt_Description); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_help.c b/swad_help.c index bc363c03..46e1aa7a 100644 --- a/swad_help.c +++ b/swad_help.c @@ -274,7 +274,7 @@ static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description, /***** Description *****/ HTM_TD_Begin ("class=\"DAT RM\""); - fprintf (Gbl.F.Out,"%s:",Description); + HTM_TxtColon (Description); HTM_TD_End (); /***** Button *****/ diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 24fb5319..290788c0 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -104,7 +104,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"cty\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Country); + HTM_TxtColon (Txt_Country); HTM_LABEL_End (); HTM_TD_End (); @@ -122,7 +122,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ins\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Institution); + HTM_TxtColon (Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -140,7 +140,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ctr\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Centre); + HTM_TxtColon (Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -159,7 +159,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"deg\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Degree); + HTM_TxtColon (Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -178,7 +178,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"crs\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Course); + HTM_TxtColon (Txt_Course); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_indicator.c b/swad_indicator.c index 9156d43c..d6b11654 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -124,7 +124,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeInd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Scope); + HTM_TxtColon (Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -140,7 +140,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthDegTypCod\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Types_of_degree); + HTM_TxtColon (Txt_Types_of_degree); HTM_LABEL_End (); HTM_TD_End (); @@ -160,7 +160,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", Dpt_PARAM_DPT_COD_NAME,The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Department); + HTM_TxtColon (Txt_Department); HTM_LABEL_End (); HTM_TD_End (); @@ -190,7 +190,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_No_of_indicators); + HTM_TxtColon (Txt_No_of_indicators); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_institution.c b/swad_institution.c index 75064e2a..8c983060 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -356,7 +356,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCtyCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Country); + HTM_TxtColon (Txt_Country); HTM_LABEL_End (); HTM_TD_End (); @@ -396,7 +396,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Institution); + HTM_TxtColon (Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -422,7 +422,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Short_name); + HTM_TxtColon (Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -448,7 +448,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Web); + HTM_TxtColon (Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -481,7 +481,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Shortcut); + HTM_TxtColon (Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -504,7 +504,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_QR_code); + HTM_TxtColon (Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -519,7 +519,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users_of_the_institution); + HTM_TxtColon (Txt_Users_of_the_institution); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -531,7 +531,7 @@ static void Ins_Configuration (bool PrintView) /***** Number of centres *****/ HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Centres); + HTM_TxtColon (Txt_Centres); HTM_TD_End (); /* Form to go to see centres of this institution */ @@ -553,7 +553,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Degrees); + HTM_TxtColon (Txt_Degrees); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -566,7 +566,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Courses); + HTM_TxtColon (Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -579,7 +579,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Departments); + HTM_TxtColon (Txt_Departments); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -632,9 +632,8 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - (Role == Rol_UNK) ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); diff --git a/swad_mail.c b/swad_mail.c index 51f90338..b4afb4e1 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1264,7 +1264,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"Email\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Current_email); + HTM_TxtColon (Txt_Current_email); HTM_LABEL_End (); HTM_TD_End (); @@ -1278,7 +1278,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NumEmails - 1); HTM_LABEL_Begin ("for=\"Email\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Other_emails); + HTM_TxtColon (Txt_Other_emails); HTM_LABEL_End (); HTM_TD_End (); } @@ -1363,9 +1363,8 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewEmail\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - NumEmails ? Txt_New_email : // A new email - Txt_Email); // The first email + HTM_TxtColon (NumEmails ? Txt_New_email : // A new email + Txt_Email); // The first email HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_match.c b/swad_match.c index 5ad7e340..d6e2e875 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1202,7 +1202,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1254,7 +1254,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Groups); + HTM_TxtColon (Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_match_result.c b/swad_match_result.c index 596e5db8..f1ec4915 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -209,7 +209,7 @@ void McR_SelUsrsToViewUsrsMchResults (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -758,7 +758,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); + HTM_TxtColon (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -788,7 +788,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[StartEndTime]); + HTM_TxtColon (Txt_START_END_TIME[StartEndTime]); HTM_TD_End (); if (asprintf (&Id,"match_%u",(unsigned) StartEndTime) < 0) @@ -807,7 +807,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Questions); + HTM_TxtColon (Txt_Questions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -821,7 +821,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Score); + HTM_TxtColon (Txt_Score); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -842,7 +842,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Tags); + HTM_TxtColon (Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); diff --git a/swad_message.c b/swad_message.c index 823246c6..e3b3df89 100644 --- a/swad_message.c +++ b/swad_message.c @@ -293,7 +293,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_To); + HTM_TxtColon (Txt_MSG_To); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -486,8 +486,8 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) HTM_TH_Begin (1,ColSpan,"LM LIGHT_BLUE"); HTM_LABEL_Begin ("for=\"OtherRecipients\""); - fprintf (Gbl.F.Out,"%s:",StdsAndTchsWritten ? Txt_Other_recipients : - Txt_Recipients); + HTM_TxtColon (StdsAndTchsWritten ? Txt_Other_recipients : + Txt_Recipients); HTM_LABEL_End (); HTM_TH_End (); @@ -538,7 +538,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgSubject\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_Subject); + HTM_TxtColon (Txt_MSG_Subject); HTM_LABEL_End (); HTM_TD_End (); @@ -590,7 +590,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgContent\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content); + HTM_TxtColon (Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); @@ -626,7 +626,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgContent\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content); + HTM_TxtColon (Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_network.c b/swad_network.c index ea457002..185bfe74 100644 --- a/swad_network.c +++ b/swad_network.c @@ -325,8 +325,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) (unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_IMG (Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],Net_WebsAndSocialNetworksTitle[NumURL], "class=\"CONTEXT_ICO_16x16\" style=\"margin-right:6px;\""); - fprintf (Gbl.F.Out,"%s:", - Net_WebsAndSocialNetworksTitle[NumURL]); + HTM_TxtColon (Net_WebsAndSocialNetworksTitle[NumURL]); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_nickname.c b/swad_nickname.c index ba448e94..d69df8c2 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -275,7 +275,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /* The first nickname is the current one */ HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"Nick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Current_nickname); + HTM_TxtColon (Txt_Current_nickname); HTM_LABEL_End (); HTM_TD_End (); @@ -289,7 +289,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NumNicks - 1); HTM_LABEL_Begin ("for=\"Nick\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Other_nicknames); + HTM_TxtColon (Txt_Other_nicknames); HTM_LABEL_End (); HTM_TD_End (); } @@ -371,9 +371,8 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewNick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:", - NumNicks ? Txt_New_nickname : // A new nickname - Txt_Nickname); // The first nickname + HTM_TxtColon (NumNicks ? Txt_New_nickname : // A new nickname + Txt_Nickname); // The first nickname HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_notification.c b/swad_notification.c index 97fbfb3b..21ba265e 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1941,7 +1941,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]); + HTM_TxtColon (Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]); HTM_TD_End (); HTM_TD_Begin ("class=\"CM\""); diff --git a/swad_password.c b/swad_password.c index 4f31cf5a..8dc4a1b1 100644 --- a/swad_password.c +++ b/swad_password.c @@ -686,7 +686,7 @@ void Pwd_ShowFormChgMyPwd (void) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"UsrPwd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Current_password); + HTM_TxtColon (Txt_Current_password); HTM_LABEL_End (); HTM_TD_End (); @@ -735,7 +735,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void) /***** Label ****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Paswd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Password); + HTM_TxtColon (Txt_Password); HTM_LABEL_End (); HTM_TD_End (); @@ -765,7 +765,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Label */ HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Paswd1\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_New_password); + HTM_TxtColon (Txt_New_password); HTM_LABEL_End (); HTM_TD_End (); @@ -783,7 +783,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Label */ HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Paswd2\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Retype_new_password); + HTM_TxtColon (Txt_Retype_new_password); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_photo.c b/swad_photo.c index d2b844ca..d08d3429 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1800,7 +1800,7 @@ static void Pho_PutSelectorForTypeOfAvg (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"AvgType\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Average_type); + HTM_TxtColon (Txt_Average_type); HTM_LABEL_End (); HTM_TD_End (); @@ -1865,7 +1865,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"PhotoSize\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Size_of_photos); + HTM_TxtColon (Txt_Size_of_photos); HTM_LABEL_End (); HTM_TD_End (); @@ -1930,7 +1930,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Order\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Sort_degrees_by); + HTM_TxtColon (Txt_Sort_degrees_by); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_privacy.c b/swad_privacy.c index 8353d5a8..5962dca3 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -159,7 +159,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel, /***** Select visibility *****/ HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",TxtLabel); + HTM_TxtColon (TxtLabel); HTM_TD_End (); /***** Form with list of options *****/ diff --git a/swad_project.c b/swad_project.c index d14ec869..402c67e9 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1192,7 +1192,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassLabel); break; } - fprintf (Gbl.F.Out,"%s:",Txt_Assigned_QUESTION); + HTM_TxtColon (Txt_Assigned_QUESTION); HTM_TD_End (); switch (ProjectView) @@ -1232,7 +1232,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassLabel); break; } - fprintf (Gbl.F.Out,"%s:",Txt_Number_of_students); + HTM_TxtColon (Txt_Number_of_students); HTM_TD_End (); switch (ProjectView) @@ -1306,7 +1306,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); break; } - fprintf (Gbl.F.Out,"%s:",Txt_Proposal); + HTM_TxtColon (Txt_Proposal); HTM_TD_End (); switch (ProjectView) @@ -1666,7 +1666,7 @@ static void Prj_ShowOneProjectTxtField (struct Project *Prj, // Not applicable break; } - fprintf (Gbl.F.Out,"%s:",Label); + HTM_TxtColon (Label); HTM_TD_End (); /***** Change text format *****/ @@ -1761,7 +1761,7 @@ static void Prj_ShowOneProjectURL (const struct Project *Prj, // Not applicable break; } - fprintf (Gbl.F.Out,"%s:",Txt_URL); + HTM_TxtColon (Txt_URL); HTM_TD_End (); switch (ProjectView) @@ -1874,25 +1874,22 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj, case Prj_LIST_PROJECTS: HTM_TD_Begin ("colspan=\"4\" class=\"RT %s COLOR%u\"", ClassLabel,Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%s:", - NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_FILE_BROWSER_PROJECT: HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); - fprintf (Gbl.F.Out,"%s:", - NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_PRINT_ONE_PROJECT: HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); - fprintf (Gbl.F.Out,"%s:", - NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_EDIT_ONE_PROJECT: HTM_TD_Begin ("class=\"RT ASG_LABEL\""); - fprintf (Gbl.F.Out,"%s:",Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtColon (Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; } HTM_TD_End (); @@ -3301,7 +3298,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -3319,7 +3316,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", Dpt_PARAM_DPT_COD_NAME, The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Department); + HTM_TxtColon (Txt_Department); HTM_LABEL_End (); HTM_TD_End (); @@ -3338,7 +3335,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Assigned_QUESTION); + HTM_TxtColon (Txt_Assigned_QUESTION); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3357,7 +3354,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Number_of_students); + HTM_TxtColon (Txt_Number_of_students); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3370,7 +3367,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Proposal); + HTM_TxtColon (Txt_Proposal); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3410,7 +3407,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_URL); + HTM_TxtColon (Txt_URL); HTM_LABEL_End (); HTM_TD_End (); @@ -3448,7 +3445,7 @@ static void Prj_EditOneProjectTxtArea (const char *Id, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"",Id,The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Label); + HTM_TxtColon (Label); HTM_LABEL_End (); HTM_TD_End (); @@ -3748,7 +3745,7 @@ void Prj_ShowFormConfig (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Editable); + HTM_TxtColon (Txt_Editable); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_record.c b/swad_record.c index ae97711a..95716856 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1803,7 +1803,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, ICanEditThisField ? The_ClassFormInBox[Gbl.Prefs.Theme] : "REC_DAT_SMALL", Gbl.RowEvenOdd); - fprintf (Gbl.F.Out,"%s:",Gbl.Crs.Records.LstFields.Lst[NumField].Name); + HTM_TxtColon (Gbl.Crs.Records.LstFields.Lst[NumField].Name); if (TypeOfView == Rec_CRS_LIST_ONE_RECORD || TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS) { @@ -2845,7 +2845,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat,const char *ClassForm) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Email); + HTM_TxtColon (Txt_Email); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -2879,7 +2879,7 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *ClassForm, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RT %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_ID); + HTM_TxtColon (Txt_ID); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LT\""); @@ -2921,7 +2921,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Role\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Role); + HTM_TxtColon (Txt_Role); HTM_LABEL_End (); HTM_TD_End (); @@ -3140,7 +3140,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, { /***** No form, only text *****/ HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Role); + HTM_TxtColon (Txt_Role); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3200,7 +3200,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Surname2\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Surname_2); + HTM_TxtColon (Txt_Surname_2); HTM_LABEL_End (); HTM_TD_End (); @@ -3318,7 +3318,7 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"OriginPlace\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Place_of_origin); + HTM_TxtColon (Txt_Place_of_origin); HTM_LABEL_End (); HTM_TD_End (); @@ -3350,7 +3350,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Date_of_birth); + HTM_TxtColon (Txt_Date_of_birth); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3384,7 +3384,7 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"LocalAddress\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Local_address); + HTM_TxtColon (Txt_Local_address); HTM_LABEL_End (); HTM_TD_End (); @@ -3417,7 +3417,7 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"LocalPhone\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Phone); + HTM_TxtColon (Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); @@ -3453,7 +3453,7 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"FamilyAddress\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Family_address); + HTM_TxtColon (Txt_Family_address); HTM_LABEL_End (); HTM_TD_End (); @@ -3486,7 +3486,7 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"FamilyPhone\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Phone); + HTM_TxtColon (Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); @@ -3522,7 +3522,7 @@ static void Rec_ShowComments (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"Comments\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_USER_comments); + HTM_TxtColon (Txt_USER_comments); HTM_LABEL_End (); HTM_TD_End (); @@ -3584,7 +3584,7 @@ static void Rec_ShowInstitution (struct Instit *Ins, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Institution); + HTM_TxtColon (Txt_Institution); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3616,7 +3616,7 @@ static void Rec_ShowCentre (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Centre); + HTM_TxtColon (Txt_Centre); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3652,7 +3652,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Department); + HTM_TxtColon (Txt_Department); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3687,7 +3687,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Office); + HTM_TxtColon (Txt_Office); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3710,7 +3710,7 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Phone); + HTM_TxtColon (Txt_Phone); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -4142,7 +4142,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Office\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Office); + HTM_TxtColon (Txt_Office); HTM_LABEL_End (); HTM_TD_End (); @@ -4160,7 +4160,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"OfficePhone\" class=\"%s\"",ClassForm); - fprintf (Gbl.F.Out,"%s:",Txt_Phone); + HTM_TxtColon (Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_statistic.c b/swad_statistic.c index 2d6497bc..fa826037 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -377,7 +377,7 @@ void Sta_AskShowCrsHits (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -400,7 +400,7 @@ void Sta_AskShowCrsHits (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Show); + HTM_TxtColon (Txt_Show); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); @@ -540,7 +540,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Role\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_LABEL_End (); HTM_TD_End (); @@ -569,7 +569,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeSta\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Scope); + HTM_TxtColon (Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -592,7 +592,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"CountType\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Show); + HTM_TxtColon (Txt_Show); HTM_LABEL_End (); HTM_TD_End (); @@ -717,7 +717,7 @@ static void Sta_WriteSelectorAction (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"StatAct\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Action); + HTM_TxtColon (Txt_Action); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_survey.c b/swad_survey.c index 32dd8a2e..8e6490ab 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -643,7 +643,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, /* Users' roles who can answer the survey */ HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" : "ASG_GRP_LIGHT"); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_BR (); Rol_WriteSelectorRoles (1 << Rol_STD | 1 << Rol_NET | @@ -1895,7 +1895,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeSvy\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Scope); + HTM_TxtColon (Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -1912,7 +1912,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Title); + HTM_TxtColon (Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1931,7 +1931,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Description); + HTM_TxtColon (Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1948,7 +1948,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -2080,7 +2080,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Groups); + HTM_TxtColon (Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -2722,7 +2722,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Wording); + HTM_TxtColon (Txt_Wording); HTM_LABEL_End (); HTM_TD_End (); @@ -2738,7 +2738,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Type); + HTM_TxtColon (Txt_Type); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); diff --git a/swad_test.c b/swad_test.c index 572af0eb..86db5a4a 100644 --- a/swad_test.c +++ b/swad_test.c @@ -355,7 +355,7 @@ void Tst_ShowFormAskTst (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NumQst\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_No_of_questions); + HTM_TxtColon (Txt_No_of_questions); HTM_LABEL_End (); HTM_TD_End (); @@ -1680,7 +1680,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, /***** Label *****/ HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Tags); + HTM_TxtColon (Txt_Tags); HTM_TD_End (); /***** Select all tags *****/ @@ -1901,7 +1901,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Plugins); + HTM_TxtColon (Txt_Plugins); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -1926,7 +1926,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_No_of_questions); + HTM_TxtColon (Txt_No_of_questions); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -1948,7 +1948,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MinTimeNxtTstPerQst\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Minimum_time_seconds_per_question_between_two_tests); + HTM_TxtColon (Txt_Minimum_time_seconds_per_question_between_two_tests); HTM_LABEL_End (); HTM_TD_End (); @@ -1966,7 +1966,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Feedback_to_students); + HTM_TxtColon (Txt_Feedback_to_students); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -2313,7 +2313,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) /***** Label *****/ HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Types_of_answers); + HTM_TxtColon (Txt_Types_of_answers); HTM_TD_End (); /***** Select all types of answers *****/ @@ -5124,7 +5124,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Tags); + HTM_TxtColon (Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -5203,7 +5203,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Stem\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Wording); + HTM_TxtColon (Txt_Wording); HTM_LABEL_End (); HTM_TD_End (); @@ -5234,7 +5234,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Type); + HTM_TxtColon (Txt_Type); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -5260,7 +5260,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Answers); + HTM_TxtColon (Txt_Answers); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -7491,7 +7491,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Users); + HTM_TxtColon (Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -8128,8 +8128,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:", - Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs.Role][Gbl.Usrs.Other.UsrDat.Sex]); + HTM_TxtColon (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs.Role][Gbl.Usrs.Other.UsrDat.Sex]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -8155,7 +8154,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Date); + HTM_TxtColon (Txt_Date); HTM_TD_End (); HTM_TD_Begin ("id=\"test\" class=\"DAT LT\""); @@ -8170,7 +8169,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Questions); + HTM_TxtColon (Txt_Questions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -8184,7 +8183,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Score); + HTM_TxtColon (Txt_Score); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -8205,7 +8204,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - fprintf (Gbl.F.Out,"%s:",Txt_Tags); + HTM_TxtColon (Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); diff --git a/swad_user.c b/swad_user.c index d0e3f623..0832492f 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6307,9 +6307,8 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role) else Rol_WrongRoleExit (); Sex = Usr_GetSexOfUsrsLst (Role); - fprintf (Gbl.F.Out,"%s:", - Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : - Txt_ROLES_PLURAL_Abc[Role][Sex]); + HTM_TxtColon (Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : + Txt_ROLES_PLURAL_Abc[Role][Sex]); HTM_LABEL_End (); HTM_TH_End (); diff --git a/swad_zip.c b/swad_zip.c index 9b992c57..5d069972 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -583,7 +583,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_Filename); + HTM_TxtColon (Txt_Filename); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -600,7 +600,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - fprintf (Gbl.F.Out,"%s:",Txt_File_size); + HTM_TxtColon (Txt_File_size); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\"");