From 9545a622f584baa13242959d8c82a7e976a17b20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 26 Oct 2019 01:56:36 +0200 Subject: [PATCH] Version19.44.2 --- css/{swad19.42.6.css => swad19.44.2.css} | 21 +++++----- swad_HTML.c | 42 +++++++++++++++++++ swad_HTML.h | 9 +++++ swad_ID.c | 8 ++-- swad_action.c | 2 +- swad_action.h | 2 +- swad_agenda.c | 4 +- swad_assignment.c | 4 +- swad_attendance.c | 16 ++++---- swad_banner.c | 4 +- swad_centre.c | 2 +- swad_changelog.h | 5 ++- swad_cookie.c | 4 +- swad_course.c | 10 ++--- swad_degree.c | 2 +- swad_enrolment.c | 22 +++++----- swad_exam.c | 6 +-- swad_file_browser.c | 8 ++-- swad_follow.c | 4 +- swad_forum.c | 28 ++++++------- swad_game.c | 32 +++++++-------- swad_group.c | 16 ++++---- swad_institution.c | 4 +- swad_layout.c | 32 +-------------- swad_layout.h | 8 +--- swad_mail.c | 8 ++-- swad_main.c | 2 +- swad_match.c | 12 +++--- swad_match_result.c | 8 ++-- swad_menu.c | 4 +- swad_message.c | 4 +- swad_network.c | 4 +- swad_nickname.c | 4 +- swad_notice.c | 6 +-- swad_notification.c | 4 +- swad_password.c | 8 ++-- swad_privacy.c | 4 +- swad_profile.c | 4 +- swad_project.c | 30 +++++++------- swad_record.c | 20 +++++----- swad_statistic.c | 10 ++--- swad_survey.c | 24 +++++------ swad_tab.c | 4 +- swad_test.c | 8 ++-- swad_text.c | 51 +++++++++++++++++------- swad_timeline.c | 24 +++++------ swad_user.c | 16 ++++---- 47 files changed, 298 insertions(+), 256 deletions(-) rename css/{swad19.42.6.css => swad19.44.2.css} (99%) diff --git a/css/swad19.42.6.css b/css/swad19.44.2.css similarity index 99% rename from css/swad19.42.6.css rename to css/swad19.44.2.css index 8c1a79a0..46396f34 100644 --- a/css/swad19.42.6.css +++ b/css/swad19.44.2.css @@ -600,6 +600,18 @@ a:hover /* Default ==> underlined */ background-image:-webkit-linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); /* Safari */ background-image:linear-gradient(#c86b85 0,#c86b85 54px,white 54px,white 100%); } + + +.TAB_LIST + { + display:inline-block; + list-style-type:none; + padding:0; + margin:0; + text-align:left; + vertical-align:middle; + } + @media only screen and (max-width: 480px) { /* For mobile-phones */ #tabs @@ -2211,15 +2223,6 @@ a:hover img.CENTRE_PHOTO_SHOW } /*********************************** Lists ***********************************/ -.LIST_TABS - { - display:inline-block; - list-style-type:none; - padding:0; - margin:0; - text-align:left; - vertical-align:middle; - } .LIST_LEFT, .LIST_TREE { display:inline-block; diff --git a/swad_HTML.c b/swad_HTML.c index f3c383c3..e4a851e9 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -497,3 +497,45 @@ void HTM_DIV_End (void) HTM_TD_NestingLevel--; } + +/*****************************************************************************/ +/******************************** Main zone **********************************/ +/*****************************************************************************/ + +void HTM_MAIN_Begin (const char *Class) + { + fprintf (Gbl.F.Out,"
",Class); + } + +void HTM_MAIN_End (void) + { + fprintf (Gbl.F.Out,"
"); + } + +/*****************************************************************************/ +/********************************* Articles **********************************/ +/*****************************************************************************/ + +void HTM_ARTICLE_Begin (const char *ArticleId) + { + fprintf (Gbl.F.Out,"
",ArticleId); + } + +void HTM_ARTICLE_End (void) + { + fprintf (Gbl.F.Out,"
"); + } + +/*****************************************************************************/ +/********************************* Sections **********************************/ +/*****************************************************************************/ + +void HTM_SECTION_Begin (const char *SectionId) + { + fprintf (Gbl.F.Out,"
",SectionId); + } + +void HTM_SECTION_End (void) + { + fprintf (Gbl.F.Out,"
"); + } diff --git a/swad_HTML.h b/swad_HTML.h index c7b64834..ea1490b8 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -65,4 +65,13 @@ void HTM_TD_ColouredEmpty (unsigned NumColumns); void HTM_DIV_Begin (const char *fmt,...); void HTM_DIV_End (void); +void HTM_MAIN_Begin (const char *Class); +void HTM_MAIN_End (void); + +void HTM_ARTICLE_Begin (const char *ArticleId); +void HTM_ARTICLE_End (void); + +void HTM_SECTION_Begin (const char *SectionId); +void HTM_SECTION_End (void); + #endif diff --git a/swad_ID.c b/swad_ID.c index 8931ecbb..f8c24503 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -514,7 +514,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (ID_ID_SECTION_ID); + HTM_SECTION_Begin (ID_ID_SECTION_ID); /***** Start box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), @@ -532,7 +532,7 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -546,7 +546,7 @@ void ID_ShowFormChangeOtherUsrID (void) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (ID_ID_SECTION_ID); + HTM_SECTION_Begin (ID_ID_SECTION_ID); /***** Start box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), @@ -564,7 +564,7 @@ void ID_ShowFormChangeOtherUsrID (void) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_action.c b/swad_action.c index c05d02d4..2bc10a80 100644 --- a/swad_action.c +++ b/swad_action.c @@ -5494,7 +5494,7 @@ void Act_AdjustCurrentAction (void) /*** Write error message and exit when no permission to perform an action ****/ /*****************************************************************************/ -void Act_NoPermissionExit (void) +void Lay_NoPermissionExit (void) { extern const char *Txt_You_dont_have_permission_to_perform_this_action; diff --git a/swad_action.h b/swad_action.h index 10efa95d..4358e8ad 100644 --- a/swad_action.h +++ b/swad_action.h @@ -1691,6 +1691,6 @@ char *Act_GetActionTextFromDB (long ActCod, void Act_AdjustActionWhenNoUsrLogged (void); void Act_AdjustCurrentAction (void); -void Act_NoPermissionExit (void); +void Lay_NoPermissionExit (void); #endif diff --git a/swad_agenda.c b/swad_agenda.c index 0c2b7dd8..237c2841 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -765,9 +765,9 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod) AgdEvent.Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", Gbl.RowEvenOdd); - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); fprintf (Gbl.F.Out,"%s",AgdEvent.Event); - Lay_EndArticle (); + HTM_ARTICLE_End (); HTM_TD_End (); /* Location */ diff --git a/swad_assignment.c b/swad_assignment.c index 900ca5b3..327c00c6 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -405,9 +405,9 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView) Asg.Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", Gbl.RowEvenOdd); - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); fprintf (Gbl.F.Out,"%s",Asg.Title); - Lay_EndArticle (); + HTM_ARTICLE_End (); HTM_TD_End (); /* Assignment folder */ diff --git a/swad_attendance.c b/swad_attendance.c index 9a651527..28301ca1 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -437,11 +437,11 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt HTM_TD_Begin ("class=\"LT\""); else HTM_TD_Begin ("class=\"LT COLOR%u\"",Gbl.RowEvenOdd); - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); Att_PutLinkAttEvent (Att,Txt_View_event,Att->Title, Att->Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE"); - Lay_EndArticle (); + HTM_ARTICLE_End (); HTM_TD_End (); /* Number of students in this event */ @@ -1953,7 +1953,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) { @@ -2014,7 +2014,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Usr_ShowWarningNoUsersFound (Rol_STD); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -3219,7 +3219,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView, Usr_UsrDataConstructor (&UsrDat); /***** Start section with attendance table *****/ - Lay_StartSection (Att_ATTENDANCE_TABLE_ID); + HTM_SECTION_Begin (Att_ATTENDANCE_TABLE_ID); /***** Begin table *****/ HTM_TABLE_BeginCenterPadding (2); @@ -3280,7 +3280,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView, Att_PutButtonToShowDetails (); /***** End section with attendance table *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -3448,7 +3448,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList, Usr_UsrDataConstructor (&UsrDat); /***** Start section with attendance details *****/ - Lay_StartSection (Att_ATTENDANCE_DETAILS_ID); + HTM_SECTION_Begin (Att_ATTENDANCE_DETAILS_ID); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_Details,NULL, @@ -3472,7 +3472,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumUsrsInList, Box_EndBoxTable (); /***** End section with attendance details *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_banner.c b/swad_banner.c index 706064d3..1b513d80 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -439,9 +439,9 @@ static void Ban_ListBannersForEdition (void) HTM_TD_Begin ("class=\"%s RM\"", Ban->Hidden ? "DAT_LIGHT" : "DAT"); - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); fprintf (Gbl.F.Out,"%ld",Ban->BanCod); - Lay_EndArticle (); + HTM_ARTICLE_End (); HTM_TD_End (); /* Banner short name */ diff --git a/swad_centre.c b/swad_centre.c index 5af21d45..9322d8d1 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -2503,7 +2503,7 @@ static void Ctr_PutFormToCreateCentre (void) else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) Frm_StartForm (ActReqCtr); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_centre,NULL, diff --git a/swad_changelog.h b/swad_changelog.h index 78a74ade..b34ad036 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,13 +487,14 @@ 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.1 (2019-10-26)" -#define CSS_FILE "swad19.42.6.css" +#define Log_PLATFORM_VERSION "SWAD 19.44.2 (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. + Version 19.44.2: Oct 26, 2019 Changes in layout. (246318 lines) Version 19.44.1: Oct 26, 2019 Remove course from project configuration when removing course. (246284 lines) Version 19.44: Oct 25, 2019 Configuration of all projects. Changed preassigned (projects) to assigned in database and messages. (246280 lines) diff --git a/swad_cookie.c b/swad_cookie.c index c26c21c4..3907f42e 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -65,7 +65,7 @@ void Coo_EditMyPrefsOnCookies (void) extern const char *Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites; /***** Start section with preferences about cookies *****/ - Lay_StartSection (Coo_COOKIES_ID); + HTM_SECTION_Begin (Coo_COOKIES_ID); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_Cookies,Coo_PutIconsCookies, @@ -98,7 +98,7 @@ void Coo_EditMyPrefsOnCookies (void) Box_EndBoxTable (); /***** End section with preferences about cookies *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_course.c b/swad_course.c index 430f3fa0..2ac7eaf1 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1698,7 +1698,7 @@ static void Crs_PutFormToCreateCourse (void) else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) Frm_StartForm (ActReqCrs); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_course,NULL, @@ -2007,7 +2007,7 @@ void Crs_RemoveCourse (void) } } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -2379,7 +2379,7 @@ void Crs_ChangeInsCrsCod (void) Crs_EditingCrs->ShrtName); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -2574,7 +2574,7 @@ void Crs_ChangeCrsYear (void) NewYear); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -2727,7 +2727,7 @@ static void Crs_RenameCourse (struct Course *Crs,Cns_ShrtOrFullName_t ShrtOrFull } } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index dc716cca..c7c24429 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -959,7 +959,7 @@ static void Deg_PutFormToCreateDegree (void) else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) Frm_StartForm (ActReqDeg); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_degree,NULL, diff --git a/swad_enrolment.c b/swad_enrolment.c index 9cf64f38..c77f75a4 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -640,7 +640,7 @@ static void Enr_ReqAdminUsrs (Rol_Role_t Role) Enr_ReqAnotherUsrIDToRegisterRemove (Role); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } } @@ -1077,13 +1077,13 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) case Rol_STD: if (Gbl.Usrs.Me.Role.Logged < Rol_TCH) // Can I register/remove students? // No, I can not - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; case Rol_NET: case Rol_TCH: if (Gbl.Usrs.Me.Role.Logged < Rol_DEG_ADM) // Can I register/remove teachers? // No, I can not - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; default: Rol_WrongRoleExit (); @@ -1140,7 +1140,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) WhatToDo.RegisterUsrs = false; } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; default: Lay_ShowErrorAndExit ("Wrong registering / removing specification."); @@ -2210,7 +2210,7 @@ void Enr_ShowEnrolmentRequests (void) (1 << Rol_TCH)); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } } @@ -2421,7 +2421,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; @@ -2543,7 +2543,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; @@ -2639,7 +2639,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; @@ -2711,7 +2711,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; @@ -2761,7 +2761,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; @@ -2786,7 +2786,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected); break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } break; diff --git a/swad_exam.c b/swad_exam.c index 54c80e6b..a48000b8 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1005,9 +1005,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Build anchor string *****/ Frm_SetAnchorStr (ExaCod,&Anchor); - /***** Start article *****/ + /***** Begin article *****/ if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); /***** Start box *****/ Width = "625px"; @@ -1496,7 +1496,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** End article *****/ if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) - Lay_EndArticle (); + HTM_ARTICLE_End (); /***** Free anchor string *****/ Frm_FreeAnchorStr (Anchor); diff --git a/swad_file_browser.c b/swad_file_browser.c index 710b88ed..e4d28ab6 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3344,7 +3344,7 @@ static void Brw_GetSelectedGroupData (struct GroupData *GrpDat,bool AbortOnError else if (!Grp_GetIfIBelongToGrp (GrpDat->GrpCod)) { if (AbortOnError) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); GrpDat->GrpCod = -1L; } } @@ -3647,7 +3647,7 @@ static void Brw_ShowFileBrowser (void) snprintf (FileBrowserSectionId,sizeof (FileBrowserSectionId), "file_browser_%u", Gbl.FileBrowser.Id); - Lay_StartSection (FileBrowserSectionId); + HTM_SECTION_Begin (FileBrowserSectionId); Box_BoxBegin ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type], Brw_PutIconsFileBrowser, Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type],Box_NOT_CLOSABLE); @@ -3680,7 +3680,7 @@ static void Brw_ShowFileBrowser (void) /***** End box *****/ Box_BoxEnd (); - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -10277,7 +10277,7 @@ void Brw_ChgFileMetadata (void) } else /***** Write error message and exit *****/ - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show again the file browser *****/ Brw_ShowAgainFileBrowserOrWorks (); diff --git a/swad_follow.c b/swad_follow.c index 72b7332f..4e31af13 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -515,7 +515,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat, bool ItsMe = Usr_ItsMe (UsrDat->UsrCod); /***** Start section *****/ - Lay_StartSection (Fol_FOLLOW_SECTION_ID); + HTM_SECTION_Begin (Fol_FOLLOW_SECTION_ID); /***** Followed users *****/ HTM_DIV_Begin ("id=\"following_side\""); @@ -588,7 +588,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat, HTM_DIV_End (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_forum.c b/swad_forum.c index b57c3c23..73e4efe0 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -963,7 +963,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag ReadTimeUTC = For_GetThrReadTime (Gbl.Forum.ForumSelected.ThrCod); /***** Show alert after action *****/ - Lay_StartSection (For_FORUM_POSTS_SECTION_ID); + HTM_SECTION_Begin (For_FORUM_POSTS_SECTION_ID); Ale_ShowAlerts (For_FORUM_POSTS_SECTION_ID); // Possible pending alerts if (Message) if (Message[0]) @@ -1096,13 +1096,13 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag DB_FreeMySQLResult (&mysql_res); /***** Form to write a new post in the thread *****/ - Lay_StartSection (For_NEW_POST_SECTION_ID); + HTM_SECTION_Begin (For_NEW_POST_SECTION_ID); For_WriteFormForumPst (true,LastSubject); - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -2536,7 +2536,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, DB_FreeMySQLResult (&mysql_res); /***** Show alert after action *****/ - Lay_StartSection (For_FORUM_THREADS_SECTION_ID); + HTM_SECTION_Begin (For_FORUM_THREADS_SECTION_ID); if (Message) if (Message[0]) Ale_ShowAlert (AlertType,Message); @@ -2613,13 +2613,13 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, } /***** Put a form to write the first post of a new thread *****/ - Lay_StartSection (For_NEW_THREAD_SECTION_ID); + HTM_SECTION_Begin (For_NEW_THREAD_SECTION_ID); For_WriteFormForumPst (false,NULL); - Lay_EndSection (); + HTM_SECTION_End (); /***** End box with threads of this forum ****/ Box_BoxEnd (); - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -3902,7 +3902,7 @@ static void For_RestrictAccess (void) break; } if (!ICanSeeForum) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -4161,11 +4161,11 @@ void For_RemovePost (void) /* Check if I am the author of the message */ ItsMe = Usr_ItsMe (UsrDat.UsrCod); if (!ItsMe) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /* Check if the message is the last message in the thread */ if (Gbl.Forum.ForumSelected.PstCod != For_GetLastPstCod (Gbl.Forum.ForumSelected.ThrCod)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Remove the post *****/ ThreadDeleted = For_RemoveForumPst (Gbl.Forum.ForumSelected.PstCod,Media.MedCod); @@ -4226,7 +4226,7 @@ void For_RequestRemoveThread (void) For_ShowForumList (); /***** Show question and button to remove the thread *****/ - Lay_StartSection (For_REMOVE_THREAD_SECTION_ID); + HTM_SECTION_Begin (For_REMOVE_THREAD_SECTION_ID); if (Subject[0]) Ale_ShowAlertAndButton (For_ActionsDelThrFor[Gbl.Forum.ForumSelected.Type], For_FORUM_THREADS_SECTION_ID,NULL, @@ -4240,7 +4240,7 @@ void For_RequestRemoveThread (void) For_PutAllHiddenParamsRemThread, Btn_REMOVE_BUTTON,Txt_Remove_thread, Ale_QUESTION,Txt_Do_you_really_want_to_remove_the_entire_thread); - Lay_EndSection (); + HTM_SECTION_End (); /***** Show the threads again *****/ For_ShowForumThreadsHighlightingOneThread (Gbl.Forum.ForumSelected.ThrCod, @@ -4297,7 +4297,7 @@ void For_RemoveThread (void) Ale_SUCCESS,Txt_Thread_removed); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ diff --git a/swad_game.c b/swad_game.c index fd43631f..045b302c 100644 --- a/swad_game.c +++ b/swad_game.c @@ -449,7 +449,7 @@ void Gam_ShowOneGame (long GamCod, /* Game title */ Gam_SetParamCurrentGamCod (GamCod); // Used to pass parameter - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); Frm_StartForm (ActSeeGam); Gam_PutParams (); Frm_LinkFormSubmit (Txt_View_game, @@ -458,7 +458,7 @@ void Gam_ShowOneGame (long GamCod, fprintf (Gbl.F.Out,"%s", Game.Title); Frm_EndForm (); - Lay_EndArticle (); + HTM_ARTICLE_End (); /* Number of questions */ HTM_DIV_Begin ("class=\"%s\"",Game.Hidden ? "ASG_GRP_LIGHT" : @@ -915,7 +915,7 @@ void Gam_AskRemGame (void) /***** Get data of the game from database *****/ Gam_GetDataOfGameByCod (&Game); if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show question and button to remove game *****/ Gam_SetParamCurrentGamCod (Game.GamCod); // Used to pass parameter @@ -944,7 +944,7 @@ void Gam_RemoveGame (void) /***** Get data of the game from database *****/ Gam_GetDataOfGameByCod (&Game); if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Remove game from all tables *****/ Gam_RemoveGameFromAllTables (Game.GamCod); @@ -1016,7 +1016,7 @@ void Gam_HideGame (void) /***** Get data of the game from database *****/ Gam_GetDataOfGameByCod (&Game); if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Hide game *****/ DB_QueryUPDATE ("can not hide game", @@ -1042,7 +1042,7 @@ void Gam_UnhideGame (void) /***** Get data of the game from database *****/ Gam_GetDataOfGameByCod (&Game); if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show game *****/ DB_QueryUPDATE ("can not show game", @@ -1079,7 +1079,7 @@ void Gam_RequestCreatOrEditGame (void) /***** Check if I can create new games *****/ if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Get parameters *****/ Game.GamCod = Gam_GetParams (); @@ -1215,7 +1215,7 @@ void Gam_RecFormGame (void) OldGame.GamCod = NewGame.GamCod; Gam_GetDataOfGameByCod (&OldGame); if (!Gam_CheckIfICanEditGames ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /***** Get game title *****/ @@ -1256,7 +1256,7 @@ void Gam_RecFormGame (void) Gam_PutFormsEditionGame (&NewGame,false); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show games again *****/ Gam_ListAllGames (); @@ -1358,7 +1358,7 @@ void Gam_RequestNewQuestion (void) Tst_ShowFormAskSelectTstsForGame (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, @@ -1387,7 +1387,7 @@ void Gam_ListTstQuestionsToSelect (void) Tst_ListQuestionsToSelect (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -1874,7 +1874,7 @@ void Gam_AddTstQuestionsToGame (void) Gam_FreeListsSelectedQuestions (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, @@ -1973,7 +1973,7 @@ void Gam_RequestRemoveQst (void) QstInd); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, @@ -2031,7 +2031,7 @@ void Gam_RemoveQst (void) Ale_ShowAlert (Ale_SUCCESS,Txt_Question_removed); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, @@ -2080,7 +2080,7 @@ void Gam_MoveUpQst (void) Ale_ShowAlert (Ale_WARNING,Txt_Movement_not_allowed); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, @@ -2139,7 +2139,7 @@ void Gam_MoveDownQst (void) Ale_ShowAlert (Ale_WARNING,Txt_This_game_has_no_questions); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show current game *****/ Gam_ShowOneGame (Game.GamCod, diff --git a/swad_group.c b/swad_group.c index c3aa28ae..edf18ec7 100644 --- a/swad_group.c +++ b/swad_group.c @@ -229,7 +229,7 @@ static void Grp_ReqEditGroupsInternal (Ale_AlertType_t AlertTypeGroupTypes, static void Grp_ReqEditGroupsInternal0 (void) { /***** Start groups types section *****/ - Lay_StartSection (Grp_GROUP_TYPES_SECTION_ID); + HTM_SECTION_Begin (Grp_GROUP_TYPES_SECTION_ID); } static void Grp_ReqEditGroupsInternal1 (Ale_AlertType_t AlertTypeGroupTypes, @@ -250,10 +250,10 @@ static void Grp_ReqEditGroupsInternal1 (Ale_AlertType_t AlertTypeGroupTypes, Grp_EditGroupTypes (); /***** End groups types section *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** Start groups section *****/ - Lay_StartSection (Grp_GROUPS_SECTION_ID); + HTM_SECTION_Begin (Grp_GROUPS_SECTION_ID); } static void Grp_ReqEditGroupsInternal2 (Ale_AlertType_t AlertTypeGroups, @@ -269,7 +269,7 @@ static void Grp_ReqEditGroupsInternal2 (Ale_AlertType_t AlertTypeGroups, Grp_EditGroups (); /***** End groups section *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** Free list of classrooms in this centre *****/ Cla_FreeListClassrooms (); @@ -2469,7 +2469,7 @@ static void Grp_PutFormToCreateGroupType (void) extern const char *Txt_Create_type_of_group; /***** Begin form *****/ - Lay_StartSection (Grp_NEW_GROUP_TYPE_SECTION_ID); + HTM_SECTION_Begin (Grp_NEW_GROUP_TYPE_SECTION_ID); Frm_StartFormAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID); /***** Start box *****/ @@ -2572,7 +2572,7 @@ static void Grp_PutFormToCreateGroupType (void) /***** End form *****/ Frm_EndForm (); - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -2592,7 +2592,7 @@ static void Grp_PutFormToCreateGroup (void) Rol_Role_t Role; /***** Begin form *****/ - Lay_StartSection (Grp_NEW_GROUP_SECTION_ID); + HTM_SECTION_Begin (Grp_NEW_GROUP_SECTION_ID); Frm_StartFormAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID); /***** Start box and table *****/ @@ -2710,7 +2710,7 @@ static void Grp_PutFormToCreateGroup (void) /***** End form *****/ Frm_EndForm (); - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_institution.c b/swad_institution.c index fa2e50bc..dea9cf4a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -1733,7 +1733,7 @@ void Ins_RemoveInstitution (void) /***** Check if this institution has users *****/ if (!Ins_CheckIfICanEdit (Ins_EditingIns)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); else if (Ins_EditingIns->Ctrs.Num || Ins_EditingIns->NumUsrsWhoClaimToBelongToIns || Ins_EditingIns->NumUsrs) // Institution has centres or users ==> don't remove @@ -2213,7 +2213,7 @@ static void Ins_PutFormToCreateInstitution (void) else if (Gbl.Usrs.Me.Role.Max >= Rol_GST) Frm_StartForm (ActReqIns); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Start box and table *****/ Box_StartBoxTable (NULL,Txt_New_institution,NULL, diff --git a/swad_layout.c b/swad_layout.c index f473776a..91721aed 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -353,7 +353,7 @@ void Lay_WriteStartOfPage (void) Mnu_WriteMenuThisTab (); /* Start canvas: main zone for actions output */ - HTM_DIV_Begin ("class=\"MAIN_ZONE_CANVAS\""); + HTM_MAIN_Begin ("MAIN_ZONE_CANVAS"); /* If it is mandatory to read any information about course */ if (Gbl.Crs.Info.ShowMsgMustBeRead) @@ -402,7 +402,7 @@ static void Lay_WriteEndOfPage (void) if (!Gbl.Layout.DivsEndWritten) { /***** End of central part of main zone *****/ - HTM_DIV_End (); // Canvas (main zone to output content of the current action) + HTM_MAIN_End (); // Canvas (main zone to output content of the current action) HTM_DIV_End (); // Layout with horizontal or vertical menu HTM_DIV_End (); // main_zone_central_container @@ -1314,34 +1314,6 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction, // jumping to the next line on narrow screens } -/*****************************************************************************/ -/****************************** Start/end section ****************************/ -/*****************************************************************************/ - -void Lay_StartSection (const char *SectionId) - { - fprintf (Gbl.F.Out,"
",SectionId); - } - -void Lay_EndSection (void) - { - fprintf (Gbl.F.Out,"
"); - } - -/*****************************************************************************/ -/****************************** Start/end article ****************************/ -/*****************************************************************************/ - -void Lay_StartArticle (const char *ArticleId) - { - fprintf (Gbl.F.Out,"
",ArticleId); - } - -void Lay_EndArticle (void) - { - fprintf (Gbl.F.Out,"
"); - } - /*****************************************************************************/ /********** Write error message and exit when not enough memory **************/ /*****************************************************************************/ diff --git a/swad_layout.h b/swad_layout.h index 360b8cff..46cc1918 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -71,15 +71,9 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction, bool Checked,bool Disabled, const char *Title,const char *Text); -void Lay_StartSection (const char *SectionId); -void Lay_EndSection (void); - -void Lay_StartArticle (const char *ArticleId); -void Lay_EndArticle (void); - void Lay_NotEnoughMemoryExit (void); void Lay_WrongScopeExit (void); -void Act_NoPermissionExit (void); +void Lay_NoPermissionExit (void); void Lay_ShowErrorAndExit (const char *Txt); void Lay_RefreshNotifsAndConnected (void); diff --git a/swad_mail.c b/swad_mail.c index 925a8883..31e740c3 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1153,7 +1153,7 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (Mai_EMAIL_SECTION_ID); + HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID); /***** Start box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), @@ -1171,7 +1171,7 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -1185,7 +1185,7 @@ void Mai_ShowFormChangeOtherUsrEmail (void) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (Mai_EMAIL_SECTION_ID); + HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID); /***** Start box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), @@ -1204,7 +1204,7 @@ void Mai_ShowFormChangeOtherUsrEmail (void) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_main.c b/swad_main.c index 2363bce9..d84a2ba4 100644 --- a/swad_main.c +++ b/swad_main.c @@ -147,7 +147,7 @@ int main (void) /***** Check if the user have permission to execute the action *****/ if (!Act_CheckIfIHavePermissionToExecuteAction (Gbl.Action.Act)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Update most frequently used actions *****/ MFU_UpdateMFUActions (); diff --git a/swad_match.c b/swad_match.c index 358ebc59..f4586968 100644 --- a/swad_match.c +++ b/swad_match.c @@ -792,7 +792,7 @@ void Mch_ToggleVisibilResultsMchUsr (void) /***** Check if I have permission to change visibility *****/ if (!Mch_CheckIfICanEditThisMatch (&Match)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Toggle visibility of match results *****/ Match.Status.ShowUsrResults = !Match.Status.ShowUsrResults; @@ -955,7 +955,7 @@ void Mch_RemoveMatch (void) /***** Check if I can remove this match *****/ if (!Mch_CheckIfICanEditThisMatch (&Match)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Remove the match from all database tables *****/ Mch_RemoveMatchFromAllTables (Match.MchCod); @@ -1185,7 +1185,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) extern const char *Txt_Play; /***** Start section for a new match *****/ - Lay_StartSection (Mch_NEW_MATCH_SECTION_ID); + HTM_SECTION_Begin (Mch_NEW_MATCH_SECTION_ID); /***** Begin form *****/ Frm_StartForm (ActNewMch); @@ -1234,7 +1234,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) Frm_EndForm (); /***** End section for a new match *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -1344,7 +1344,7 @@ void Mch_ResumeMatch (void) /***** Check if I have permission to resume match *****/ if (!Mch_CheckIfICanEditThisMatch (&Match)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Update match status in database *****/ Mch_UpdateMatchStatusInDB (&Match); @@ -2043,7 +2043,7 @@ static void Mch_ShowMatchStatusForStd (struct Match *Match) /***** Can I play this match? *****/ ICanPlayThisMatchBasedOnGrps = Mch_CheckIfICanPlayThisMatchBasedOnGrps (Match->MchCod); if (!ICanPlayThisMatchBasedOnGrps) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Left column *****/ Mch_ShowLeftColumnStd (Match); diff --git a/swad_match_result.c b/swad_match_result.c index 92e75322..5fa23bd6 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -191,7 +191,7 @@ void McR_SelUsrsToViewUsrsMchResults (void) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumTotalUsrs) { @@ -239,7 +239,7 @@ void McR_SelUsrsToViewUsrsMchResults (void) Usr_ShowWarningNoUsersFound (Rol_UNK); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -750,7 +750,7 @@ void McR_ShowOneMchResult (void) if (!Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (UsrDat,Usr_DONT_GET_PREFS)) Lay_ShowErrorAndExit (Txt_The_user_does_not_exist); if (!Usr_CheckIfICanViewTst (UsrDat)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /* User */ HTM_TR_Begin (NULL); @@ -864,7 +864,7 @@ void McR_ShowOneMchResult (void) Box_BoxEnd (); } else // I am not allowed to view this match result - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ diff --git a/swad_menu.c b/swad_menu.c index 9420b266..e6150f3b 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -340,7 +340,7 @@ void Mnu_WriteMenuThisTab (void) /***** Menu start *****/ fprintf (Gbl.F.Out,""); } diff --git a/swad_message.c b/swad_message.c index 53813291..dbb3ffce 100644 --- a/swad_message.c +++ b/swad_message.c @@ -245,7 +245,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumUsrsInCrs) { @@ -265,7 +265,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) } /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /***** Get list of users' IDs or nicknames written explicitely *****/ diff --git a/swad_network.c b/swad_network.c index 3a66b790..90fe2d68 100644 --- a/swad_network.c +++ b/swad_network.c @@ -280,7 +280,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (Net_MY_WEBS_ID); + HTM_SECTION_Begin (Net_MY_WEBS_ID); /***** Start box *****/ snprintf (StrRecordWidth,sizeof (StrRecordWidth), @@ -363,7 +363,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_nickname.c b/swad_nickname.c index 055f51d0..79274e3c 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -233,7 +233,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its Act_Action_t NextAction; /***** Start section *****/ - Lay_StartSection (Nck_NICKNAME_SECTION_ID); + HTM_SECTION_Begin (Nck_NICKNAME_SECTION_ID); /***** Get my nicknames *****/ NumNicks = @@ -417,7 +417,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its Box_EndBoxTable (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_notice.c b/swad_notice.c index daefa588..ae824b88 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -649,10 +649,10 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, /***** Build anchor string *****/ Frm_SetAnchorStr (NotCod,&Anchor); - /***** Start article for this notice *****/ + /***** Begin article for this notice *****/ if (TypeNoticesListing == Not_LIST_FULL_NOTICES) { - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); if (Highlight) HTM_DIV_Begin ("class=\"NOTICE_HIGHLIGHT\""); } @@ -749,7 +749,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, { if (Highlight) HTM_DIV_End (); - Lay_EndArticle (); + HTM_ARTICLE_End (); } /***** Free anchor string *****/ diff --git a/swad_notification.c b/swad_notification.c index 046bf26f..1e6e2c54 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1904,7 +1904,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Ntf_NotifyEvent_t NotifyEvent; /***** Start section with settings on privacy *****/ - Lay_StartSection (Ntf_NOTIFICATIONS_ID); + HTM_SECTION_Begin (Ntf_NOTIFICATIONS_ID); /***** Start box *****/ Box_BoxBegin (NULL,Txt_Notifications,Ntf_PutIconsNotif, @@ -1971,7 +1971,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Box_BoxEnd (); /***** End section with settings about notifications *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_password.c b/swad_password.c index d4a36c63..e82819e4 100644 --- a/swad_password.c +++ b/swad_password.c @@ -655,7 +655,7 @@ void Pwd_ShowFormChgMyPwd (void) bool IHaveAPasswordInDB = (bool) Gbl.Usrs.Me.UsrDat.Password[0]; /***** Start section *****/ - Lay_StartSection (Pwd_PASSWORD_SECTION_ID); + HTM_SECTION_Begin (Pwd_PASSWORD_SECTION_ID); /***** Begin form *****/ Frm_StartFormAnchor (ActChgMyPwd,Pwd_PASSWORD_SECTION_ID); @@ -724,7 +724,7 @@ void Pwd_ShowFormChgMyPwd (void) Frm_EndForm (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ @@ -839,7 +839,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void) NULL,Box_NOT_CLOSABLE); /***** Start section *****/ - Lay_StartSection (Pwd_PASSWORD_SECTION_ID); + HTM_SECTION_Begin (Pwd_PASSWORD_SECTION_ID); /***** Show possible alerts *****/ Ale_ShowAlerts (Pwd_PASSWORD_SECTION_ID); @@ -875,7 +875,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void) Box_BoxEnd (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_privacy.c b/swad_privacy.c index de29f380..87147c65 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -88,7 +88,7 @@ void Pri_EditMyPrivacy (void) extern const char *Txt_Timeline; /***** Start section with settings on privacy *****/ - Lay_StartSection (Pri_PRIVACY_ID); + HTM_SECTION_Begin (Pri_PRIVACY_ID); /***** If any of my settings about privacy is unknown *****/ if (Gbl.Usrs.Me.UsrDat.PhotoVisibility == Pri_VISIBILITY_UNKNOWN || @@ -128,7 +128,7 @@ void Pri_EditMyPrivacy (void) Box_EndBoxTable (); /***** End section with settings on privacy *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_profile.c b/swad_profile.c index 1202a096..da1984ea 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -245,9 +245,9 @@ void Prf_GetUsrDatAndShowUserProfile (void) if (Gbl.Usrs.Me.Logged) // Timeline visible only by logged users { /* Show timeline */ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); TL_ShowTimelineUsr (); - Lay_EndSection (); + HTM_SECTION_End (); } } diff --git a/swad_project.c b/swad_project.c index d7992d3c..825e1b35 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1155,7 +1155,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, HTM_TD_Begin ("class=\"%s LT\"",ClassTitle); break; } - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); if (Prj->Title[0]) { if (ICanViewProjectFiles) @@ -1171,7 +1171,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, } if (Faults.WrongTitle) Prj_PutWarningIcon (); - Lay_EndArticle (); + HTM_ARTICLE_End (); HTM_TD_End (); /* Department */ @@ -3028,7 +3028,7 @@ void Prj_ReqRemProject (void) Prj.Title); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -3091,7 +3091,7 @@ void Prj_RemoveProject (void) Prj.Title); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -3126,7 +3126,7 @@ void Prj_HideProject (void) " WHERE PrjCod=%ld AND CrsCod=%ld", Prj.PrjCod,Gbl.Hierarchy.Crs.CrsCod); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -3161,7 +3161,7 @@ void Prj_ShowProject (void) " WHERE PrjCod=%ld AND CrsCod=%ld", Prj.PrjCod,Gbl.Hierarchy.Crs.CrsCod); else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -3612,7 +3612,7 @@ void Prj_RecFormProject (void) Prj_RequestCreatOrEditPrj (Prj.PrjCod); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -3733,7 +3733,7 @@ void Prj_ShowFormConfig (void) { extern const char *Hlp_ASSESSMENT_Projects; extern const char *The_ClassFormInBox[The_NUM_THEMES]; - extern const char *Txt_Projects; + extern const char *Txt_Configure_projects; extern const char *Txt_Editable; extern const char *Txt_Editable_by_non_editing_teachers; extern const char *Txt_Save_changes; @@ -3742,7 +3742,7 @@ void Prj_ShowFormConfig (void) Prj_GetConfigPrjFromDB (); /***** Start box *****/ - Box_BoxBegin (NULL,Txt_Projects,Prj_PutIconsListProjects, + Box_BoxBegin (NULL,Txt_Configure_projects,Prj_PutIconsListProjects, Hlp_ASSESSMENT_Projects,Box_NOT_CLOSABLE); /***** Begin form *****/ @@ -3909,7 +3909,7 @@ void Prj_ReqLockAllProjectsEdition (void) Prj_FreeListProjects (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show projects again *****/ Prj_ShowProjectsInCurrentPage (); @@ -3943,7 +3943,7 @@ void Prj_ReqUnlockAllProjectsEdition (void) Prj_FreeListProjects (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show projects again *****/ Prj_ShowProjectsInCurrentPage (); @@ -3980,7 +3980,7 @@ void Prj_LockAllProjectsEdition (void) Prj_FreeListProjects (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show projects again *****/ Prj_ShowProjectsInCurrentPage (); @@ -4013,7 +4013,7 @@ void Prj_UnlockAllProjectsEdition (void) Prj_FreeListProjects (); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show projects again *****/ Prj_ShowProjectsInCurrentPage (); @@ -4097,7 +4097,7 @@ void Prj_LockProjectEdition (void) Prj_FormLockUnlock (&Prj); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); @@ -4140,7 +4140,7 @@ void Prj_UnlockProjectEdition (void) Prj_FormLockUnlock (&Prj); } else - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Free memory of the project *****/ Prj_FreeMemProject (&Prj); diff --git a/swad_record.c b/swad_record.c index b491717f..68dc5b81 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1007,7 +1007,7 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView) snprintf (RecordSectionId,sizeof (RecordSectionId), "record_%u", NumUsr); - Lay_StartSection (RecordSectionId); + HTM_SECTION_Begin (RecordSectionId); if (Gbl.Action.Act == ActPrnRecSevGst && NumUsr != 0 && @@ -1027,7 +1027,7 @@ static void Rec_ListRecordsGsts (Rec_SharedRecordViewType_t TypeOfView) /* End container for this user */ HTM_DIV_End (); - Lay_EndSection (); + HTM_SECTION_End (); NumUsr++; } @@ -1212,7 +1212,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, snprintf (RecordSectionId,sizeof (RecordSectionId), "record_%u", NumUsr); - Lay_StartSection (RecordSectionId); + HTM_SECTION_Begin (RecordSectionId); if (Gbl.Action.Act == ActPrnRecSevStd && NumUsr != 0 && @@ -1248,7 +1248,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView, /* End container for this user */ HTM_DIV_End (); - Lay_EndSection (); + HTM_SECTION_End (); NumUsr++; } @@ -1434,7 +1434,7 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView) snprintf (RecordSectionId,sizeof (RecordSectionId), "record_%u", NumUsr); - Lay_StartSection (RecordSectionId); + HTM_SECTION_Begin (RecordSectionId); if (Gbl.Action.Act == ActPrnRecSevTch && NumUsr != 0 && @@ -1466,7 +1466,7 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView) /* End container for this user */ HTM_DIV_End (); - Lay_EndSection (); + HTM_SECTION_End (); NumUsr++; } @@ -1701,7 +1701,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, case Rec_CRS_PRINT_SEVERAL_RECORDS: break; default: - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; } @@ -1718,7 +1718,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, } } else // Not me ==> I am a student trying to do something forbidden - Act_NoPermissionExit (); + Lay_NoPermissionExit (); break; case Rol_NET: break; @@ -4024,7 +4024,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) char StrRecordWidth[10 + 1]; /***** Start section *****/ - Lay_StartSection (Rec_MY_INS_CTR_DPT_ID); + HTM_SECTION_Begin (Rec_MY_INS_CTR_DPT_ID); /***** Start box and table *****/ sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); @@ -4249,7 +4249,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Box_EndBoxTable (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } /*****************************************************************************/ diff --git a/swad_statistic.c b/swad_statistic.c index 326369c6..81b2a589 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -349,7 +349,7 @@ void Sta_AskShowCrsHits (void) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumTotalUsrs) { @@ -484,7 +484,7 @@ void Sta_AskShowCrsHits (void) Ale_ShowAlert (Ale_WARNING,Txt_No_teachers_or_students_found); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -860,7 +860,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse) Sta_AskShowGblHits (); /***** Start results section *****/ - Lay_StartSection (Sta_STAT_RESULTS_SECTION_ID); + HTM_SECTION_Begin (Sta_STAT_RESULTS_SECTION_ID); /***** Check selection *****/ if ((Gbl.Stat.Role == Sta_ROLE_ALL_USRS || @@ -902,7 +902,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse) Sta_AskShowCrsHits (); /***** Start results section *****/ - Lay_StartSection (Sta_STAT_RESULTS_SECTION_ID); + HTM_SECTION_Begin (Sta_STAT_RESULTS_SECTION_ID); /***** Check selection *****/ if (!Usr_CountNumUsrsInListOfSelectedUsrs ()) // Error: there are no users selected @@ -1476,7 +1476,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse) /* End box and section */ Box_BoxEnd (); - Lay_EndSection (); + HTM_SECTION_End (); } /***** Free structure that stores the query result *****/ diff --git a/swad_survey.c b/swad_survey.c index 86662920..49d31144 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -522,7 +522,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, HTM_TD_Begin ("class=\"LT\""); else HTM_TD_Begin ("class=\"LT COLOR%u\"",Gbl.RowEvenOdd); - Lay_StartArticle (Anchor); + HTM_ARTICLE_Begin (Anchor); Frm_StartForm (ActSeeSvy); Svy_PutParamSvyCod (SvyCod); Svy_PutHiddenParamSvyOrder (); @@ -534,7 +534,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, fprintf (Gbl.F.Out,"%s", Svy.Title); Frm_EndForm (); - Lay_EndArticle (); + HTM_ARTICLE_End (); /* Number of questions and number of distinct users who have already answered this survey */ HTM_DIV_Begin ("class=\"%s\"", @@ -1526,7 +1526,7 @@ void Svy_AskRemSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show question and button to remove survey *****/ Svy_CurrentSvyCod = Svy.SvyCod; @@ -1559,7 +1559,7 @@ void Svy_RemoveSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Remove all the users in this survey *****/ DB_QueryDELETE ("can not remove users who are answered a survey", @@ -1623,7 +1623,7 @@ void Svy_AskResetSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Ask for confirmation of reset *****/ Ale_ShowAlert (Ale_WARNING,Txt_Do_you_really_want_to_reset_the_survey_X, @@ -1671,7 +1671,7 @@ void Svy_ResetSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Remove all the users in this survey *****/ DB_QueryDELETE ("can not remove users who are answered a survey", @@ -1717,7 +1717,7 @@ void Svy_HideSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Hide survey *****/ DB_QueryUPDATE ("can not hide survey", @@ -1752,7 +1752,7 @@ void Svy_UnhideSurvey (void) /***** Get data of the survey from database *****/ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /***** Show survey *****/ DB_QueryUPDATE ("can not show survey", @@ -1816,7 +1816,7 @@ void Svy_RequestCreatOrEditSvy (void) { /***** Put link (form) to create new survey *****/ if (!Svy_CheckIfICanCreateSvy ()) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /* Initialize to empty survey */ Svy.SvyCod = -1L; @@ -1841,7 +1841,7 @@ void Svy_RequestCreatOrEditSvy (void) /* Get data of the survey from database */ Svy_GetDataOfSurveyByCod (&Svy); if (!Svy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /* Get text of the survey from database */ Svy_GetSurveyTxtFromDB (Svy.SvyCod,Txt); @@ -2034,7 +2034,7 @@ static void Svy_SetDefaultAndAllowedScope (struct Survey *Svy) } if (!ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ @@ -2129,7 +2129,7 @@ void Svy_RecFormSurvey (void) OldSvy.SvyCod = NewSvy.SvyCod; Svy_GetDataOfSurveyByCod (&OldSvy); if (!OldSvy.Status.ICanEdit) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); NewSvy.Scope = OldSvy.Scope; } diff --git a/swad_tab.c b/swad_tab.c index 5ddf8ffe..66bb17fd 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_DIV_End (); } diff --git a/swad_test.c b/swad_test.c index 5d3f9fb4..a3885b84 100644 --- a/swad_test.c +++ b/swad_test.c @@ -7449,7 +7449,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumTotalUsrs) { @@ -7498,7 +7498,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) Usr_ShowWarningNoUsersFound (Rol_UNK); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -8096,7 +8096,7 @@ void Tst_ShowOneTstResult (void) if (!Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Usr_DONT_GET_PREFS)) Lay_ShowErrorAndExit (Txt_The_user_does_not_exist); if (!Usr_CheckIfICanViewTst (&Gbl.Usrs.Other.UsrDat)) - Act_NoPermissionExit (); + Lay_NoPermissionExit (); /* User */ HTM_TR_Begin (NULL); @@ -8206,7 +8206,7 @@ void Tst_ShowOneTstResult (void) Box_BoxEnd (); } else // I am not allowed to view this test result - Act_NoPermissionExit (); + Lay_NoPermissionExit (); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 214e6393..83770a20 100644 --- a/swad_text.c +++ b/swad_text.c @@ -4393,6 +4393,27 @@ const char *Txt_Configure = "Configurar"; #endif +const char *Txt_Configure_projects = +#if L==1 // ca + "Configurar projectes"; +#elif L==2 // de + "Konfigurieren Projekte"; +#elif L==3 // en + "Configure projects"; +#elif L==4 // es + "Configurar proyectos"; +#elif L==5 // fr + "Configurer projets"; +#elif L==6 // gn + "Configurar proyectos"; // Okoteve traducción +#elif L==7 // it + "Configurare progetti"; +#elif L==8 // pl + "Projekty konfiguracja"; +#elif L==9 // pt + "Configurar projetos"; +#endif + const char *Txt_Configure_tests = #if L==1 // ca "Configurar tests"; @@ -4409,7 +4430,7 @@ const char *Txt_Configure_tests = #elif L==7 // it "Configurare test"; #elif L==8 // pl - "Test Konfiguracja"; + "Test konfiguracja"; #elif L==9 // pt "Configurar testes"; #endif @@ -9833,44 +9854,44 @@ const char *Txt_Edit_rich_text = const char *Txt_Editable = #if L==1 // ca - "Editable"; + "Editables"; #elif L==2 // de - "Bearbeitbar"; + "Bearbeitbare"; #elif L==3 // en "Editable"; #elif L==4 // es - "Editable"; + "Editables"; #elif L==5 // fr - "Éditable"; + "Éditables"; #elif L==6 // gn - "Editable"; // Okoteve traducción + "Editables"; // Okoteve traducción #elif L==7 // it - "Modificabile"; + "Modificabili"; #elif L==8 // pl "Edytowalne"; #elif L==9 // pt - "Editável"; + "Editáveis"; #endif const char *Txt_Editable_by_non_editing_teachers = #if L==1 // ca - "Editable per professors no editors"; + "Editables per professors no editors"; #elif L==2 // de - "Bearbeitbar von nicht bearbeitenden Lehrern"; + "Bearbeitbare von nicht bearbeitenden Lehrern"; #elif L==3 // en "Editable by non-editing teachers"; #elif L==4 // es - "Editable por profesores no editores"; + "Editables por profesores no editores"; #elif L==5 // fr - "Editable par des enseignants non-éditeurs"; + "Éditables par des enseignants non-éditeurs"; #elif L==6 // gn - "Editable por profesores no editores"; // Okoteve traducción + "Editables por profesores no editores"; // Okoteve traducción #elif L==7 // it - "Modificabile da professori non-editing"; + "Modificabili da professori non-editing"; #elif L==8 // pl "Edytowalne przez nauczycieli, którzy nie dokonali edycji"; #elif L==9 // pt - "Editável por professores não editores"; + "Editáveis por professores não editores"; #endif const char *Txt_eg_A_B = diff --git a/swad_timeline.c b/swad_timeline.c index a2da5729..2a154fc7 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -2412,14 +2412,14 @@ void TL_ReceivePostUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Receive and store post, and write updated timeline after publication (user) *****/ TL_ReceivePostGbl (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_ReceivePostGbl (void) @@ -3121,14 +3121,14 @@ void TL_ReceiveCommentUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Receive comment in a note and write updated timeline after commenting (user) *****/ TL_ReceiveCommentGbl (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_ReceiveCommentGbl (void) @@ -3771,7 +3771,7 @@ void TL_RequestRemNoteUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Request the removal of note *****/ TL_RequestRemovalNote (); @@ -3780,7 +3780,7 @@ void TL_RequestRemNoteUsr (void) TL_ShowTimelineUsr (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_RequestRemNoteGbl (void) @@ -3860,7 +3860,7 @@ void TL_RemoveNoteUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Remove a note *****/ TL_RemoveNote (); @@ -3869,7 +3869,7 @@ void TL_RemoveNoteUsr (void) TL_ShowTimelineUsr (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_RemoveNoteGbl (void) @@ -4078,7 +4078,7 @@ void TL_RequestRemComUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Request the removal of comment in note *****/ TL_RequestRemovalComment (); @@ -4087,7 +4087,7 @@ void TL_RequestRemComUsr (void) TL_ShowTimelineUsr (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_RequestRemComGbl (void) @@ -4173,7 +4173,7 @@ void TL_RemoveComUsr (void) Prf_ShowUserProfile (&Gbl.Usrs.Other.UsrDat); /***** Start section *****/ - Lay_StartSection (TL_TIMELINE_SECTION_ID); + HTM_SECTION_Begin (TL_TIMELINE_SECTION_ID); /***** Remove a comment *****/ TL_RemoveComment (); @@ -4182,7 +4182,7 @@ void TL_RemoveComUsr (void) TL_ShowTimelineUsr (); /***** End section *****/ - Lay_EndSection (); + HTM_SECTION_End (); } void TL_RemoveComGbl (void) diff --git a/swad_user.c b/swad_user.c index 2e3440a8..7cce4168 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6194,7 +6194,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumTotalUsrs) { @@ -6233,7 +6233,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (Act_Action_t NextAction,void (*FuncParams Usr_ShowWarningNoUsersFound (Rol_UNK); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -7820,7 +7820,7 @@ void Usr_SeeGuests (void) } /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (Gbl.Usrs.LstUsrs[Rol_GST].NumUsrs) { @@ -7880,7 +7880,7 @@ void Usr_SeeGuests (void) Usr_ShowWarningNoUsersFound (Rol_GST); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -7973,7 +7973,7 @@ void Usr_SeeStudents (void) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (Gbl.Usrs.LstUsrs[Rol_STD].NumUsrs) { @@ -8041,7 +8041,7 @@ void Usr_SeeStudents (void) Usr_ShowWarningNoUsersFound (Rol_STD); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd (); @@ -8142,7 +8142,7 @@ void Usr_SeeTeachers (void) Grp_MY_GROUPS); /***** Start section with user list *****/ - Lay_StartSection (Usr_USER_LIST_SECTION_ID); + HTM_SECTION_Begin (Usr_USER_LIST_SECTION_ID); if (NumUsrs) { @@ -8221,7 +8221,7 @@ void Usr_SeeTeachers (void) Usr_ShowWarningNoUsersFound (Rol_TCH); /***** End section with user list *****/ - Lay_EndSection (); + HTM_SECTION_End (); /***** End box *****/ Box_BoxEnd ();