From 069d5e7ffa896a46061eb176d5773c5a25d81cbf Mon Sep 17 00:00:00 2001 From: acanas Date: Mon, 29 Jan 2024 08:47:21 +0100 Subject: [PATCH] Version 23.61.1: Jan 29, 2024 Code refactoring in boxes. --- swad_account.c | 8 +++----- swad_agenda.c | 7 +++---- swad_announcement.c | 3 +-- swad_assignment.c | 6 ++---- swad_attendance.c | 7 +++---- swad_box.c | 4 ++-- swad_box.h | 2 +- swad_browser.c | 7 +++---- swad_building.c | 3 +-- swad_calendar.c | 3 +-- swad_center.c | 5 ++--- swad_changelog.h | 3 ++- swad_chat.c | 5 ++--- swad_cookie.c | 6 ++---- swad_country.c | 7 ++----- swad_course.c | 6 ++---- swad_date.c | 3 +-- swad_degree.c | 5 ++--- swad_department.c | 3 +-- swad_exam.c | 3 +-- swad_exam_log.c | 4 +--- swad_follow.c | 3 +-- swad_forum.c | 3 +-- swad_game.c | 3 +-- swad_group.c | 3 +-- swad_help.c | 3 +-- swad_hierarchy.c | 3 +-- swad_icon.c | 3 +-- swad_info.c | 2 +- swad_institution.c | 5 ++--- swad_language.c | 3 +-- swad_layout.c | 7 ++----- swad_mail.c | 12 ++++-------- swad_menu.c | 3 +-- swad_message.c | 9 +++------ swad_network.c | 3 +-- swad_notice.c | 3 +-- swad_notification.c | 3 +-- swad_photo_shape.c | 3 +-- swad_plugin.c | 2 +- swad_privacy.c | 6 ++---- swad_program.c | 3 +-- swad_project.c | 3 +-- swad_question.c | 6 ++---- swad_record.c | 8 +++----- swad_rubric.c | 3 +-- swad_statistic.c | 3 +-- swad_survey.c | 6 ++---- swad_tag.c | 3 +-- swad_test.c | 3 +-- swad_test_print.c | 9 +++------ swad_theme.c | 3 +-- swad_timeline.c | 3 +-- swad_user.c | 9 +++------ 54 files changed, 87 insertions(+), 157 deletions(-) diff --git a/swad_account.c b/swad_account.c index 1f593a36..f37175d4 100644 --- a/swad_account.c +++ b/swad_account.c @@ -222,9 +222,8 @@ void Acc_CheckIfEmptyAccountExists (void) if ((NumUsrs = Acc_DB_GetUsrsWithID (&mysql_res,ID))) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL, - (NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user : - Txt_Do_you_think_you_are_one_of_these_users, + Box_BoxTableBegin (NumUsrs == 1 ? Txt_Do_you_think_you_are_this_user : + Txt_Do_you_think_you_are_one_of_these_users, NULL,NULL, NULL,Box_CLOSABLE,5); @@ -380,8 +379,7 @@ static void Acc_ShowFormRequestNewAccountWithPars (const char *NewNickWithoutArr Frm_BeginForm (ActCreUsrAcc); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Actions[ActCreUsrAcc], - NULL,NULL, + Box_BoxTableBegin (Txt_Actions[ActCreUsrAcc],NULL,NULL, Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE,2); /***** Nickname *****/ diff --git a/swad_agenda.c b/swad_agenda.c index 203e3aa9..780dd223 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1369,8 +1369,8 @@ void Agd_ReqCreatOrEditEvent (void) Agd_PutCurrentParsMyAgenda (&Agenda); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,AgdEvent.Title[0] ? AgdEvent.Title : - Txt_Event, + Box_BoxTableBegin (AgdEvent.Title[0] ? AgdEvent.Title : + Txt_Event, NULL,NULL, Hlp_PROFILE_Agenda_edit_event,Box_NOT_CLOSABLE,2); @@ -1578,8 +1578,7 @@ void Agd_GetAndShowAgendasStats (void) unsigned NumUsrsTotal; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_AGENDAS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_AGENDAS],NULL,NULL, Hlp_ANALYTICS_Figures_agendas,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_announcement.c b/swad_announcement.c index 44dd203a..df93c67a 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -335,8 +335,7 @@ void Ann_ShowFormAnnouncement (void) Frm_BeginForm (ActNewAnn); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Announcement, - NULL,NULL, + Box_BoxTableBegin (Txt_Announcement,NULL,NULL, Hlp_COMMUNICATION_Announcements,Box_NOT_CLOSABLE,2); /***** Announcement subject and body *****/ diff --git a/swad_assignment.c b/swad_assignment.c index 43aff720..b7d33db8 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1213,8 +1213,7 @@ void Asg_ReqCreatOrEditAsg (void) Asg_PutPars (&Assignments); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL, - Assignments.Asg.Title[0] ? Assignments.Asg.Title : + Box_BoxTableBegin (Assignments.Asg.Title[0] ? Assignments.Asg.Title : Txt_Assignment, NULL,NULL, Hlp_ASSESSMENT_Assignments_edit_assignment,Box_NOT_CLOSABLE,2); @@ -1821,8 +1820,7 @@ void Asg_GetAndShowAssignmentsStats (void) NumCoursesWithAssignments = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_ASSIGNMENTS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_ASSIGNMENTS],NULL,NULL, Hlp_ANALYTICS_Figures_assignments,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_attendance.c b/swad_attendance.c index 8d9917e0..4c54bdbe 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -980,8 +980,7 @@ void Att_ReqCreatOrEditEvent (void) Pag_PutParPagNum (Pag_ATT_EVENTS,Events.CurrentPage); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL, - Events.Event.Title[0] ? Events.Event.Title : + Box_BoxTableBegin (Events.Event.Title[0] ? Events.Event.Title : Txt_Event, NULL,NULL, Hlp_USERS_Attendance_edit_event,Box_NOT_CLOSABLE,2); @@ -1424,8 +1423,8 @@ static void Att_ShowEvent (struct Att_Events *Events) Events->Event.NumStdsTotal = Att_DB_GetNumStdsTotalWhoAreInEvent (Events->Event.AttCod); /***** Show attendance event inside a box *****/ - Box_BoxTableBegin (NULL,Events->Event.Title[0] ? Events->Event.Title : - Txt_Event, + Box_BoxTableBegin (Events->Event.Title[0] ? Events->Event.Title : + Txt_Event, Att_PutIconsOneEvent,Events, Hlp_USERS_Attendance,Box_NOT_CLOSABLE,2); Att_ShowOneEventRow (Events, diff --git a/swad_box.c b/swad_box.c index 37d3741e..613da7b6 100644 --- a/swad_box.c +++ b/swad_box.c @@ -66,12 +66,12 @@ static void Box_BoxInternalBegin (const char *Width,const char *Title, /*****************************************************************************/ // CellPadding must be 0, 1, 2, 4 or 8 -void Box_BoxTableBegin (const char *Width,const char *Title, +void Box_BoxTableBegin (const char *Title, void (*FunctionToDrawContextualIcons) (void *Args),void *Args, const char *HelpLink,Box_Closable_t Closable, unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10 { - Box_BoxBegin (Width,Title, + Box_BoxBegin (NULL,Title, FunctionToDrawContextualIcons,Args, HelpLink,Closable); HTM_TABLE_BeginWidePadding (CellPadding); diff --git a/swad_box.h b/swad_box.h index 970f998c..0b62637b 100644 --- a/swad_box.h +++ b/swad_box.h @@ -51,7 +51,7 @@ typedef enum /****************************** Public prototypes ****************************/ /*****************************************************************************/ -void Box_BoxTableBegin (const char *Width,const char *Title, +void Box_BoxTableBegin (const char *Title, void (*FunctionToDrawContextualIcons) (void *Args),void *Args, const char *HelpLink,Box_Closable_t Closable, unsigned CellPadding); diff --git a/swad_browser.c b/swad_browser.c index 9562fea2..4b4d919a 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -6289,7 +6289,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) /***** Begin box *****/ HTM_DIV_Begin ("id=\"dropzone-upload\""); - Box_BoxBegin ("95%",Txt_Upload_files, + Box_BoxBegin (NULL,Txt_Upload_files, NULL,NULL, NULL,Box_NOT_CLOSABLE); @@ -9119,7 +9119,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned NumDocs, if (asprintf (&Title,"%u %s",NumDocs,NumDocs == 1 ? TitleSingular : TitlePlural) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Write heading *****/ @@ -10100,8 +10100,7 @@ void Brw_GetAndShowOERsStats (void) unsigned long NumFiles[2]; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_OER], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_OER],NULL,NULL, Hlp_ANALYTICS_Figures_open_educational_resources_oer,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_building.c b/swad_building.c index a90604f5..1f82b9b4 100644 --- a/swad_building.c +++ b/swad_building.c @@ -121,8 +121,7 @@ void Bld_SeeBuildings (void) Bld_GetListBuildings (&Buildings,Bld_ALL_DATA); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Buildings, - Bld_PutIconsListingBuildings,NULL, + Box_BoxTableBegin (Txt_Buildings,Bld_PutIconsListingBuildings,NULL, Hlp_CENTER_Buildings,Box_NOT_CLOSABLE,2); HTM_TR_Begin (NULL); diff --git a/swad_calendar.c b/swad_calendar.c index c9e37933..bc9a3198 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -351,8 +351,7 @@ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FIRST_DAY_OF_WEEK], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_FIRST_DAY_OF_WEEK],NULL,NULL, Hlp_ANALYTICS_Figures_calendar,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_center.c b/swad_center.c index 3e1745cc..8257ab40 100644 --- a/swad_center.c +++ b/swad_center.c @@ -128,8 +128,7 @@ void Ctr_SeeCtrWithPendingDegs (void) if ((NumCtrs = Ctr_DB_GetCtrsWithPendingDegs (&mysql_res))) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Centers_with_pending_degrees, - NULL,NULL, + Box_BoxTableBegin (Txt_Centers_with_pending_degrees,NULL,NULL, Hlp_SYSTEM_Pending,Box_NOT_CLOSABLE,2); /***** Wrtie heading *****/ @@ -1609,7 +1608,7 @@ void Ctr_ListCtrsFound (MYSQL_RES **mysql_res,unsigned NumCtrs) NumCtrs == 1 ? Txt_HIERARCHY_SINGUL_abc[Hie_CTR] : Txt_HIERARCHY_PLURAL_abc[Hie_CTR]) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Write heading *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 8b25c12f..080d261a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -633,10 +633,11 @@ Me sale este error, no s "can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod') */ -#define Log_PLATFORM_VERSION "SWAD 23.61 (2024-01-28)" +#define Log_PLATFORM_VERSION "SWAD 23.61.1 (2024-01-29)" #define CSS_FILE "swad23.61.css" #define JS_FILE "swad23.53.6.js" /* + Version 23.61.1: Jan 29, 2024 Code refactoring in boxes. (335684 lines) Version 23.61: Jan 28, 2024 Responsive design. (335753 lines) Version 23.60.3: Jan 26, 2024 Responsive design in figures about institutions. (335720 lines) Version 23.60.2: Jan 26, 2024 Responsive design in search for users. (335714 lines) diff --git a/swad_chat.c b/swad_chat.c index 62b25e59..04f1daec 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -258,9 +258,8 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) if (NumRooms) // If not empty chat rooms found { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Rooms_with_users, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Txt_Rooms_with_users,NULL,NULL, + NULL,Box_NOT_CLOSABLE,2); /***** Write heading *****/ HTM_TR_Begin (NULL); diff --git a/swad_cookie.c b/swad_cookie.c index a4d1d378..0bca83c0 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -70,8 +70,7 @@ void Coo_EditMyPrefsOnCookies (void) HTM_SECTION_Begin (Coo_COOKIES_ID); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Cookies, - Coo_PutIconsCookies,NULL, + Box_BoxTableBegin (Txt_Cookies,Coo_PutIconsCookies,NULL, Hlp_PROFILE_Settings_cookies,Box_NOT_CLOSABLE,2); /***** Edit my preference about cookies *****/ @@ -183,8 +182,7 @@ void Coo_GetAndShowNumUsrsPerCookies (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_COOKIES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_COOKIES],NULL,NULL, Hlp_ANALYTICS_Figures_cookies,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_country.c b/swad_country.c index 7aff9a07..cf0d2986 100644 --- a/swad_country.c +++ b/swad_country.c @@ -126,8 +126,7 @@ void Cty_SeeCtyWithPendingInss (void) if ((NumCtys = Cty_DB_GetCtysWithPendingInss (&mysql_res))) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Countries_with_pending_institutions, - NULL,NULL, + Box_BoxTableBegin (Txt_Countries_with_pending_institutions,NULL,NULL, Hlp_SYSTEM_Pending,Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -1672,9 +1671,7 @@ void Cty_ListCtysFound (MYSQL_RES **mysql_res,unsigned NumCtys) NumCtys == 1 ? Txt_HIERARCHY_SINGUL_abc[Hie_CTY] : Txt_HIERARCHY_PLURAL_abc[Hie_CTY]) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Write heading *****/ diff --git a/swad_course.c b/swad_course.c index cac9cdb6..d99f92cc 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1642,9 +1642,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct Usr_Data *UsrDat,Rol_Role_t Role) if (NumCrss) { /* Begin box and table */ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (NULL,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); /* Heading row */ HTM_TR_Begin (NULL); @@ -1717,7 +1715,7 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) NumCrss == 1 ? Txt_HIERARCHY_SINGUL_abc[Hie_CRS] : Txt_HIERARCHY_PLURAL_abc[Hie_CRS]) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Heading row *****/ diff --git a/swad_date.c b/swad_date.c index 6b301011..efbfe291 100644 --- a/swad_date.c +++ b/swad_date.c @@ -1828,8 +1828,7 @@ void Dat_GetAndShowNumUsrsPerDateFormat (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_DATE_FORMAT], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_DATE_FORMAT],NULL,NULL, Hlp_ANALYTICS_Figures_dates,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_degree.c b/swad_degree.c index 47c38235..b95d6920 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -132,8 +132,7 @@ void Deg_SeeDegWithPendingCrss (void) if ((NumDegs = Deg_DB_GetDegsWithPendingCrss (&mysql_res))) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Degrees_with_pending_courses, - NULL,NULL, + Box_BoxTableBegin (Txt_Degrees_with_pending_courses,NULL,NULL, Hlp_SYSTEM_Pending,Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -1523,7 +1522,7 @@ void Deg_ListDegsFound (MYSQL_RES **mysql_res,unsigned NumDegs) NumDegs == 1 ? Txt_HIERARCHY_SINGUL_abc[Hie_DEG] : Txt_HIERARCHY_PLURAL_abc[Hie_DEG]) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Write heading *****/ diff --git a/swad_department.c b/swad_department.c index 5bf09c2a..980db186 100644 --- a/swad_department.c +++ b/swad_department.c @@ -149,8 +149,7 @@ void Dpt_SeeAllDepts (void) if (asprintf (&Title,Txt_Departments_of_INSTITUTION_X, Gbl.Hierarchy.Node[Hie_INS].FullName) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title, - Dpt_PutIconToEditDpts,NULL, + Box_BoxTableBegin (Title,Dpt_PutIconToEditDpts,NULL, Hlp_INSTITUTION_Departments,Box_NOT_CLOSABLE,2); free (Title); diff --git a/swad_exam.c b/swad_exam.c index ce779cf0..27fffb16 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1579,8 +1579,7 @@ void Exa_GetAndShowExamsStats (void) NumCoursesWithExams = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_EXAMS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_EXAMS],NULL,NULL, Hlp_ANALYTICS_Figures_exams,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_exam_log.c b/swad_exam_log.c index 8cc7ce33..7a117939 100644 --- a/swad_exam_log.c +++ b/swad_exam_log.c @@ -259,9 +259,7 @@ void ExaLog_ShowExamLog (const struct ExaPrn_Print *Print) UserAgent = NULL; /***** Begin box *****/ - Box_BoxTableBegin (NULL,Txt_Hits, - NULL,NULL, - NULL,Box_CLOSABLE,2); + Box_BoxTableBegin (Txt_Hits,NULL,NULL,NULL,Box_CLOSABLE,2); /***** Begin table *****/ HTM_TABLE_BeginWideMarginPadding (2); diff --git a/swad_follow.c b/swad_follow.c index 592a4998..313564e2 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -1173,8 +1173,7 @@ void Fol_GetAndShowFollowStats (void) double Average; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FOLLOW], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_FOLLOW],NULL,NULL, Hlp_ANALYTICS_Figures_followed_followers,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_forum.c b/swad_forum.c index 0490d2b4..cdd7fa73 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -3297,8 +3297,7 @@ void For_GetAndShowForumStats (void) FiguresForum.NumUsrsToBeNotifiedByEMail = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_FORUMS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_FORUMS],NULL,NULL, Hlp_ANALYTICS_Figures_forums,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_game.c b/swad_game.c index 9799bbfe..a1f36a82 100644 --- a/swad_game.c +++ b/swad_game.c @@ -2232,8 +2232,7 @@ void Gam_GetAndShowGamesStats (void) NumCoursesWithGames = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_GAMES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_GAMES],NULL,NULL, Hlp_ANALYTICS_Figures_games,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_group.c b/swad_group.c index 2bc33b98..5c31ada8 100644 --- a/swad_group.c +++ b/swad_group.c @@ -2014,8 +2014,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod) Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Groups, - NULL,NULL, + Box_BoxTableBegin (Txt_Groups,NULL,NULL, Hlp_USERS_Groups,Box_NOT_CLOSABLE,0); /***** List to select the groups the user belongs to *****/ diff --git a/swad_help.c b/swad_help.c index 02e36a33..ea2321a2 100644 --- a/swad_help.c +++ b/swad_help.c @@ -123,8 +123,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void) /***** Begin box and table *****/ HTM_DIV_Begin (NULL); - Box_BoxTableBegin (NULL,Txt_What_would_you_like_to_do, - NULL,NULL, + Box_BoxTableBegin (Txt_What_would_you_like_to_do,NULL,NULL, NULL,Box_CLOSABLE,2); if (Gbl.Usrs.Me.Logged) // I am logged diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 3abde014..089ac7dd 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -1088,8 +1088,7 @@ void Hie_GetAndShowHierarchyStats (void) Rol_Role_t Role; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_HIERARCHY], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_HIERARCHY],NULL,NULL, Hlp_ANALYTICS_Figures_hierarchy,Box_NOT_CLOSABLE,2); /* Head row */ diff --git a/swad_icon.c b/swad_icon.c index bd5f747a..e7cfdc95 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -571,8 +571,7 @@ void Ico_GetAndShowNumUsrsPerIconSet (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_ICON_SETS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_ICON_SETS],NULL,NULL, Hlp_ANALYTICS_Figures_icons,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_info.c b/swad_info.c index 990f706a..c973dc64 100644 --- a/swad_info.c +++ b/swad_info.c @@ -882,7 +882,7 @@ void Inf_FormsToSelSendInfo (void) /***** Form to choice between alternatives *****/ /* Begin box and table */ - Box_BoxTableBegin (NULL,Txt_Source_of_information, + Box_BoxTableBegin (Txt_Source_of_information, Inf_PutIconToViewInfo,&Gbl.Crs.Info.Type, HelpEdit[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE,4); diff --git a/swad_institution.c b/swad_institution.c index 9d60d079..e383e41a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -150,8 +150,7 @@ void Ins_SeeInsWithPendingCtrs (void) if (NumInss) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Institutions_with_pending_centers, - NULL,NULL, + Box_BoxTableBegin (Txt_Institutions_with_pending_centers,NULL,NULL, Hlp_SYSTEM_Pending,Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -1549,7 +1548,7 @@ void Ins_ListInssFound (MYSQL_RES **mysql_res,unsigned NumInss) NumInss == 1 ? Txt_HIERARCHY_SINGUL_abc[Hie_INS] : Txt_HIERARCHY_PLURAL_abc[Hie_INS]) < 0) Err_NotEnoughMemoryExit (); - Box_BoxTableBegin (NULL,Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Title,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); free (Title); /***** Write heading *****/ diff --git a/swad_language.c b/swad_language.c index c2890ce5..f1af2585 100644 --- a/swad_language.c +++ b/swad_language.c @@ -267,8 +267,7 @@ void Lan_GetAndShowNumUsrsPerLanguage (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_LANGUAGES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_LANGUAGES],NULL,NULL, Hlp_ANALYTICS_Figures_language,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_layout.c b/swad_layout.c index e720c2ea..8f7aaa84 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1593,9 +1593,7 @@ void Lay_AdvertisementMobile (void) HTM_DIV_Begin ("style=\"margin-top:25px;\""); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,8); + Box_BoxTableBegin (NULL,NULL,NULL,NULL,Box_NOT_CLOSABLE,8); /***** Show advertisement *****/ HTM_TR_Begin (NULL); @@ -1759,8 +1757,7 @@ void Lay_GetAndShowNumUsrsPerSideColumns (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS],NULL,NULL, Hlp_ANALYTICS_Figures_columns,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_mail.c b/swad_mail.c index fa83f803..ca560f95 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -139,14 +139,10 @@ void Mai_SeeMailDomains (void) Mai_GetListMailDomainsAllowedForNotif (&Mails); /***** Begin box and table *****/ - if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM) - Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications, - Mai_PutIconToEditMailDomains,NULL, - Hlp_START_Domains,Box_NOT_CLOSABLE,2); - else - Box_BoxTableBegin (NULL,Txt_Email_domains_allowed_for_notifications, - NULL,NULL, - Hlp_START_Domains,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Txt_Email_domains_allowed_for_notifications, + Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains : + NULL,NULL, + Hlp_START_Domains,Box_NOT_CLOSABLE,2); /***** Write heading *****/ HTM_TR_Begin (NULL); diff --git a/swad_menu.c b/swad_menu.c index a7959e1c..9fb5255d 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -419,8 +419,7 @@ void Mnu_GetAndShowNumUsrsPerMenu (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_MENUS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_MENUS],NULL,NULL, Hlp_ANALYTICS_Figures_menu,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_message.c b/swad_message.c index e4672bbb..bdea5884 100644 --- a/swad_message.c +++ b/swad_message.c @@ -1488,7 +1488,7 @@ static void Msg_ShowSntOrRcvMessages (struct Msg_Messages *Messages) /***** Begin box with messages *****/ Msg_SetNumMsgsStr (Messages,&NumMsgsStr,NumUnreadMsgs); - Box_BoxBegin ("97%",NumMsgsStr, + Box_BoxBegin (NULL,NumMsgsStr, Msg_PutIconsListMsgs,Messages, Help[Messages->TypeOfMessages],Box_NOT_CLOSABLE); free (NumMsgsStr); @@ -2811,9 +2811,7 @@ void Msg_ListBannedUsrs (void) Usr_UsrDataConstructor (&UsrDat); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Banned_users, - NULL,NULL, - NULL,Box_NOT_CLOSABLE,2); + Box_BoxTableBegin (Txt_Banned_users,NULL,NULL,NULL,Box_NOT_CLOSABLE,2); /***** List users *****/ for (NumUsr = 1; @@ -2892,8 +2890,7 @@ void Msg_GetAndShowMsgsStats (void) NumMsgsReceivedAndNotified = Msg_DB_GetNumRcvMsgs (Gbl.Scope.Current,Msg_STATUS_NOTIFIED); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_MESSAGES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_MESSAGES],NULL,NULL, Hlp_ANALYTICS_Figures_messages,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_network.c b/swad_network.c index 93c9617b..c7adc28e 100644 --- a/swad_network.c +++ b/swad_network.c @@ -343,8 +343,7 @@ void Net_ShowWebAndSocialNetworksStats (void) NumNetworks = Net_DB_GetWebAndSocialNetworksStats (&mysql_res); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SOCIAL_NETWORKS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_SOCIAL_NETWORKS],NULL,NULL, Hlp_ANALYTICS_Figures_webs_social_networks,Box_NOT_CLOSABLE,2); /***** Write heading *****/ diff --git a/swad_notice.c b/swad_notice.c index db2a5a48..a66d2b36 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -814,8 +814,7 @@ void Not_GetAndShowNoticesStats (void) NumTotalNotifications += NumNotif; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_NOTICES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_NOTICES],NULL,NULL, Hlp_ANALYTICS_Figures_notices,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_notification.c b/swad_notification.c index dc204db2..4805a84b 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1818,8 +1818,7 @@ void Ntf_GetAndShowNumUsrsPerNotifyEvent (void) unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS]; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_NOTIFY_EVENTS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_NOTIFY_EVENTS],NULL,NULL, Hlp_ANALYTICS_Figures_notifications,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_photo_shape.c b/swad_photo_shape.c index caf31210..7aee2536 100644 --- a/swad_photo_shape.c +++ b/swad_photo_shape.c @@ -177,8 +177,7 @@ void PhoSha_GetAndShowNumUsrsPerPhotoShape (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_PHOTO_SHAPES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_PHOTO_SHAPES],NULL,NULL, Hlp_ANALYTICS_Figures_user_photos,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_plugin.c b/swad_plugin.c index 7ee079d7..bf45d05d 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -122,7 +122,7 @@ void Plg_ListPlugins (void) Plg_GetListPlugins (&Plugins); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Plugins, + Box_BoxTableBegin (Txt_Plugins, Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins : NULL, NULL, diff --git a/swad_privacy.c b/swad_privacy.c index aee8db54..d5df1499 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -110,8 +110,7 @@ void Pri_EditMyPrivacy (void) Ale_ShowAlert (Ale_WARNING,Txt_Please_check_your_privacy_settings); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Privacy, - Pri_PutIconsPrivacy,NULL, + Box_BoxTableBegin (Txt_Privacy,Pri_PutIconsPrivacy,NULL, Hlp_PROFILE_Settings_privacy,Box_NOT_CLOSABLE,2); /***** Edit photo visibility *****/ @@ -296,8 +295,7 @@ void Pri_GetAndShowNumUsrsPerPrivacy (void) extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES]; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_PRIVACY], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_PRIVACY],NULL,NULL, Hlp_ANALYTICS_Figures_privacy,Box_NOT_CLOSABLE,2); /***** Privacy for photo *****/ diff --git a/swad_program.c b/swad_program.c index e0a25110..8884a0bd 100644 --- a/swad_program.c +++ b/swad_program.c @@ -2244,8 +2244,7 @@ void Prg_GetAndShowCourseProgramStats (void) NumCoursesWithItems = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_COURSE_PROGRAMS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_COURSE_PROGRAMS],NULL,NULL, Hlp_ANALYTICS_Figures_course_programs,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_project.c b/swad_project.c index 907f1dcb..01551cd5 100644 --- a/swad_project.c +++ b/swad_project.c @@ -4743,8 +4743,7 @@ void Prj_GetAndShowProjectsStats (void) NumCoursesWithProjects = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_PROJECTS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_PROJECTS],NULL,NULL, Hlp_ANALYTICS_Figures_projects,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_question.c b/swad_question.c index 2f2eda0c..e06dc426 100644 --- a/swad_question.c +++ b/swad_question.c @@ -829,8 +829,7 @@ void Qst_ListOneOrMoreQstsForEdition (struct Qst_Questions *Questions, MYSQL_ROW row; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Questions, - Qst_PutIconsEditBankQsts,Questions, + Box_BoxTableBegin (Txt_Questions,Qst_PutIconsEditBankQsts,Questions, Hlp_ASSESSMENT_Questions,Box_NOT_CLOSABLE,5); /***** Write the heading *****/ @@ -1389,8 +1388,7 @@ void Qst_ListOneQstToEdit (struct Qst_Questions *Questions) Questions->NumQsts = 1; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Questions, - Qst_PutIconsEditBankQsts,Questions, + Box_BoxTableBegin (Txt_Questions,Qst_PutIconsEditBankQsts,Questions, Hlp_ASSESSMENT_Questions,Box_NOT_CLOSABLE,5); /***** Write the heading *****/ diff --git a/swad_record.c b/swad_record.c index edcf0997..ca6563f8 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1644,8 +1644,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, } /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,NULL, - NULL,NULL, + Box_BoxTableBegin (NULL,NULL,NULL, Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -2092,7 +2091,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView, /***** Begin box and table *****/ Rec_Record.UsrDat = UsrDat; Rec_Record.TypeOfView = TypeOfView; - Box_BoxTableBegin (NULL,NULL, + Box_BoxTableBegin (NULL, TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons Rec_PutIconsCommands,NULL, Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2); @@ -3877,8 +3876,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_SECTION_Begin (Rec_MY_INS_CTR_DPT_ID); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL, - IAmATeacher ? Txt_Institution_center_and_department : + Box_BoxTableBegin (IAmATeacher ? Txt_Institution_center_and_department : Txt_HIERARCHY_SINGUL_Abc[Hie_INS], NULL,NULL, Hlp_PROFILE_Institution,Box_NOT_CLOSABLE,2); diff --git a/swad_rubric.c b/swad_rubric.c index 1ed5bbb9..ee7b2f10 100644 --- a/swad_rubric.c +++ b/swad_rubric.c @@ -1136,8 +1136,7 @@ void Rub_GetAndShowRubricsStats (void) } /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_RUBRICS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_RUBRICS],NULL,NULL, Hlp_ANALYTICS_Figures_rubrics,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_statistic.c b/swad_statistic.c index 0d4d9d76..744584fc 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -503,8 +503,7 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats) Frm_BeginFormAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Statistics_of_all_visits, - NULL,NULL, + Box_BoxTableBegin (Txt_Statistics_of_all_visits,NULL,NULL, Hlp_ANALYTICS_Visits_global_visits,Box_NOT_CLOSABLE,2); /***** Start and end dates for the search *****/ diff --git a/swad_survey.c b/swad_survey.c index 096fd02f..721121d3 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -1636,8 +1636,7 @@ void Svy_ReqCreatOrEditSvy (void) Svy_PutPars (&Surveys); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL, - Surveys.Svy.Title[0] ? Surveys.Svy.Title : + Box_BoxTableBegin (Surveys.Svy.Title[0] ? Surveys.Svy.Title : Txt_Survey, NULL,NULL, Hlp_ANALYTICS_Surveys_edit_survey,Box_NOT_CLOSABLE,2); @@ -3306,8 +3305,7 @@ void Svy_GetAndShowSurveysStats (void) } /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SURVEYS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_SURVEYS],NULL,NULL, Hlp_ANALYTICS_Figures_surveys,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_tag.c b/swad_tag.c index 827158b1..7d9c2fb1 100644 --- a/swad_tag.c +++ b/swad_tag.c @@ -393,8 +393,7 @@ void Tag_ShowFormEditTags (void) if ((NumTags = Tag_DB_GetAllTagsFromCurrentCrs (&mysql_res))) { /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Tags, - NULL,NULL, + Box_BoxTableBegin (Txt_Tags,NULL,NULL, Hlp_ASSESSMENT_Questions_editing_tags,Box_NOT_CLOSABLE,2); /***** Show tags *****/ diff --git a/swad_test.c b/swad_test.c index b3837eba..83a41acf 100644 --- a/swad_test.c +++ b/swad_test.c @@ -759,8 +759,7 @@ void Tst_GetAndShowTestsStats (void) struct Qst_Stats Stats; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_TESTS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_TESTS],NULL,NULL, Hlp_ANALYTICS_Figures_tests,Box_NOT_CLOSABLE,2); /***** Write table heading *****/ diff --git a/swad_test_print.c b/swad_test_print.c index 9f4a9df0..f3bddc65 100644 --- a/swad_test_print.c +++ b/swad_test_print.c @@ -1706,8 +1706,7 @@ void TstPrn_SelDatesToSeeMyPrints (void) Frm_BeginForm (ActSeeMyTstResCrs); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Results, - NULL,NULL, + Box_BoxTableBegin (Txt_Results,NULL,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (SetHMS); @@ -1732,8 +1731,7 @@ void TstPrn_ShowMyPrints (void) Dat_GetIniEndDatesFromForm (); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Results, - NULL,NULL, + Box_BoxTableBegin (Txt_Results,NULL,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,2); /***** Header of the table with the list of users *****/ @@ -1772,8 +1770,7 @@ static void TstPrn_ShowUsrsPrints (__attribute__((unused)) void *Args) Dat_GetIniEndDatesFromForm (); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Results, - NULL,NULL, + Box_BoxTableBegin (Txt_Results,NULL,NULL, Hlp_ASSESSMENT_Tests_results,Box_NOT_CLOSABLE,5); /***** Header of the table with the list of users *****/ diff --git a/swad_theme.c b/swad_theme.c index 7923ba09..59292fb0 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -283,8 +283,7 @@ void The_GetAndShowNumUsrsPerTheme (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_THEMES], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_THEMES],NULL,NULL, Hlp_ANALYTICS_Figures_theme,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_timeline.c b/swad_timeline.c index 4fbc17a4..4cba9473 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -568,8 +568,7 @@ void Tml_GetAndShowTimelineActivityStats (void) unsigned NumUsrsTotal; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_TIMELINE], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_TIMELINE],NULL,NULL, Hlp_ANALYTICS_Figures_timeline,Box_NOT_CLOSABLE,2); /***** Heading row *****/ diff --git a/swad_user.c b/swad_user.c index 5b9fc8de..e4d0abe0 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1167,8 +1167,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncPars) (void)) FuncPars (); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Log_in, - NULL,NULL, + Box_BoxTableBegin (Txt_Log_in,NULL,NULL, Hlp_PROFILE_LogIn,Box_NOT_CLOSABLE,2); /***** User's ID/nickname *****/ @@ -6552,8 +6551,7 @@ void Usr_GetAndShowUsersStats (void) extern const char *Txt_Average_number_of_users_belonging_to_a_course; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_USERS], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_USERS],NULL,NULL, Hlp_ANALYTICS_Figures_users,Box_NOT_CLOSABLE,2); /***** Write heading *****/ @@ -6685,8 +6683,7 @@ void Usr_GetAndShowUsersRanking (void) extern const char *Txt_Followers; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_USERS_RANKING], - NULL,NULL, + Box_BoxTableBegin (Txt_FIGURE_TYPES[Fig_USERS_RANKING],NULL,NULL, Hlp_ANALYTICS_Figures_ranking,Box_NOT_CLOSABLE,2); /***** Write heading *****/