diff --git a/swad_HTML.c b/swad_HTML.c index 47adfdca..dd3f3abe 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1495,3 +1495,12 @@ void HTM_IMG (const char *URL,const char *Icon,const char *Title, fprintf (Gbl.F.Out," />"); } + +/*****************************************************************************/ +/****************************** Breaking lines *******************************/ +/*****************************************************************************/ + +void HTM_BR (void) + { + fprintf (Gbl.F.Out,"
"); + } diff --git a/swad_HTML.h b/swad_HTML.h index 38bbd419..1655e20f 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -147,4 +147,6 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable void HTM_IMG (const char *URL,const char *Icon,const char *Title, const char *fmt,...); +void HTM_BR (void); + #endif diff --git a/swad_ID.c b/swad_ID.c index c8f75633..103e73db 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -384,7 +384,7 @@ void ID_WriteUsrIDs (struct UsrData *UsrDat,const char *Anchor) NumID++) { if (NumID) - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_SPAN_Begin ("class=\"%s\"", UsrDat->IDs.List[NumID].Confirmed ? "USR_ID_C" : @@ -614,7 +614,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\""); } else // NumID >= 1 - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (UsrDat->IDs.Num > 1) // I have two or more IDs { @@ -720,7 +720,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, "", // Show the most recent ID false, "size=\"18\""); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Btn_PutCreateButtonInline (Txt_Add_this_ID); Frm_EndForm (); HTM_TD_End (); diff --git a/swad_account.c b/swad_account.c index 6c8b2a2b..97cff040 100644 --- a/swad_account.c +++ b/swad_account.c @@ -284,7 +284,7 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD /***** Write user's ID and name *****/ HTM_TD_Begin ("class=\"DAT_N LT COLOR%u\"",Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"%s: %s",Txt_ID,ID); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s: ",Txt_Name); if (UsrDat->FullName[0]) fprintf (Gbl.F.Out,"%s",UsrDat->FullName); diff --git a/swad_attendance.c b/swad_attendance.c index 787ac769..e30c09ca 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -3579,7 +3579,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd); HTM_SPAN_Begin ("id=\"%s\"",Id); HTM_SPAN_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.AttEvents.Lst[NumAttEvent].Title); Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME], Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA, diff --git a/swad_centre.c b/swad_centre.c index 8aecb6e4..4cb8f741 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -345,7 +345,7 @@ static void Ctr_Configuration (bool PrintView) Gbl.Hierarchy.Ctr.FullName); Log_DrawLogo (Hie_CTR,Gbl.Hierarchy.Ctr.CtrCod, Gbl.Hierarchy.Ctr.ShrtName,64,NULL,true); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.FullName); if (PutLink) HTM_A_End (); @@ -2607,7 +2607,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); HTM_TH_Empty (1); @@ -2644,7 +2644,7 @@ static void Ctr_PutHeadCentresForEdition (void) HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); HTM_TH (1,1,"LM",Txt_Requester); diff --git a/swad_changelog.h b/swad_changelog.h index 919e1684..9139c391 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.60.1 (2019-11-09)" +#define Log_PLATFORM_VERSION "SWAD 19.60.2 (2019-11-09)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* @@ -495,7 +495,8 @@ 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.60.1: Nov 09, 2019 Code refactoring in HTML break line. (246281 lines) + Version 19.60.2: Nov 09, 2019 Code refactoring in HTML break lines. (246290 lines) + Version 19.60.1: Nov 09, 2019 Code refactoring in HTML break lines. (246281 lines) Version 19.60: Nov 09, 2019 Code refactoring in HTML options. (246203 lines) Version 19.59: Nov 09, 2019 Code refactoring in HTML params. (246187 lines) Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines) diff --git a/swad_connected.c b/swad_connected.c index e2edeaf9..60baad3b 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -207,7 +207,7 @@ static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal) if (UsrsTotal) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%u %s", UsrsTotal, (UsrsTotal == 1) ? Txt_ROLES_SINGUL_abc[Role][Usr_SEX_UNKNOWN] : diff --git a/swad_country.c b/swad_country.c index 2d8ed6d3..20a41044 100644 --- a/swad_country.c +++ b/swad_country.c @@ -689,7 +689,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); diff --git a/swad_course.c b/swad_course.c index 611ac427..70871471 100644 --- a/swad_course.c +++ b/swad_course.c @@ -227,7 +227,7 @@ static void Crs_Configuration (bool PrintView) Gbl.Hierarchy.Deg.ShrtName,64,NULL,true); if (PutLink) HTM_A_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Crs.FullName); HTM_DIV_End (); diff --git a/swad_degree.c b/swad_degree.c index 0524e02b..f2b4e42e 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -329,7 +329,7 @@ static void Deg_Configuration (bool PrintView) Gbl.Hierarchy.Deg.FullName); Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod, Gbl.Hierarchy.Deg.ShrtName,64,NULL,true); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName); if (PutLink) HTM_A_End (); diff --git a/swad_duplicate.c b/swad_duplicate.c index 69146538..d32b060b 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -200,7 +200,7 @@ void Dup_ListDuplicateUsrs (void) if (NumInformants > 1) { fprintf (Gbl.F.Out,"%s: %u",Txt_Informants,NumInformants); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } /* Button to view users similar to this */ diff --git a/swad_exam.c b/swad_exam.c index 3c86bf31..37be0b23 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1052,7 +1052,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", Ins.WWW,StyleTitle); Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.FullName,64,NULL,true); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Ins.FullName); if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) HTM_SPAN_End (); @@ -1077,7 +1077,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleNormal); fprintf (Gbl.F.Out," "); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_EXAM_ANNOUNCEMENT); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_figure.c b/swad_figure.c index 61ddd975..b629cee5 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -218,7 +218,7 @@ void Fig_ReqShowFigures (void) Sco_GetScope ("ScopeFig"); Sco_PutSelectorScope ("ScopeFig",false); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Type of statistic *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -596,31 +596,31 @@ static void Fig_WriteHeadHierarchy (void) HTM_TH_Begin (1,1,"RM"); Ico_PutIcon ("globe.svg",Txt_Countries,"CONTEXT_ICO_x16"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_Countries); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); Ico_PutIcon ("university.svg",Txt_Institutions,"CONTEXT_ICO_x16"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_Institutions); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); Ico_PutIcon ("building.svg",Txt_Centres,"CONTEXT_ICO_x16"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_Centres); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); Ico_PutIcon ("graduation-cap.svg",Txt_Degrees,"CONTEXT_ICO_x16"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_Degrees); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); Ico_PutIcon ("list-ol.svg",Txt_Courses,"CONTEXT_ICO_x16"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_Courses); HTM_TH_End (); @@ -1425,7 +1425,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, /***** Write link to institution *****/ HTM_TD_Begin ("class=\"%s CM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); Ins_DrawInstitutionLogoWithLink (&Ins,40); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%u",NumberThisRow); HTM_TD_End (); @@ -2499,19 +2499,19 @@ static void Fig_WriteStatsExpTreesTableHead2 (void) HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Folders); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_course); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Files); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_course); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Size); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_course); HTM_TH_End (); @@ -2532,19 +2532,19 @@ static void Fig_WriteStatsExpTreesTableHead3 (void) HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Folders); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Files); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]); HTM_TH_End (); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s/",Txt_Size); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]); HTM_TH_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 820e91b4..f9eea188 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3387,7 +3387,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) ID_WriteUsrIDs (UsrDat,NULL); /***** Show user's name *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Frm_LinkFormSubmit (Txt_View_record_for_this_course,"AUTHOR_TXT",NULL); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); @@ -3400,7 +3400,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) /***** Show user's email *****/ if (UsrDat->Email[0]) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_A_Begin ("href=\"mailto:%s\" target=\"_blank\" class=\"AUTHOR_TXT\"", UsrDat->Email); fprintf (Gbl.F.Out,"%s",UsrDat->Email); diff --git a/swad_forum.c b/swad_forum.c index 104e90fb..e052cef3 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -3388,7 +3388,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], if (PermissionThreadDeletion[Gbl.Forum.ForumSelected.Type] & (1 << Gbl.Usrs.Me.Role.Logged)) // If I have permission to remove thread in this forum... { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Frm_StartFormAnchor (For_ActionsReqDelThr[Gbl.Forum.ForumSelected.Type], For_REMOVE_THREAD_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current @@ -3405,7 +3405,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], /***** Put button to cut the thread for moving it to another forum *****/ if (ICanMoveThreads) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Frm_StartFormAnchor (For_ActionsCutThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID); For_PutAllHiddenParamsForum (Gbl.Forum.CurrentPageThrs, // Page of threads = current diff --git a/swad_group.c b/swad_group.c index b1a33826..d211c1b9 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1444,7 +1444,7 @@ static void Grp_WriteHeadingGroupTypes (void) HTM_TH (1,1,"BM",NULL); HTM_TH_Begin (1,1,"CM"); fprintf (Gbl.F.Out,"%s",Txt_Type_of_group); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"(%s)",Txt_eg_Lectures_Practicals); HTM_TH_End (); HTM_TH (1,1,"CM",Txt_Mandatory_enrolment); @@ -1649,7 +1649,7 @@ static void Grp_WriteHeadingGroups (void) HTM_TH (1,1,"CM",Txt_Type_BR_of_group); HTM_TH_Begin (1,1,"CM"); fprintf (Gbl.F.Out,"%s",Txt_Group_name); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"(%s)",Txt_eg_A_B); HTM_TH_End (); HTM_TH (1,1,"CM",Txt_Classroom); @@ -2331,14 +2331,14 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) /***** Name of group type *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"9\" class=\"GRP_TITLE LM\""); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",GrpTyp->GrpTypName); if (GrpTyp->MustBeOpened) { UniqueId++; if (asprintf (&Id,"open_time_%u",UniqueId) < 0) Lay_NotEnoughMemoryExit (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s: ",Txt_Opening_of_groups); HTM_SPAN_Begin ("id=\"%s\"",Id); HTM_SPAN_End (); diff --git a/swad_info.c b/swad_info.c index 6ab55e41..0c9df21b 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1168,7 +1168,7 @@ void Inf_FormsToSelSendInfo (void) if (Txt_INFO_SRC_HELP[InfoSrc]) { HTM_SPAN_Begin ("class=\"DAT\""); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"(%s)",Txt_INFO_SRC_HELP[InfoSrc]); HTM_SPAN_End (); } diff --git a/swad_institution.c b/swad_institution.c index 2dc72afd..b58a4914 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -342,7 +342,7 @@ static void Ins_Configuration (bool PrintView) Gbl.Hierarchy.Ins.FullName); Log_DrawLogo (Hie_INS,Gbl.Hierarchy.Ins.InsCod, Gbl.Hierarchy.Ins.ShrtName,64,NULL,true); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ins.FullName); if (PutLink) HTM_A_End (); @@ -881,7 +881,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) HTM_TH (1,1,"RM",Txt_Departments_ABBREVIATION); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); HTM_TH_Empty (1); @@ -2280,7 +2280,7 @@ static void Ins_PutHeadInstitutionsForEdition (void) HTM_TH (1,1,"RM",Txt_Centres_ABBREVIATION); HTM_TH_Begin (1,1,"RM"); fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); HTM_TH (1,1,"LM",Txt_Requester); diff --git a/swad_layout.c b/swad_layout.c index 9ebda1f3..7003869e 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1609,13 +1609,13 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto, if (!PrintView) HTM_A_End (); } - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (CrsCod > 0) { fprintf (Gbl.F.Out,"%s",Crs.FullName); if (DrawingClassPhoto && !Gbl.Usrs.ClassPhoto.AllGroups) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Grp_WriteNamesOfSelectedGrps (); } } @@ -1663,8 +1663,8 @@ void Lay_AdvertisementMobile (void) HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\"" " class=\"DAT\""); fprintf (Gbl.F.Out,"%s",Txt_Stay_connected_with_SWADroid); - fprintf (Gbl.F.Out,"
"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); + HTM_BR (); HTM_IMG (Cfg_URL_ICON_PUBLIC,"SWADroid200x300.png",Txt_Stay_connected_with_SWADroid, "style=\"width:250px; height:375px;\""); HTM_A_End (); diff --git a/swad_mail.c b/swad_mail.c index 47999923..53adabb5 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1326,7 +1326,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, /* Form to change user's email */ if (NumEmail > 1 || (ItsMe && !Confirmed)) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (ItsMe) Frm_StartFormAnchor (ActChgMyMai,Mai_EMAIL_SECTION_ID); else @@ -1392,7 +1392,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, } HTM_INPUT_EMAIL ("NewEmail",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrDat.Email, "size=\"18\""); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Btn_PutCreateButtonInline (NumEmails ? Txt_Change_email : // User already has an email address Txt_Save_changes); // User has no email address yet Frm_EndForm (); diff --git a/swad_match.c b/swad_match.c index 3d61097c..a94c1ad3 100644 --- a/swad_match.c +++ b/swad_match.c @@ -2161,7 +2161,7 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match) Match->Status.QstInd); HTM_DIV_Begin ("class=\"MCH_NUM_ANSWERERS\""); fprintf (Gbl.F.Out,"%s",Txt_MATCH_respond); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,""); if (Match->Status.QstInd > 0 && Match->Status.QstInd < Mch_AFTER_LAST_QUESTION) diff --git a/swad_match_result.c b/swad_match_result.c index 7f200fbd..6dbb7f10 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -340,9 +340,9 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther) HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); HTM_TH_Begin (1,1,"RT"); fprintf (Gbl.F.Out,"%s",Txt_Score); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s
",Txt_out_of_PART_OF_A_SCORE); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX); HTM_TH_End (); HTM_TH_Empty (1); @@ -771,7 +771,7 @@ void McR_ShowOneMchResult (void) if (UsrDat->FirstName[0]) fprintf (Gbl.F.Out,", %s", UsrDat->FirstName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : NULL, diff --git a/swad_message.c b/swad_message.c index 639c1f33..5767c2d4 100644 --- a/swad_message.c +++ b/swad_message.c @@ -2966,7 +2966,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) Title,"ICO16x16"); /***** Form to delete message *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Gbl.Msg.MsgCod = MsgCod; // Message to be deleted Ico_PutContextualIconToRemove (ActionDelMsg[Gbl.Msg.TypeOfMessages], Msg_PutHiddenParamsOneMsg); diff --git a/swad_nickname.c b/swad_nickname.c index 16a9e5ae..ba448e94 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -332,7 +332,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /* Form to change the nickname */ if (NumNick > 1) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (ItsMe) Frm_StartFormAnchor (ActChgMyNck,Nck_NICKNAME_SECTION_ID); else @@ -404,7 +404,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its HTM_INPUT_TEXT ("NewNick",1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA, NicknameWithArroba,false, "size=\"18\""); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Btn_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname Txt_Save_changes); // I have no nickname yet); Frm_EndForm (); diff --git a/swad_notification.c b/swad_notification.c index adc0b7f6..5ceeadb9 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -2058,7 +2058,7 @@ void Ntf_WriteNumberOfNewNtfs (void) NumUnseenNtfs, NumUnseenNtfs == 1 ? Txt_notification : Txt_notifications); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_SPAN_End (); /***** Icon and number of new notifications *****/ diff --git a/swad_password.c b/swad_password.c index 97af409a..62dc76c6 100644 --- a/swad_password.c +++ b/swad_password.c @@ -868,7 +868,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void) fprintf (Gbl.F.Out,"%s",Txt_I_understand_that_this_action_can_not_be_undone); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Password *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); diff --git a/swad_photo.c b/swad_photo.c index f7620aab..68d5207f 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -903,7 +903,7 @@ static void Pho_UpdatePhoto2 (void) "style=\"width:%upx;height:%upx;\"", Pho_PHOTO_REAL_WIDTH,Pho_PHOTO_REAL_HEIGHT); free (Img); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]); HTM_TD_End (); } @@ -2542,11 +2542,11 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg, /***** Caption *****/ HTM_DIV_Begin ("class=\"CLASSPHOTO_CAPTION\""); fprintf (Gbl.F.Out,"%s",Deg->ShrtName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%d %s",NumStds,Txt_students_ABBREVIATION); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%d %s",NumStdsWithPhoto,Txt_photos); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"(%d%%)", NumStds > 0 ? (int) (((NumStdsWithPhoto * 100.0) / NumStds) + 0.5) : 0); diff --git a/swad_project.c b/swad_project.c index da91557b..564934a7 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1076,7 +1076,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, if (PrjIsFaulty) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Prj_PutWarningIcon (); } diff --git a/swad_record.c b/swad_record.c index b1c693ed..6123768b 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1757,9 +1757,9 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, HTM_TD_Begin ("class=\"REC_HEAD CM\""); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Crs.FullName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",UsrDat->FullName); HTM_TD_End (); @@ -2759,11 +2759,11 @@ static void Rec_ShowFullName (struct UsrData *UsrDat) /***** First name *****/ fprintf (Gbl.F.Out,"%s",UsrDat->FirstName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Surname 1 *****/ fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Surname 2 *****/ fprintf (Gbl.F.Out,"%s",UsrDat->Surname2); diff --git a/swad_report.c b/swad_report.c index 9281bfe1..150e996f 100644 --- a/swad_report.c +++ b/swad_report.c @@ -279,7 +279,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report) Report->Permalink, Txt_Report); Ico_PutIcon ("file-alt.svg",Txt_Report,"ICO64x64"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Report->FilenameReport); HTM_A_End (); HTM_DIV_End (); @@ -314,7 +314,7 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC) /***** Report date *****/ if (CurrentTimeUTC) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s: ",Txt_Date); HTM_SPAN_Begin ("class=\"DAT_N\""); fprintf (Gbl.F.Out,"%s %s UTC",CurrentTimeUTC->StrDate, @@ -849,7 +849,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report) fprintf (Gbl.F.Rep,"%ld %s", Report->UsrFigures.NumClicks - NumClicks, Txt_Other_actions); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } /***** Free structure that stores the query result *****/ diff --git a/swad_role.c b/swad_role.c index a7dca315..126a868c 100644 --- a/swad_role.c +++ b/swad_role.c @@ -559,7 +559,7 @@ void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected, Disabled ? " disabled=\"disabled\"" : ""); fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } } diff --git a/swad_statistic.c b/swad_statistic.c index 8706f6c9..099a7ca6 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -435,7 +435,7 @@ void Sta_AskShowCrsHits (void) HTM_LABEL_End (); /***** Separator *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Option b) Listing of detailed clicks to this course *****/ HTM_LABEL_Begin (NULL); @@ -2854,9 +2854,9 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co { fprintf (Gbl.F.Out,"%u%%",(unsigned) (((Hits->Num * 100.0) / Hits->Total) + 0.5)); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Str_WriteFloatNumToFile (Gbl.F.Out,Hits->Num); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); BarHeight = (unsigned) (((Hits->Num * 500.0) / Hits->Max) + 0.5); if (BarHeight == 0) BarHeight = 1; @@ -2866,12 +2866,12 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co else { fprintf (Gbl.F.Out,"0%%"); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"0"); } /* Write the hour */ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%uh",Hour); HTM_TD_End (); } diff --git a/swad_survey.c b/swad_survey.c index 5ea53d48..5ca9d004 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -644,7 +644,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" : "ASG_GRP_LIGHT"); fprintf (Gbl.F.Out,"%s:",Txt_Users); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Rol_WriteSelectorRoles (1 << Rol_STD | 1 << Rol_NET | 1 << Rol_TCH, @@ -2753,7 +2753,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, AnsType == SvyQst->AnswerType ? " checked=\"checked\"" : ""); fprintf (Gbl.F.Out,"%s",Txt_SURVEY_STR_ANSWER_TYPES[AnsType]); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } HTM_TD_End (); diff --git a/swad_test.c b/swad_test.c index febaae51..031d3cc5 100644 --- a/swad_test.c +++ b/swad_test.c @@ -1140,7 +1140,7 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm, OptionsDisabled ? " disabled=\"disabled\"" : ""); fprintf (Gbl.F.Out,"%s",Txt_No_image_video); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); /***** Choice 2: Current media *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -1917,7 +1917,7 @@ static void Tst_ShowFormConfigTst (void) Pluggable == Gbl.Test.Config.Pluggable ? " checked=\"checked\"" : ""); fprintf (Gbl.F.Out,"%s",Txt_TST_PLUGGABLE[Pluggable]); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } HTM_TD_End (); @@ -1982,7 +1982,7 @@ static void Tst_ShowFormConfigTst (void) Feedback == Gbl.Test.Config.Feedback ? " checked=\"checked\"" : ""); fprintf (Gbl.F.Out,"%s",Txt_TST_STR_FEEDBACK[Feedback]); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } HTM_TD_End (); @@ -5213,14 +5213,14 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], " rows=\"5\" required=\"required\""); fprintf (Gbl.F.Out,"%s",Stem); HTM_TEXTAREA_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); Tst_PutFormToEditQstMedia (&Gbl.Test.Media,-1, false); /***** Feedback *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s (%s):",Txt_Feedback,Txt_optional); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_TEXTAREA_Begin ("name=\"Feedback\" class=\"STEM_TEXTAREA\" rows=\"2\""); if (Feedback) if (Feedback[0]) @@ -5250,7 +5250,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], AnsType == Gbl.Test.AnswerType ? " checked=\"checked\"" : ""); fprintf (Gbl.F.Out,"%s ",Txt_TST_STR_ANSWER_TYPES[AnsType]); HTM_LABEL_End (); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } HTM_TD_End (); @@ -5418,7 +5418,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], /* Feedback */ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s (%s):",Txt_Feedback,Txt_optional); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_TEXTAREA_Begin ("name=\"FbStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"2\"%s", NumOpt,OptionsDisabled ? " disabled=\"disabled\"" : ""); @@ -7709,9 +7709,9 @@ static void Tst_ShowHeaderTestResults (void) HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1); HTM_TH_Begin (1,1,"RT"); fprintf (Gbl.F.Out,"%s",Txt_Score); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",Txt_out_of_PART_OF_A_SCORE); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX); HTM_TH_End (); HTM_TH_Empty (1); @@ -8143,7 +8143,7 @@ void Tst_ShowOneTstResult (void) if (Gbl.Usrs.Other.UsrDat.FirstName[0]) fprintf (Gbl.F.Out,", %s", Gbl.Usrs.Other.UsrDat.FirstName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Other.UsrDat,PhotoURL); Pho_ShowUsrPhoto (&Gbl.Usrs.Other.UsrDat,ShowPhoto ? PhotoURL : NULL, diff --git a/swad_timetable.c b/swad_timetable.c index f9b7d0ba..b672f995 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -1555,7 +1555,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co fprintf (Gbl.F.Out,"%s", Crs.ShrtName[0] ? Crs.ShrtName : Txt_unknown_removed_course); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); } } @@ -1570,13 +1570,13 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co if (Gbl.TimeTable.View == TT_CRS_VIEW && GrpCod > 0) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",GrpDat.GrpTypName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",GrpDat.GrpName); if (GrpDat.Classroom.ClaCod > 0) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"(%s)",GrpDat.Classroom.ShrtName); } } @@ -1585,7 +1585,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co if (Info) if (Info[0]) { - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"
%s",Info); } @@ -1664,7 +1664,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co if (Gbl.TimeTable.View == TT_CRS_EDIT) { /***** Group *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_LABEL_Begin ("for=\"TTGrp%s\"",CellStr); fprintf (Gbl.F.Out,"%s",Txt_Group); HTM_LABEL_End (); @@ -1705,7 +1705,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co HTM_SELECT_End (); /***** Info *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_LABEL_Begin ("for=\"TTInf%s\"",CellStr); fprintf (Gbl.F.Out,"%s",Txt_Info); HTM_LABEL_End (); @@ -1722,7 +1722,7 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co else // TimeTableView == TT_TUT_EDIT { /***** Info *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); HTM_LABEL_Begin ("for=\"TTInf%s\" class=\"DAT_SMALL\"",CellStr); fprintf (Gbl.F.Out,"%s",Txt_Info); HTM_LABEL_End (); diff --git a/swad_user.c b/swad_user.c index ee6258c1..2cb58e2c 100644 --- a/swad_user.c +++ b/swad_user.c @@ -895,7 +895,7 @@ void Usr_WriteFirstNameBRSurnames (const struct UsrData *UsrDat) { /***** Write first name and surname 1 *****/ fprintf (Gbl.F.Out,"%s",UsrDat->FirstName); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); /***** Write surname2 if exists *****/ @@ -8904,12 +8904,12 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType, fprintf (Gbl.F.Out,"%s",UsrDat.FirstName); else fprintf (Gbl.F.Out," "); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (UsrDat.Surname1[0]) fprintf (Gbl.F.Out,"%s",UsrDat.Surname1); else fprintf (Gbl.F.Out," "); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); if (UsrDat.Surname2[0]) fprintf (Gbl.F.Out,"%s",UsrDat.Surname2); else @@ -9712,14 +9712,14 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows) ID_WriteUsrIDs (UsrDat,NULL); /***** Show user's name *****/ - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",UsrDat->Surname1); if (UsrDat->Surname2[0]) fprintf (Gbl.F.Out," %s",UsrDat->Surname2); if (UsrDat->FirstName[0]) { fprintf (Gbl.F.Out,","); - fprintf (Gbl.F.Out,"
"); + HTM_BR (); fprintf (Gbl.F.Out,"%s",UsrDat->FirstName); }