diff --git a/swad_HTML.c b/swad_HTML.c index e4a851e9..69242207 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -539,3 +539,17 @@ void HTM_SECTION_End (void) { fprintf (Gbl.F.Out,""); } + +/*****************************************************************************/ +/****************************** Unordered lists ******************************/ +/*****************************************************************************/ +/* +void HTM_UL_Begin (const char *SectionId) + { + fprintf (Gbl.F.Out,""); + } diff --git a/swad_HTML.h b/swad_HTML.h index ea1490b8..c11966a9 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -74,4 +74,6 @@ void HTM_ARTICLE_End (void); void HTM_SECTION_Begin (const char *SectionId); void HTM_SECTION_End (void); +void HTM_UL_End (void); + #endif diff --git a/swad_ID.c b/swad_ID.c index f8c24503..ebc5f848 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -516,7 +516,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) /***** Start section *****/ HTM_SECTION_Begin (ID_ID_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); @@ -548,7 +548,7 @@ void ID_ShowFormChangeOtherUsrID (void) /***** Start section *****/ HTM_SECTION_Begin (ID_ID_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); diff --git a/swad_MFU.c b/swad_MFU.c index 6f92ef61..9103c118 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -217,7 +217,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) char MenuStr[MFU_MAX_BYTES_MENU + 1]; char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1]; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_My_frequent_actions,NULL, Hlp_ANALYTICS_Frequent,Box_NOT_CLOSABLE); HTM_DIV_Begin ("id=\"MFU_actions_big\""); @@ -317,7 +317,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) fprintf (Gbl.F.Out,""); } } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); /***** End div *****/ HTM_DIV_End (); diff --git a/swad_account.c b/swad_account.c index 741f6d49..68f80135 100644 --- a/swad_account.c +++ b/swad_account.c @@ -140,7 +140,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) extern const char *Txt_Check; extern const char *Txt_Skip_this_step; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Title,NULL, Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); @@ -213,7 +213,7 @@ void Acc_CheckIfEmptyAccountExists (void) ID); if (NumUsrs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL, (NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user : Txt_Do_you_think_you_are_one_of_these_users, @@ -354,7 +354,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** Begin form to enter some data of the new user *****/ Frm_StartForm (ActCreUsrAcc); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Create_account,NULL, Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE,2); @@ -426,7 +426,7 @@ void Acc_ShowFormGoToRequestNewAccount (void) extern const char *Txt_New_on_PLATFORM_Sign_up; extern const char *Txt_Create_account; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_New_on_PLATFORM_Sign_up, Cfg_PLATFORM_SHORT_NAME); diff --git a/swad_agenda.c b/swad_agenda.c index 237c2841..98ce44dc 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -153,7 +153,7 @@ void Agd_ShowMyAgenda (void) /***** Get parameters *****/ Agd_GetParams (Agd_MY_AGENDA); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin ("100%",Txt_My_agenda,Agd_PutIconsMyFullAgenda, Hlp_PROFILE_Agenda,Box_NOT_CLOSABLE); @@ -352,7 +352,7 @@ void Agd_ShowUsrAgenda (void) { Error = false; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Public_agenda_USER, Gbl.Usrs.Other.UsrDat.FullName); @@ -396,7 +396,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void) /* If nickname is correct, user code is already got from nickname */ if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) // Existing user { - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Public_agenda_USER, Gbl.Usrs.Other.UsrDat.FullName); @@ -519,7 +519,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType) if (Gbl.Agenda.Num) { - /***** Start box and table *****/ + /***** Begin box and table *****/ switch (AgendaType) { case Agd_MY_AGENDA_TODAY: @@ -1487,7 +1487,7 @@ void Agd_RequestCreatOrEditEvent (void) } Agd_PutCurrentParamsMyAgenda (); - /***** Start box and table *****/ + /***** Begin box and table *****/ if (ItsANewEvent) Box_StartBoxTable (NULL,Txt_New_event,NULL, Hlp_PROFILE_Agenda_new_event,Box_NOT_CLOSABLE,2); @@ -1900,7 +1900,7 @@ void Agd_PrintAgdQRCode (void) { extern const char *Txt_Where_s_USER; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Where_s_USER, Gbl.Usrs.Me.UsrDat.FullName); diff --git a/swad_alert.c b/swad_alert.c index 7e293b06..34d144ac 100644 --- a/swad_alert.c +++ b/swad_alert.c @@ -404,7 +404,7 @@ static void Ale_ShowFixAlertAndButton1 (Ale_AlertType_t AlertType,const char *Tx if (!Gbl.Layout.HTMLStartWritten) Lay_WriteStartOfPage (); - /***** Start box *****/ + /***** Begin box *****/ fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /*****************************************************************************/ @@ -221,7 +221,7 @@ static void Ban_EditBannersInternal (void) " FROM banners ORDER BY ShortName"); Ban_GetListBanners (&mysql_res,NumRows); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Banners,Ban_PutIconsEditingBanners, Hlp_SYSTEM_Banners_edit,Box_NOT_CLOSABLE); @@ -858,7 +858,7 @@ static void Ban_PutFormToCreateBanner (void) /***** Begin form *****/ Frm_StartForm (ActNewBan); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_banner,NULL, Hlp_SYSTEM_Banners_edit,Box_NOT_CLOSABLE,2); diff --git a/swad_box.c b/swad_box.c index a06d3bc9..bfe58a28 100644 --- a/swad_box.c +++ b/swad_box.c @@ -138,7 +138,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title, else Gbl.Box.Ids[Gbl.Box.Nested] = NULL; - /***** Start box container *****/ + /***** Begin box container *****/ if (Closable == Box_CLOSABLE) { /* Create unique id for alert */ @@ -149,7 +149,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title, else HTM_DIV_Begin ("class=\"FRAME_CONTAINER\""); - /***** Start box *****/ + /***** Begin box *****/ if (Width) HTM_DIV_Begin ("class=\"%s\" style=\"width:%s;\"",ClassFrame,Width); else diff --git a/swad_calendar.c b/swad_calendar.c index 84ef0ef5..8c04c108 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -259,7 +259,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar, Hld_GetListHolidays (); } - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,NULL,FunctionToDrawContextualIcons, PrintView ? NULL : Hlp_START_Calendar,Box_NOT_CLOSABLE); diff --git a/swad_centre.c b/swad_centre.c index 9322d8d1..629f345b 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -175,7 +175,7 @@ void Ctr_SeeCtrWithPendingDegs (void) } if (NumCtrs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Centres_with_pending_degrees,NULL, Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2); @@ -322,7 +322,7 @@ static void Ctr_Configuration (bool PrintView) (unsigned) Gbl.Hierarchy.Ctr.CtrCod); PhotoExists = Fil_CheckIfPathExists (PathPhoto); - /***** Start box *****/ + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -811,7 +811,7 @@ static void Ctr_ListCentres (void) extern const char *Txt_Create_centre; unsigned NumCtr; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); @@ -1010,7 +1010,7 @@ static void Ctr_EditCentresInternal (void) /***** Write menu to select country and institution *****/ Hie_WriteMenuHierarchy (); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Centres_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); @@ -2312,7 +2312,7 @@ void Ctr_RequestPhoto (void) /***** Begin form to upload photo *****/ Frm_StartForm (ActRecCtrPho); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Photo,NULL, NULL,Box_NOT_CLOSABLE); @@ -2505,7 +2505,7 @@ static void Ctr_PutFormToCreateCentre (void) else Lay_NoPermissionExit (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_centre,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -2928,7 +2928,7 @@ void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs) /***** Query database *****/ if (NumCtrs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of centres found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s", diff --git a/swad_changelog.h b/swad_changelog.h index b34ad036..11f13e3b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,13 +487,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.44.2 (2019-10-26)" +#define Log_PLATFORM_VERSION "SWAD 19.44.3 (2019-10-26)" #define CSS_FILE "swad19.44.2.css" #define JS_FILE "swad19.39.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. +// TODO: Buscar emparejamientos "); + /***** End box *****/ + HTM_UL_End (); Box_BoxEnd (); } @@ -278,7 +278,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) " ORDER BY NumUsrs DESC,RoomCode"); if (NumRows > 0) // If not empty chat rooms found { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Rooms_with_users,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_classroom.c b/swad_classroom.c index dd066261..89af1ec5 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -249,7 +249,7 @@ static void Cla_EditClassroomsInternal (void) /***** Get list of classrooms *****/ Cla_GetListClassrooms (Cla_ALL_DATA); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Classrooms,Cla_PutIconsEditingClassrooms, Hlp_CENTRE_Classrooms_edit,Box_NOT_CLOSABLE); @@ -889,7 +889,7 @@ static void Cla_PutFormToCreateClassroom (void) /***** Begin form *****/ Frm_StartForm (ActNewCla); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_classroom,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_connected.c b/swad_connected.c index 0cb838b7..0d0c938c 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -95,7 +95,7 @@ void Con_ShowConnectedUsrs (void) Sco_SetScopesForListingStudents (); Sco_GetScope ("ScopeCon"); - /***** Start box *****/ + /***** Begin box *****/ /* Current time */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%s" diff --git a/swad_cookie.c b/swad_cookie.c index 3907f42e..0c98aca1 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -67,7 +67,7 @@ void Coo_EditMyPrefsOnCookies (void) /***** Start section with preferences about cookies *****/ HTM_SECTION_Begin (Coo_COOKIES_ID); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Cookies,Coo_PutIconsCookies, Hlp_PROFILE_Settings_cookies,Box_NOT_CLOSABLE,2); diff --git a/swad_country.c b/swad_country.c index 040617d1..52a41c8f 100644 --- a/swad_country.c +++ b/swad_country.c @@ -150,7 +150,7 @@ void Cty_SeeCtyWithPendingInss (void) /***** Get countries *****/ if (NumCtys) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Countries_with_pending_institutions,NULL, Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2); @@ -253,7 +253,7 @@ static void Cty_Configuration (bool PrintView) if (Gbl.Hierarchy.Cty.CtyCod <= 0) // No country selected return; - /***** Start box *****/ + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -534,7 +534,7 @@ void Cty_ListCountries2 (void) /***** Write menu to select country *****/ Hie_WriteMenuHierarchy (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Countries,Cty_PutIconsListingCountries, Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE,2); @@ -978,7 +978,7 @@ static void Cty_EditCountriesInternal (void) /***** Write menu to select country *****/ Hie_WriteMenuHierarchy (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Countries,Cty_PutIconsEditingCountries, Hlp_SYSTEM_Countries,Box_NOT_CLOSABLE); @@ -2033,7 +2033,7 @@ static void Cty_PutFormToCreateCountry (void) /***** Begin form *****/ Frm_StartForm (ActNewCty); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_country,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -2430,7 +2430,7 @@ void Cty_ListCtysFound (MYSQL_RES **mysql_res,unsigned NumCtys) /***** Query database *****/ if (NumCtys) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of countries found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s", diff --git a/swad_course.c b/swad_course.c index 2ac7eaf1..03f9fe13 100644 --- a/swad_course.c +++ b/swad_course.c @@ -207,7 +207,7 @@ static void Crs_Configuration (bool PrintView) Mnu_ContextMenuEnd (); } - /***** Start box *****/ + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -580,7 +580,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) "%s LIGHT_BLUE", The_ClassFormInBoxBold[Gbl.Prefs.Theme]); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_My_courses,Crs_PutIconToSearchCourses, Hlp_PROFILE_Courses,Box_NOT_CLOSABLE); fprintf (Gbl.F.Out,""); + HTM_UL_End (); Box_BoxEnd (); } @@ -1168,7 +1168,7 @@ static void Crs_ListCourses (void) extern const char *Txt_Create_course; unsigned Year; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Courses_of_DEGREE_X, Gbl.Hierarchy.Deg.ShrtName); @@ -1376,7 +1376,7 @@ static void Crs_EditCoursesInternal (void) /***** Write menu to select country, institution, centre and degree *****/ Hie_WriteMenuHierarchy (); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Courses_of_DEGREE_X, Gbl.Hierarchy.Deg.ShrtName); @@ -1700,7 +1700,7 @@ static void Crs_PutFormToCreateCourse (void) else Lay_NoPermissionExit (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_course,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -3059,7 +3059,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) /***** List the courses (one row per course) *****/ if (NumCrss) { - /* Start box and table */ + /* Begin box and table */ Box_StartBoxTable ("100%",NULL,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -3127,7 +3127,7 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) /***** List the courses (one row per course) *****/ if (NumCrss) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of courses found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s", @@ -3343,7 +3343,7 @@ void Crs_AskRemoveOldCrss (void) /***** Begin form *****/ Frm_StartForm (ActRemOldCrs); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Eliminate_old_courses,NULL, Hlp_SYSTEM_Hierarchy_eliminate_old_courses,Box_NOT_CLOSABLE); diff --git a/swad_date.c b/swad_date.c index 0aae6c91..a1394d0b 100644 --- a/swad_date.c +++ b/swad_date.c @@ -104,7 +104,7 @@ void Dat_PutBoxToSelectDateFormat (void) extern const char *Txt_Dates; Dat_Format_t Format; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Dates,Dat_PutIconsDateFormat, Hlp_PROFILE_Settings_dates,Box_NOT_CLOSABLE); @@ -132,8 +132,8 @@ void Dat_PutBoxToSelectDateFormat (void) ""); } - /***** End list and form *****/ - fprintf (Gbl.F.Out,""); + /***** End list *****/ + HTM_UL_End (); /***** End form *****/ Frm_EndForm (); diff --git a/swad_degree.c b/swad_degree.c index c7c24429..3170dbfd 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -180,7 +180,7 @@ void Deg_SeeDegWithPendingCrss (void) /***** Get degrees *****/ if (NumDegs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Degrees_with_pending_courses,NULL, Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2); @@ -310,7 +310,7 @@ static void Deg_Configuration (bool PrintView) if (Gbl.Hierarchy.Deg.DegCod <= 0) // No degree selected return; - /***** Start box *****/ + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -961,7 +961,7 @@ static void Deg_PutFormToCreateDegree (void) else Lay_NoPermissionExit (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_degree,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1153,7 +1153,7 @@ static void Deg_ListDegrees (void) extern const char *Txt_Create_degree; unsigned NumDeg; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Degrees_of_CENTRE_X, Gbl.Hierarchy.Ctr.ShrtName); @@ -1339,7 +1339,7 @@ static void Deg_EditDegreesInternal (void) /***** Write menu to select country, institution and centre *****/ Hie_WriteMenuHierarchy (); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Degrees_of_CENTRE_X, Gbl.Hierarchy.Ctr.ShrtName); @@ -2593,7 +2593,7 @@ void Deg_ListDegsFound (MYSQL_RES **mysql_res,unsigned NumDegs) /***** Query database *****/ if (NumDegs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of degrees found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s", diff --git a/swad_degree_type.c b/swad_degree_type.c index 46ac1897..7e3978d5 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -197,7 +197,7 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder extern const char *Txt_Create_another_type_of_degree; extern const char *Txt_Create_type_of_degree; - /***** Start box *****/ + /***** Begin box *****/ switch (NextAction) { case ActSeeDegTyp: @@ -264,7 +264,7 @@ static void DT_EditDegreeTypesInternal (void) /***** Get list of degree types *****/ DT_GetListDegreeTypes (Hie_SYS,DT_ORDER_BY_DEGREE_TYPE); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Types_of_degree,DT_PutIconsEditingDegreeTypes, Hlp_CENTRE_DegreeTypes_edit,Box_NOT_CLOSABLE); @@ -465,7 +465,7 @@ static void DT_PutFormToCreateDegreeType (void) /***** Begin form *****/ Frm_StartForm (ActNewDegTyp); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_type_of_degree,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_department.c b/swad_department.c index 8830bd7c..b968976f 100644 --- a/swad_department.c +++ b/swad_department.c @@ -110,7 +110,7 @@ void Dpt_SeeDepts (void) /***** Get list of departments *****/ Dpt_GetListDepartments (Gbl.Hierarchy.Ins.InsCod); - /***** Start box and table *****/ + /***** Begin box and table *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Departments_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); @@ -268,7 +268,7 @@ static void Dpt_EditDepartmentsInternal (void) /***** Get list of departments *****/ Dpt_GetListDepartments (Gbl.Hierarchy.Ins.InsCod); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Departments_of_INSTITUTION_X, Gbl.Hierarchy.Ins.FullName); @@ -910,7 +910,7 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Begin form *****/ Frm_StartForm (ActNewDpt); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_department,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_duplicate.c b/swad_duplicate.c index eaf40407..49627bb3 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -137,7 +137,7 @@ void Dup_ListDuplicateUsrs (void) struct UsrData UsrDat; unsigned NumInformants; - /***** Start box with list of possible duplicate users *****/ + /***** Begin box with list of possible duplicate users *****/ Box_BoxBegin (NULL,Txt_Possibly_duplicate_users,NULL, Hlp_USERS_Duplicates_possibly_duplicate_users,Box_NOT_CLOSABLE); @@ -259,7 +259,7 @@ static void Dup_ListSimilarUsrs (void) unsigned NumUsrs; unsigned NumUsr; - /***** Start box with list of possible duplicate users *****/ + /***** Begin box with list of possible duplicate users *****/ Box_BoxBegin (NULL,Txt_Similar_users,NULL, Hlp_USERS_Duplicates_similar_users,Box_NOT_CLOSABLE); diff --git a/swad_enrolment.c b/swad_enrolment.c index c77f75a4..eb2fc9e9 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -407,7 +407,7 @@ void Enr_ReqAcceptRegisterInCrs (void) extern const char *Txt_Remove_me_from_this_course; Ntf_NotifyEvent_t NotifyEvent; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Enrolment,NULL, Hlp_USERS_SignUp_confirm_enrolment,Box_NOT_CLOSABLE); @@ -723,7 +723,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role) } Frm_StartForm (NextAction); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Title,NULL, Hlp_USERS_Administration_administer_multiple_users,Box_NOT_CLOSABLE); @@ -801,7 +801,7 @@ void Enr_AskRemoveOldUsrs (void) /***** Begin form *****/ Frm_StartForm (ActRemOldUsr); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Eliminate_old_users,NULL, NULL,Box_NOT_CLOSABLE); @@ -1017,7 +1017,7 @@ static void Enr_PutActionsRegRemSeveralUsrs (void) Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1); /***** End list of options *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /*****************************************************************************/ @@ -1585,7 +1585,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) } /***** End list of options *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); return OptionsShown; } @@ -1854,7 +1854,7 @@ void Enr_AskRemAllStdsThisCrs (void) extern const char *Txt_Remove_all_students; extern const char *Txt_Do_you_really_want_to_remove_the_X_students_from_the_course_Y_; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Remove_all_students,NULL, Hlp_USERS_Administration_remove_all_students,Box_NOT_CLOSABLE); @@ -2279,7 +2279,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) Gbl.Scope.Default = Hie_CRS; Sco_GetScope ("ScopeEnr"); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Enrolment_requests,NULL, Hlp_USERS_Requests,Box_NOT_CLOSABLE); @@ -3121,7 +3121,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role) extern const char *Txt_Administer_one_user; Act_Action_t NextAction; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Administer_one_user,NULL, Hlp_USERS_Administration_administer_one_user,Box_NOT_CLOSABLE); diff --git a/swad_exam.c b/swad_exam.c index a48000b8..b999aab7 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -573,7 +573,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx " ORDER BY ExamDate DESC", Gbl.Hierarchy.Crs.CrsCod,SubQueryStatus); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Announcements_of_exams, ICanEdit ? Exa_PutIconToCreateNewExamAnnouncement : NULL, @@ -1009,7 +1009,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) HTM_ARTICLE_Begin (Anchor); - /***** Start box *****/ + /***** Begin box *****/ Width = "625px"; Gbl.ExamAnns.Anchor = Anchor; // Used to put contextual icons Gbl.ExamAnns.ExaCod = ExaCod; // Used to put contextual icons diff --git a/swad_figure.c b/swad_figure.c index 46c01c0e..88cb7dcb 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -200,7 +200,7 @@ void Fig_ReqShowFigures (void) /***** Form to show statistic *****/ Frm_StartForm (ActSeeUseGbl); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Figures,NULL, Hlp_ANALYTICS_Figures,Box_NOT_CLOSABLE); @@ -366,7 +366,7 @@ static void Fig_GetAndShowUsersStats (void) extern const char *Txt_Average_number_of_courses_to_which_a_user_belongs; extern const char *Txt_Average_number_of_users_belonging_to_a_course; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_USERS],NULL, Hlp_ANALYTICS_Figures_users,Box_NOT_CLOSABLE,2); @@ -495,7 +495,7 @@ static void Fig_GetAndShowUsersRanking (void) extern const char *Txt_Messages; extern const char *Txt_Followers; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_USERS_RANKING],NULL, Hlp_ANALYTICS_Figures_ranking,Box_NOT_CLOSABLE,2); @@ -560,7 +560,7 @@ static void Fig_GetAndShowHierarchyStats (void) extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES]; Rol_Role_t Role; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_HIERARCHY],NULL, Hlp_ANALYTICS_Figures_hierarchy,Box_NOT_CLOSABLE,2); @@ -1028,7 +1028,7 @@ static void Fig_GetAndShowInstitutionsStats (void) extern const char *Hlp_ANALYTICS_Figures_institutions; extern const char *Txt_Institutions; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Institutions,NULL, Hlp_ANALYTICS_Figures_institutions,Box_NOT_CLOSABLE); @@ -1066,7 +1066,7 @@ static void Fig_GetAndShowInssOrderedByNumCtrs (void) MYSQL_RES *mysql_res; unsigned NumInss = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_centres,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1131,7 +1131,7 @@ static void Fig_GetAndShowInssOrderedByNumDegs (void) MYSQL_RES *mysql_res; unsigned NumInss = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_degrees,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1199,7 +1199,7 @@ static void Fig_GetAndShowInssOrderedByNumCrss (void) MYSQL_RES *mysql_res; unsigned NumInss = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_courses,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1270,7 +1270,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsInCrss (void) MYSQL_RES *mysql_res; unsigned NumInss = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_in_courses,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1345,7 +1345,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void) MYSQL_RES *mysql_res; unsigned NumInss; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them, NULL, NULL,Box_NOT_CLOSABLE,2); @@ -1587,7 +1587,7 @@ static void Fig_GetAndShowFileBrowsersStats (void) StatCrsFileZones[NumStat], &SizeOfFileZones[NumStat]); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_FIGURE_TYPES[Fig_FOLDERS_AND_FILES],NULL, Hlp_ANALYTICS_Figures_folders_and_files,Box_NOT_CLOSABLE); @@ -2756,7 +2756,7 @@ static void Fig_GetAndShowOERsStats (void) Brw_License_t License; unsigned long NumFiles[2]; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_OER],NULL, Hlp_ANALYTICS_Figures_open_educational_resources_oer,Box_NOT_CLOSABLE,2); @@ -2950,7 +2950,7 @@ static void Fig_GetAndShowAssignmentsStats (void) if ((NumCoursesWithAssignments = Asg_GetNumCoursesWithAssignments (Gbl.Scope.Current)) != 0) NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_ASSIGNMENTS],NULL, Hlp_ANALYTICS_Figures_assignments,Box_NOT_CLOSABLE,2); @@ -3009,7 +3009,7 @@ static void Fig_GetAndShowProjectsStats (void) if ((NumCoursesWithProjects = Prj_GetNumCoursesWithProjects (Gbl.Scope.Current)) != 0) NumProjectsPerCourse = (float) NumProjects / (float) NumCoursesWithProjects; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_PROJECTS],NULL, Hlp_ANALYTICS_Figures_projects,Box_NOT_CLOSABLE,2); @@ -3065,7 +3065,7 @@ static void Fig_GetAndShowTestsStats (void) Tst_AnswerType_t AnsType; struct Tst_Stats Stats; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_TESTS],NULL, Hlp_ANALYTICS_Figures_tests,Box_NOT_CLOSABLE,2); @@ -3209,7 +3209,7 @@ static void Fig_GetAndShowGamesStats (void) if ((NumCoursesWithGames = Gam_GetNumCoursesWithGames (Gbl.Scope.Current)) != 0) NumGamesPerCourse = (float) NumGames / (float) NumCoursesWithGames; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_GAMES],NULL, Hlp_ANALYTICS_Figures_games,Box_NOT_CLOSABLE,2); @@ -3266,7 +3266,7 @@ static void Fig_GetAndShowSocialActivityStats (void) unsigned NumUsrs; unsigned NumUsrsTotal; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_TIMELINE],NULL, Hlp_ANALYTICS_Figures_timeline,Box_NOT_CLOSABLE,2); @@ -3574,7 +3574,7 @@ static void Fig_GetAndShowFollowStats (void) unsigned NumUsrs; float Average; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FOLLOW],NULL, Hlp_ANALYTICS_Figures_followed_followers,Box_NOT_CLOSABLE,2); @@ -3860,7 +3860,7 @@ static void Fig_GetAndShowForumStats (void) FiguresForum.NumPosts = 0; FiguresForum.NumUsrsToBeNotifiedByEMail = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FORUMS],NULL, Hlp_ANALYTICS_Figures_forums,Box_NOT_CLOSABLE,2); @@ -4204,7 +4204,7 @@ static void Fig_GetAndShowNumUsrsPerNotifyEvent (void) unsigned NumMailsTotal = 0; unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS]; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_NOTIFY_EVENTS],NULL, Hlp_ANALYTICS_Figures_notifications,Box_NOT_CLOSABLE,2); @@ -4436,7 +4436,7 @@ static void Fig_GetAndShowNoticesStats (void) NumTotalNotices += NumNoticesDeleted; NumTotalNotifications += NumNotif; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_NOTICES],NULL, Hlp_ANALYTICS_Figures_notices,Box_NOT_CLOSABLE,2); @@ -4507,7 +4507,7 @@ static void Fig_GetAndShowMsgsStats (void) NumMsgsReceivedAndDeleted = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_DELETED ); NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_MESSAGES],NULL, Hlp_ANALYTICS_Figures_messages,Box_NOT_CLOSABLE,2); @@ -4602,7 +4602,7 @@ static void Fig_GetAndShowSurveysStats (void) NumQstsPerSurvey = Svy_GetNumQstsPerCrsSurvey (Gbl.Scope.Current); } - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SURVEYS],NULL, Hlp_ANALYTICS_Figures_surveys,Box_NOT_CLOSABLE,2); @@ -4658,7 +4658,7 @@ static void Fig_GetAndShowNumUsrsPerPrivacy (void) extern const char *Txt_Extended_public_profile; extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES]; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_PRIVACY],NULL, Hlp_ANALYTICS_Figures_privacy,Box_NOT_CLOSABLE,2); @@ -4781,7 +4781,7 @@ static void Fig_GetAndShowNumUsrsPerCookies (void) unsigned NumUsrs[Mnu_NUM_MENUS]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_COOKIES],NULL, Hlp_ANALYTICS_Figures_cookies,Box_NOT_CLOSABLE,2); @@ -4857,7 +4857,7 @@ static void Fig_GetAndShowNumUsrsPerLanguage (void) unsigned NumUsrs[1 + Lan_NUM_LANGUAGES]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_LANGUAGES],NULL, Hlp_ANALYTICS_Figures_language,Box_NOT_CLOSABLE,2); @@ -4934,7 +4934,7 @@ static void Fig_GetAndShowNumUsrsPerFirstDayOfWeek (void) unsigned NumUsrs[7]; // 7: seven days in a week unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_FIRST_DAY_OF_WEEK],NULL, Hlp_ANALYTICS_Figures_calendar,Box_NOT_CLOSABLE,2); @@ -5015,7 +5015,7 @@ static void Fig_GetAndShowNumUsrsPerDateFormat (void) unsigned NumUsrs[Dat_NUM_OPTIONS_FORMAT]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_DATE_FORMAT],NULL, Hlp_ANALYTICS_Figures_dates,Box_NOT_CLOSABLE,2); @@ -5092,7 +5092,7 @@ static void Fig_GetAndShowNumUsrsPerIconSet (void) unsigned NumUsrs[Ico_NUM_ICON_SETS]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_ICON_SETS],NULL, Hlp_ANALYTICS_Figures_icons,Box_NOT_CLOSABLE,2); @@ -5174,7 +5174,7 @@ static void Fig_GetAndShowNumUsrsPerMenu (void) unsigned NumUsrs[Mnu_NUM_MENUS]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_MENUS],NULL, Hlp_ANALYTICS_Figures_menu,Box_NOT_CLOSABLE,2); @@ -5255,7 +5255,7 @@ static void Fig_GetAndShowNumUsrsPerTheme (void) unsigned NumUsrs[The_NUM_THEMES]; unsigned NumUsrsTotal = 0; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_THEMES],NULL, Hlp_ANALYTICS_Figures_theme,Box_NOT_CLOSABLE,2); @@ -5335,7 +5335,7 @@ static void Fig_GetAndShowNumUsrsPerSideColumns (void) unsigned NumUsrsTotal = 0; extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS],NULL, Hlp_ANALYTICS_Figures_columns,Box_NOT_CLOSABLE,2); diff --git a/swad_file_browser.c b/swad_file_browser.c index e4d28ab6..96169978 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3112,7 +3112,7 @@ static void Brw_ShowFileBrowserProject (void) Prj_GetDataOfProjectByCod (&Prj); Gbl.Prjs.PrjCod = Prj.PrjCod; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Prj.Title,NULL, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); @@ -3168,7 +3168,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) /***** Write top before showing file browser *****/ Brw_WriteTopBeforeShowingFileBrowser (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("100%",Txt_Assignments_and_other_works, Brw_PutIconShowFigure, Hlp_FILES_Homework_for_teachers,Box_NOT_CLOSABLE,0); @@ -3318,7 +3318,7 @@ static void Brw_FormToChangeCrsGrpZone (void) } /***** End list and form *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); Frm_EndForm (); } @@ -3642,7 +3642,7 @@ static void Brw_ShowFileBrowser (void) /***** Check if the clipboard is in this tree *****/ Gbl.FileBrowser.Clipboard.IsThisTree = Brw_CheckIfClipboardIsInThisTree (); - /***** Start box *****/ + /***** Begin box *****/ Gbl.FileBrowser.Id++; snprintf (FileBrowserSectionId,sizeof (FileBrowserSectionId), "file_browser_%u", @@ -8343,7 +8343,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) Frm_StartForm (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); Brw_PutImplicitParamsFileBrowser (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Create_folder,NULL, NULL,Box_NOT_CLOSABLE); Ale_ShowAlert (Ale_INFO,Txt_You_can_create_a_new_folder_inside_the_folder_X, @@ -8378,7 +8378,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const char *Txt_Done; - /***** Start box *****/ + /***** Begin box *****/ HTM_DIV_Begin ("id=\"dropzone-upload\""); Box_BoxBegin ("95%",Txt_Upload_files,NULL, NULL,Box_NOT_CLOSABLE); @@ -8436,7 +8436,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) extern const char *Txt_Upload_file; extern const char *Txt_or_you_can_upload_a_new_file_to_the_folder_X; - /***** Start box *****/ + /***** Begin box *****/ HTM_DIV_Begin ("id=\"classic-upload\" style=\"display:none;\""); Box_BoxBegin (NULL,Txt_Upload_file,NULL, NULL,Box_NOT_CLOSABLE); @@ -8473,7 +8473,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) Frm_StartForm (Brw_ActPaste[Gbl.FileBrowser.Type]); Brw_PutImplicitParamsFileBrowser (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Paste,NULL, NULL,Box_NOT_CLOSABLE); @@ -8505,7 +8505,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) Frm_StartForm (Brw_ActCreateLink[Gbl.FileBrowser.Type]); Brw_PutImplicitParamsFileBrowser (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Create_link,NULL, NULL,Box_NOT_CLOSABLE); @@ -9504,7 +9504,7 @@ void Brw_ShowFileMetadata (void) Brw_PutImplicitParamsFileBrowser (); } - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2); /***** Link to download the file *****/ @@ -11803,7 +11803,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned long NumDocs, /***** Query database *****/ if (NumDocs) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of documents found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%lu %s", @@ -12159,7 +12159,7 @@ void Brw_AskRemoveOldFiles (void) Frm_StartForm (ActRemOldBrf); Brw_PutHiddenParamFullTreeIfSelected (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Remove_old_files,NULL, NULL,Box_NOT_CLOSABLE); diff --git a/swad_follow.c b/swad_follow.c index 4e31af13..d03d50fe 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -145,7 +145,7 @@ void Fol_SuggestUsrsToFollowMainZone (void) Fol_SUGGEST_ANY_USER, &mysql_res))) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow, Hlp_START_Profiles_who_to_follow,Box_NOT_CLOSABLE,2); @@ -699,7 +699,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat) /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&FollowingUsrDat); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("560px",Txt_Following,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -782,7 +782,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat) /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&FollowerUsrDat); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable ("560px",Txt_Followers,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_forum.c b/swad_forum.c index 73e4efe0..9ba64cbc 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -969,7 +969,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag if (Message[0]) Ale_ShowAlert (AlertType,Message); - /***** Start box *****/ + /***** Begin box *****/ snprintf (FrameTitle,sizeof (FrameTitle), "%s: %s", Txt_Thread,Thr.Subject); @@ -1575,7 +1575,7 @@ static void For_ShowForumList (void) /***** Fill the list with the institutions I belong to *****/ Usr_GetMyInstits (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Forums,For_PutIconsForums, Hlp_MESSAGES_Forums,Box_NOT_CLOSABLE); @@ -1726,7 +1726,7 @@ static void For_ShowForumList (void) } /***** End list *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); /***** End box *****/ Box_BoxEnd (); @@ -1777,7 +1777,7 @@ static void For_PutFormWhichForums (void) "", Gbl.Form.Id,Txt_FORUM_WHICH_FORUM[ForumSet]); } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); HTM_DIV_End (); Frm_EndForm (); } @@ -2541,7 +2541,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, if (Message[0]) Ale_ShowAlert (AlertType,Message); - /***** Start box for threads of this forum *****/ + /***** Begin box for threads of this forum *****/ snprintf (FrameTitle,sizeof (FrameTitle), "%s: %s", Txt_Forum,ForumName); @@ -3920,7 +3920,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) extern const char *Txt_MSG_Content; extern const char *Txt_Send; - /***** Start box *****/ + /***** Begin box *****/ if (IsReply) Box_BoxBegin (NULL,Txt_New_post,NULL, Hlp_MESSAGES_Forums_new_post,Box_NOT_CLOSABLE); diff --git a/swad_game.c b/swad_game.c index 045b302c..9330e797 100644 --- a/swad_game.c +++ b/swad_game.c @@ -202,7 +202,7 @@ static void Gam_ListAllGames (void) 0, &Pagination); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Games,Gam_PutIconsListGames, Hlp_ASSESSMENT_Games,Box_NOT_CLOSABLE); @@ -380,7 +380,7 @@ void Gam_ShowOneGame (long GamCod, Dat_StartEndTime_t StartEndTime; char Txt[Cns_MAX_BYTES_TEXT + 1]; - /***** Start box *****/ + /***** Begin box *****/ if (ShowOnlyThisGame) Box_BoxBegin (NULL,Txt_Game,NULL, Hlp_ASSESSMENT_Games,Box_NOT_CLOSABLE); @@ -1126,7 +1126,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) ActChgGam); Gam_PutParams (); - /***** Start box and table *****/ + /***** Begin box and table *****/ if (ItsANewGame) Box_StartBoxTable (NULL,Txt_New_game,NULL, Hlp_ASSESSMENT_Games_new_game,Box_NOT_CLOSABLE,2); @@ -1591,7 +1591,7 @@ static void Gam_ListGameQuestions (struct Game *Game) " ORDER BY gam_questions.QstInd", Game->GamCod); - /***** Start box *****/ + /***** Begin box *****/ Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter Box_BoxBegin (NULL,Txt_Questions,ICanEditQuestions ? Gam_PutIconToAddNewQuestions : NULL, diff --git a/swad_group.c b/swad_group.c index edf18ec7..d911517c 100644 --- a/swad_group.c +++ b/swad_group.c @@ -288,7 +288,7 @@ static void Grp_EditGroupTypes (void) extern const char *Txt_Types_of_group; extern const char *Txt_There_are_no_types_of_group_in_the_course_X; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Types_of_group,Grp_PutIconsEditingGroupTypes, Hlp_USERS_Groups,Box_NOT_CLOSABLE); @@ -316,7 +316,7 @@ static void Grp_EditGroups (void) extern const char *Txt_Groups; extern const char *Txt_No_groups_have_been_created_in_the_course_X; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Groups,Grp_PutIconsEditingGroups, Hlp_USERS_Groups,Box_NOT_CLOSABLE); @@ -374,7 +374,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void), if (!Gbl.Crs.Grps.NumGrps) return; - /***** Start box *****/ + /***** Begin box *****/ ICanEdit = !Gbl.Form.Inside && (Gbl.Usrs.Me.Role.Logged == Rol_TCH || Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM); @@ -1801,7 +1801,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void) Grp_ShowWarningToStdsToChangeGrps (); } - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_My_groups,ICanEdit ? Grp_PutIconToEditGroups : NULL, Hlp_USERS_Groups,Box_NOT_CLOSABLE); @@ -2082,7 +2082,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod) /***** Get list of groups types and groups in current course *****/ Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Groups,NULL, Hlp_USERS_Groups,Box_NOT_CLOSABLE,0); @@ -2472,7 +2472,7 @@ static void Grp_PutFormToCreateGroupType (void) HTM_SECTION_Begin (Grp_NEW_GROUP_TYPE_SECTION_ID); Frm_StartFormAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ Box_StartBoxTable (NULL,Txt_New_type_of_group,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -2595,7 +2595,7 @@ static void Grp_PutFormToCreateGroup (void) HTM_SECTION_Begin (Grp_NEW_GROUP_SECTION_ID); Frm_StartFormAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_group,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_help.c b/swad_help.c index 8822facf..bc363c03 100644 --- a/swad_help.c +++ b/swad_help.c @@ -127,7 +127,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void) Txt_You_can_search_for_courses_select_them_and_request_your_enrolment_in_them, Txt_If_you_can_not_find_your_institution_your_centre_your_degree_or_your_courses_you_can_create_them); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_What_would_you_like_to_do,NULL, NULL,Box_CLOSABLE,2); diff --git a/swad_holiday.c b/swad_holiday.c index 2f682d98..b1b083eb 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -552,7 +552,7 @@ static void Hld_ListHolidaysForEdition (void) struct Holiday *Hld; Hld_HolidayType_t HolidayType; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Holidays,Cal_PutIconToSeeCalendar, Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2); @@ -969,7 +969,7 @@ static void Hld_PutFormToCreateHoliday (void) /***** Begin form *****/ Frm_StartForm (ActNewHld); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_holiday,NULL, Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE,2); diff --git a/swad_indicator.c b/swad_indicator.c index e5c581c5..5cdbdf7d 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -110,7 +110,7 @@ void Ind_ReqIndicatorsCourses (void) /***** Get parameters *****/ Ind_GetParamsIndicators (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Indicators_of_courses,NULL, Hlp_ANALYTICS_Indicators,Box_NOT_CLOSABLE); diff --git a/swad_info.c b/swad_info.c index 8f0ad976..273ee95d 100644 --- a/swad_info.c +++ b/swad_info.c @@ -594,7 +594,7 @@ void Inf_WriteMsgYouMustReadInfo (void) extern const char *Txt_You_should_read_the_following_information; Inf_InfoType_t InfoType; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Required_reading,NULL, NULL,Box_NOT_CLOSABLE); @@ -620,7 +620,7 @@ void Inf_WriteMsgYouMustReadInfo (void) Frm_EndForm (); fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); HTM_DIV_End (); /***** End box *****/ @@ -1043,7 +1043,7 @@ static void Inf_ShowPage (const char *URL) Hlp_ASSESSMENT_System, // Inf_ASSESSMENT }; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : NULL, @@ -1128,7 +1128,7 @@ void Inf_FormsToSelSendInfo (void) } /***** Form to choice between alternatives *****/ - /* Start box and table */ + /* Begin box and table */ Box_StartBoxTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo, HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE,4); @@ -1791,7 +1791,7 @@ static bool Inf_CheckAndShowPlainTxt (void) if (TxtHTML[0]) { - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : NULL, @@ -1875,7 +1875,7 @@ static bool Inf_CheckAndShowRichTxt (void) if (TxtMD[0]) { - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : NULL, diff --git a/swad_institution.c b/swad_institution.c index dea9cf4a..1f33b987 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -168,7 +168,7 @@ void Ins_SeeInsWithPendingCtrs (void) /***** Get institutions *****/ if (NumInss) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Institutions_with_pending_centres,NULL, Hlp_SYSTEM_Hierarchy_pending,Box_NOT_CLOSABLE,2); @@ -324,7 +324,7 @@ static void Ins_Configuration (bool PrintView) if (Gbl.Hierarchy.Ins.InsCod <= 0) // No institution selected return; - /***** Start box *****/ + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -702,7 +702,7 @@ static void Ins_ListInstitutions (void) extern const char *Txt_Create_institution; unsigned NumIns; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Institutions_of_COUNTRY_X, Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); @@ -948,7 +948,7 @@ static void Ins_EditInstitutionsInternal (void) /***** Write menu to select country *****/ Hie_WriteMenuHierarchy (); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Institutions_of_COUNTRY_X, Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); @@ -2215,7 +2215,7 @@ static void Ins_PutFormToCreateInstitution (void) else Lay_NoPermissionExit (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_institution,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -2543,7 +2543,7 @@ void Ins_ListInssFound (MYSQL_RES **mysql_res,unsigned NumInss) /***** List the institutions (one row per institution) *****/ if (NumInss) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of institutions found */ snprintf (Gbl.Title,sizeof (Gbl.Title), "%u %s", diff --git a/swad_layout.c b/swad_layout.c index 91721aed..7ea737b9 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -295,7 +295,7 @@ void Lay_WriteStartOfPage (void) return; } - /***** Start box that contains the whole page except the foot *****/ + /***** Begin box that contains the whole page except the foot *****/ HTM_DIV_Begin ("id=\"whole_page\""); /***** Header of layout *****/ @@ -1681,7 +1681,7 @@ void Lay_AdvertisementMobile (void) { HTM_DIV_Begin ("style=\"margin-top:25px;\""); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,NULL,NULL, NULL,Box_NOT_CLOSABLE,8); diff --git a/swad_link.c b/swad_link.c index 5fd586ce..55d66954 100644 --- a/swad_link.c +++ b/swad_link.c @@ -100,7 +100,7 @@ void Lnk_SeeLinks (void) /***** Get list of links *****/ Lnk_GetListLinks (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Links,Lnk_PutIconsListingLinks, Hlp_SYSTEM_Links,Box_NOT_CLOSABLE); @@ -206,7 +206,7 @@ static void Lnk_WriteListOfLinks (void) Gbl.Links.Lst[NumLnk].ShrtName); /***** List end *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /*****************************************************************************/ @@ -233,7 +233,7 @@ static void Lnk_EditLinksInternal (void) /***** Get list of links *****/ Lnk_GetListLinks (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Links,Lnk_PutIconsEditingLinks, Hlp_SYSTEM_Links_edit,Box_NOT_CLOSABLE); @@ -739,7 +739,7 @@ static void Lnk_PutFormToCreateLink (void) /***** Begin form *****/ Frm_StartForm (ActNewLnk); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_link,NULL, Hlp_SYSTEM_Links_edit,Box_NOT_CLOSABLE,2); diff --git a/swad_logo.c b/swad_logo.c index 914ab9fa..63aad92a 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -288,7 +288,7 @@ void Log_RequestLogo (Hie_Level_t Scope) /***** Begin form to upload logo *****/ Frm_StartForm (ActionRec); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Logo,NULL, NULL,Box_NOT_CLOSABLE); diff --git a/swad_mail.c b/swad_mail.c index 31e740c3..c38b88ae 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -121,7 +121,7 @@ void Mai_SeeMailDomains (void) /***** Get list of mail domains *****/ Mai_GetListMailDomainsAllowedForNotif (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications, Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains : NULL, @@ -473,7 +473,7 @@ static void Mai_ListMailDomainsForEdition (void) unsigned NumMai; struct Mail *Mai; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL, Hlp_START_Domains_edit,Box_NOT_CLOSABLE,2); @@ -749,7 +749,7 @@ static void Mai_PutFormToCreateMailDomain (void) /***** Begin form *****/ Frm_StartForm (ActNewMai); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_email_domain,NULL, Hlp_START_Domains_edit,Box_NOT_CLOSABLE,2); @@ -1155,7 +1155,7 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail) /***** Start section *****/ HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); @@ -1187,7 +1187,7 @@ void Mai_ShowFormChangeOtherUsrEmail (void) /***** Start section *****/ HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); diff --git a/swad_match.c b/swad_match.c index f4586968..43cc8b88 100644 --- a/swad_match.c +++ b/swad_match.c @@ -256,7 +256,7 @@ void Mch_ListMatches (struct Game *Game,bool PutFormNewMatch) /* Free allocated memory for subquery */ free ((void *) SubQuery); - /***** Start box *****/ + /***** Begin box *****/ Gam_SetParamCurrentGamCod (Game->GamCod); // Used to pass parameter Box_BoxBegin (NULL,Txt_Matches,ICanEditMatches ? Mch_PutIconToCreateNewMatch : NULL, @@ -1192,7 +1192,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) Gam_PutParamGameCod (Game->GamCod); Gam_PutParamQstInd (0); // Start by first question in game - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_match,NULL, Hlp_ASSESSMENT_Games_matches,Box_NOT_CLOSABLE,2); @@ -1253,7 +1253,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void) if (Gbl.Crs.Grps.GrpTypes.Num) { - /***** Start box and table *****/ + /***** Begin box and table *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); diff --git a/swad_match_result.c b/swad_match_result.c index 5fa23bd6..02f1a0cd 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -114,7 +114,7 @@ void McR_SelDatesToSeeMyMchResults (void) /***** Begin form *****/ Frm_StartForm (ActSeeMyMchRes); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2); Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); @@ -138,7 +138,7 @@ void McR_ShowMyMchResults (void) /***** Get starting and ending dates *****/ Dat_GetIniEndDatesFromForm (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2); @@ -182,7 +182,7 @@ void McR_SelUsrsToViewUsrsMchResults (void) Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs + Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); @@ -276,7 +276,7 @@ void McR_ShowUsrsMchResults (void) /***** Check the number of users whose matches results will be shown *****/ if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected... { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE,2); @@ -734,7 +734,7 @@ void McR_ShowOneMchResult (void) McR_GetMatchResultQuestionsFromDB (Match.MchCod,UsrDat->UsrCod, &NumQsts,&NumQstsNotBlank); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Match_result,NULL, Hlp_ASSESSMENT_Games_results,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, diff --git a/swad_media.c b/swad_media.c index 111c8a0b..d6f65d86 100644 --- a/swad_media.c +++ b/swad_media.c @@ -406,7 +406,7 @@ void Med_PutMediaUploader (int NumMediaInForm,const char *ClassInput) HTM_DIV_Begin ("id=\"%s_med_upl\" style=\"display:none;\"", // container _med_upl Id); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Multimedia,NULL, Hlp_Multimedia,Box_NOT_CLOSABLE); diff --git a/swad_menu.c b/swad_menu.c index e6150f3b..7244049b 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -340,7 +340,7 @@ void Mnu_WriteMenuThisTab (void) /***** Menu start *****/ fprintf (Gbl.F.Out,""); + HTM_UL_End (); + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ diff --git a/swad_message.c b/swad_message.c index dbb3ffce..dc11327e 100644 --- a/swad_message.c +++ b/swad_message.c @@ -227,7 +227,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; // Teachers } - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Gbl.Msg.Reply.IsReply ? Txt_Reply_message : Txt_New_message,NULL, Hlp_MESSAGES_Write,Box_NOT_CLOSABLE); @@ -1748,12 +1748,12 @@ static void Msg_ShowSentOrReceivedMessages (void) &mysql_res); Gbl.Msg.NumMsgs = (unsigned) NumRows; - /***** Start box with messages *****/ + /***** Begin box with messages *****/ Box_BoxBegin ("97%",Msg_WriteNumMsgs (NumUnreadMsgs),Msg_PutIconsListMsgs, Help[Gbl.Msg.TypeOfMessages],Box_NOT_CLOSABLE); /***** Filter messages *****/ - /* Start box with filter */ + /* Begin box with filter */ Box_BoxBegin (NULL,Txt_Filter,NULL, HelpFilter[Gbl.Msg.TypeOfMessages],Box_CLOSABLE); @@ -3853,7 +3853,7 @@ void Msg_ListBannedUsrs (void) /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&UsrDat); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Banned_users,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_network.c b/swad_network.c index 90fe2d68..6e5e1af9 100644 --- a/swad_network.c +++ b/swad_network.c @@ -282,7 +282,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) /***** Start section *****/ HTM_SECTION_Begin (Net_MY_WEBS_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); @@ -549,7 +549,7 @@ void Net_ShowWebAndSocialNetworksStats (void) break; } - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_FIGURE_TYPES[Fig_SOCIAL_NETWORKS],NULL, Hlp_ANALYTICS_Figures_webs_social_networks,Box_NOT_CLOSABLE,2); diff --git a/swad_nickname.c b/swad_nickname.c index 79274e3c..5a00a9d8 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -243,7 +243,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its " ORDER BY CreatTime DESC", UsrDat->UsrCod); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); diff --git a/swad_notice.c b/swad_notice.c index ae824b88..81102fed 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -108,7 +108,7 @@ void Not_ShowFormNotice (void) /***** Begin form *****/ Frm_StartForm (ActRcvNot); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_New_notice,NULL, Hlp_MESSAGES_Notices,Box_NOT_CLOSABLE); @@ -406,7 +406,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,long HighlightNotCod) if (TypeNoticesListing == Not_LIST_FULL_NOTICES) { - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrWidth,sizeof (StrWidth), "%upx", Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50); diff --git a/swad_notification.c b/swad_notification.c index 1e6e2c54..8fff1f0d 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -373,7 +373,7 @@ void Ntf_ShowMyNotifications (void) Txt_Domains); // View allowed mail domains Mnu_ContextMenuEnd (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Notifications,Ntf_PutIconsNotif, Hlp_START_Notifications,Box_NOT_CLOSABLE); @@ -1906,7 +1906,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) /***** Start section with settings on privacy *****/ HTM_SECTION_Begin (Ntf_NOTIFICATIONS_ID); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Notifications,Ntf_PutIconsNotif, Hlp_PROFILE_Settings_notifications,Box_NOT_CLOSABLE); diff --git a/swad_password.c b/swad_password.c index e82819e4..2967c055 100644 --- a/swad_password.c +++ b/swad_password.c @@ -274,7 +274,7 @@ void Pwd_ShowFormSendNewPwd (void) /***** Begin form *****/ Frm_StartForm (ActSndNewPwd); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Forgotten_password,NULL, Hlp_PROFILE_Password,Box_NOT_CLOSABLE); @@ -660,7 +660,7 @@ void Pwd_ShowFormChgMyPwd (void) /***** Begin form *****/ Frm_StartFormAnchor (ActChgMyPwd,Pwd_PASSWORD_SECTION_ID); - /***** Start box *****/ + /***** Begin box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); @@ -834,7 +834,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void) extern const char *Txt_Change_password; Act_Action_t NextAction; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Password,NULL, NULL,Box_NOT_CLOSABLE); diff --git a/swad_photo.c b/swad_photo.c index e2908a2f..087c34d4 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -302,7 +302,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat) bool ItsMe = Usr_ItsMe (UsrDat->UsrCod); Act_Action_t NextAction; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Photo,ItsMe ? Pho_PutIconToRequestRemoveMyPhoto : Pho_PutIconToRequestRemoveOtherUsrPhoto, Hlp_PROFILE_Photo,Box_NOT_CLOSABLE); @@ -1717,7 +1717,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) switch (SeeOrPrint) { case Pho_DEGREES_SEE: - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Degrees,Pho_PutIconToPrintDegreeStats, Hlp_ANALYTICS_Degrees,Box_NOT_CLOSABLE); HTM_TABLE_BeginCenterPadding (2); @@ -1738,7 +1738,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) break; case Pho_DEGREES_PRINT: - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Degrees,NULL, NULL,Box_NOT_CLOSABLE); break; diff --git a/swad_place.c b/swad_place.c index ec02c1ed..3584d719 100644 --- a/swad_place.c +++ b/swad_place.c @@ -280,7 +280,7 @@ static void Plc_EditPlacesInternal (void) /***** Get list of places *****/ Plc_GetListPlaces (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Places,Plc_PutIconsEditingPlaces, Hlp_INSTITUTION_Places_edit,Box_NOT_CLOSABLE); @@ -803,7 +803,7 @@ static void Plc_PutFormToCreatePlace (void) /***** Begin form *****/ Frm_StartForm (ActNewPlc); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_place,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_plugin.c b/swad_plugin.c index b0aff158..6c5a1c08 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -107,7 +107,7 @@ void Plg_ListPlugins (void) /***** Get list of plugins *****/ Plg_GetListPlugins (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Plugins, Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins : NULL, @@ -197,7 +197,7 @@ static void Plg_EditPluginsInternal (void) /***** Get list of plugins *****/ Plg_GetListPlugins (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Plugins,NULL, NULL,Box_NOT_CLOSABLE); @@ -885,7 +885,7 @@ static void Plg_PutFormToCreatePlugin (void) /***** Begin form *****/ Frm_StartForm (ActNewPlg); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_plugin,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_privacy.c b/swad_privacy.c index 87147c65..747b202b 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -96,7 +96,7 @@ void Pri_EditMyPrivacy (void) Gbl.Usrs.Me.UsrDat.ExPrfVisibility == Pri_VISIBILITY_UNKNOWN) Ale_ShowAlert (Ale_WARNING,Txt_Please_check_your_privacy_settings); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy, Hlp_PROFILE_Settings_privacy,Box_NOT_CLOSABLE,2); @@ -193,7 +193,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel, } /***** End list and form *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); if (Action != ActUnk) Frm_EndForm (); HTM_TD_End (); diff --git a/swad_profile.c b/swad_profile.c index da1984ea..c59fff32 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -197,7 +197,7 @@ void Prf_RequestUserProfile (void) /***** Begin form *****/ Frm_StartForm (ActSeeOthPubPrf); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Another_user_s_profile,NULL, Hlp_START_Profiles_view_public_profile,Box_NOT_CLOSABLE); @@ -414,7 +414,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Prf_ShowNumFilesCurrentlyPublished (UsrDat); /* End left list */ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); HTM_DIV_End (); /***** Right list *****/ @@ -442,7 +442,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Prf_ShowNumMessagesSent (UsrDat,&UsrFigures); /* End right list */ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } HTM_DIV_End (); diff --git a/swad_project.c b/swad_project.c index 825e1b35..6456cdd2 100644 --- a/swad_project.c +++ b/swad_project.c @@ -311,7 +311,7 @@ static void Prj_ShowProjectsInCurrentPage (void) Pag_CalculatePagination (&Pagination); Gbl.Prjs.CurrentPage = (unsigned) Pagination.CurrentPage; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Projects,Prj_PutIconsListProjects, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); @@ -2044,7 +2044,7 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Project *Prj, } } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /***** Free structure that stores the query result *****/ @@ -3290,7 +3290,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) ActChgPrj); Prj_PutCurrentParams (); - /* Start box and table */ + /* Begin box and table */ Box_StartBoxTable (NULL,Txt_Data,NULL, NULL,Box_NOT_CLOSABLE,2); @@ -3741,7 +3741,7 @@ void Prj_ShowFormConfig (void) /***** Read projects configuration from database *****/ Prj_GetConfigPrjFromDB (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Configure_projects,Prj_PutIconsListProjects, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); diff --git a/swad_record.c b/swad_record.c index 68dc5b81..c7746200 100644 --- a/swad_record.c +++ b/swad_record.c @@ -194,7 +194,7 @@ void Rec_ReqEditRecordFields (void) /***** List the current fields of records for edit them *****/ if (Gbl.Crs.Records.LstFields.Num) // Fields found... { - /* Start box and table */ + /* Begin box and table */ Box_StartBoxTable (NULL,Txt_Record_fields,NULL, Hlp_USERS_Students_course_record_card,Box_NOT_CLOSABLE,2); @@ -369,7 +369,7 @@ void Rec_ShowFormCreateRecordField (void) /***** Begin form *****/ Frm_StartForm (ActNewFie); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_New_record_field,NULL, Hlp_USERS_Students_course_record_card,Box_NOT_CLOSABLE,2); @@ -1740,7 +1740,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, Rol_WrongRoleExit (); } - /***** Start box and table *****/ + /***** Begin box and table *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), "%upx", Rec_RECORD_WIDTH); @@ -2253,7 +2253,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, if (Ins.InsCod > 0) Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA); - /***** Start box and table *****/ + /***** Begin box and table *****/ sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); Gbl.Record.UsrDat = UsrDat; Gbl.Record.TypeOfView = TypeOfView; @@ -4026,7 +4026,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) /***** Start section *****/ HTM_SECTION_Begin (Rec_MY_INS_CTR_DPT_ID); - /***** Start box and table *****/ + /***** Begin box and table *****/ sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); Box_StartBoxTable (StrRecordWidth, IAmATeacher ? Txt_Institution_centre_and_department : diff --git a/swad_report.c b/swad_report.c index 78b923f7..437a64bc 100644 --- a/swad_report.c +++ b/swad_report.c @@ -156,7 +156,7 @@ void Rep_ReqMyUsageReport (void) /***** Form to show my usage report *****/ Frm_StartForm (ActSeeMyUsgRep); - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Report_of_use_of_PLATFORM, Cfg_PLATFORM_SHORT_NAME); @@ -263,7 +263,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report) extern const char *Txt_Report; extern const char *Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Report_of_use_of_PLATFORM, Cfg_PLATFORM_SHORT_NAME); diff --git a/swad_search.c b/swad_search.c index de536cf1..57150619 100644 --- a/swad_search.c +++ b/swad_search.c @@ -133,7 +133,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie }; Sch_WhatToSearch_t WhatToSearch; - /***** Start box *****/ + /***** Begin box *****/ HTM_DIV_Begin ("class=\"CM\""); Box_BoxBegin (NULL,Txt_Search,Crs_PutIconToSelectMyCourses, Hlp_START_Search,Box_NOT_CLOSABLE); diff --git a/swad_statistic.c b/swad_statistic.c index 81b2a589..4d74275d 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -337,7 +337,7 @@ void Sta_AskShowCrsHits (void) Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs + Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; - /***** Start box *****/ + /***** Begin box *****/ snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Statistics_of_visits_to_the_course_X, Gbl.Hierarchy.Crs.ShrtName); @@ -526,7 +526,7 @@ void Sta_AskShowGblHits (void) /***** Begin form *****/ Frm_StartFormAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Statistics_of_all_visits,NULL, Hlp_ANALYTICS_Visits_global_visits,Box_NOT_CLOSABLE,2); @@ -3990,7 +3990,7 @@ void Sta_ShowLastClicks (void) Sta_PutLinkToCourseHits (); // Course hits Mnu_ContextMenuEnd (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Last_clicks_in_real_time,NULL, Hlp_USERS_Connected_last_clicks,Box_NOT_CLOSABLE); diff --git a/swad_survey.c b/swad_survey.c index 49d31144..f10764df 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -229,7 +229,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) 0, &Pagination); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin ("100%",Txt_Surveys,Svy_PutIconsListSurveys, Hlp_ASSESSMENT_Surveys,Box_NOT_CLOSABLE); @@ -440,7 +440,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, struct Survey Svy; char Txt[Cns_MAX_BYTES_TEXT + 1]; - /***** Start box *****/ + /***** Begin box *****/ if (ShowOnlyThisSvyComplete) Box_BoxBegin (NULL,Txt_Survey,NULL, Hlp_ASSESSMENT_Surveys,Box_NOT_CLOSABLE); @@ -786,7 +786,7 @@ static void Svy_WriteStatus (struct Survey *Svy) Txt_SURVEY_You_have_not_answered); /***** End list with items of status *****/ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /*****************************************************************************/ @@ -1853,7 +1853,7 @@ void Svy_RequestCreatOrEditSvy (void) ActChgSvy); Svy_PutParams (); - /***** Start box and table *****/ + /***** Begin box and table *****/ if (ItsANewSurvey) Box_StartBoxTable (NULL,Txt_New_survey,NULL, Hlp_ASSESSMENT_Surveys_new_survey,Box_NOT_CLOSABLE,2); @@ -2053,7 +2053,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) if (Gbl.Crs.Grps.GrpTypes.Num) { - /***** Start box and table *****/ + /***** Begin box and table *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -2671,7 +2671,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, } } - /***** Start box *****/ + /***** Begin box *****/ if (SvyQst->QstCod > 0) // If the question already has assigned a code { /* Parameters for contextual icon */ @@ -3199,7 +3199,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy, " WHERE SvyCod=%ld ORDER BY QstInd", Svy->SvyCod); - /***** Start box *****/ + /***** Begin box *****/ Svy_CurrentSvyCod = Svy->SvyCod; Box_BoxBegin (NULL,Txt_Questions,Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion : NULL, diff --git a/swad_syllabus.c b/swad_syllabus.c index 2afcdc50..8b940b3a 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -160,7 +160,7 @@ void Syl_PutFormWhichSyllabus (void) "", Gbl.Form.Id,Txt_SYLLABUS_WHICH_SYLLABUS[WhichSyllabus]); } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); HTM_DIV_End (); Frm_EndForm (); } @@ -518,7 +518,7 @@ static void Syl_ShowSyllabus (bool PutIconToEdit) Gbl.Action.Act == ActRgtIteSylLec || Gbl.Action.Act == ActRgtIteSylPra || Gbl.Action.Act == ActLftIteSylLec || Gbl.Action.Act == ActLftIteSylPra); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.Crs.Info.Type], PutIconToEdit ? Inf_PutIconToEditInfo : NULL, diff --git a/swad_tab.c b/swad_tab.c index 66bb17fd..30fcae14 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -101,7 +101,7 @@ void Tab_DrawTabs (void) /***** Start tabs container *****/ HTM_DIV_Begin ("class=\"%s\"",ClassHeadRow3[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,""); + HTM_UL_End (); + fprintf (Gbl.F.Out,""); HTM_DIV_End (); } diff --git a/swad_test.c b/swad_test.c index a3885b84..b667eab0 100644 --- a/swad_test.c +++ b/swad_test.c @@ -329,7 +329,7 @@ void Tst_ShowFormAskTst (void) break; } - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Take_a_test,Tst_PutIconsTests, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); @@ -450,7 +450,7 @@ void Tst_ShowNewTest (void) if (Gbl.Usrs.Me.IBelongToCurrentCrs) Tst_UpdateMyNumAccessTst (NumAccessesTst); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Test,NULL, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, @@ -548,7 +548,7 @@ void Tst_AssessTest (void) /***** Create new test in database to store the result *****/ TstCod = Tst_CreateTestResultInDB (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Test_result,NULL, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, @@ -915,7 +915,7 @@ void Tst_ShowTagList (unsigned NumTags,MYSQL_RES *mysql_res) fprintf (Gbl.F.Out,"
  • %s
    • ", row[0]); } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } else fprintf (Gbl.F.Out,"%s", @@ -1290,7 +1290,7 @@ void Tst_ShowFormAskEditTsts (void) TsI_PutFormToImportQuestions (); // Import questions from XML file Mnu_ContextMenuEnd (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_List_edit_questions,Tst_PutIconsTests, Hlp_ASSESSMENT_Tests_editing_questions,Box_NOT_CLOSABLE); @@ -1346,7 +1346,7 @@ void Tst_ShowFormAskSelectTstsForGame (void) MYSQL_RES *mysql_res; unsigned long NumRows; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Select_questions,NULL, Hlp_ASSESSMENT_Games_questions,Box_NOT_CLOSABLE); @@ -1792,7 +1792,7 @@ static void Tst_ShowFormEditTags (void) /***** Get current tags in current course *****/ if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Tags,NULL, Hlp_ASSESSMENT_Tests_writing_a_question,Box_NOT_CLOSABLE,2); @@ -1905,7 +1905,7 @@ static void Tst_ShowFormConfigTst (void) /***** Read test configuration from database *****/ Tst_GetConfigTstFromDB (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Configure_tests,Tst_PutIconsTests, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); @@ -2814,7 +2814,7 @@ static void Tst_ListOneOrMoreQuestionsForEdition (unsigned long NumRows, unsigned long NumHitsNotBlankThisQst; double TotalScoreThisQst; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Questions,Tst_PutIconsTests, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); @@ -3070,7 +3070,7 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows, unsigned UniqueId; time_t TimeUTC; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Questions,NULL, Hlp_ASSESSMENT_Games_questions,Box_NOT_CLOSABLE); @@ -4781,7 +4781,7 @@ void Tst_GetAndWriteTagsQst (long QstCod) row = mysql_fetch_row (mysql_res); fprintf (Gbl.F.Out,"
  • %s
    • ",row[0]); } - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } else fprintf (Gbl.F.Out,"(%s)", @@ -5052,7 +5052,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], bool AnswerHasContent; bool DisplayRightColumn; - /***** Start box *****/ + /***** Begin box *****/ if (Gbl.Test.QstCod > 0) // The question already has assigned a code { snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -7440,7 +7440,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs + Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE); @@ -7528,7 +7528,7 @@ void Tst_SelDatesToSeeMyTstResults (void) /***** Begin form *****/ Frm_StartForm (ActSeeMyTstRes); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); @@ -7552,7 +7552,7 @@ void Tst_ShowMyTstResults (void) /***** Get starting and ending dates *****/ Dat_GetIniEndDatesFromForm (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); @@ -7625,7 +7625,7 @@ void Tst_ShowUsrsTstResults (void) /***** Check the number of users whose tests results will be shown *****/ if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected... { - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Results,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); @@ -8080,7 +8080,7 @@ void Tst_ShowOneTstResult (void) /***** Get questions and user's answers of the test result from database *****/ Tst_GetTestResultQuestionsFromDB (TstCod); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Test_result,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE); Lay_WriteHeaderClassPhoto (false,false, diff --git a/swad_test_import.c b/swad_test_import.c index 540684c7..ddbfc558 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -132,7 +132,7 @@ void TsI_ShowFormImportQstsFromXML (void) extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions; extern const char *Txt_XML_file; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Import_questions,NULL, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); @@ -504,7 +504,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer) /***** Allocate and get XML tree *****/ XML_GetTree (XMLBuffer,&RootElem); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Imported_questions,NULL, Hlp_ASSESSMENT_Tests,Box_NOT_CLOSABLE); diff --git a/swad_timeline.c b/swad_timeline.c index 2a154fc7..098886c9 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -995,7 +995,7 @@ static void TL_ShowTimeline (char *Query, NumPubsGot = DB_QuerySELECT (&mysql_res,"can not get timeline", "%s", Query); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Title,TL_PutIconsTimeline, Hlp_START_Timeline,Box_NOT_CLOSABLE); @@ -1014,10 +1014,12 @@ static void TL_ShowTimeline (char *Query, TL_PutLinkToViewNewPublications (); /* Hidden list where insert just received (not visible) publications via AJAX */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /*****************************************************************************/ @@ -2642,7 +2645,7 @@ static void TL_WriteCommentsInNote (const struct TL_Note *SocNot) NumCom < NumCommentsInitiallyHidden; NumCom++) TL_WriteOneCommentInList (mysql_res); - fprintf (Gbl.F.Out,""); + HTM_UL_End (); /***** Link to toggle on/off comments *****/ HTM_DIV_Begin ("id=\"exp_%s\" class=\"TL_EXPAND_COM TL_RIGHT_WIDTH\"", @@ -2660,7 +2663,7 @@ static void TL_WriteCommentsInNote (const struct TL_Note *SocNot) NumCom < NumComments; NumCom++) TL_WriteOneCommentInList (mysql_res); - fprintf (Gbl.F.Out,""); + HTM_UL_End (); } /***** Free structure that stores the query result *****/ @@ -2817,7 +2820,7 @@ static void TL_WriteComment (struct TL_Comment *SocCom, if (ShowCommentAlone) { - fprintf (Gbl.F.Out,""); + HTM_UL_End (); HTM_DIV_End (); Box_BoxEnd (); } diff --git a/swad_timetable.c b/swad_timetable.c index cbb38285..6effc3aa 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -354,7 +354,7 @@ void TT_ShowClassTimeTable (void) /***** Get whether to show only my groups or all groups *****/ Grp_GetParamWhichGrps (); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || diff --git a/swad_user.c b/swad_user.c index 7cce4168..cc4ef580 100644 --- a/swad_user.c +++ b/swad_user.c @@ -2601,7 +2601,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)) if (FuncParams) FuncParams (); - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTable (NULL,Txt_Log_in,NULL, Hlp_PROFILE_LogIn,Box_NOT_CLOSABLE,2); @@ -3504,7 +3504,7 @@ void Usr_ShowFormsLogoutAndRole (void) Txt_logged[Gbl.Usrs.Me.UsrDat.Sex], Txt_ROLES_SINGUL_abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Session,Usr_PutLinkToLogOut, Hlp_PROFILE_Session_role,Box_NOT_CLOSABLE); @@ -6167,7 +6167,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams extern const char *Txt_Select_users; unsigned NumTotalUsrs; - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Title,NULL,HelpLink,Box_NOT_CLOSABLE); /***** Get and update type of list, @@ -7183,7 +7183,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role, Usr_SearchListUsrs (Role); if ((NumUsrs = Gbl.Usrs.LstUsrs[Role].NumUsrs)) { - /***** Start box and table *****/ + /***** Begin box and table *****/ /* Number of users found */ Sex = Usr_GetSexOfUsrsLst (Role); snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -7336,7 +7336,7 @@ void Usr_ListDataAdms (void) /***** Get list of administrators *****/ Usr_GetAdmsLst (Gbl.Scope.Current); - /***** Start box with list of administrators *****/ + /***** Begin box with list of administrators *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL, Hlp_USERS_Administrators,Box_NOT_CLOSABLE); @@ -7801,7 +7801,7 @@ void Usr_SeeGuests (void) /***** Get list of guests in current scope *****/ Usr_GetGstsLst (Gbl.Scope.Current); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN],Usr_PutIconsListGsts, Hlp_USERS_Guests,Box_NOT_CLOSABLE); @@ -7942,7 +7942,7 @@ void Usr_SeeStudents (void) /***** Get list of students *****/ Usr_GetListUsrs (Gbl.Scope.Current,Rol_STD); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],Usr_PutIconsListStds, Hlp_USERS_Students,Box_NOT_CLOSABLE); @@ -8121,7 +8121,7 @@ void Usr_SeeTeachers (void) 1 << Rol_NET | 1 << Rol_TCH); - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],Usr_PutIconsListTchs, Hlp_USERS_Teachers,Box_NOT_CLOSABLE); @@ -8351,7 +8351,7 @@ static void Usr_PutOptionsListUsrs (const bool ICanChooseOption[Usr_LIST_USRS_NU Usr_ShowOneListUsrsOption (Opt,Label[Opt]); /* End list of options */ - fprintf (Gbl.F.Out,""); + HTM_UL_End (); /***** Put button to confirm *****/ Btn_PutConfirmButton (Txt_Continue); @@ -9640,7 +9640,7 @@ void Usr_PrintUsrQRCode (void) if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ()) { - /***** Start box *****/ + /***** Begin box *****/ Box_BoxBegin (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL, NULL,Box_NOT_CLOSABLE); diff --git a/swad_zip.c b/swad_zip.c index 11ab6464..546aa031 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -563,7 +563,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, extern const char *Txt_FILE_uncompressed; char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; - /***** Start box and table *****/ + /***** Begin box and table *****/ Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2); /***** Link to download the file *****/