diff --git a/css/swad_desktop.css b/css/swad_desktop.css index d2ef44161..ccebdda8b 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -330,7 +330,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .FRAME10 { margin:0; - padding:0; + padding:10px; background-color:white; border-radius:4px; box-shadow:1px 1px 1px #CCC; @@ -341,7 +341,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} .FRAME10_SHADOW { margin:4px 0 14px 0; - padding:0; + padding:10px; background-color:rgba(255,255,255,0.95); border-width:1px; border-style:solid; @@ -354,12 +354,11 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} } .TABLE10 { - padding:10px; width:100%; } .TIT_TBL_10 { - margin:20px 10px 10px 10px; + margin:10px; color:#808080; font-size:16pt; font-weight:bold; diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 508cd26bd..9dc0b138d 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -294,7 +294,7 @@ form {margin:0; display:inline;} .FRAME10 { margin:0; - padding:0; + padding:10px; background-color:white; border-radius:8px; box-shadow:1px 1px 1px #CCC; @@ -305,7 +305,7 @@ form {margin:0; display:inline;} .FRAME10_SHADOW { margin:4px 0 14px 0; - padding:0; + padding:10px; background-color:rgba(255,255,255,0.95); border-width:1px; border-style:solid; @@ -318,12 +318,11 @@ form {margin:0; display:inline;} } .TABLE10 { - padding:10px; width:100%; } .TIT_TBL_10 { - margin:20px 10px 10px 10px; + margin:10px; color:#808080; font-size:20pt; font-weight:bold; diff --git a/swad_QR.c b/swad_QR.c index 9b975f1a6..eedb83caa 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -81,7 +81,7 @@ void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText) sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname); Par_PutHiddenParamString ("QRString",NicknameWithArroba); Act_LinkFormSubmit (Txt_QR_code,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("qr",Txt_QR_code,PrintText ? Txt_QR_code : + Lay_PutIconWithText ("qr",Txt_QR_code,PrintText ? Txt_QR_code : NULL); Act_FormEnd (); } diff --git a/swad_account.c b/swad_account.c index ea4a6e6a6..d273db0f5 100644 --- a/swad_account.c +++ b/swad_account.c @@ -124,7 +124,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith fprintf (Gbl.F.Out,"
"); Act_FormStart (ActCreUsrAcc); sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); /***** Nickname *****/ if (NewNicknameWithoutArroba[0]) @@ -168,7 +168,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith Pwd_PutFormToGetNewPasswordTwice (); /***** Send button and form end *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_account); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account); Act_FormEnd (); fprintf (Gbl.F.Out,"
"); } @@ -205,7 +205,7 @@ void Acc_ShowFormChangeMyAccount (void) fprintf (Gbl.F.Out,""); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_User_account); + Lay_StartRoundFrameTable (NULL,2,Txt_User_account); /***** Nickname *****/ Nck_ShowFormChangeUsrNickname (); @@ -223,7 +223,7 @@ void Acc_ShowFormChangeMyAccount (void) ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true); /***** End of table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } diff --git a/swad_action.c b/swad_action.c index 794df378e..968e9204b 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4328,7 +4328,7 @@ void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (), if (FuncParams) FuncParams (); Act_LinkFormSubmit (Title,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon (Icon,Title,Title); + Lay_PutIconWithText (Icon,Title,Title); Act_FormEnd (); } @@ -4339,7 +4339,7 @@ void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (), void Act_PutIconLink (const char *Icon,const char *Title) { Act_LinkFormSubmit (Title,NULL); - Lay_PutSendIcon (Icon,Title,NULL); + Lay_PutIconWithText (Icon,Title,NULL); Act_FormEnd (); } @@ -4705,7 +4705,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) char ActionStr[128]; /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Frequent_actions); + Lay_StartRoundFrameTable (NULL,0,Txt_Frequent_actions); /***** Write list of frequently used actions *****/ for (NumAct = 0; @@ -4738,7 +4738,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ diff --git a/swad_announcement.c b/swad_announcement.c index 71eca242d..af434cc0b 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -318,7 +318,7 @@ void Ann_ShowFormAnnouncement (void) Act_FormStart (ActRcvAnn); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_announcement); + Lay_StartRoundFrameTable (NULL,2,Txt_New_announcement); /***** Message subject and body *****/ fprintf (Gbl.F.Out,"" @@ -359,7 +359,7 @@ void Ann_ShowFormAnnouncement (void) ""); /***** Button to create announcement and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_announcement); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_announcement); /***** End form *****/ Act_FormEnd (); diff --git a/swad_assignment.c b/swad_assignment.c index 86359bc65..64d0228cb 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -143,7 +143,7 @@ static void Asg_ShowAllAssignments (void) Pag_WriteLinksToPagesCentered (Pag_ASSIGNMENTS,0,&Pagination); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Assignments); + Lay_StartRoundFrameTable (NULL,2,Txt_Assignments); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) @@ -198,7 +198,7 @@ static void Asg_ShowAllAssignments (void) Asg_ShowOneAssignment (Gbl.Asgs.LstAsgCods[NumAsg-1]); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -1119,8 +1119,8 @@ void Asg_RequestCreatOrEditAsg (void) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,2,ItsANewAssignment ? Txt_New_assignment : - Txt_Edit_assignment); + Lay_StartRoundFrameTable (NULL,2,ItsANewAssignment ? Txt_New_assignment : + Txt_Edit_assignment); /***** Assignment title *****/ fprintf (Gbl.F.Out,"" @@ -1211,9 +1211,9 @@ void Asg_RequestCreatOrEditAsg (void) /***** New assignment *****/ if (ItsANewAssignment) - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_assignment); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_assignment); else - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Act_FormEnd (); /***** Show current assignments *****/ @@ -1243,7 +1243,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) "" "", Txt_Groups); - Lay_StartRoundFrameTable10 ("100%",0,NULL); + Lay_StartRoundFrameTable ("100%",0,NULL); /***** First row: checkbox to select the whole course *****/ fprintf (Gbl.F.Out,"" @@ -1264,7 +1264,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); fprintf (Gbl.F.Out,"" ""); } diff --git a/swad_attendance.c b/swad_attendance.c index c87d0f615..ab51370dd 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -177,7 +177,7 @@ static void Att_ShowAllAttEvents (void) Pag_WriteLinksToPagesCentered (Pag_ATT_EVENTS,0,&Pagination); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Events); + Lay_StartRoundFrameTable (NULL,2,Txt_Events); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) @@ -228,7 +228,7 @@ static void Att_ShowAllAttEvents (void) Att_ShowOneAttEvent (&Gbl.AttEvents.Lst[NumAttEvent-1],false); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -1085,8 +1085,8 @@ void Att_RequestCreatOrEditAttEvent (void) Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,2,ItsANewAttEvent ? Txt_New_event : - Txt_Edit_event); + Lay_StartRoundFrameTable (NULL,2,ItsANewAttEvent ? Txt_New_event : + Txt_Edit_event); /***** Attendance event title *****/ fprintf (Gbl.F.Out,"" @@ -1185,9 +1185,9 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Button and end frame *****/ if (ItsANewAttEvent) - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_event); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event); else - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); /***** End form *****/ Act_FormEnd (); @@ -1219,7 +1219,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) "" "", Txt_Groups); - Lay_StartRoundFrameTable10 ("100%",0,NULL); + Lay_StartRoundFrameTable ("100%",0,NULL); /***** First row: checkbox to select the whole course *****/ fprintf (Gbl.F.Out,"" @@ -1240,7 +1240,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); fprintf (Gbl.F.Out,"" ""); } @@ -1847,10 +1847,10 @@ void Att_SeeOneAttEvent (void) Pag_GetParamPagNum (Pag_ATT_EVENTS); /***** Show attendance *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Event); + Lay_StartRoundFrameTable (NULL,2,Txt_Event); Att.AttCod = Gbl.AttEvents.AttCod; Att_ShowOneAttEvent (&Att,true); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); switch (Gbl.Usrs.Me.LoggedRole) { @@ -1891,7 +1891,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) /***** List students' data *****/ /* Header */ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); fprintf (Gbl.F.Out,"" "" "" @@ -1917,7 +1917,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att) Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att); /* Footer */ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); if (Att->Open) { @@ -1963,7 +1963,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) /***** List students' data *****/ /* Header */ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Attendance); + Lay_StartRoundFrameTable (NULL,2,Txt_Attendance); fprintf (Gbl.F.Out,"" "" "" @@ -1999,7 +1999,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) } /* Send button and end frame */ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); /***** End form *****/ Act_FormEnd (); @@ -2634,13 +2634,13 @@ void Usr_ReqListAttendanceStdsCrs (void) Grp_PutParamsCodGrps (); /* Start frame */ - Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]); + Lay_StartRoundFrameTable (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]); /* Write list of students to select some of them */ Usr_ListUsersToSelect (Rol_STUDENT); /* Send button and end frame */ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_list); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Show_list); /* End form */ Act_FormEnd (); @@ -2952,7 +2952,7 @@ static void Att_ListEventsToSelect (void) } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Events); + Lay_StartRoundFrameTable (NULL,2,Txt_Events); /***** Heading row *****/ fprintf (Gbl.F.Out,"" @@ -3023,13 +3023,13 @@ static void Att_ListEventsToSelect (void) fprintf (Gbl.F.Out,"" ""); Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance); + Lay_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance); fprintf (Gbl.F.Out,"" ""); } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** End form *****/ if (Gbl.CurrentAct == ActSeeLstAttStd) @@ -3053,7 +3053,7 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte Usr_UsrDataConstructor (&UsrDat); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Attendance); + Lay_StartRoundFrameTable (NULL,2,Txt_Attendance); /***** Heading row *****/ Att_WriteTableHeadSeveralAttEvents (); @@ -3117,7 +3117,7 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -3279,7 +3279,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumStdsInList,long *LstSe Usr_UsrDataConstructor (&UsrDat); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Details); + Lay_StartRoundFrameTable (NULL,2,Txt_Details); /***** List students with attendance details *****/ for (NumStd = 0, Gbl.RowEvenOdd = 0; @@ -3295,7 +3295,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumStdsInList,long *LstSe } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_banner.c b/swad_banner.c index 2f6f72167..094c8bc62 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -90,7 +90,7 @@ void Ban_SeeBanners (void) Ban_PutFormToEditBanners (); /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Banners); + Lay_StartRoundFrameTable (NULL,2,Txt_Banners); /***** Write all the banners *****/ for (NumBan = 0; @@ -112,7 +112,7 @@ void Ban_SeeBanners (void) Gbl.Banners.Lst[NumBan].ShortName); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of banners *****/ Ban_FreeListBanners (); @@ -303,7 +303,7 @@ static void Ban_ListBannersForEdition (void) unsigned NumBan; struct Banner *Ban; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Banners); + Lay_StartRoundFrameTable (NULL,2,Txt_Banners); /***** Table head *****/ Ban_PutHeadBanners (); @@ -399,7 +399,7 @@ static void Ban_ListBannersForEdition (void) ""); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -738,7 +738,7 @@ static void Ban_PutFormToCreateBanner (void) Act_FormStart (ActNewBan); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_banner); + Lay_StartRoundFrameTable (NULL,2,Txt_New_banner); /***** Write heading *****/ Ban_PutHeadBanners (); @@ -775,7 +775,7 @@ static void Ban_PutFormToCreateBanner (void) Cns_MAX_LENGTH_WWW,Ban->WWW); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_banner); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_banner); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_calendar.c b/swad_calendar.c index 8090265e7..26292f687 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -130,7 +130,7 @@ void Cal_DrawCalendar (void) Act_PutContextualLink (ActPrnCal,NULL,"print",Txt_Print); fprintf (Gbl.F.Out,""); } - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable (NULL,0,NULL); Lay_WriteHeaderClassPhoto (1,PrintView,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, @@ -172,7 +172,7 @@ void Cal_DrawCalendar (void) Exa_FreeListExamAnnouncements (); /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ diff --git a/swad_centre.c b/swad_centre.c index 05b4350cc..de01815c1 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -138,7 +138,7 @@ void Ctr_SeeCtrWithPendingDegs (void) if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Centres_with_pending_degrees); + Lay_StartRoundFrameTable (NULL,2,Txt_Centres_with_pending_degrees); fprintf (Gbl.F.Out,"" "" "" @@ -203,7 +203,7 @@ void Ctr_SeeCtrWithPendingDegs (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed); @@ -285,7 +285,7 @@ static void Ctr_Configuration (bool PrintView) } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); /***** Title *****/ fprintf (Gbl.F.Out,"" @@ -513,7 +513,7 @@ static void Ctr_Configuration (bool PrintView) } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } } @@ -572,7 +572,7 @@ static void Ctr_ListCentresForSeeing (void) /***** Write heading *****/ sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, Gbl.CurrentIns.Ins.FullName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Ctr_PutHeadCentresForSeeing (true); // Order selectable /***** Write all the centres and their nuber of teachers *****/ @@ -582,7 +582,7 @@ static void Ctr_ListCentresForSeeing (void) Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1153,7 +1153,7 @@ static void Ctr_ListCentresForEdition (void) /***** Write heading *****/ sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, Gbl.CurrentIns.Ins.FullName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Ctr_PutHeadCentresForEdition (); /***** Write all the centres *****/ @@ -1370,7 +1370,7 @@ static void Ctr_ListCentresForEdition (void) } /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1848,7 +1848,7 @@ void Ctr_RequestPhoto (void) Act_FormStart (ActRecCtrPho); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Photo); + Lay_StartRoundFrameTable (NULL,2,Txt_Photo); fprintf (Gbl.F.Out,"" ""); @@ -1860,7 +1860,7 @@ void Ctr_RequestPhoto (void) /***** Upload photo *****/ fprintf (Gbl.F.Out,"" "" "" @@ -1870,7 +1870,7 @@ void Ctr_RequestPhoto (void) Fil_NAME_OF_PARAM_FILENAME_ORG); /***** Button to create announcement and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_photo); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Upload_photo); /***** End form *****/ Act_FormEnd (); @@ -1986,7 +1986,7 @@ static void Ctr_PutFormToCreateCentre (void) /***** Start of frame *****/ sprintf (Gbl.Title,Txt_New_centre_of_INSTITUTION_X, Gbl.CurrentIns.Ins.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); /***** Write heading *****/ Ctr_PutHeadCentresForEdition (); @@ -2090,7 +2090,7 @@ static void Ctr_PutFormToCreateCentre (void) ""); /***** End of frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** End of form *****/ Act_FormEnd (); @@ -2457,7 +2457,7 @@ unsigned Ctr_ListCtrsFound (const char *Query) if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Centres); + Lay_StartRoundFrameTable (NULL,2,Txt_Centres); /* Number of centres found */ fprintf (Gbl.F.Out,"" @@ -2491,7 +2491,7 @@ unsigned Ctr_ListCtrsFound (const char *Query) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 8dc66d6cf..6d6001aac 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.112 (2015/04/12)" +#define Log_PLATFORM_VERSION "SWAD 14.113 (2015/04/12)" // 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 14.113: Apr 12, 2015 Refactoring code related to frames. (184462 lines) + Version 14.112.1: Apr 12, 2015 Refactoring code related to frames with ending buttons. (184583 lines) Version 14.112: Apr 12, 2015 Optimization in frames with ending buttons. Changes in form to upload logo. Changes in form to photo of centre. diff --git a/swad_chat.c b/swad_chat.c index ba7a64713..60fa9b456 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -117,7 +117,7 @@ void Cht_ShowListOfAvailableChatRooms (void) Usr_GetMyDegrees (); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Chat_rooms); + Lay_StartRoundFrameTable (NULL,0,Txt_Chat_rooms); fprintf (Gbl.F.Out,"" "" "
" @@ -225,7 +225,7 @@ void Cht_ShowListOfAvailableChatRooms (void) "
" "" ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -250,12 +250,11 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) if (NumRows > 0) // If not empty chat rooms found { /***** Table start *****/ - Lay_WriteTitle (Txt_Rooms_with_users); - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable (NULL,2,Txt_Rooms_with_users); fprintf (Gbl.F.Out,"" "" - "%s " + "%s" "" "" @@ -284,7 +283,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) } /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_connected.c b/swad_connected.c index 2abd6837e..f835a5744 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -88,7 +88,7 @@ void Con_ShowConnectedUsrs (void) Txt_MONTHS_SMALL_SHORT[Gbl.Now.Date.Month-1], Gbl.Now.Time.Hour, Gbl.Now.Time.Minute); - Lay_StartRoundFrameTable10 (NULL,0,Gbl.Title); + Lay_StartRoundFrameTable (NULL,0,Gbl.Title); /***** Put form to update connected users *****/ fprintf (Gbl.F.Out,"" @@ -105,7 +105,7 @@ void Con_ShowConnectedUsrs (void) fprintf (Gbl.F.Out,""); } Act_LinkFormSubmitAnimated (Txt_Update_connected_users,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update_connected_users,Txt_Update_connected_users); + Lay_PutCalculateIconWithText (Txt_Update_connected_users,Txt_Update_connected_users); Act_FormEnd (); fprintf (Gbl.F.Out,"" @@ -123,7 +123,7 @@ void Con_ShowConnectedUsrs (void) ""); /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -134,17 +134,14 @@ void Con_ShowLastClicks (void) { extern const char *Txt_Last_clicks_in_real_time; - Lay_StartRoundFrameTable10 (NULL,0,Txt_Last_clicks_in_real_time); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time); - fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh + fprintf (Gbl.F.Out,"
"); Con_GetAndShowLastClicks (); - fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh + fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh - fprintf (Gbl.F.Out,"" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrame (); } /*****************************************************************************/ @@ -181,10 +178,8 @@ void Con_GetAndShowLastClicks (void) NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get last clicks"); /***** Write list of connected users *****/ - fprintf (Gbl.F.Out,""); - - /* Print table row */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" + "" "" "" "" @@ -458,7 +458,7 @@ static void Cty_Configuration (bool PrintView) } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } } @@ -514,7 +514,7 @@ void Cty_ListCountries2 (void) Lay_PutFormToEdit (ActEdiCty); /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Countries); + Lay_StartRoundFrameTable (NULL,2,Txt_Countries); fprintf (Gbl.F.Out,"" ""); for (Order = Cty_ORDER_BY_COUNTRY; @@ -690,7 +690,7 @@ void Cty_ListCountries2 (void) Ins_GetNumInssTotal () - NumInssWithCountry); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Div for Google Geochart *****/ if (Gbl.CurrentAct == ActSeeCty) @@ -1279,7 +1279,7 @@ static void Cty_ListCountriesForEdition (void) struct Country *Cty; Txt_Language_t Lan; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Countries); + Lay_StartRoundFrameTable (NULL,2,Txt_Countries); /***** Table head *****/ Cty_PutHeadCountries (); @@ -1388,7 +1388,7 @@ static void Cty_ListCountriesForEdition (void) } } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1667,7 +1667,7 @@ static void Cty_PutFormToCreateCountry (void) Act_FormStart (ActNewCty); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_country); + Lay_StartRoundFrameTable (NULL,2,Txt_New_country); /***** Write heading *****/ Cty_PutHeadCountries (); @@ -1742,7 +1742,7 @@ static void Cty_PutFormToCreateCountry (void) } /***** Send button and end of frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_country); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_country); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_course.c b/swad_course.c index 059870690..a88581f8f 100644 --- a/swad_course.c +++ b/swad_course.c @@ -204,7 +204,7 @@ static void Crs_Configuration (bool PrintView) } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); /***** Title *****/ fprintf (Gbl.F.Out,"" @@ -439,9 +439,9 @@ static void Crs_Configuration (bool PrintView) /***** Send button and end frame *****/ if (IsForm) - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); else - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** End form *****/ if (IsForm) @@ -578,10 +578,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) char PathRelRSSFile[PATH_MAX+1]; /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_My_courses); - fprintf (Gbl.F.Out,"" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + ""); + Lay_EndRoundFrame (); } /*****************************************************************************/ @@ -1223,7 +1219,7 @@ static void Crs_ListCoursesForSeeing (void) /***** Write heading *****/ sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X, Gbl.CurrentDeg.Deg.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message); + Lay_StartRoundFrameTable (NULL,2,Gbl.Message); Crs_PutHeadCoursesForSeeing (); /***** List the courses *****/ @@ -1322,7 +1318,7 @@ static void Crs_ListCoursesForSeeing (void) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1352,7 +1348,7 @@ static void Crs_ListCoursesForEdition (void) /***** Write heading *****/ sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X, Gbl.CurrentDeg.Deg.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message); + Lay_StartRoundFrameTable (NULL,2,Gbl.Message); Crs_PutHeadCoursesForEdition (); /***** List the courses *****/ @@ -1582,7 +1578,7 @@ static void Crs_ListCoursesForEdition (void) } /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1670,7 +1666,7 @@ static void Crs_PutFormToCreateCourse (void) /***** Write heading *****/ sprintf (Gbl.Message,Txt_New_course_of_DEGREE_X, Gbl.CurrentDeg.Deg.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message); + Lay_StartRoundFrameTable (NULL,2,Gbl.Message); Crs_PutHeadCoursesForEdition (); /***** Disabled icon to remove course *****/ @@ -1775,7 +1771,7 @@ static void Crs_PutFormToCreateCourse (void) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_course); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_course); /***** End form *****/ Act_FormEnd (); @@ -3161,7 +3157,7 @@ unsigned Crs_ListCrssFound (const char *Query) if (NumCrss) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Courses); + Lay_StartRoundFrameTable (NULL,2,Txt_Courses); /* Number of courses found */ fprintf (Gbl.F.Out,"" @@ -3216,7 +3212,7 @@ unsigned Crs_ListCrssFound (const char *Query) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_degree.c b/swad_degree.c index 6479f6d23..182098e7b 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -188,7 +188,7 @@ void Deg_SeeDegWithPendingCrss (void) if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees_with_pending_courses); + Lay_StartRoundFrameTable (NULL,2,Txt_Degrees_with_pending_courses); fprintf (Gbl.F.Out,"" "" "" @@ -482,7 +482,7 @@ static void Deg_Configuration (bool PrintView) } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } } @@ -1078,7 +1078,7 @@ static void Deg_ListDegreeTypesForSeeing (void) unsigned NumDegTyp; const char *BgColor; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Types_of_degree); + Lay_StartRoundFrameTable (NULL,2,Txt_Types_of_degree); /***** Write heading *****/ Deg_PutHeadDegreeTypesForSeeing (); @@ -1135,7 +1135,7 @@ static void Deg_ListDegreeTypesForSeeing (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1149,7 +1149,7 @@ static void Deg_ListDegreeTypesForEdition (void) unsigned NumDegTyp; /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Types_of_degree); + Lay_StartRoundFrameTable (NULL,2,Txt_Types_of_degree); Deg_PutHeadDegreeTypesForEdition (); /***** List degree types with forms for edition *****/ @@ -1219,7 +1219,7 @@ static void Deg_ListDegreeTypesForEdition (void) Gbl.Degs.DegTypes.Lst[NumDegTyp].NumDegs); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1234,7 +1234,7 @@ static void Deg_ListDegreesForSeeing (void) /***** Write heading *****/ sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, Gbl.CurrentCtr.Ctr.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Deg_PutHeadDegreesForSeeing (); /***** List the degrees *****/ @@ -1244,7 +1244,7 @@ static void Deg_ListDegreesForSeeing (void) Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.LstDegs[NumDeg]),NumDeg + 1); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1400,7 +1400,7 @@ static void Deg_ListDegreesForEdition (void) /***** Write heading *****/ sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, Gbl.CurrentCtr.Ctr.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Deg_PutHeadDegreesForEdition (); /***** List the degrees *****/ @@ -1683,7 +1683,7 @@ static void Deg_ListDegreesForEdition (void) } /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1757,7 +1757,7 @@ static void Deg_PutFormToCreateDegType (void) Act_FormStart (ActNewDegTyp); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_type_of_degree); + Lay_StartRoundFrameTable (NULL,2,Txt_New_type_of_degree); /***** Write heading *****/ fprintf (Gbl.F.Out,"" @@ -1789,7 +1789,7 @@ static void Deg_PutFormToCreateDegType (void) /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_type_of_degree); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_degree); /***** End form *****/ Act_FormEnd (); @@ -1823,7 +1823,7 @@ static void Deg_PutFormToCreateDegree (void) /***** Start of frame *****/ sprintf (Gbl.Title,Txt_New_degree_of_CENTRE_X, Gbl.CurrentCtr.Ctr.ShortName); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); /***** Write heading *****/ Deg_PutHeadDegreesForEdition (); @@ -1950,7 +1950,7 @@ static void Deg_PutFormToCreateDegree (void) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_degree); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_degree); /***** End form *****/ Act_FormEnd (); @@ -4035,7 +4035,7 @@ unsigned Deg_ListDegsFound (const char *Query) if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees); + Lay_StartRoundFrameTable (NULL,2,Txt_Degrees); /* Number of degrees found */ fprintf (Gbl.F.Out,"" @@ -4069,7 +4069,7 @@ unsigned Deg_ListDegsFound (const char *Query) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_department.c b/swad_department.c index 31df9ccf6..3632d86d8 100644 --- a/swad_department.c +++ b/swad_department.c @@ -100,7 +100,7 @@ void Dpt_SeeDepts (void) Dpt_PutFormToEditDpts (); /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Departments); + Lay_StartRoundFrameTable (NULL,0,Txt_Departments); fprintf (Gbl.F.Out,""); for (Order = Dpt_ORDER_BY_DEPARTMENT; Order <= Dpt_ORDER_BY_NUM_TCHS; @@ -182,7 +182,7 @@ void Dpt_SeeDepts (void) Rol_TEACHER) - NumTchsInsWithDpt); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of departments *****/ Dpt_FreeListDepartments (); @@ -490,7 +490,7 @@ static void Dpt_ListDepartmentsForEdition (void) struct Institution Ins; unsigned NumIns; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Departments); + Lay_StartRoundFrameTable (NULL,2,Txt_Departments); /***** Table head *****/ Dpt_PutHeadDepartments (); @@ -595,7 +595,7 @@ static void Dpt_ListDepartmentsForEdition (void) Dpt->NumTchs); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -881,7 +881,7 @@ static void Dpt_PutFormToCreateDepartment (void) Act_FormStart (ActNewDpt); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_department); + Lay_StartRoundFrameTable (NULL,2,Txt_New_department); /***** Write heading *****/ fprintf (Gbl.F.Out,"" @@ -942,7 +942,7 @@ static void Dpt_PutFormToCreateDepartment (void) Cns_MAX_LENGTH_WWW,Dpt->WWW); /***** Send button and end of frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_department); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_department); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_enrollment.c b/swad_enrollment.c index bd5d146c8..d4c7dcdb8 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -254,11 +254,11 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction) /***** Form to request user's ID, @nickname or e-mail address *****/ Act_FormStart (NextAction); - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"" "" - "
", + " size=\"20\" maxlength=\"%u\" />", The_ClassFormul[Gbl.Prefs.Theme], Txt_nick_email_or_ID, Usr_MAX_BYTES_USR_LOGIN); @@ -529,9 +529,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) Act_FormStart (ActRcvFrmMdfUsrCrs); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users); - fprintf (Gbl.F.Out,"" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Confirm); + Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Confirm); /***** End of form *****/ Act_FormEnd (); @@ -2172,7 +2168,7 @@ void Enr_ShowEnrollmentRequests (void) /* Send button */ fprintf (Gbl.F.Out,"
"); Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update,Txt_Update); + Lay_PutCalculateIconWithText (Txt_Update,Txt_Update); Act_FormEnd (); fprintf (Gbl.F.Out,"
"); @@ -2375,7 +2371,7 @@ void Enr_ShowEnrollmentRequests (void) Usr_UsrDataConstructor (&UsrDat); /* Start table */ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); fprintf (Gbl.F.Out,"" "" "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrame (); } /*****************************************************************************/ diff --git a/swad_exam.c b/swad_exam.c index 57a00bb9b..12ee7ff35 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -762,7 +762,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ } /***** Start frame *****/ - Lay_StartRoundFrameTable10 ("500px",0,NULL); + Lay_StartRoundFrameTable ("500px",0,NULL); if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) { @@ -1224,11 +1224,11 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ fprintf (Gbl.F.Out,"" \ ""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) - Lay_EndRoundFrameTable10 ((ExaCod > 0) ? Lay_CONFIRM_BUTTON : + Lay_EndRoundFrameTableWithButton ((ExaCod > 0) ? Lay_CONFIRM_BUTTON : Lay_CREATE_BUTTON, Txt_Publish_announcement_OF_EXAM); else - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) QR_ExamAnnnouncement (); diff --git a/swad_file_browser.c b/swad_file_browser.c index d99c28e27..b3924465c 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -2867,10 +2867,10 @@ void Brw_AskEditWorksCrs (void) Par_PutHiddenParamChar ("FullTree",'Y'); // By default, show all files /* Put list of users to select some of them */ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Users); + Lay_StartRoundFrameTable (NULL,0,Txt_Users); Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_STUDENT); - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_View_works); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_works); /* End form */ Act_FormEnd (); @@ -2950,7 +2950,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) Brw_WriteTopBeforeShowingFileBrowser (); /***** Header of the table with the list of users *****/ - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable (NULL,0,NULL); /***** List the assignments and works of the selected users *****/ Ptr = Gbl.Usrs.Select.All; @@ -2984,7 +2984,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void) } /***** End of the table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else // If no users are selected... { @@ -3294,7 +3294,7 @@ static void Brw_ShowFileBrowser (void) Gbl.FileBrowser.Clipboard.IsThisTree = Brw_CheckIfClipboardIsInThisTree (); /***** Start of table *****/ - Lay_StartRoundFrameTable10 (NULL,0,Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type]); + Lay_StartRoundFrameTable (NULL,0,Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type]); /***** Title *****/ fprintf (Gbl.F.Out,"" @@ -3317,7 +3317,7 @@ static void Brw_ShowFileBrowser (void) Brw_ListDir (1,Gbl.FileBrowser.Priv.PathRootFolder,Brw_RootFolderInternalNames[Gbl.FileBrowser.Type]); /***** End of table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -7635,23 +7635,21 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_folder); - fprintf (Gbl.F.Out,"" - "" - "", + " size=\"32\" maxlength=\"40\" value=\"\" />", The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder); /* Button to send and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_folder); + Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_folder); /***** End form *****/ Act_FormEnd (); @@ -7672,10 +7670,9 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) /***** Start frame *****/ fprintf (Gbl.F.Out,"
"); + Lay_StartRoundFrame ("95%",Txt_Upload_files); - Lay_StartRoundFrameTable10 ("100%",0,Txt_Upload_files); - fprintf (Gbl.F.Out,"
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); - + Lay_EndRoundFrame (); fprintf (Gbl.F.Out,""); } @@ -7759,11 +7755,10 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) extern const char *Txt_or_you_can_upload_a_new_file_to_the_folder_X; /***** Start frame *****/ - fprintf (Gbl.F.Out,"" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); - + Lay_EndRoundFrame (); fprintf (Gbl.F.Out,""); } @@ -7832,17 +7824,15 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Paste); - fprintf (Gbl.F.Out,"" - "" - ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Paste); + Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Paste); /***** End form *****/ Act_FormEnd (); @@ -7881,14 +7871,14 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_link); - fprintf (Gbl.F.Out,"" - "" - "", + "
" "%s" diff --git a/swad_country.c b/swad_country.c index 78712cb7d..7564918b5 100644 --- a/swad_country.c +++ b/swad_country.c @@ -116,7 +116,7 @@ void Cty_SeeCtyWithPendingInss (void) if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries with pending institutions"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Countries_with_pending_institutions); + Lay_StartRoundFrameTable (NULL,2,Txt_Countries_with_pending_institutions); fprintf (Gbl.F.Out,"
" @@ -183,7 +183,7 @@ void Cty_SeeCtyWithPendingInss (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed); @@ -245,7 +245,7 @@ static void Cty_Configuration (bool PrintView) fprintf (Gbl.F.Out,""); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
" - "
" + Lay_StartRoundFrame (NULL,Txt_My_courses); + fprintf (Gbl.F.Out,"
" "
    ", @@ -842,10 +840,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) /***** End frame *****/ fprintf (Gbl.F.Out,"
" - "
" - "
" @@ -254,7 +254,7 @@ void Deg_SeeDegWithPendingCrss (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed); @@ -321,7 +321,7 @@ static void Deg_Configuration (bool PrintView) /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); /***** Title *****/ fprintf (Gbl.F.Out,"
"); + Lay_StartRoundFrame (NULL,Txt_Admin_several_users); /***** Step 1: List of students to be enrolled / removed *****/ fprintf (Gbl.F.Out,"
" @@ -610,9 +608,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void) Pwd_AskForConfirmationOnDangerousAction (); /***** Send button and end frame *****/ - fprintf (Gbl.F.Out,"
" - ""); + Lay_StartRoundFrame (NULL,Txt_Admin_one_user); /***** Write form to request another user's ID *****/ Enr_WriteFormToReqAnotherUsrID (ActReqMdfUsr); /***** End frame *****/ - fprintf (Gbl.F.Out,"
"); + Lay_StartRoundFrame (NULL,Txt_Create_folder); sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); /***** Folder *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" - "
"); + /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_upload_new_files_to_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); @@ -7712,7 +7709,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); fprintf (Gbl.F.Out,"
" - "%s
" + "%s" "" "", Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here); @@ -7737,15 +7734,14 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) if (Gbl.FileBrowser.FullTree) Par_PutHiddenParamChar ("FullTree",'Y'); - /* Button to send */ + /***** Button to send *****/ Lay_PutConfirmButton (Txt_FILE_UPLOAD_Done); + + /***** End form *****/ Act_FormEnd (); /***** End frame *****/ - fprintf (Gbl.F.Out,"
"); + /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_upload_a_new_file_to_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); @@ -7795,10 +7790,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow) Act_FormEnd (); /***** End frame *****/ - fprintf (Gbl.F.Out,"
"); + Lay_StartRoundFrame (NULL,Txt_Paste); + + /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); - fprintf (Gbl.F.Out,"
"); + Lay_StartRoundFrame (NULL,Txt_Create_link); + + /***** Help message *****/ sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X, FileNameToShow); Lay_ShowAlert (Lay_INFO,Gbl.Message); - /* URL */ + /***** URL *****/ fprintf (Gbl.F.Out,"" "" "" "" "" - "
" @@ -7902,7 +7892,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) The_ClassFormul[Gbl.Prefs.Theme],Txt_URL, PATH_MAX); - /* Link name */ + /***** Link name *****/ fprintf (Gbl.F.Out,"
" "" @@ -7912,13 +7902,11 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) " size=\"40\" maxlength=\"100\" value=\"\" />" "
" - "
", The_ClassFormul[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_link); + Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_link); /***** End form *****/ Act_FormEnd (); @@ -8873,7 +8861,7 @@ void Brw_ShowFileMetadata (void) } /***** Start frame *****/ - Lay_StartRoundFrameTable10Shadow (NULL,2); + Lay_StartRoundFrameTableShadow (NULL,2); /***** Link to download the file *****/ fprintf (Gbl.F.Out,"" @@ -9066,11 +9054,11 @@ void Brw_ShowFileMetadata (void) /***** End frame *****/ if (ICanEdit) // I can edit file properties { - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save_file_properties); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save_file_properties); Act_FormEnd (); } else - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Mark possible notifications as seen *****/ switch (Gbl.FileBrowser.Type) @@ -10842,7 +10830,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) { /***** Write heading *****/ /* Table start */ - Lay_StartRoundFrameTable10 (NULL,2,Title); + Lay_StartRoundFrameTable (NULL,2,Title); /* Write header with number of documents found */ fprintf (Gbl.F.Out,"" @@ -10912,7 +10900,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title) ""); /* Table end */ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_forum.c b/swad_forum.c index 4352b447d..16062df19 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -898,15 +898,13 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) For_GetThrReadTime (ThrCod,ReadTime); /* Table start */ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Thread); + Lay_StartRoundFrame (NULL,Txt_Thread); /* Put a form to select which forums */ For_PutFormWhichForums (); /* Write a link to top level of forums */ - fprintf (Gbl.F.Out,"" - "" - "
" + fprintf (Gbl.F.Out,"
" "" - "
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + "
"); + Lay_EndRoundFrame (); LastSubject[0] = '\0'; if (NumPsts) // If there are posts... @@ -986,10 +982,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination); /***** Show posts from this page, the author and the date of last reply *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Messages); - fprintf (Gbl.F.Out,"" - "" - ""); + Lay_StartRoundFrameTable (NULL,2,Txt_Messages); mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible-1)); for (NumRow = Pagination.FirstItemVisible; @@ -1031,10 +1024,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) Gbl.Usrs.Me.UsrDat.UsrCod); } - fprintf (Gbl.F.Out,"
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -1617,15 +1607,13 @@ void For_ShowForumList (void) Usr_GetMyInstitutions (); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Forums); + Lay_StartRoundFrame (NULL,Txt_Forums); /***** Put a form to select which forums *****/ For_PutFormWhichForums (); /***** Write a link to top level of forums *****/ - fprintf (Gbl.F.Out,"" - "" - "
" + fprintf (Gbl.F.Out,"
" "" - "
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + "
"); + Lay_EndRoundFrame (); } /*****************************************************************************/ @@ -1759,8 +1745,6 @@ static void For_PutFormWhichForums (void) /***** Form to select which forums I want to see (all my forums or only the forums of current institution/degree/course) *****/ - fprintf (Gbl.F.Out,"" - ""); Act_FormStart (ActSeeFor); For_PutParamForumOrder (); For_PutParamsForumInsDegCrs (); @@ -1784,8 +1768,6 @@ static void For_PutFormWhichForums (void) } fprintf (Gbl.F.Out,""); Act_FormEnd (); - fprintf (Gbl.F.Out,"" - ""); } /*****************************************************************************/ @@ -2467,15 +2449,13 @@ void For_ShowForumThrs (void) /***** Header whith the name of this forum, the number of threads, and the total number of posts *****/ /* Table start */ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Forum); + Lay_StartRoundFrame (NULL,Txt_Forum); /* Put a form to select which forums */ For_PutFormWhichForums (); /* Write a link to top level of forums */ - fprintf (Gbl.F.Out,"" - "" - "
" + fprintf (Gbl.F.Out,"
" "" - "
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + "
"); + Lay_EndRoundFrame (); /***** List the threads *****/ if (NumThrs) @@ -2501,7 +2479,7 @@ void For_ShowForumThrs (void) Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Threads); + Lay_StartRoundFrameTable (NULL,2,Txt_Threads); /***** Heading row *****/ fprintf (Gbl.F.Out,"" @@ -2559,7 +2537,7 @@ void For_ShowForumThrs (void) For_ListForumThrs (ThrCods,&PaginationThrs); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Write links to all the pages in the listing of threads *****/ if (PaginationThrs.MoreThanOnePage) @@ -3716,8 +3694,8 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) For_PutAllHiddenParamsForum (); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,IsReply ? Txt_New_message : - Txt_New_thread); + Lay_StartRoundFrameTable (NULL,2,IsReply ? Txt_New_message : + Txt_New_thread); fprintf (Gbl.F.Out,"" "" @@ -3753,7 +3731,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Send_message); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Send_message); /***** End form *****/ Act_FormEnd (); diff --git a/swad_group.c b/swad_group.c index d19ef69d1..756b06dc0 100644 --- a/swad_group.c +++ b/swad_group.c @@ -247,7 +247,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) Usr_PutExtraParamsUsrList (NextAction); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Groups); + Lay_StartRoundFrameTable (NULL,2,Txt_Groups); /***** Select all groups *****/ fprintf (Gbl.F.Out,"" @@ -281,12 +281,12 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) ""); Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update_students_according_to_selected_groups,Txt_Update_students); + Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students); fprintf (Gbl.F.Out,"" ""); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** End form *****/ Act_FormEnd (); @@ -1127,7 +1127,7 @@ static void Grp_ListGroupTypesForEdition (void) unsigned NumGrpTyp; /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Types_of_group); + Lay_StartRoundFrameTable (NULL,2,Txt_Types_of_group); Grp_WriteHeadingGroupTypes (); /***** List group types with forms for edition *****/ @@ -1248,7 +1248,7 @@ static void Grp_ListGroupTypesForEdition (void) Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1309,7 +1309,7 @@ static void Grp_ListGroupsForEdition (void) struct Group *Grp; /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Groups); + Lay_StartRoundFrameTable (NULL,2,Txt_Groups); Grp_WriteHeadingGroups (); /***** List the groups *****/ @@ -1430,7 +1430,7 @@ static void Grp_ListGroupsForEdition (void) } } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1592,7 +1592,7 @@ unsigned Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents) Grp_ShowWarningToStdsToChangeGrps (); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_My_groups); + Lay_StartRoundFrameTable (NULL,2,Txt_My_groups); /***** List the groups the user belongs to for change *****/ for (NumGrpTyp = 0; @@ -1602,7 +1602,7 @@ unsigned Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents) NumGrpsIBelong += Grp_ListGrpsForChange (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of groups types and groups in this course *****/ Grp_FreeListGrpTypesAndGrps (); @@ -1738,7 +1738,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod) Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Groups); + Lay_StartRoundFrameTable (NULL,0,Txt_Groups); /***** List to select the groups the user belongs to *****/ for (NumGrpTyp = 0; @@ -1748,7 +1748,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod) Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of groups types and groups in current course *****/ Grp_FreeListGrpTypesAndGrps (); @@ -2059,7 +2059,7 @@ static void Grp_PutFormToCreateGroupType (void) Act_FormStart (ActNewGrpTyp); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_type_of_group); + Lay_StartRoundFrameTable (NULL,2,Txt_New_type_of_group); /***** Write heading *****/ Grp_WriteHeadingGroupTypes (); @@ -2144,7 +2144,7 @@ static void Grp_PutFormToCreateGroupType (void) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_type_of_group); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_group); /***** End form *****/ Act_FormEnd (); @@ -2164,7 +2164,7 @@ static void Grp_PutFormToCreateGroup (void) Act_FormStart (ActNewGrp); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_group); + Lay_StartRoundFrameTable (NULL,2,Txt_New_group); /***** Write heading *****/ Grp_WriteHeadingGroups (); @@ -2220,7 +2220,7 @@ static void Grp_PutFormToCreateGroup (void) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_group); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_group); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_holiday.c b/swad_holiday.c index a00ab148e..8e78328ac 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -96,7 +96,7 @@ void Hld_SeeHolidays (void) Hld_PutFormToEditHlds (); /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Holidays); + Lay_StartRoundFrameTable (NULL,2,Txt_Holidays); fprintf (Gbl.F.Out,""); for (Order = Hld_ORDER_BY_PLACE; Order <= Hld_ORDER_BY_START_DATE; @@ -166,7 +166,7 @@ void Hld_SeeHolidays (void) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of holidays *****/ Hld_FreeListHolidays (); @@ -473,7 +473,7 @@ static void Hld_ListHolidaysForEdition (void) struct Holiday *Hld; Hld_HolidayType_t HolidayType; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Holidays); + Lay_StartRoundFrameTable (NULL,2,Txt_Holidays); /***** Table head *****/ Hld_PutHeadHolidays (); @@ -587,7 +587,7 @@ static void Hld_ListHolidaysForEdition (void) ""); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -918,7 +918,7 @@ static void Hld_PutFormToCreateHoliday (void) Act_FormStart (ActNewHld); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_holiday); + Lay_StartRoundFrameTable (NULL,2,Txt_New_holiday); /***** Write heading *****/ fprintf (Gbl.F.Out,"" @@ -1006,7 +1006,7 @@ static void Hld_PutFormToCreateHoliday (void) Hld_MAX_LENGTH_HOLIDAY_NAME,Hld->Name); /***** Send button and end of frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_holiday); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_holiday); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_icon.c b/swad_icon.c index d0e287e60..2b4dc76c7 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -69,7 +69,7 @@ void Ico_PutIconsToSelectIconSet (void) extern const char *Txt_Icons; Ico_IconSet_t IconSet; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Icons); + Lay_StartRoundFrameTable (NULL,2,Txt_Icons); fprintf (Gbl.F.Out,""); for (IconSet = (Ico_IconSet_t) 0; IconSet < Ico_NUM_ICON_SETS; @@ -93,7 +93,7 @@ void Ico_PutIconsToSelectIconSet (void) fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ diff --git a/swad_import.c b/swad_import.c index 3ffd075e3..0edc16144 100644 --- a/swad_import.c +++ b/swad_import.c @@ -509,7 +509,7 @@ static unsigned Imp_GetAndListImpGrpsAndStdsFromDB (bool ItsAFormToRegRemStds) if (NumGrps) { /***** Start table with groups *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); fprintf (Gbl.F.Out,"" "", @@ -592,7 +592,7 @@ static unsigned Imp_GetAndListImpGrpsAndStdsFromDB (bool ItsAFormToRegRemStds) } /***** End of table with courses *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_indicator.c b/swad_indicator.c index aa411b477..ac5e4e589 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -90,7 +90,7 @@ void Ind_ReqIndicatorsCourses (void) unsigned NumCrss; /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Indicators_of_courses); + Lay_StartRoundFrameTable (NULL,2,Txt_Indicators_of_courses); fprintf (Gbl.F.Out,"" ""); @@ -177,7 +177,7 @@ void Ind_ReqIndicatorsCourses (void) fprintf (Gbl.F.Out,"" ""); Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update_indicators,Txt_Update_indicators); + Lay_PutCalculateIconWithText (Txt_Update_indicators,Txt_Update_indicators); fprintf (Gbl.F.Out,"" "" ""); @@ -211,7 +211,7 @@ void Ind_ReqIndicatorsCourses (void) /***** End frame *****/ fprintf (Gbl.F.Out,"" ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); diff --git a/swad_info.c b/swad_info.c index af0f6672c..0ea07fe41 100644 --- a/swad_info.c +++ b/swad_info.c @@ -874,21 +874,17 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL) extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES]; /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); + Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[InfoType]); /***** Link to view in a new window *****/ - fprintf (Gbl.F.Out,"" - "" - "", + fprintf (Gbl.F.Out,"", URL,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("fullscreen", - Txt_View_in_a_new_window, - Txt_View_in_a_new_window); - fprintf (Gbl.F.Out,"" - ""); + Lay_PutIconWithText ("fullscreen", + Txt_View_in_a_new_window, + Txt_View_in_a_new_window); /***** End of frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrame (); } /*****************************************************************************/ @@ -925,7 +921,7 @@ void Inf_FormsToSelSendInfo (void) /***** Forms for the different edition alternatives *****/ /* Start of table */ - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable (NULL,0,NULL); /* Forms */ for (InfoSrc = (Inf_InfoSrc_t) 1; @@ -949,12 +945,12 @@ void Inf_FormsToSelSendInfo (void) } /* End of table */ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Form to choice between alternatives *****/ /* Start of form and table */ Act_FormStart (Inf_ActionsSelecInfoSrc[InfoType]); - Lay_StartRoundFrameTable10 (NULL,0,NULL); + Lay_StartRoundFrameTable (NULL,0,NULL); /* Title */ fprintf (Gbl.F.Out,"" @@ -987,7 +983,7 @@ void Inf_FormsToSelSendInfo (void) } /* End of table and form */ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); Act_FormEnd (); } @@ -1590,7 +1586,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType) if (TxtHTML[0]) { /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); + Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[InfoType]); if (InfoType == Inf_INTRODUCTION || InfoType == Inf_TEACHING_GUIDE) @@ -1612,7 +1608,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType) fprintf (Gbl.F.Out,"

" "" ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_WARNING,Txt_No_information_available); @@ -1645,7 +1641,7 @@ static void Inf_ShowRichTxtInfo (Inf_InfoType_t InfoType) if (TxtMD[0]) { /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); + Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[InfoType]); if (InfoType == Inf_INTRODUCTION || InfoType == Inf_TEACHING_GUIDE) @@ -1716,7 +1712,7 @@ static void Inf_ShowRichTxtInfo (Inf_InfoType_t InfoType) fprintf (Gbl.F.Out,"" "" ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_WARNING,Txt_No_information_available); @@ -1829,7 +1825,7 @@ void Inf_EditPlainTxtInfo (void) /***** Start table *****/ Act_FormStart (Inf_ActionsRcvPlaTxtInfo[InfoType]); - Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); + Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[InfoType]); if (InfoType == Inf_INTRODUCTION || InfoType == Inf_TEACHING_GUIDE) @@ -1850,7 +1846,7 @@ void Inf_EditPlainTxtInfo (void) ""); /***** End form *****/ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Act_FormEnd (); } @@ -1867,7 +1863,7 @@ void Inf_EditRichTxtInfo (void) /***** Start form *****/ Act_FormStart (Inf_ActionsRcvRchTxtInfo[InfoType]); - Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]); + Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[InfoType]); if (InfoType == Inf_INTRODUCTION || InfoType == Inf_TEACHING_GUIDE) @@ -1888,7 +1884,7 @@ void Inf_EditRichTxtInfo (void) ""); /***** End form *****/ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Act_FormEnd (); } diff --git a/swad_institution.c b/swad_institution.c index 0d0404782..a127cfb2b 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -128,7 +128,7 @@ void Ins_SeeInsWithPendingCtrs (void) if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Institutions_with_pending_centres); + Lay_StartRoundFrameTable (NULL,2,Txt_Institutions_with_pending_centres); fprintf (Gbl.F.Out,"" "" "" @@ -192,7 +192,7 @@ void Ins_SeeInsWithPendingCtrs (void) Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else Lay_ShowAlert (Lay_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed); @@ -261,7 +261,7 @@ static void Ins_Configuration (bool PrintView) } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,NULL); + Lay_StartRoundFrameTable (NULL,2,NULL); /***** Title *****/ fprintf (Gbl.F.Out,"" @@ -467,7 +467,7 @@ static void Ins_Configuration (bool PrintView) } /***** End of the frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } } @@ -512,7 +512,7 @@ static void Ins_ListInstitutionsForSeeing (void) /***** Table head *****/ sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Ins_PutHeadInstitutionsForSeeing (true); // Order selectable /***** Write all the institutions and their nuber of users *****/ @@ -522,7 +522,7 @@ static void Ins_ListInstitutionsForSeeing (void) Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -1103,7 +1103,7 @@ static void Ins_ListInstitutionsForEdition (void) /***** Write heading *****/ sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); Ins_PutHeadInstitutionsForEdition (); /***** Write all the institutions *****/ @@ -1293,7 +1293,7 @@ static void Ins_ListInstitutionsForEdition (void) /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1768,7 +1768,7 @@ static void Ins_PutFormToCreateInstitution (void) /***** Start of frame *****/ sprintf (Gbl.Title,Txt_New_institution_of_COUNTRY_X, Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); - Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title); + Lay_StartRoundFrameTable (NULL,2,Gbl.Title); /***** Write heading *****/ Ins_PutHeadInstitutionsForEdition (); @@ -1847,7 +1847,7 @@ static void Ins_PutFormToCreateInstitution (void) ""); /***** Send button and end of frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_institution); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_institution); /***** End of form *****/ Act_FormEnd (); @@ -2129,7 +2129,7 @@ unsigned Ins_ListInssFound (const char *Query) if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions"))) { /***** Write heading *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Institutions); + Lay_StartRoundFrameTable (NULL,2,Txt_Institutions); /* Number of institutions found */ fprintf (Gbl.F.Out,"" @@ -2163,7 +2163,7 @@ unsigned Ins_ListInssFound (const char *Query) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_layout.c b/swad_layout.c index 86a6a2912..e2e6477dd 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -110,31 +110,25 @@ void Lay_WriteStartOfPage (void) extern const char *The_TabOnBgColors[The_NUM_THEMES]; extern const char *Txt_NEW_YEAR_GREETING; unsigned ColspanCentralPart = 3; // Initialized to avoid warnning -// char QueryDebug[1024]; - /***** If, when this function is called, the head is being written, or the head is already written ==> - ==> don't do anything *****/ + /***** If, when this function is called, the head is being written + or the head is already written ==> don't do anything *****/ if (Gbl.Layout.WritingHTMLStart || Gbl.Layout.HTMLStartWritten) return; -// if (Gbl.Usrs.Me.UsrDat.UsrCod == 1346) -// { -// sprintf (QueryDebug,"INSERT INTO debug (DebugTime,Txt) VALUES (NOW(),'Act_Actions[ActRefLstClk].ActCod = %u --- Act_Actions[Gbl.CurrentAct].ActCod = %u')", -// (unsigned) Act_Actions[ActRefLstClk].ActCod,(unsigned) Act_Actions[Gbl.CurrentAct].ActCod); -// DB_QueryINSERT (QueryDebug,"Error inserting in debug table"); -// } - /***** Compute connected users *****/ if (Gbl.CurrentAct == ActLstCon || (Gbl.Prefs.Layout == Lay_LAYOUT_DESKTOP && (Gbl.Prefs.SideCols & Lay_SHOW_RIGHT_COLUMN) && - Gbl.CurrentCrs.Crs.CrsCod >= 0)) // Right column visible && There is a course selected + Gbl.CurrentCrs.Crs.CrsCod > 0)) + // Right column visible && There is a course selected Con_ComputeConnectedUsrsBelongingToCurrentCrs (); /***** Send head width the file type for the HTTP protocol *****/ if (Gbl.CurrentAct == ActRefCon || - Gbl.CurrentAct == ActRefLstClk) // Don't generate a full HTML page, only refresh connected users + Gbl.CurrentAct == ActRefLstClk) + // Don't generate a full HTML page, only refresh connected users { fprintf (Gbl.F.Out,"Content-Type: text/html; charset=windows-1252\r\n"); fprintf (Gbl.F.Out,"Cache-Control: max-age=0, no-cache, must-revalidate\r\n\r\n"); @@ -160,7 +154,8 @@ void Lay_WriteStartOfPage (void) "\n"); /***** Write start of HTML code *****/ - // WARNING: It is necessary to comment the line AddDefaultCharset UTF8 in httpd.conf to enable meta tag + // WARNING: It is necessary to comment the line 'AddDefaultCharset UTF8' + // in httpd.conf to enable meta tag fprintf (Gbl.F.Out,"\n" "\n" "\n" @@ -429,7 +424,8 @@ static void Lay_WriteRedirectionToMyLanguage (void) { extern const char *Txt_STR_LANG_ID[Txt_NUM_LANGUAGES]; - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Cfg_HTTPS_URL_SWAD_CGI, Txt_STR_LANG_ID[Gbl.Usrs.Me.UsrDat.Prefs.Language], Act_Actions[ActAutUsrChgLan].ActCod, @@ -735,9 +731,10 @@ static void Lay_WritePageTopHeading (void) if (Gbl.Usrs.Me.Logged) { /* Number of new messages (not seen) */ - fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh + fprintf (Gbl.F.Out,"
"); Ntf_WriteNumberOfNewNtfs (); - fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh + fprintf (Gbl.F.Out,"
"); // Used for AJAX based refresh } break; case Lay_LAYOUT_MOBILE: @@ -762,7 +759,7 @@ static void Lay_WritePageTopHeading (void) { case Lay_LAYOUT_DESKTOP: /***** 3rd. row, 1st. column *****/ - if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible + if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible fprintf (Gbl.F.Out,""); /***** 4th. row, 1st. column *****/ - if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible + if (Gbl.Prefs.SideCols & Lay_SHOW_LEFT_COLUMN) // Left column visible { fprintf (Gbl.F.Out,""); Lay_ShowLeftColumn (); - fprintf (Gbl.F.Out,""); // End of first column + fprintf (Gbl.F.Out,""); } break; case Lay_LAYOUT_MOBILE: @@ -991,7 +988,7 @@ void Lay_PutFormToEdit (Act_Action_t Action) /**************** Put a icon with a text to submit a form ********************/ /*****************************************************************************/ -void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text) +void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text) { // margin is used because this form link may be placed after another one fprintf (Gbl.F.Out,"
" @@ -1011,7 +1008,7 @@ void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text) /********** When clicked, the icon will be replaced by an animation **********/ /*****************************************************************************/ -void Lay_PutCalculateIcon (const char *Alt,const char *Text) +void Lay_PutCalculateIconWithText (const char *Alt,const char *Text) { fprintf (Gbl.F.Out,"
" @@ -1094,9 +1091,9 @@ void Lay_WriteTitle (const char *Title) /*****************************************************************************/ // CellPadding must be 0, 1, 2, 4 or 8 -void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const char *Title) +void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title) { - Lay_StartRoundFrame10 (Width,Title); + Lay_StartRoundFrame (Width,Title); fprintf (Gbl.F.Out,""); } -void Lay_StartRoundFrame10 (const char *Width,const char *Title) +void Lay_StartRoundFrame (const char *Width,const char *Title) { fprintf (Gbl.F.Out,"
" "
" "
"); } -void Lay_EndRoundFrameTable10 (Lay_Button_t Button,const char *TxtButton) +void Lay_EndRoundFrameTable (void) { fprintf (Gbl.F.Out,"
"); - Lay_EndRoundFrame10 (Button,TxtButton); + Lay_EndRoundFrame (); } -void Lay_EndRoundFrame10 (Lay_Button_t Button,const char *TxtButton) +void Lay_EndRoundFrame (void) + { + fprintf (Gbl.F.Out,"
" + "
"); + } + +void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton) + { + fprintf (Gbl.F.Out,""); + + Lay_EndRoundFrameWithButton (Button,TxtButton); + } + +void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton) { /***** Button *****/ if (TxtButton) @@ -1517,7 +1527,7 @@ void Lay_PutIconsToSelectLayout (void) extern const char *Txt_LAYOUT_NAMES[Lay_NUM_LAYOUTS]; Lay_Layout_t Layout; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Layout); + Lay_StartRoundFrameTable (NULL,2,Txt_Layout); fprintf (Gbl.F.Out,""); for (Layout = (Lay_Layout_t) 0; Layout < Lay_NUM_LAYOUTS; @@ -1539,7 +1549,7 @@ void Lay_PutIconsToSelectLayout (void) fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTableWithButton (Lay_NO_BUTTON,NULL); } /*****************************************************************************/ @@ -1597,7 +1607,7 @@ void Lay_AdvertisementMobile (void) fprintf (Gbl.F.Out,"
"); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,8,NULL); + Lay_StartRoundFrameTable (NULL,8,NULL); /***** Show advertisement *****/ fprintf (Gbl.F.Out,"" @@ -1614,7 +1624,7 @@ void Lay_AdvertisementMobile (void) Gbl.Prefs.IconsURL); /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameWithButton (Lay_NO_BUTTON,NULL); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_layout.h b/swad_layout.h index f5ea94c6d..6f88b9268 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -96,8 +96,8 @@ void Lay_WriteTitle (const char *Title); void Lay_PutFormToView (Act_Action_t Action); void Lay_PutFormToEdit (Act_Action_t Action); -void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text); -void Lay_PutCalculateIcon (const char *Alt,const char *Text); +void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text); +void Lay_PutCalculateIconWithText (const char *Alt,const char *Text); void Lay_PutCreateButton (const char *Text); void Lay_PutCreateButtonInline (const char *Text); @@ -105,11 +105,13 @@ void Lay_PutConfirmButton (const char *Text); void Lay_PutConfirmButtonInline (const char *Text); void Lay_PutRemoveButton (const char *Text); -void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const char *Title); -void Lay_StartRoundFrame10 (const char *Width,const char *Title); -void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding); -void Lay_EndRoundFrameTable10 (Lay_Button_t Button,const char *TxtButton); -void Lay_EndRoundFrame10 (Lay_Button_t Button,const char *TxtButton); +void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title); +void Lay_StartRoundFrame (const char *Width,const char *Title); +void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding); +void Lay_EndRoundFrameTable (void); +void Lay_EndRoundFrame (void); +void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton); +void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton); void Lay_ShowErrorAndExit (const char *Message); void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message); diff --git a/swad_link.c b/swad_link.c index dddd4c968..a6542da88 100644 --- a/swad_link.c +++ b/swad_link.c @@ -86,7 +86,7 @@ void Lnk_SeeLinks (void) /***** Table head *****/ if (Gbl.Links.Num) { - Lay_StartRoundFrameTable10 (NULL,2,Txt_Links); + Lay_StartRoundFrameTable (NULL,2,Txt_Links); /***** Write all the links *****/ for (NumLnk = 0; @@ -105,7 +105,7 @@ void Lnk_SeeLinks (void) Gbl.Links.Lst[NumLnk].ShortName); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free list of links *****/ @@ -282,7 +282,7 @@ static void Lnk_ListLinksForEdition (void) unsigned NumLnk; struct Link *Lnk; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Links); + Lay_StartRoundFrameTable (NULL,2,Txt_Links); /***** Table head *****/ Lnk_PutHeadLinks (); @@ -351,7 +351,7 @@ static void Lnk_ListLinksForEdition (void) ""); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -588,7 +588,7 @@ static void Lnk_PutFormToCreateLink (void) Act_FormStart (ActNewLnk); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_link); + Lay_StartRoundFrameTable (NULL,2,Txt_New_link); /***** Write heading *****/ Lnk_PutHeadLinks (); @@ -618,7 +618,7 @@ static void Lnk_PutFormToCreateLink (void) Cns_MAX_LENGTH_WWW,Lnk->WWW); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_link); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_link); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_logo.c b/swad_logo.c index 65ed45e9e..acfe22f0f 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -280,9 +280,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) Act_FormStart (ActionRec); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Logo); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrame (NULL,Txt_Logo); /***** Write help message *****/ sprintf (Gbl.Message,Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y, @@ -291,17 +289,16 @@ void Log_RequestLogo (Sco_Scope_t Scope) /***** Upload logo *****/ fprintf (Gbl.F.Out,"" - "" - "" - "", + "", The_ClassFormul[Gbl.Prefs.Theme], Txt_File_with_the_logo, Fil_NAME_OF_PARAM_FILENAME_ORG); /***** Button to create announcement and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_logo); + Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Upload_logo); /***** End form *****/ Act_FormEnd (); @@ -319,7 +316,7 @@ static void Log_PutLinkToRemoveLogo (Act_Action_t Action) /***** Link for removing the photo *****/ Act_FormStart (Action); Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("delon",Txt_Remove_logo,Txt_Remove_logo); + Lay_PutIconWithText ("delon",Txt_Remove_logo,Txt_Remove_logo); Act_FormEnd (); } diff --git a/swad_mail.c b/swad_mail.c index 5849e82b0..fc5e1a649 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -101,7 +101,7 @@ void Mai_SeeMailDomains (void) Mai_PutFormToEditMailDomains (); /***** Table head *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Mail_domains_allowed_for_notifications); + Lay_StartRoundFrameTable (NULL,2,Txt_Mail_domains_allowed_for_notifications); fprintf (Gbl.F.Out,""); for (Order = Mai_ORDER_BY_DOMAIN; Order <= Mai_ORDER_BY_USERS; @@ -146,7 +146,7 @@ void Mai_SeeMailDomains (void) Gbl.Mails.Lst[NumMai].NumUsrs); /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free list of mail domains *****/ Mai_FreeListMailDomains (); @@ -390,7 +390,7 @@ static void Mai_ListMailDomainsForEdition (void) unsigned NumMai; struct Mail *Mai; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Mail_domains_allowed_for_notifications); + Lay_StartRoundFrameTable (NULL,2,Txt_Mail_domains_allowed_for_notifications); /***** Table head *****/ Mai_PutHeadMailDomains (); @@ -454,7 +454,7 @@ static void Mai_ListMailDomainsForEdition (void) Mai->NumUsrs); } - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -649,7 +649,7 @@ static void Mai_PutFormToCreateMailDomain (void) Act_FormStart (ActNewMai); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_mail_domain); + Lay_StartRoundFrameTable (NULL,2,Txt_New_mail_domain); /***** Write heading *****/ fprintf (Gbl.F.Out,"" @@ -681,7 +681,7 @@ static void Mai_PutFormToCreateMailDomain (void) /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_mail_domain); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_mail_domain); /***** End of form *****/ Act_FormEnd (); diff --git a/swad_menu.c b/swad_menu.c index bc6896ebb..64f30fed6 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -307,7 +307,7 @@ void Mnu_PutIconsToSelectMenu (void) extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS]; Mnu_Menu_t Menu; - Lay_StartRoundFrameTable10 (NULL,2,Txt_Menu); + Lay_StartRoundFrameTable (NULL,2,Txt_Menu); fprintf (Gbl.F.Out,""); for (Menu = (Mnu_Menu_t) 0; Menu < Mnu_NUM_MENUS; @@ -329,7 +329,7 @@ void Mnu_PutIconsToSelectMenu (void) fprintf (Gbl.F.Out,""); } fprintf (Gbl.F.Out,""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ diff --git a/swad_message.c b/swad_message.c index 7a46780f5..b30ceef8e 100644 --- a/swad_message.c +++ b/swad_message.c @@ -147,7 +147,7 @@ void Msg_ListEMails (void) if (Usr_GetIfShowBigList (Gbl.Usrs.LstStds.NumUsrs)) { /***** Start of the frame used to list the e-mails *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_Students_who_have_accepted_and_who_have_e_mail); + Lay_StartRoundFrameTable (NULL,0,Txt_Students_who_have_accepted_and_who_have_e_mail); fprintf (Gbl.F.Out,"" ""); @@ -216,7 +216,7 @@ void Msg_ListEMails (void) ""); /***** End of the frame used to list the e-mails *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Icon to open the client e-mail program *****/ fprintf (Gbl.F.Out,"
" @@ -225,7 +225,7 @@ void Msg_ListEMails (void) Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses, Txt_Create_e_mail_message, The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message); + Lay_PutIconWithText ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message); fprintf (Gbl.F.Out,"
"); } } @@ -315,7 +315,7 @@ static void Msg_PutFormMsgUsrs (const char *Content) } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_message); + Lay_StartRoundFrameTable (NULL,2,Txt_New_message); /***** Draw lists of users with the recipients *****/ fprintf (Gbl.F.Out,"" @@ -352,7 +352,7 @@ static void Msg_PutFormMsgUsrs (const char *Content) ""); /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Send_message); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Send_message); /***** End form *****/ Act_FormEnd (); @@ -1566,7 +1566,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) fprintf (Gbl.F.Out,"
"); Act_LinkFormSubmitAnimated (Txt_Update_messages,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Update_messages,Txt_Update_messages); + Lay_PutCalculateIconWithText (Txt_Update_messages,Txt_Update_messages); fprintf (Gbl.F.Out,"
"); Act_FormEnd (); @@ -1627,14 +1627,10 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) Pag_MESSAGES_SENT, 0,&Pagination); - /***** Show received messages in this page *****/ - Lay_StartRoundFrameTable10 ("100%",0, - TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received : - Txt_Messages_sent); - fprintf (Gbl.F.Out,"" - "" - ""); + /***** Show received / sent messages in this page *****/ + Lay_StartRoundFrameTable ("95%",2, + TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received : + Txt_Messages_sent); mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible-1)); for (NumRow = Pagination.FirstItemVisible; @@ -1649,10 +1645,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages) Msg_ShowASentOrReceivedMessage (TypeOfMessages,NumMsg,MsgCod); } - fprintf (Gbl.F.Out,"
" - "" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -2985,7 +2978,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject, (Replied ? Txt_Go_to_course_and_reply_again : Txt_Go_to_course_and_reply), The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("reply",Replied ? Txt_Reply_again : + Lay_PutIconWithText ("reply",Replied ? Txt_Reply_again : Txt_Reply, Replied ? Txt_Reply_again : Txt_Reply); @@ -3521,7 +3514,7 @@ void Msg_ListBannedUsrs (void) Usr_UsrDataConstructor (&UsrDat); /***** Start table with list of users *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Banned_users); + Lay_StartRoundFrameTable (NULL,2,Txt_Banned_users); /***** List users *****/ for (NumUsr = 1; @@ -3536,8 +3529,6 @@ void Msg_ListBannedUsrs (void) /* Get user's data from database */ if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) { - fprintf (Gbl.F.Out,""); - /* Put form to unban user */ fprintf (Gbl.F.Out,"" ""); @@ -3571,7 +3562,7 @@ void Msg_ListBannedUsrs (void) } /***** End of table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_network.c b/swad_network.c index c89c2a1ac..90cd3f91a 100644 --- a/swad_network.c +++ b/swad_network.c @@ -227,7 +227,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) char URL[Cns_MAX_BYTES_URL+1]; /***** Start table *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Webs_social_networks); + Lay_StartRoundFrameTable (NULL,2,Txt_Webs_social_networks); for (NumURL = (Net_WebsAndSocialNetworks_t) 0; NumURL < Net_NUM_WEBS_AND_SOCIAL_NETWORKS; @@ -281,7 +281,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) } /***** End table *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /*****************************************************************************/ @@ -433,7 +433,7 @@ void Net_ShowWebAndSocialNetworksStats (void) "can not get number of users with webs / social networks"); /***** Number of users *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS]); + Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS]); fprintf (Gbl.F.Out,"" "" @@ -495,7 +495,7 @@ void Net_ShowWebAndSocialNetworksStats (void) } /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); diff --git a/swad_notice.c b/swad_notice.c index d9c75604b..15a7bf03e 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -97,7 +97,7 @@ void Not_ShowFormNotice (void) Act_FormStart (ActRcvNot); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_New_notice); + Lay_StartRoundFrameTable (NULL,2,Txt_New_notice); /***** Message body *****/ fprintf (Gbl.F.Out,"" @@ -113,7 +113,7 @@ void Not_ShowFormNotice (void) Txt_MSG_Message); /***** Button to create notice and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_notice); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_notice); /***** End form *****/ Act_FormEnd (); @@ -381,7 +381,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing) { sprintf (StrWidth,"%upx", Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 40); - Lay_StartRoundFrameTable10 (StrWidth,2,Txt_All_notices); + Lay_StartRoundFrameTable (StrWidth,2,Txt_All_notices); fprintf (Gbl.F.Out,"" ""); } @@ -445,7 +445,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing) { fprintf (Gbl.F.Out,"" ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } /***** Free structure that stores the query result *****/ diff --git a/swad_notification.c b/swad_notification.c index 73df06752..3e55913f4 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -315,7 +315,7 @@ void Ntf_ShowMyNotifications (void) Usr_UsrDataConstructor (&UsrDat); /***** Table start *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Notifications); + Lay_StartRoundFrameTable (NULL,2,Txt_Notifications); fprintf (Gbl.F.Out,"" "" @@ -564,7 +564,7 @@ void Ntf_ShowMyNotifications (void) } /***** Table end *****/ - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1650,7 +1650,7 @@ static void Ntf_PutLinkToMarkAllNotifAsSeen (void) Act_FormStart (ActMrkNtfSee); Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read); + Lay_PutIconWithText ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read); Act_FormEnd (); } @@ -1691,7 +1691,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Act_FormStart (ActChgNtfPrf); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Notifications); + Lay_StartRoundFrameTable (NULL,2,Txt_Notifications); fprintf (Gbl.F.Out,"" "" "" @@ -1733,7 +1733,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) } /***** Button to save changes and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save_changes); + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save_changes); /***** End form *****/ Act_FormEnd (); diff --git a/swad_password.c b/swad_password.c index b4dca5b49..c2e1c7aca 100644 --- a/swad_password.c +++ b/swad_password.c @@ -242,24 +242,22 @@ void Pwd_ShowFormSendNewPwd (void) Act_FormStart (ActSndNewPwd); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Password); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrame (NULL,Txt_Password); /***** Help text *****/ Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_); /***** User's ID/nickname *****/ fprintf (Gbl.F.Out,"" - "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin); + "", + The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID, + Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin); /***** Send button and end table *****/ - fprintf (Gbl.F.Out,"" - ""); - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Email_new_password); + Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Email_new_password); /***** End form *****/ Act_FormEnd (); @@ -684,7 +682,7 @@ void Pwd_ShowFormChgPwd (void) Act_FormStart (ActChgPwd); /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Password); + Lay_StartRoundFrameTable (NULL,2,Txt_Password); /* Current password */ if (IHaveAPasswordInDB) // If I have a password in database... @@ -714,7 +712,7 @@ void Pwd_ShowFormChgPwd (void) Pwd_PutFormToGetNewPasswordTwice (); /***** Send button and end form *****/ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON, + Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON, IHaveAPasswordInDB ? Txt_Change_password : Txt_Set_password); diff --git a/swad_photo.c b/swad_photo.c index 4818c79bb..19a5035af 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -272,7 +272,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho } /***** Start frame *****/ - Lay_StartRoundFrameTable10 (NULL,2,Txt_Photo); + Lay_StartRoundFrameTable (NULL,2,Txt_Photo); /***** Show current photo and help message *****/ fprintf (Gbl.F.Out,"" @@ -298,7 +298,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho UsrDat->UsrCod); /***** End frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_photo); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Upload_photo); /***** End form *****/ Act_FormEnd (); @@ -1761,7 +1761,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void) Usr_PutParamColsClassPhoto (); Usr_PutParamListWithPhotos (); Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate_average_photo_of_a_degree,Txt_Calculate_average_photo_of_THE_DEGREE_X); + Lay_PutCalculateIconWithText (Txt_Calculate_average_photo_of_a_degree,Txt_Calculate_average_photo_of_THE_DEGREE_X); /***** Put selector with all the degrees *****/ fprintf (Gbl.F.Out,"" - "" - "" - "", + " size=\"20\" maxlength=\"%u\" value=\"@%s\" />", The_ClassFormul[Gbl.Prefs.Theme], Txt_Nickname, Nck_MAX_BYTES_NICKNAME_WITH_ARROBA, DefaultNickname); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Continue); + Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Continue); /***** End form *****/ Act_FormEnd (); @@ -441,7 +437,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Act_FormStart (ActCal1stClkTim); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); + Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -483,7 +479,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Act_FormStart (ActCalNumClk); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); + Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -520,7 +516,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Act_FormStart (ActCalNumFilVie); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); + Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -557,7 +553,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Act_FormStart (ActCalNumForPst); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); + Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" @@ -594,7 +590,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) Act_FormStart (ActCalNumMsgSnt); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutCalculateIcon (Txt_Calculate,Txt_Calculate); + Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } fprintf (Gbl.F.Out,"" diff --git a/swad_record.c b/swad_record.c index 2cf383ab4..403ac45ca 100644 --- a/swad_record.c +++ b/swad_record.c @@ -97,9 +97,9 @@ void Rec_ReqEditRecordFields (void) /***** List the current fields of records for edit them *****/ if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found... { - Lay_StartRoundFrameTable10 (NULL,2,Txt_Record_fields); + Lay_StartRoundFrameTable (NULL,2,Txt_Record_fields); Rec_ListFieldsRecordsForEdition (); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrameTable (); } else // No fields of records found for current course in the database { @@ -276,7 +276,7 @@ void Rec_ShowFormCreateRecordField (void) Act_FormStart (ActNewFie); /***** Start of frame *****/ - Lay_StartRoundFrameTable10 (NULL,0,Txt_New_record_field); + Lay_StartRoundFrameTable (NULL,0,Txt_New_record_field); /***** Write heading *****/ Rec_WriteHeadingRecordFields (); @@ -321,7 +321,7 @@ void Rec_ShowFormCreateRecordField (void) ""); /***** Send button and end frame *****/ - Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_record_field); + Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_record_field); /***** End form *****/ Act_FormEnd (); @@ -1165,13 +1165,9 @@ static void Rec_ShowRecordOneTchCrs (void) Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /* Office hours */ - Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod); - fprintf (Gbl.F.Out,"" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrame (); fprintf (Gbl.F.Out,""); } @@ -1261,13 +1257,9 @@ void Rec_ListRecordsTchsCrs (void) /* Office hours */ if (ShowOfficeHours) { - Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod); - fprintf (Gbl.F.Out,"" - ""); - Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL); + Lay_EndRoundFrame (); } fprintf (Gbl.F.Out,""); @@ -1295,7 +1287,7 @@ void Rec_ShowLinkToPrintPreviewOfRecords (void) unsigned i; Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]); - Lay_PutSendIcon ("print",Txt_Print,Txt_Print); + Lay_PutIconWithText ("print",Txt_Print,Txt_Print); fprintf (Gbl.F.Out,"(" "