diff --git a/swad_ID.c b/swad_ID.c index 02e1670cd..e2ac6fbac 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -509,7 +509,7 @@ void ID_ShowFormOthIDs (void) if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ID,NULL); + Lay_StartRoundFrame (NULL,Txt_ID,NULL,NULL); /***** Show user's record *****/ Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); diff --git a/swad_MFU.c b/swad_MFU.c index 9c50aa04b..bad4b1850 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -216,7 +216,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) char TabMenuStr[128+6+128+1]; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_My_frequent_actions,NULL); + Lay_StartRoundFrame (NULL,Txt_My_frequent_actions,NULL,NULL); fprintf (Gbl.F.Out,"
"); /***** Write list of frequently used actions *****/ diff --git a/swad_account.c b/swad_account.c index 63594e25c..02a5adc81 100644 --- a/swad_account.c +++ b/swad_account.c @@ -141,7 +141,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) extern const char *Txt_Check; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Title,NULL); + Lay_StartRoundFrame (NULL,Title,NULL,NULL); /***** Form to request user's ID for possible account already created *****/ Act_FormStart (ActChkUsrAcc); @@ -391,7 +391,7 @@ void Acc_ShowFormGoToRequestNewAccount (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME); - Lay_StartRoundFrame (NULL,Gbl.Title,NULL); + Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL); /***** Button to go to request the creation of a new account *****/ Act_FormStart (ActFrmMyAcc); diff --git a/swad_announcement.c b/swad_announcement.c index c8b0aceaf..804961bd2 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -116,7 +116,8 @@ void Ann_ShowAllAnnouncements (void) /***** Start frame *****/ Lay_StartRoundFrame ("550px",Txt_Announcements, ICanEdit ? Ann_PutIconToAddNewAnnouncement : - NULL); + NULL, + NULL); if (!NumAnnouncements) Lay_ShowAlert (Lay_INFO,Txt_No_announcements); diff --git a/swad_assignment.c b/swad_assignment.c index 17306642f..04611b1dc 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -136,7 +136,8 @@ static void Asg_ShowAllAssignments (void) Pag_WriteLinksToPagesCentered (Pag_ASSIGNMENTS,0,&Pagination); /***** Start frame *****/ - Lay_StartRoundFrame ("100%",Txt_Assignments,Asg_PutIconsListAssignments); + Lay_StartRoundFrame ("100%",Txt_Assignments, + Asg_PutIconsListAssignments,NULL); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) diff --git a/swad_attendance.c b/swad_attendance.c index 28894d484..510e128e0 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -208,7 +208,8 @@ static void Att_ShowAllAttEvents (void) /***** Start frame *****/ Lay_StartRoundFrame ("100%",Txt_Events, ICanEdit ? Att_PutIconToCreateNewAttEvent : - NULL); + NULL, + NULL); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) @@ -2598,7 +2599,8 @@ void Usr_ReqListStdsAttendanceCrs (void) /***** Draw a class photo with students of the course *****/ /* Start frame */ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], + NULL,NULL); /* Form to select type of list used for select several users */ Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt); @@ -3129,7 +3131,8 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, Lay_StartRoundFrame (NULL,Txt_Attendance, (TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList : ((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList : - NULL)); + NULL), + NULL); fprintf (Gbl.F.Out,"", PutButtonShowDetails ? "FRAME_TABLE_MARGIN" : "FRAME_TABLE"); diff --git a/swad_banner.c b/swad_banner.c index e662acbb1..f3c81a2b6 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -86,7 +86,7 @@ void Ban_SeeBanners (void) " ORDER BY ShortName"); /***** Frame head *****/ - Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners); + Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners,NULL); /***** Write all the banners *****/ fprintf (Gbl.F.Out,"
"); diff --git a/swad_calendar.c b/swad_calendar.c index 34e985e90..d019cc9ee 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -73,7 +73,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void) { extern const char *Txt_Calendar; - Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek); + Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,NULL); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40B"); Lay_EndRoundFrame (); } @@ -242,7 +242,8 @@ void Cal_DrawCalendar (void) /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Cal_PutIconToPrintCalendar); + Cal_PutIconToPrintCalendar, + NULL); Lay_WriteHeaderClassPhoto (PrintView,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, diff --git a/swad_centre.c b/swad_centre.c index fec5b857b..f8881ec8c 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -295,7 +295,8 @@ static void Ctr_Configuration (bool PrintView) /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Ctr_PutIconsToPrintAndUpload); + Ctr_PutIconsToPrintAndUpload, + NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
"); @@ -739,7 +740,7 @@ static void Ctr_ListCentres (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName); - Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsListCentres); + Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsListCentres,NULL); if (Gbl.Ctrs.Num) // There are centres in the current institution { @@ -2180,7 +2181,7 @@ void Ctr_RequestPhoto (void) Act_FormStart (ActRecCtrPho); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Photo,NULL); + Lay_StartRoundFrame (NULL,Txt_Photo,NULL,NULL); /***** Write help message *****/ sprintf (Gbl.Message,"%s: %s
" diff --git a/swad_changelog.h b/swad_changelog.h index b15621fac..cf5f44083 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.51 (2016-11-12)" +#define Log_PLATFORM_VERSION "SWAD 16.52 (2016-11-12)" #define CSS_FILE "swad16.51.css" #define JS_FILE "swad16.46.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 16.52: Nov 12, 2016 Code refactoring in frames to include contextual help. (206653 lines) Version 16.51: Nov 12, 2016 Contextual help on the top right corner of frames. (206606 lines) Copy icon/help64x64.png to icon directory diff --git a/swad_chat.c b/swad_chat.c index 26d3db955..baba0a5da 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -116,7 +116,7 @@ void Cht_ShowListOfAvailableChatRooms (void) Usr_GetMyDegrees (); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL); + Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL,NULL); fprintf (Gbl.F.Out,"
" "
    "); diff --git a/swad_connected.c b/swad_connected.c index d298de2b5..9f9059a72 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -98,7 +98,7 @@ void Con_ShowConnectedUsrs (void) Gbl.Now.Date.Day, Gbl.Now.Time.Hour, Gbl.Now.Time.Minute); - Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected); + Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected,NULL); /***** Number of connected users in the whole platform *****/ Con_ShowGlobalConnectedUsrs (); @@ -149,7 +149,7 @@ void Con_ShowLastClicks (void) { extern const char *Txt_Last_clicks_in_real_time; - Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL); + Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL,NULL); fprintf (Gbl.F.Out,"
    "); diff --git a/swad_country.c b/swad_country.c index baf1ac4f3..72d8d077e 100644 --- a/swad_country.c +++ b/swad_country.c @@ -227,7 +227,8 @@ static void Cty_Configuration (bool PrintView) { /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Cty_PutIconToPrint); + Cty_PutIconToPrint, + NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
    "); @@ -515,7 +516,7 @@ void Cty_ListCountries2 (void) const char *BgColor; /***** Table head *****/ - Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconsListCountries); + Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconsListCountries,NULL); fprintf (Gbl.F.Out,"
" ""); for (Order = Cty_ORDER_BY_COUNTRY; diff --git a/swad_course.c b/swad_course.c index 2568e25ef..0a5701197 100644 --- a/swad_course.c +++ b/swad_course.c @@ -189,7 +189,8 @@ static void Crs_Configuration (bool PrintView) /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Crs_PutIconToPrint); + Crs_PutIconToPrint, + NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
"); @@ -538,7 +539,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_My_courses,NULL); + Lay_StartRoundFrame (NULL,Txt_My_courses,NULL,NULL); fprintf (Gbl.F.Out,"
" "
    "); @@ -1179,7 +1180,7 @@ static void Crs_ListCourses (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName); - Lay_StartRoundFrame (NULL,Gbl.Title,Crs_PutIconsListCourses); + Lay_StartRoundFrame (NULL,Gbl.Title,Crs_PutIconsListCourses,NULL); if (Gbl.CurrentDeg.NumCrss) // There are courses in the current degree { @@ -3337,7 +3338,7 @@ void Crs_AskRemoveOldCrss (void) Act_FormStart (ActRemOldCrs); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL); + Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,NULL); /***** Form to request number of months without clicks *****/ fprintf (Gbl.F.Out,"%s ", diff --git a/swad_degree.c b/swad_degree.c index a0f4780af..0b931dc25 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -309,7 +309,8 @@ static void Deg_Configuration (bool PrintView) { /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Deg_PutIconsToPrintAndUpload); + Deg_PutIconsToPrintAndUpload, + NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
    "); @@ -1620,7 +1621,7 @@ static void Deg_ListDegrees (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShrtName); - Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsListDegrees); + Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsListDegrees,NULL); if (Gbl.CurrentCtr.Ctr.Degs.Num) // There are degrees in the current centre { diff --git a/swad_degree_type.c b/swad_degree_type.c index c822e7f56..bd3c604ab 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -199,7 +199,8 @@ static void DT_ListDegreeTypesForSeeing (void) /***** Write heading *****/ Lay_StartRoundFrame (NULL,Txt_Types_of_degree, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"
"); DT_PutHeadDegreeTypesForSeeing (); diff --git a/swad_department.c b/swad_department.c index bc246b7a6..48d80a7d8 100644 --- a/swad_department.c +++ b/swad_department.c @@ -98,7 +98,8 @@ void Dpt_SeeDepts (void) /***** Table head *****/ Lay_StartRoundFrame (NULL,Txt_Departments, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Dpt_PutIconToEditDpts : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"
" ""); for (Order = Dpt_ORDER_BY_DEPARTMENT; diff --git a/swad_duplicate.c b/swad_duplicate.c index 2a867407a..90a7962e4 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -137,7 +137,7 @@ void Dup_ListDuplicateUsrs (void) unsigned NumInformants; /***** Start frame with list of possible duplicate users *****/ - Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL); + Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL,NULL); /***** Build query *****/ sprintf (Query,"SELECT UsrCod,COUNT(*) AS N,MIN(UNIX_TIMESTAMP(InformTime)) AS T" @@ -254,7 +254,7 @@ static void Dup_ListSimilarUsrs (void) unsigned NumUsr; /***** Start frame with list of possible duplicate users *****/ - Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL); + Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL,NULL); /***** Build query *****/ if (Gbl.Usrs.Other.UsrDat.Surname1[0] && diff --git a/swad_enrollment.c b/swad_enrollment.c index 384454a79..6da252b32 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -351,7 +351,7 @@ void Enr_ReqAcceptRegisterInCrs (void) extern const char *Txt_Remove_me_from_this_course; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL); + Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL,NULL); /***** Show message *****/ sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_, @@ -609,7 +609,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role) Lay_StartRoundFrame (NULL, Role == Rol_STUDENT ? Txt_Admin_several_students : Txt_Admin_several_teachers, - NULL); + NULL,NULL); /***** Step 1: List of students to be enrolled / removed *****/ fprintf (Gbl.F.Out,"
" @@ -698,7 +698,7 @@ void Enr_AskRemoveOldUsrs (void) Act_FormStart (ActRemOldUsr); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL); + Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL,NULL); /***** Form to request number of months without clicks *****/ fprintf (Gbl.F.Out,"%s ", @@ -2125,7 +2125,7 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected) Sco_GetScope ("ScopeEnr"); /***** Start frame *****/ - Lay_StartRoundFrame ("100%",Txt_Enrollment_requests,NULL); + Lay_StartRoundFrame ("100%",Txt_Enrollment_requests,NULL,NULL); /***** Selection of scope and roles *****/ /* Start form */ @@ -2913,7 +2913,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role) extern const char *Txt_Admin_one_user; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL); + Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL,NULL); /***** Write form to request another user's ID *****/ Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd : diff --git a/swad_exam.c b/swad_exam.c index 312f06885..766bb7d14 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -554,7 +554,8 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx Gbl.ExamAnnouncements.HighlightDate[0]) ? Txt_All_announcements_of_exam : Txt_Announcements_of_exam, ICanEdit ? Exa_PutIconToCreateNewExamAnnouncement : - NULL); + NULL, + NULL); /***** The result of the query may be empty *****/ if (!NumExaAnns) @@ -932,7 +933,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t Gbl.ExamAnnouncements.ExaCodToEdit = ExaCod; // Used as parameter in contextual links Lay_StartRoundFrame ("625px",NULL, TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement : - NULL); + NULL, + NULL); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { diff --git a/swad_file_browser.c b/swad_file_browser.c index 40f81f9ac..16e0a24b7 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3063,7 +3063,7 @@ void Brw_AskEditWorksCrs (void) Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs,NULL)) { /***** Draw class photos to select users *****/ - Lay_StartRoundFrame (NULL,Txt_Users,NULL); + Lay_StartRoundFrame (NULL,Txt_Users,NULL,NULL); /* Form to select type of list used for select several users */ Usr_ShowFormsToSelectUsrListType (ActReqAsgWrkCrs); @@ -3585,7 +3585,7 @@ static void Brw_ShowFileBrowser (void) Gbl.FileBrowser.Id++; fprintf (Gbl.F.Out,"
",Gbl.FileBrowser.Id); Lay_StartRoundFrame ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type], - Brw_PutIconsFileBrowser); + Brw_PutIconsFileBrowser,NULL); /***** Subtitle *****/ Brw_WriteSubtitleOfFileBrowser (); @@ -8027,7 +8027,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL); + Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL,NULL); sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); @@ -8062,7 +8062,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) /***** Start frame *****/ fprintf (Gbl.F.Out,"
"); - Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL); + Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL,NULL); /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_upload_new_files_to_the_folder_X, @@ -8150,7 +8150,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) /***** Start frame *****/ fprintf (Gbl.F.Out,"
"); - Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL); + Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL,NULL); /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_upload_a_new_file_to_the_folder_X, @@ -8218,7 +8218,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Paste,NULL); + Lay_StartRoundFrame (NULL,Txt_Paste,NULL,NULL); /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X, @@ -8266,7 +8266,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Create_link,NULL); + Lay_StartRoundFrame (NULL,Txt_Create_link,NULL,NULL); /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X, @@ -11764,7 +11764,7 @@ void Brw_AskRemoveOldFiles (void) Brw_PutParamsContextualLink (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL); + Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL,NULL); /***** Form to request number of months (to remove files older) *****/ fprintf (Gbl.F.Out,"%s ", diff --git a/swad_follow.c b/swad_follow.c index 6280a292d..f54cf9e1c 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -224,7 +224,7 @@ void Fol_SuggestWhoToFollow (void) if (NumUsrs) { /***** Start frame *****/ - Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow); + Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,NULL); /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&UsrDat); diff --git a/swad_forum.c b/swad_forum.c index 647c467c6..6bd4b744a 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -972,7 +972,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) ReadTimeUTC = For_GetThrReadTime (ThrCod); /* Table start */ - Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums); + Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums,NULL); /* Put a form to select which forums */ For_PutFormWhichForums (); @@ -1740,7 +1740,7 @@ void For_ShowForumList (void) Usr_GetMyInstits (); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums); + Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums,NULL); /***** Put a form to select which forums *****/ For_PutFormWhichForums (); @@ -2591,7 +2591,7 @@ void For_ShowForumThrs (void) /***** Header whith the name of this forum, the number of threads, and the total number of posts *****/ /* Table start */ - Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums); + Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums,NULL); /* Put a form to select which forums */ For_PutFormWhichForums (); @@ -3807,7 +3807,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) Lay_StartRoundFrame (NULL, IsReply ? Txt_New_message : Txt_New_thread, - NULL); + NULL,NULL); /***** Start form *****/ if (IsReply) // Form to write a reply to a message of an existing thread diff --git a/swad_group.c b/swad_group.c index d593ee263..e30722b4f 100644 --- a/swad_group.c +++ b/swad_group.c @@ -243,7 +243,8 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_Groups, ICanEdit ? Grp_PutIconToEditGroups : - NULL); + NULL, + NULL); /***** Start form to update the students listed depending on the groups selected *****/ @@ -1570,7 +1571,8 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_My_groups, ICanEdit ? Grp_PutIconToEditGroups : - NULL); + NULL, + NULL); if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups { diff --git a/swad_holiday.c b/swad_holiday.c index 0373add03..b8199f65b 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -94,7 +94,8 @@ void Hld_SeeHolidays (void) /***** Table head *****/ Lay_StartRoundFrame (NULL,Txt_Holidays, Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"
" ""); for (Order = Hld_ORDER_BY_PLACE; diff --git a/swad_icon.c b/swad_icon.c index 36a799246..4e598992b 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -75,7 +75,7 @@ void Ico_PutIconsToSelectIconSet (void) extern const char *Txt_Icons; Ico_IconSet_t IconSet; - Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet); + Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet,NULL); fprintf (Gbl.F.Out,"
" ""); for (IconSet = (Ico_IconSet_t) 0; diff --git a/swad_indicator.c b/swad_indicator.c index 09cf957b3..d94361304 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -103,7 +103,7 @@ void Ind_ReqIndicatorsCourses (void) Ind_GetParamsIndicators (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL); + Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL,NULL); /***** Form to update indicators *****/ /* Start form */ diff --git a/swad_info.c b/swad_info.c index 8127590a2..a2fab36f4 100644 --- a/swad_info.c +++ b/swad_info.c @@ -401,7 +401,8 @@ void Inf_ShowInfo (void) { Lay_StartRoundFrame ("100%",Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : - NULL); + NULL, + NULL); Lay_ShowAlert (Lay_INFO,Txt_No_information); if (ICanEdit) Inf_PutButtonToEditInfo (); @@ -996,7 +997,8 @@ static void Inf_ShowPage (const char *URL) /***** Start of frame *****/ Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : - NULL); + NULL, + NULL); /***** Link to view in a new window *****/ fprintf (Gbl.F.Out,"", @@ -1733,7 +1735,8 @@ static bool Inf_CheckAndShowPlainTxt (void) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : - NULL); + NULL, + NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) @@ -1805,7 +1808,8 @@ static bool Inf_CheckAndShowRichTxt (void) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : - NULL); + NULL, + NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) @@ -1979,7 +1983,8 @@ void Inf_EditPlainTxtInfo (void) /***** Start form and frame *****/ Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]); - Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL); + Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], + NULL,NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) @@ -2018,7 +2023,8 @@ void Inf_EditRichTxtInfo (void) /***** Start form and frame *****/ Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]); - Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL); + Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], + NULL,NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) diff --git a/swad_institution.c b/swad_institution.c index 5dbc5747b..767175586 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -293,7 +293,8 @@ static void Ins_Configuration (bool PrintView) { /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Ins_PutIconsToPrintAndUpload); + Ins_PutIconsToPrintAndUpload, + NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
"); @@ -662,7 +663,7 @@ static void Ins_ListInstitutions (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsListInstitutions); + Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsListInstitutions,NULL); if (Gbl.Inss.Num) // There are institutions in the current country { diff --git a/swad_layout.c b/swad_layout.c index 670bb25a6..947e61061 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1239,7 +1239,7 @@ void Lay_WriteTitle (const char *Title) void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding, const char *Title) { - Lay_StartRoundFrame (Width,Title,NULL); + Lay_StartRoundFrame (Width,Title,NULL,NULL); fprintf (Gbl.F.Out,"
"); } - // if (HelpLink) - // { - fprintf (Gbl.F.Out,"
"); - - fprintf (Gbl.F.Out,"", - "https://github.com/acanas/swad-core/wiki/User%20guide"); + if (HelpLink) + { + fprintf (Gbl.F.Out,"
" + "", + HelpLink); Lay_PutIconWithText ("help64x64.png",Txt_Help,NULL); - fprintf (Gbl.F.Out,""); - - fprintf (Gbl.F.Out,"
"); - // } + fprintf (Gbl.F.Out,"" + "
"); + } fprintf (Gbl.F.Out,""); if (Title) diff --git a/swad_layout.h b/swad_layout.h index 1b5808284..7a53f0897 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -97,7 +97,8 @@ void Lay_PutRemoveButtonInline (const char *Text); void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding, const char *Title); void Lay_StartRoundFrame (const char *Width,const char *Title, - void (*FunctionToDrawContextualIcons) (void)); + void (*FunctionToDrawContextualIcons) (void), + const char *HelpLink); void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding); void Lay_EndRoundFrameTable (void); void Lay_EndRoundFrame (void); diff --git a/swad_link.c b/swad_link.c index 5e962a4af..a4cfa5944 100644 --- a/swad_link.c +++ b/swad_link.c @@ -85,7 +85,8 @@ void Lnk_SeeLinks (void) { Lay_StartRoundFrame (NULL,Txt_Links, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Lnk_PutIconToEditLinks : - NULL); + NULL, + NULL); Lnk_WriteListOfLinks (); Lay_EndRoundFrame (); } diff --git a/swad_logo.c b/swad_logo.c index 5c19938bb..0f009a92c 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -283,7 +283,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) Act_FormStart (ActionRec); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Logo,NULL); + Lay_StartRoundFrame (NULL,Txt_Logo,NULL,NULL); /***** Write help message *****/ sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y, diff --git a/swad_mail.c b/swad_mail.c index c55f2681c..1e5fbc954 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -103,7 +103,8 @@ void Mai_SeeMailDomains (void) /***** Table head *****/ Lay_StartRoundFrame (NULL,Txt_Mail_domains_allowed_for_notifications, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"
" ""); for (Order = Mai_ORDER_BY_DOMAIN; @@ -1122,7 +1123,7 @@ void Mai_ShowFormOthEmail (void) if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Email,NULL); + Lay_StartRoundFrame (NULL,Txt_Email,NULL,NULL); /***** Show user's record *****/ Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); @@ -1524,7 +1525,7 @@ void Mai_PutButtonToCheckEmailAddress (void) Act_FormStart (ActFrmMyAcc); /***** Frame with button to go to account *****/ - Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL); + Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL,NULL); Lay_ShowAlert (Lay_WARNING,Txt_Please_check_and_confirm_your_email_address); Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Check); diff --git a/swad_menu.c b/swad_menu.c index 4ecb6fbe8..80e210a6c 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -311,7 +311,7 @@ void Mnu_PutIconsToSelectMenu (void) extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS]; Mnu_Menu_t Menu; - Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu); + Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu,NULL); fprintf (Gbl.F.Out,"
" ""); for (Menu = (Mnu_Menu_t) 0; diff --git a/swad_message.c b/swad_message.c index 9a932158c..e38c2bd6b 100644 --- a/swad_message.c +++ b/swad_message.c @@ -202,7 +202,7 @@ static void Msg_PutFormMsgUsrs (char *Content) Lay_StartRoundFrame (NULL, Gbl.Msg.Reply.IsReply ? Txt_Reply_message : Txt_New_message, - NULL); + NULL,NULL); if (Gbl.Msg.ShowOnlyOneRecipient) /***** Form to show several potential recipients *****/ @@ -1716,7 +1716,7 @@ static void Msg_ShowSentOrReceivedMessages (void) /***** Start frame with messages *****/ Lay_StartRoundFrame ("97%", Msg_WriteNumMsgs (NumUnreadMsgs), - Msg_PutIconsListMsgs); + Msg_PutIconsListMsgs,NULL); if (Gbl.Msg.NumMsgs) // If there are messages... { diff --git a/swad_network.c b/swad_network.c index 3be0ea4bc..302d6dd67 100644 --- a/swad_network.c +++ b/swad_network.c @@ -296,7 +296,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) /***** Start table *****/ Lay_StartRoundFrame (NULL,Txt_Webs_social_networks, - Net_PutIconsWebsSocialNetworks); + Net_PutIconsWebsSocialNetworks,NULL); fprintf (Gbl.F.Out,"
"); for (NumURL = (Net_WebsAndSocialNetworks_t) 0; diff --git a/swad_notice.c b/swad_notice.c index d48e572c0..086ea5570 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -393,7 +393,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing) Lay_StartRoundFrame (StrWidth, Gbl.CurrentCrs.Notices.HighlightNotCod > 0 ? Txt_All_notices : Txt_Notices, - Not_PutIconsListNotices); + Not_PutIconsListNotices,NULL); if (!NumNotices) Lay_ShowAlert (Lay_INFO,Txt_No_notices); } diff --git a/swad_notification.c b/swad_notification.c index 21fe7bf99..6c7f69675 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -371,7 +371,7 @@ void Ntf_ShowMyNotifications (void) Usr_UsrDataConstructor (&UsrDat); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif); + Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL); fprintf (Gbl.F.Out,"
" "" "
" @@ -1880,7 +1880,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Ntf_NotifyEvent_t NotifyEvent; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif); + Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL); /***** Start form *****/ Act_FormStart (ActChgNtfPrf); diff --git a/swad_password.c b/swad_password.c index 0b1ad05bb..facfe166d 100644 --- a/swad_password.c +++ b/swad_password.c @@ -244,7 +244,7 @@ void Pwd_ShowFormSendNewPwd (void) Act_FormStart (ActSndNewPwd); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL); + Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL,NULL); /***** Help text *****/ Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_); @@ -804,7 +804,7 @@ void Pwd_ShowFormOthPwd (void) if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Password,NULL); + Lay_StartRoundFrame (NULL,Txt_Password,NULL,NULL); /***** Show user's record *****/ Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); diff --git a/swad_photo.c b/swad_photo.c index 7aabd4ea3..a5e2eb582 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -311,7 +311,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_Photo, ItsMe ? Pho_PutIconToRequestRemoveMyPhoto : - Pho_PutIconToRequestRemoveOtherUsrPhoto); + Pho_PutIconToRequestRemoveOtherUsrPhoto, + NULL); /***** Start form *****/ if (ItsMe) @@ -425,7 +426,8 @@ void Pho_ReqRemoveMyPhoto (void) if (Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Photo,Pho_PutIconToRequestRemoveMyPhoto); + Lay_StartRoundFrame (NULL,Txt_Photo, + Pho_PutIconToRequestRemoveMyPhoto,NULL); /***** Show current photo and help message *****/ Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL, @@ -490,7 +492,8 @@ void Pho_ReqRemoveUsrPhoto (void) if (Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Photo,Pho_PutIconToRequestRemoveOtherUsrPhoto); + Lay_StartRoundFrame (NULL,Txt_Photo, + Pho_PutIconToRequestRemoveOtherUsrPhoto,NULL); Pho_ShowUsrPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL, "PHOTO186x248",Pho_NO_ZOOM,false); @@ -2037,7 +2040,8 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_Degrees, SeeOrPrint == Pho_DEGREES_SEE ? Pho_PutIconToPrintDegreeStats : - NULL); + NULL, + NULL); if (NumRows) // Degrees with students found { @@ -2129,7 +2133,8 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_Degrees, SeeOrPrint == Pho_DEGREES_SEE ? Pho_PutIconToPrintDegreeStats : - NULL); + NULL, + NULL); if (NumRows) // Degrees with students found { diff --git a/swad_place.c b/swad_place.c index 8fcc8d1c9..42a4afe8c 100644 --- a/swad_place.c +++ b/swad_place.c @@ -95,7 +95,8 @@ void Plc_SeePlaces (void) /***** Table head *****/ Lay_StartRoundFrame (NULL,Txt_Places, Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEditPlaces : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"" ""); for (Order = Plc_ORDER_BY_PLACE; diff --git a/swad_plugin.c b/swad_plugin.c index a42c8e571..f5a2dcccf 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -93,7 +93,8 @@ void Plg_ListPlugins (void) /***** Table start *****/ Lay_StartRoundFrame (NULL,Txt_Plugins, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Plg_PutIconToEditPlugins : - NULL); + NULL, + NULL); /***** Write table heading *****/ fprintf (Gbl.F.Out,"
" diff --git a/swad_preference.c b/swad_preference.c index 50a0ca8a9..9d247a5e7 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -73,7 +73,7 @@ void Pre_EditPrefs (void) fprintf (Gbl.F.Out,"
" "" "
"); - Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage); + Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage,NULL); fprintf (Gbl.F.Out,"
"); Pre_PutSelectorToSelectLanguage (); // 1. Language fprintf (Gbl.F.Out,"
"); @@ -380,7 +380,7 @@ static void Pre_PutIconsToSelectSideCols (void) extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; unsigned SideCols; - Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns); + Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns,NULL); fprintf (Gbl.F.Out,"" ""); for (SideCols = 0; diff --git a/swad_privacy.c b/swad_privacy.c index 6bdd3eaa2..186d1122e 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -101,7 +101,7 @@ void Pri_EditMyPrivacy (void) Lay_ShowAlert (Lay_WARNING,Txt_Please_review_your_privacy_preferences); /***** Start table *****/ - Lay_StartRoundFrame (NULL,Txt_Privacy,Pri_PutIconsPrivacy); + Lay_StartRoundFrame (NULL,Txt_Privacy,Pri_PutIconsPrivacy,NULL); fprintf (Gbl.F.Out,"
"); /***** Edit photo visibility *****/ diff --git a/swad_profile.c b/swad_profile.c index 5e151933d..ab1838fb0 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -168,7 +168,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna Act_FormStart (ActSeePubPrf); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_View_public_profile,NULL); + Lay_StartRoundFrame (NULL,Txt_View_public_profile,NULL,NULL); /***** Form to request user's @nickname *****/ fprintf (Gbl.F.Out,"
"); diff --git a/swad_report.c b/swad_report.c index c891047b0..3f68560db 100644 --- a/swad_report.c +++ b/swad_report.c @@ -154,7 +154,7 @@ void Rep_ReqMyUsageReport (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME); - Lay_StartRoundFrame (NULL,Gbl.Title,NULL); + Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL); /***** Header *****/ Req_TitleReport (NULL); // NULL means do not write date @@ -258,7 +258,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME); - Lay_StartRoundFrame (NULL,Gbl.Title,NULL); + Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL); /***** Header *****/ Req_TitleReport (&Report->CurrentTimeUTC); diff --git a/swad_search.c b/swad_search.c index 93a62dfb0..0566e1c23 100644 --- a/swad_search.c +++ b/swad_search.c @@ -231,7 +231,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco /***** Start form *****/ fprintf (Gbl.F.Out,"
"); Act_FormStart (Action); - Lay_StartRoundFrame (NULL,Txt_Search,NULL); + Lay_StartRoundFrame (NULL,Txt_Search,NULL,NULL); /***** Scope (whole platform, current country, current institution, current centre, current degree or current course) *****/ diff --git a/swad_social.c b/swad_social.c index 3613d04ac..4c0a6a23c 100644 --- a/swad_social.c +++ b/swad_social.c @@ -852,7 +852,7 @@ static void Soc_ShowTimeline (const char *Query,const char *Title, NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline"); /***** Start frame *****/ - Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline); + Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline,NULL); /***** Form to write a new post *****/ if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0 || // Global timeline @@ -1096,7 +1096,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot, /***** Start frame ****/ if (ShowNoteAlone) { - Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL); + Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL); fprintf (Gbl.F.Out,"
    "); } @@ -2349,7 +2349,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom, if (ShowCommentAlone) { - Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL); + Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL); /***** Write sharer/commenter if distinct to author *****/ Soc_WriteTopMessage (TopMessage,UsrCod); diff --git a/swad_statistic.c b/swad_statistic.c index d5da306b9..63fc8a262 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -438,7 +438,7 @@ void Sta_AskShowCrsHits (void) /***** Start frame *****/ sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X, Gbl.CurrentCrs.Crs.ShrtName); - Lay_StartRoundFrame (NULL,Gbl.Title,NULL); + Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL); /***** Form to select type of list used for select several users *****/ Usr_ShowFormsToSelectUsrListType (ActReqAccCrs); @@ -609,7 +609,7 @@ void Sta_AskShowGblHits (void) /***** Start frame *****/ fprintf (Gbl.F.Out,"
    "); - Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL); + Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL,NULL); fprintf (Gbl.F.Out,"
"); /***** Start and end dates for the search *****/ @@ -1360,9 +1360,11 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse) /* Write start of table frame */ fprintf (Gbl.F.Out,"
"); if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST) - Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks,NULL); + Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks, + NULL,NULL); else - Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],NULL); + Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType], + NULL,NULL); fprintf (Gbl.F.Out,"" @@ -4712,7 +4714,7 @@ static void Sta_GetAndShowInstitutionsStats (void) Usr_GetAndUpdatePrefsAboutUsrList (); /***** Form to select type of list used to display degree photos *****/ - Lay_StartRoundFrame (NULL,Txt_Institutions,NULL); + Lay_StartRoundFrame (NULL,Txt_Institutions,NULL,NULL); Usr_ShowFormsToSelectUsrListType (ActSeeUseGbl); Lay_EndRoundFrame (); diff --git a/swad_survey.c b/swad_survey.c index 580bdb3ab..2543f088a 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -211,7 +211,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) Pag_WriteLinksToPagesCentered (Pag_SURVEYS,0,&Pagination); /***** Start frame *****/ - Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys); + Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys,NULL); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) @@ -2648,10 +2648,10 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch sprintf (Gbl.Title,"%s %u", Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,... - Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst); + Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst,NULL); } else - Lay_StartRoundFrame (NULL,Txt_New_question,NULL); + Lay_StartRoundFrame (NULL,Txt_New_question,NULL,NULL); /***** Start form *****/ Act_FormStart (ActRcvSvyQst); @@ -3174,7 +3174,8 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ Gbl.Svys.SvyCodToEdit = Svy->SvyCod; Lay_StartRoundFrame (NULL,Txt_Questions, Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion : - NULL); + NULL, + NULL); if (NumQsts) { diff --git a/swad_syllabus.c b/swad_syllabus.c index 885116124..e5422534b 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -237,7 +237,8 @@ bool Syl_CheckAndEditSyllabus (void) PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive; Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], PutIconToEdit ? Inf_PutIconToEditInfo : - NULL); + NULL, + NULL); fprintf (Gbl.F.Out,"
"); diff --git a/swad_test.c b/swad_test.c index 055c54fdd..ea0f4195a 100644 --- a/swad_test.c +++ b/swad_test.c @@ -301,7 +301,7 @@ void Tst_ShowFormAskTst (void) } /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests); + Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests,NULL); /***** Get tags *****/ if ((NumRows = Tst_GetEnabledTagsFromThisCrs (&mysql_res)) != 0) @@ -411,7 +411,7 @@ void Tst_ShowNewTestExam (void) Tst_UpdateMyNumAccessTst (NumAccessesTst); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Test,NULL); + Lay_StartRoundFrame (NULL,Txt_Test,NULL,NULL); Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, @@ -506,7 +506,7 @@ void Tst_AssessTestExam (void) TstCod = Tst_CreateTestExamInDB (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Test_result,NULL); + Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,NULL); Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, @@ -653,7 +653,7 @@ static bool Tst_CheckIfNextTstAllowed (void) if (NumSecondsFromNowToNextAccTst > 0) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Test,NULL); + Lay_StartRoundFrame (NULL,Txt_Test,NULL,NULL); Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, @@ -1248,7 +1248,7 @@ void Tst_ShowFormAskEditTsts (void) fprintf (Gbl.F.Out,""); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests); + Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests,NULL); /***** Get tags already present in the table of questions *****/ if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) @@ -1811,7 +1811,7 @@ static void Tst_ShowFormConfigTst (void) Tst_GetConfigTstFromDB (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests); + Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests,NULL); /***** Start form *****/ Act_FormStart (ActRcvCfgTst); @@ -2662,7 +2662,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m double TotalScoreThisQst; /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests); + Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests,NULL); /***** Write the heading *****/ fprintf (Gbl.F.Out,"
" @@ -4445,10 +4445,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) if (Gbl.Test.QstCod > 0) // The question already has assigned a code { sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod); - Lay_StartRoundFrame (NULL,Title,Tst_PutIconToRemoveOneQst); + Lay_StartRoundFrame (NULL,Title,Tst_PutIconToRemoveOneQst,NULL); } else - Lay_StartRoundFrame (NULL,Txt_New_question,NULL); + Lay_StartRoundFrame (NULL,Txt_New_question,NULL,NULL); /***** Start form *****/ Act_FormStart (ActRcvTstQst); @@ -6856,7 +6856,7 @@ void Tst_SelUsrsToSeeUsrsExams (void) if (Usr_GetIfShowBigList (NumTotalUsrs,NULL)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Exams,NULL); + Lay_StartRoundFrame (NULL,Txt_Exams,NULL,NULL); /***** Form to select type of list used for select several users *****/ Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstExa); @@ -7474,7 +7474,7 @@ void Tst_ShowOneExam (void) Tst_GetExamQuestionsFromDB (TstCod); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Test_result,NULL); + Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,NULL); Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, diff --git a/swad_test_import.c b/swad_test_import.c index 7953dbeb6..43b577367 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -135,7 +135,7 @@ void TsI_ShowFormImportQstsFromXML (void) extern const char *Txt_XML_file; /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL); + Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL,NULL); /***** Write help message *****/ Lay_ShowAlert (Lay_INFO,Txt_You_need_an_XML_file_containing_a_list_of_questions); diff --git a/swad_theme.c b/swad_theme.c index 266beda96..092141794 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -254,7 +254,7 @@ void The_PutIconsToSelectTheme (void) extern const char *Txt_Theme_SKIN; The_Theme_t Theme; - Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme); + Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme,NULL); fprintf (Gbl.F.Out,"
" ""); for (Theme = (The_Theme_t) 0; diff --git a/swad_timetable.c b/swad_timetable.c index 1d0d21cf7..d7bee6e0a 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -258,7 +258,8 @@ void TT_ShowClassTimeTable (void) (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons : - NULL); + NULL, + NULL); /***** Start time table drawing *****/ if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE) @@ -340,7 +341,7 @@ void TT_EditCrsTimeTable (void) /***** Editable time table *****/ Gbl.TimeTable.Type = TT_COURSE_TIMETABLE; Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - TT_PutIconToViewCrsTT); + TT_PutIconToViewCrsTT,NULL); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); Lay_EndRoundFrame (); } @@ -356,7 +357,7 @@ void TT_ShowMyTutTimeTable (void) /***** Time table *****/ Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE; Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - TT_PutIconToViewMyTT); + TT_PutIconToViewMyTT,NULL); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); Lay_EndRoundFrame (); } diff --git a/swad_user.c b/swad_user.c index 07f8025a8..aeeb10243 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6258,7 +6258,8 @@ void Usr_ListDataAdms (void) Usr_GetAdmsLst (Gbl.Scope.Current); /***** Start frame with list of administrators *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], + NULL,NULL); /***** Form to select range of administrators *****/ fprintf (Gbl.F.Out,"
" @@ -6734,7 +6735,8 @@ void Usr_SeeGuests (void) Usr_GetListsSelectedUsrsCods (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],Usr_PutIconsListGsts); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], + Usr_PutIconsListGsts,NULL); /***** Form to select range of guests *****/ switch (Gbl.Usrs.Me.LoggedRole) @@ -6878,7 +6880,8 @@ void Usr_SeeStudents (void) Usr_GetListsSelectedUsrsCods (); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],Usr_PutIconsListStds); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], + Usr_PutIconsListStds,NULL); /***** Form to select range of students *****/ switch (Gbl.Usrs.Me.LoggedRole) @@ -7031,7 +7034,8 @@ void Usr_SeeTeachers (void) if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs,NULL)) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],Usr_PutIconsListTchs); + Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN], + Usr_PutIconsListTchs,NULL); /***** Form to select scope *****/ fprintf (Gbl.F.Out,"
"); @@ -7279,7 +7283,7 @@ void Usr_SeeGstClassPhotoPrn (void) if (Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs) { /***** Draw the guests' class photo *****/ - Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_StartRoundFrame (NULL,NULL,NULL,NULL); Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CTR || Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : @@ -7321,7 +7325,7 @@ void Usr_SeeStdClassPhotoPrn (void) if (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs) { /***** Draw the students' class photo *****/ - Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_StartRoundFrame (NULL,NULL,NULL,NULL); Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG || @@ -7377,7 +7381,7 @@ void Usr_SeeTchClassPhotoPrn (void) if (Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs) { /***** Draw the teachers' class photo *****/ - Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_StartRoundFrame (NULL,NULL,NULL,NULL); Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG ||