Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.113

This commit is contained in:
Antonio Cañas Vargas 2015-04-12 18:01:06 +02:00
parent 0400f10254
commit 2e3c162a45
57 changed files with 601 additions and 709 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/swad_desktop.css
View File

@ -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;

7
css/swad_mobile.css
View File

@ -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;

2
swad_QR.c
View File

@ -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 ();
}

8
swad_account.c
View File

@ -124,7 +124,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
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,"</div>");
}
@ -205,7 +205,7 @@ void Acc_ShowFormChangeMyAccount (void)
fprintf (Gbl.F.Out,"</div>");
/***** 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 ();
}

8
swad_action.c
View File

@ -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 ();
}
/*****************************************************************************/

4
swad_announcement.c
View File

@ -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,"<tr>"
@ -359,7 +359,7 @@ void Ann_ShowFormAnnouncement (void)
"</tr>");
/***** 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 ();

16
swad_assignment.c
View File

@ -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,"<tr>"
@ -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)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
Lay_StartRoundFrameTable ("100%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -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,"</td>"
"</tr>");
}

46
swad_attendance.c
View File

@ -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,"<tr>"
@ -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)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
Lay_StartRoundFrameTable ("100%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -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,"</td>"
"</tr>");
}
@ -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,"<tr>"
"<th></th>"
"<th></th>"
@ -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,"<tr>"
"<th></th>"
"<th></th>"
@ -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,"<tr>"
@ -3023,13 +3023,13 @@ static void Att_ListEventsToSelect (void)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" style=\"text-align:center;\">");
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,"</td>"
"</tr>");
}
/***** 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);

12
swad_banner.c
View File

@ -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)
"</tr>");
}
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 ();

4
swad_calendar.c
View File

@ -130,7 +130,7 @@ void Cal_DrawCalendar (void)
Act_PutContextualLink (ActPrnCal,NULL,"print",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
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 ();
}
/*****************************************************************************/

30
swad_centre.c
View File

@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
@ -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,"<tr>"
@ -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,"<tr>"
"<td style=\"text-align:center;\">");
@ -1860,7 +1860,7 @@ void Ctr_RequestPhoto (void)
/***** Upload photo *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:"
"%s:&nbsp;"
"</label>"
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>"
@ -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)
"</tr>");
/***** 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,"<tr>"
@ -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 *****/

4
swad_changelog.h
View File

@ -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.

11
swad_chat.c
View File

@ -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,"<tr>"
"<td>"
"<div style=\"display:inline-block; margin:0 auto;\">"
@ -225,7 +225,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"</div>"
"</td>"
"</tr>");
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,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:center; background-color:%s;\">"
"%s&nbsp;"
"%s"
"</td>"
"<td class=\"TIT_TBL\""
" style=\"text-align:left; background-color:%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 *****/

25
swad_connected.c
View File

@ -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,"<tr>"
@ -105,7 +105,7 @@ void Con_ShowConnectedUsrs (void)
fprintf (Gbl.F.Out,"</div>");
}
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,"</td>"
@ -123,7 +123,7 @@ void Con_ShowConnectedUsrs (void)
"</tr>");
/***** 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,"<tr>"
"<td>");
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time);
fprintf (Gbl.F.Out,"<div id=\"lastclicks\" style=\"text-align:center;\">"); // Used for AJAX based refresh
fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh
" style=\"text-align:center;\">");
Con_GetAndShowLastClicks ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
fprintf (Gbl.F.Out,"</td>"
"</tr>");
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,"<table>");
/* Print table row */
fprintf (Gbl.F.Out,"<tr>"
fprintf (Gbl.F.Out,"<table class=\"TABLE10\">"
"<tr>"
"<th class=\"TIT_TBL\""
" style=\"width:70px; text-align:left;\">"
"%s"

20
swad_country.c
View File

@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
@ -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,"</div>");
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<tr>"
@ -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,"<tr>"
"<th class=\"COUNTRY_MAP_SMALL\"></th>");
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 ();

34
swad_course.c
View File

@ -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,"<tr>"
@ -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,"<tr>"
"<td>"
"<div style=\"display:inline-block; margin:0 auto;\">"
Lay_StartRoundFrame (NULL,Txt_My_courses);
fprintf (Gbl.F.Out,"<div style=\"margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" padding:0; margin:0;"
" text-align:left; vertical-align:middle;\">",
@ -842,10 +840,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** End frame *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
"</div>");
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)
"</tr>");
/***** 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,"<tr>"
@ -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 *****/

36
swad_degree.c
View File

@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
@ -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,"<tr>"
@ -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,"<tr>"
@ -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)
"</tr>");
/***** 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,"<tr>"
@ -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 *****/

12
swad_department.c
View File

@ -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,"<tr>");
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,"<tr>"
@ -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 ();

28
swad_enrollment.c
View File

@ -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,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s: "
"</label>"
"<input type=\"text\" name=\"OtherUsrIDNickOrEMail\""
" size=\"20\" maxlength=\"%u\" />"
"</div>",
" 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,"<tr>"
"<td>");
Lay_StartRoundFrame (NULL,Txt_Admin_several_users);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
@ -610,9 +608,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
Pwd_AskForConfirmationOnDangerousAction ();
/***** Send button and end frame *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
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,"<div class=\"CONTEXT_MENU\">");
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,"</div>");
@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\""
@ -2519,7 +2515,7 @@ void Enr_ShowEnrollmentRequests (void)
}
/* End frame */
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
/* Free memory used for user's data */
Usr_UsrDataDestructor (&UsrDat);
@ -2661,17 +2657,13 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void)
}
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_one_user);
fprintf (Gbl.F.Out,"<tr>"
"<td>");
Lay_StartRoundFrame (NULL,Txt_Admin_one_user);
/***** Write form to request another user's ID *****/
Enr_WriteFormToReqAnotherUsrID (ActReqMdfUsr);
/***** End frame *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
}
/*****************************************************************************/

6
swad_exam.c
View File

@ -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,"</td>" \
"</tr>");
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 ();

90
swad_file_browser.c
View File

@ -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,"<tr>"
@ -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,"<tr>"
"<td style=\"text-align:center;\">");
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,"<label class=\"%s\">%s:</label>"
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s: "
"</label>"
"<input type=\"text\" name=\"NewFolderName\""
" size=\"32\" maxlength=\"40\" value=\"\" />"
"</td>"
"</tr>",
" 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,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrame ("95%",Txt_Upload_files);
Lay_StartRoundFrameTable10 ("100%",0,Txt_Upload_files);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** 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,"<div class=\"dz-message\">"
"<span class=\"DAT_LIGHT\">%s</div>"
"<span class=\"DAT_LIGHT\">%s</span>"
"</div>"
"</form>",
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,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</div>");
}
@ -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,"<div id=\"classic-upload\" style='display:none;'>");
fprintf (Gbl.F.Out,"<div id=\"classic-upload\" style=\"display:none;\">");
Lay_StartRoundFrame (NULL,Txt_Upload_file);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Upload_file);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** 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,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</div>");
}
@ -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,"<tr>"
"<td style=\"text-align:center;\">");
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,"</td>"
"</tr>");
/***** 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,"<tr>"
"<td style=\"text-align:center;\">");
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,"<table>"
"<tr>"
"<td style=\"text-align:right;\">"
@ -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,"<tr>"
"<td style=\"text-align:right;\">"
"<label class=\"%s\">%s (%s):</label>"
@ -7912,13 +7902,11 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>"
"</tr>"
"</table>"
"</td>"
"</tr>",
"</table>",
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,"<tr>"
@ -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,"<tr>"
@ -10912,7 +10900,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title)
"</tr>");
/* Table end */
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/***** Free structure that stores the query result *****/

60
swad_forum.c
View File

@ -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,"<tr>"
"<td>"
"<div style=\"display:inline-block; margin:0 auto;\">"
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" padding:0; margin:0;"
" text-align:left; vertical-align:middle;\">",
@ -944,10 +942,8 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
fprintf (Gbl.F.Out,"</li>"
"</ul>"
"</div>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
"</div>");
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,"<tr>"
"<td style=\"width:100%%; text-align:center;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100%%;\">");
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,"</table>"
"</td>"
"</tr>");
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,"<tr>"
"<td>"
"<div style=\"display:inline-block; margin:0 auto;\">"
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" padding:0; margin:0;"
" text-align:left; vertical-align:middle;\">",
@ -1742,10 +1730,8 @@ void For_ShowForumList (void)
/***** End table *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
"</div>");
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,"<tr>"
"<td>");
Act_FormStart (ActSeeFor);
For_PutParamForumOrder ();
For_PutParamsForumInsDegCrs ();
@ -1784,8 +1768,6 @@ static void For_PutFormWhichForums (void)
}
fprintf (Gbl.F.Out,"</ul>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
@ -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,"<tr>"
"<td>"
"<div style=\"display:inline-block; margin:0 auto;\">"
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"%s\" style=\"list-style-type:none;"
" padding:0; margin:0;"
" text-align:left; vertical-align:middle;\">",
@ -2488,10 +2468,8 @@ void For_ShowForumThrs (void)
/* End table */
fprintf (Gbl.F.Out,"</ul>"
"</div>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
"</div>");
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,"<tr>"
@ -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,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
@ -3753,7 +3731,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"</tr>");
/***** 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 ();

30
swad_group.c
View File

@ -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,"<tr>"
@ -281,12 +281,12 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
"<td colspan=\"7\" style=\"padding-top:10px;"
" text-align:center;\">");
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,"</td>"
"</tr>");
/***** 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)
"</tr>");
/***** 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)
"</tr>");
/***** 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 ();

12
swad_holiday.c
View File

@ -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,"<tr>");
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)
"</tr>");
}
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,"<tr>"
@ -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 ();

4
swad_icon.c
View File

@ -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,"<tr>");
for (IconSet = (Ico_IconSet_t) 0;
IconSet < Ico_NUM_ICON_SETS;
@ -93,7 +93,7 @@ void Ico_PutIconsToSelectIconSet (void)
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

4
swad_import.c
View File

@ -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,"<tr>"
"<th colspan=\"%u\" class=\"TIT_TBL\""
" style=\"text-align:center; vertical-align:top;\">",
@ -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 *****/

6
swad_indicator.c
View File

@ -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,"<tr>"
"<td style=\"text-align:center;\">");
@ -177,7 +177,7 @@ void Ind_ReqIndicatorsCourses (void)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
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,"</td>"
"</tr>"
"</table>");
@ -211,7 +211,7 @@ void Ind_ReqIndicatorsCourses (void)
/***** End frame *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);

40
swad_info.c
View File

@ -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,"<tr>"
"<td style=\"text-align:center;\">"
"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
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,"</td>"
"</tr>");
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,"<tr>"
@ -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,"</p>"
"</td>"
"</tr>");
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,"</div>"
"</td>"
"</tr>");
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)
"</tr>");
/***** 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)
"</tr>");
/***** End form *****/
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}

24
swad_institution.c
View File

@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
@ -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,"<tr>"
@ -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)
"</tr>");
/***** 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,"<tr>"
@ -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 *****/

74
swad_layout.c
View File

@ -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)
"<!DOCTYPE html>\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,"<html lang=\"%s\">\n"
"<head>\n"
"<meta http-equiv=\"Content-Type\" content=\"text/html;charset=windows-1252\" />\n"
@ -429,7 +424,8 @@ static void Lay_WriteRedirectionToMyLanguage (void)
{
extern const char *Txt_STR_LANG_ID[Txt_NUM_LANGUAGES];
fprintf (Gbl.F.Out,"<meta http-equiv=\"refresh\" content=\"0; url='%s/%s?act=%ld&amp;ses=%s'\">",
fprintf (Gbl.F.Out,"<meta http-equiv=\"refresh\""
" content=\"0; url='%s/%s?act=%ld&amp;ses=%s'\">",
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,"<div id=\"msg\" style=\"padding-top:8px;\">"); // Used for AJAX based refresh
fprintf (Gbl.F.Out,"<div id=\"msg\"" // Used for AJAX based refresh
" style=\"padding-top:8px;\">");
Ntf_WriteNumberOfNewNtfs ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
fprintf (Gbl.F.Out,"</div>"); // 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,"<td style=\"width:128px;"
" text-align:center; vertical-align:top;"
" background-image:url('%s/head_base_background_1x56.gif');"
@ -786,12 +783,12 @@ static void Lay_WritePageTopHeading (void)
"<tr>");
/***** 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,"<td style=\"width:128px; text-align:center;"
" vertical-align:top;\">");
Lay_ShowLeftColumn ();
fprintf (Gbl.F.Out,"</td>"); // End of first column
fprintf (Gbl.F.Out,"</td>");
}
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,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
@ -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,"<div class=\"ICON_HIGHLIGHT\""
" style=\"margin:0 5px; display:inline;\">"
@ -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,"<table class=\"TABLE10");
if (CellPadding)
@ -1104,7 +1101,7 @@ void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const ch
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,"<div style=\"text-align:center;\">"
"<div class=\"FRAME10\"");
@ -1122,7 +1119,7 @@ void Lay_StartRoundFrame10 (const char *Width,const char *Title)
// CellPadding must be 0, 1, 2, 4 or 8
void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding)
void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<div class=\"FRAME10_SHADOW\"");
@ -1136,14 +1133,27 @@ void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding)
fprintf (Gbl.F.Out,"\">");
}
void Lay_EndRoundFrameTable10 (Lay_Button_t Button,const char *TxtButton)
void Lay_EndRoundFrameTable (void)
{
fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrame10 (Button,TxtButton);
Lay_EndRoundFrame ();
}
void Lay_EndRoundFrame10 (Lay_Button_t Button,const char *TxtButton)
void Lay_EndRoundFrame (void)
{
fprintf (Gbl.F.Out,"</div>"
"</div>");
}
void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton)
{
fprintf (Gbl.F.Out,"</table>");
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,"<tr>");
for (Layout = (Lay_Layout_t) 0;
Layout < Lay_NUM_LAYOUTS;
@ -1539,7 +1549,7 @@ void Lay_PutIconsToSelectLayout (void)
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTableWithButton (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/
@ -1597,7 +1607,7 @@ void Lay_AdvertisementMobile (void)
fprintf (Gbl.F.Out,"<div style=\"margin-top:20px;\">");
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,8,NULL);
Lay_StartRoundFrameTable (NULL,8,NULL);
/***** Show advertisement *****/
fprintf (Gbl.F.Out,"<tr>"
@ -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,"</div>");
}

16
swad_layout.h
View File

@ -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);

12
swad_link.c
View File

@ -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)
"</tr>");
}
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 ();

15
swad_logo.c
View File

@ -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,"<tr>"
"<td style=\"text-align:center;\">");
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,"<label class=\"%s\">"
"%s:"
"%s:&nbsp;"
"</label>"
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>"
"</tr>",
"<input type=\"file\" name=\"%s\""
" size=\"40\" maxlength=\"100\" value=\"\" />",
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 ();
}

12
swad_mail.c
View File

@ -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,"<tr>");
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,"<tr>"
@ -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 ();

4
swad_menu.c
View File

@ -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,"<tr>");
for (Menu = (Mnu_Menu_t) 0;
Menu < Mnu_NUM_MENUS;
@ -329,7 +329,7 @@ void Mnu_PutIconsToSelectMenu (void)
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

37
swad_message.c
View File

@ -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,"<tr>"
"<td class=\"DAT_SMALL\""
" style=\"text-align:left;\">");
@ -216,7 +216,7 @@ void Msg_ListEMails (void)
"</tr>");
/***** 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,"<div class=\"CONTEXT_MENU\">"
@ -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,"</div>");
}
}
@ -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,"<tr>"
@ -352,7 +352,7 @@ static void Msg_PutFormMsgUsrs (const char *Content)
"</tr>");
/***** 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,"<div class=\"CONTEXT_MENU\">");
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,"</div>");
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,"<tr>"
"<td style=\"width:100%%; text-align:center;\">"
"<table class=\"CELLS_PAD_2\""
" style=\"width:100%%;\">");
/***** 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,"</table>"
"</td>"
"</tr>");
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,"<tr>");
/* Put form to unban user */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BM\">");
@ -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);

8
swad_network.c
View File

@ -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,"<tr>"
"<th class=\"TIT_TBL\" style=\"text-align:left;\">"
@ -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);

8
swad_notice.c
View File

@ -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,"<tr>"
@ -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,"<tr>"
"<td style=\"text-align:center;\">");
}
@ -445,7 +445,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
{
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/***** Free structure that stores the query result *****/

10
swad_notification.c
View File

@ -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,"<tr>"
"<th colspan=\"2\" class=\"TIT_TBL\""
" style=\"text-align:left;\">"
@ -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,"<tr>"
"<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:center;\">"
@ -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 ();

20
swad_password.c
View File

@ -242,24 +242,22 @@ void Pwd_ShowFormSendNewPwd (void)
Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Password);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"align:center;\">");
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,"<label class=\"%s\">"
"%s:"
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"UsrId\" size=\"8\" maxlength=\"%u\" value=\"%s\" />",
The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
"<input type=\"text\" name=\"UsrId\""
" size=\"8\" maxlength=\"%u\" value=\"%s\" />",
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,"</td>"
"</tr>");
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);

14
swad_photo.c
View File

@ -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,"<tr>"
@ -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,"<select name=\"OthDegCod\">");
@ -1861,7 +1861,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
bool TRIsOpen = false;
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Degrees);
Lay_StartRoundFrameTable (NULL,0,Txt_Degrees);
/***** Get degrees from database *****/
Pho_BuildQueryOfDegrees (Query);
@ -1917,7 +1917,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
DB_FreeMySQLResult (&mysql_res);
/***** End frame *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -1941,7 +1941,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Class photo start *****/
if (SeeOrPrint == Pho_DEGREES_SEE)
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,NULL);
else
fprintf (Gbl.F.Out,"<table>");
@ -2035,7 +2035,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Photos end *****/
if (SeeOrPrint == Pho_DEGREES_SEE)
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
else
fprintf (Gbl.F.Out,"</table>");
}

12
swad_place.c
View File

@ -97,7 +97,7 @@ void Plc_SeePlaces (void)
Plc_PutFormToEditPlcs ();
/***** Table head *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Places);
Lay_StartRoundFrameTable (NULL,0,Txt_Places);
fprintf (Gbl.F.Out,"<tr>");
for (Order = Plc_ORDER_BY_PLACE;
Order <= Plc_ORDER_BY_NUM_CTRS;
@ -171,7 +171,7 @@ void Plc_SeePlaces (void)
Ctr_GetNumCtrsTotal () - NumCtrsWithPlc);
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
/***** Free list of places *****/
Plc_FreeListPlaces ();
@ -412,7 +412,7 @@ static void Plc_ListPlacesForEdition (void)
unsigned NumPlc;
struct Place *Plc;
Lay_StartRoundFrameTable10 (NULL,2,Txt_Places);
Lay_StartRoundFrameTable (NULL,2,Txt_Places);
/***** Table head *****/
Plc_PutHeadPlaces ();
@ -480,7 +480,7 @@ static void Plc_ListPlacesForEdition (void)
Plc->NumCtrs);
}
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -685,7 +685,7 @@ static void Plc_PutFormToCreatePlace (void)
Act_FormStart (ActNewPlc);
/***** Start of frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_place);
Lay_StartRoundFrameTable (NULL,2,Txt_New_place);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -715,7 +715,7 @@ static void Plc_PutFormToCreatePlace (void)
Plc_MAX_LENGTH_PLACE_FULL_NAME,Plc->FullName);
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_place);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_place);
/***** End formn *****/
Act_FormEnd ();

12
swad_plugin.c
View File

@ -95,7 +95,7 @@ void Plg_ListPlugins (void)
Plg_PutFormToEditPlugins ();
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Plugins);
Lay_StartRoundFrameTable (NULL,2,Txt_Plugins);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -138,7 +138,7 @@ void Plg_ListPlugins (void)
}
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
/***** Free list of plugins *****/
Plg_FreeListPlugins ();
@ -353,7 +353,7 @@ static void Plg_ListPluginsForEdition (void)
unsigned NumPlg;
struct Plugin *Plg;
Lay_StartRoundFrameTable10 (NULL,2,Txt_Plugins);
Lay_StartRoundFrameTable (NULL,2,Txt_Plugins);
/***** Table head *****/
Plg_PutHeadPlugins ();
@ -460,7 +460,7 @@ static void Plg_ListPluginsForEdition (void)
"</tr>");
}
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -841,7 +841,7 @@ static void Plg_PutFormToCreatePlugin (void)
Act_FormStart (ActNewPlg);
/***** Start of frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_plugin);
Lay_StartRoundFrameTable (NULL,2,Txt_New_plugin);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -909,7 +909,7 @@ static void Plg_PutFormToCreatePlugin (void)
Cns_MAX_LENGTH_IP,Plg->IP);
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_plugin);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_plugin);
/***** End form *****/
Act_FormEnd ();

12
swad_preference.c
View File

@ -68,13 +68,9 @@ void Pre_EditPrefs (void)
char MailDomain[Cns_MAX_BYTES_STRING+1];
/***** Language *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Language);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_Language);
Pre_PutSelectorToSelectLanguage ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
/***** Layout, theme, icon set, menu & side columns *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px;\">"
@ -342,7 +338,7 @@ static void Pre_PutIconsToSelectSideCols (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols;
Lay_StartRoundFrameTable10 (NULL,2,Txt_Columns);
Lay_StartRoundFrameTable (NULL,2,Txt_Columns);
fprintf (Gbl.F.Out,"<tr>");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;
@ -364,7 +360,7 @@ static void Pre_PutIconsToSelectSideCols (void)
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

26
swad_profile.c
View File

@ -143,25 +143,21 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
Act_FormStart (ActSeePubPrf);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_View_public_profile);
Lay_StartRoundFrame (NULL,Txt_View_public_profile);
/***** Form to request user's @nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td>"
"<div class=\"%s\" style=\"text-align:center;\">"
"%s: "
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"usr\""
" size=\"20\" maxlength=\"%u\" value=\"@%s\" />"
"</div>"
"</td>"
"</tr>",
" 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,"</td>"
@ -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,"</td>"
@ -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,"</td>"
@ -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,"</td>"
@ -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,"</td>"

44
swad_record.c
View File

@ -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)
"</tr>");
/***** 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,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</div>");
}
@ -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,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
}
fprintf (Gbl.F.Out,"</div>");
@ -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,"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassFormul[Gbl.Prefs.Theme]);
@ -1508,7 +1500,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
/***** Start frame *****/
sprintf (StrRecordWidth,"%upx",RecordWidth);
Lay_StartRoundFrameTable10 (StrRecordWidth,2,NULL);
Lay_StartRoundFrameTable (StrRecordWidth,2,NULL);
/***** Header *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1606,11 +1598,11 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
/***** Button to save changes and end frame *****/
if (DataForm)
{
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -2085,7 +2077,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Start frame *****/
sprintf (StrRecordWidth,"%upx",RecordWidth);
Lay_StartRoundFrameTable10 (StrRecordWidth,2,NULL);
Lay_StartRoundFrameTable (StrRecordWidth,2,NULL);
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
@ -3063,7 +3055,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
/***** End frame *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -3271,9 +3263,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_centre_and_department);
/***** Start table *****/
Lay_StartRoundFrameTable10 ("560px",2,
IAmTeacher ? Txt_Institution_centre_and_department :
Txt_Institution);
Lay_StartRoundFrameTable ("560px",2,
IAmTeacher ? Txt_Institution_centre_and_department :
Txt_Institution);
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
@ -3492,7 +3484,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
}
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

8
swad_search.c
View File

@ -232,9 +232,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Start form *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (Action);
Lay_StartRoundFrameTable10 (NULL,2,Txt_Search);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_Search);
/***** Scope (whole platform, current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
@ -269,11 +267,9 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** String to find *****/
Sch_PutFormToSearch (Gbl.Prefs.IconsURL);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Search);
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/
Act_FormEnd ();

108
swad_statistic.c
View File

@ -384,7 +384,7 @@ static void Sta_PutFormToRequestAccessesCrs (void)
Act_FormStart (ActReqAccCrs);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("stats",Txt_Visits_to_course,Txt_Visits_to_course);
Lay_PutIconWithText ("stats",Txt_Visits_to_course,Txt_Visits_to_course);
Act_FormEnd ();
}
@ -437,14 +437,14 @@ void Sta_AskSeeCrsAccesses (void)
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:4px;\">"
"<tr>"
"<td colspan=\"2\" style=\"text-align:left;\">");
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,NULL);
/* Put list of users to select some users */
Usr_ListUsersToSelect (Rol_TEACHER);
Usr_ListUsersToSelect (Rol_STUDENT);
/* End the table */
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -1357,9 +1357,9 @@ static bool Sta_SeeAccesses (void)
/***** Put the table with the clicks *****/
/* Write start of table frame */
Lay_StartRoundFrameTable10 (Gbl.Stat.ClicksStatType == Sta_ACC_CRS_LISTING ? "100%" :
Lay_StartRoundFrameTable ((Gbl.Stat.ClicksStatType == Sta_ACC_CRS_LISTING) ? "95%" :
NULL,
0,NULL);
0,NULL);
switch (Gbl.Stat.ClicksStatType)
{
case Sta_ACC_CRS_LISTING:
@ -1414,7 +1414,7 @@ static bool Sta_SeeAccesses (void)
}
/* End of frame */
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/***** Free structure that stores the query result *****/
@ -3769,7 +3769,7 @@ static void Sta_GetAndShowUsersStats (void)
extern const char *Txt_Average_number_of_users_belonging_to_a_course;
/***** Number of users *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS]);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"TIT_TBL\" style=\"text-align:right;\">"
@ -3793,7 +3793,7 @@ static void Sta_GetAndShowUsersStats (void)
Usr_GetAndShowNumUsrsInPlatform (Rol_TEACHER);
Usr_GetAndShowNumUsrsInPlatform (Rol__GUEST_); // Users not beloging to any course
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -3810,7 +3810,7 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Messages;
extern const char *Txt_Followers;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING]);
/***** Header *****/
fprintf (Gbl.F.Out,"<tr>"
@ -3868,7 +3868,7 @@ static void Sta_GetAndShowUsersRanking (void)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -3880,14 +3880,14 @@ static void Sta_GetAndShowHierarchyStats (void)
{
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY]);
Sta_WriteHeadDegsCrssInSWAD ();
Sta_GetAndShowNumCtysInSWAD ();
Sta_GetAndShowNumInssInSWAD ();
Sta_GetAndShowNumCtrsInSWAD ();
Sta_GetAndShowNumDegsInSWAD ();
Sta_GetAndShowNumCrssInSWAD ();
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4521,7 +4521,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable10 ("100%",2,Txt_Institutions_by_number_of_centres);
Lay_StartRoundFrameTable ("95%",2,Txt_Institutions_by_number_of_centres);
/***** Get institutions ordered by number of centres *****/
switch (Gbl.Scope.Current)
@ -4558,7 +4558,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
}
Sta_GetAndShowInss (Query,Txt_Centres);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4573,7 +4573,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable10 ("100%",2,Txt_Institutions_by_number_of_degrees);
Lay_StartRoundFrameTable ("95%",2,Txt_Institutions_by_number_of_degrees);
/***** Get institutions ordered by number of degrees *****/
switch (Gbl.Scope.Current)
@ -4613,7 +4613,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
}
Sta_GetAndShowInss (Query,Txt_Degrees);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4628,7 +4628,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable10 ("100%",2,Txt_Institutions_by_number_of_courses);
Lay_StartRoundFrameTable ("95%",2,Txt_Institutions_by_number_of_courses);
/***** Get institutions ordered by number of courses *****/
switch (Gbl.Scope.Current)
@ -4671,7 +4671,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
}
Sta_GetAndShowInss (Query,Txt_Courses);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4686,7 +4686,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable10 ("100%",2,Txt_Institutions_by_number_of_users_in_courses);
Lay_StartRoundFrameTable ("95%",2,Txt_Institutions_by_number_of_users_in_courses);
/***** Get institutions ordered by number of users in courses *****/
switch (Gbl.Scope.Current)
@ -4732,7 +4732,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
}
Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4748,7 +4748,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable10 ("100%",2,Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them);
Lay_StartRoundFrameTable ("95%",2,Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them);
/***** Get institutions ordered by number of users who claim to belong to them *****/
switch (Gbl.Scope.Current)
@ -4786,7 +4786,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
}
Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -5010,7 +5010,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
unsigned NumStat;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES]);
/***** Write table heading *****/
Sta_WriteStatsExpTreesTableHead ();
@ -5028,7 +5028,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Virtual_pendrives);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -5849,7 +5849,7 @@ static void Sta_GetAndShowOERsStats (void)
unsigned long NumFiles[2];
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_OER]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_OER]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -5890,7 +5890,7 @@ static void Sta_GetAndShowOERsStats (void)
}
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6034,7 +6034,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6077,7 +6077,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumNotif);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6104,7 +6104,7 @@ static void Sta_GetAndShowTestsStats (void)
" border-width:1px;";
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_TESTS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_TESTS]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6246,7 +6246,7 @@ static void Sta_GetAndShowTestsStats (void)
StyleTableCell,Stats.AvgScorePerQuestion);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6277,7 +6277,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
char *StyleTableCell = " border-style:solid none none none;"
" border-width:1px;";
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6575,7 +6575,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
StyleTableCell,NumEventsTotal,
StyleTableCell,NumMailsTotal);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6612,7 +6612,7 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications += NumNotif;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6663,7 +6663,7 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6693,7 +6693,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6765,7 +6765,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -6792,7 +6792,7 @@ static void Sta_GetAndShowForumStats (void)
StatsForum.NumUsrsToBeNotifiedByEMail = 0;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6907,7 +6907,7 @@ static void Sta_GetAndShowForumStats (void)
Sta_WriteForumTotalStats (&StatsForum);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7160,7 +7160,7 @@ static void Sta_GetAndShowSurveysStats (void)
}
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7211,7 +7211,7 @@ static void Sta_GetAndShowSurveysStats (void)
NumNotif);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7224,7 +7224,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
extern const char *Txt_Public_profile;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY]);
/***** Privacy for photo *****/
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Photo,"PhotoVisibility");
@ -7232,7 +7232,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
/***** Privacy for public profile *****/
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
@ -7389,7 +7389,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
unsigned NumUsrs[Txt_NUM_LANGUAGES];
unsigned NumUsrsTotal = 0;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7505,7 +7505,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7525,7 +7525,7 @@ static void Sta_GetAndShowNumUsrsPerLayout (void)
unsigned NumUsrs[Lay_NUM_LAYOUTS];
unsigned NumUsrsTotal = 0;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_LAYOUTS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_LAYOUTS]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7637,7 +7637,7 @@ static void Sta_GetAndShowNumUsrsPerLayout (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7657,7 +7657,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
unsigned NumUsrs[The_NUM_THEMES];
unsigned NumUsrsTotal = 0;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_THEMES]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_THEMES]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7770,7 +7770,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7790,7 +7790,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
unsigned NumUsrs[Ico_NUM_ICON_SETS];
unsigned NumUsrsTotal = 0;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7906,7 +7906,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -7926,7 +7926,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
unsigned NumUsrs[Mnu_NUM_MENUS];
unsigned NumUsrsTotal = 0;
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MENUS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MENUS]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8038,7 +8038,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -8057,7 +8057,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
unsigned NumUsrsTotal = 0;
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS]);
Lay_StartRoundFrameTable (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS]);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8170,7 +8170,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
(float) NumUsrsTotal :
0);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

53
swad_survey.c
View File

@ -198,7 +198,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Pag_WriteLinksToPagesCentered (Pag_SURVEYS,0,&Pagination);
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Surveys);
Lay_StartRoundFrameTable (NULL,2,Txt_Surveys);
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -248,7 +248,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Svy_ShowOneSurvey (Gbl.Svys.LstSvyCods[NumSvy-1],SvyQst,false);
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
/***** Write again links to pages *****/
if (Pagination.MoreThanOnePage)
@ -310,9 +310,7 @@ void Svy_SeeOneSurvey (void)
Lay_ShowErrorAndExit ("Code of survey is missing.");
/***** Show survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/
@ -321,6 +319,7 @@ void Svy_SeeOneSurvey (void)
static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool ShowOnlyThisSvyComplete)
{
extern const char *Txt_Survey;
extern const char *Txt_View_survey;
extern const char *Txt_No_of_questions;
extern const char *Txt_No_of_users;
@ -336,6 +335,10 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh
bool RolesSelected;
char Txt[Cns_MAX_BYTES_TEXT+1];
/***** Start frame *****/
if (ShowOnlyThisSvyComplete)
Lay_StartRoundFrameTable (NULL,2,Txt_Survey);
/***** Get data of this survey *****/
Svy.SvyCod = SvyCod;
Svy_GetDataOfSurveyByCod (&Svy);
@ -547,6 +550,10 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh
Ntf_SetNotifAsSeen (Ntf_EVENT_SURVEY,
SvyCod,
Gbl.Usrs.Me.UsrDat.UsrCod);
/***** End frame *****/
if (ShowOnlyThisSvyComplete)
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -1573,9 +1580,9 @@ void Svy_RequestCreatOrEditSvy (void)
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,
ItsANewSurvey ? Txt_New_survey :
Txt_Edit_survey);
Lay_StartRoundFrameTable (NULL,2,
ItsANewSurvey ? Txt_New_survey :
Txt_Edit_survey);
/***** Survey for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1673,9 +1680,9 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Button to create/modify survey and end frame *****/
if (ItsANewSurvey)
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_survey);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_survey);
else
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -1750,7 +1757,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
Lay_StartRoundFrameTable ("95%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1771,7 +1778,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY);
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
@ -2345,9 +2352,7 @@ void Svy_RequestEditQuestion (void)
Svy_ShowFormEditOneQst (SvyCod,&SvyQst,Txt);
/***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/
@ -2429,10 +2434,10 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
{
sprintf (Gbl.Title,"%s %u",
Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,...
Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
Lay_StartRoundFrameTable (NULL,2,Gbl.Title);
}
else
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_question);
Lay_StartRoundFrameTable (NULL,2,Txt_New_question);
/***** Stem *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2508,9 +2513,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
/***** Send button and end frame *****/
if (SvyQst->QstCod > 0) // If the question already has assigned a code
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
else
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_question);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_question);
/***** End form *****/
Act_FormEnd ();
@ -2840,9 +2845,7 @@ void Svy_ReceiveQst (void)
Svy_FreeTextChoiceAnswers (&SvyQst,Svy_MAX_ANSWERS_PER_QUESTION);
/***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/
@ -2918,7 +2921,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod)
static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *Txt_Survey_questions;
extern const char *Txt_Questions;
extern const char *Txt_No_INDEX;
extern const char *Txt_Type;
extern const char *Txt_Question;
@ -2952,7 +2955,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
}
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Survey_questions);
Lay_StartRoundFrameTable (NULL,2,Txt_Questions);
if (NumQsts)
{
@ -3082,14 +3085,14 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_question,Txt_New_question);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
if (FormAnswerSurvey)
/***** End form *****/
@ -3302,9 +3305,7 @@ void Svy_RemoveQst (void)
Lay_ShowAlert (Lay_SUCCESS,Gbl.Message);
/***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/
@ -3336,9 +3337,7 @@ void Svy_ReceiveSurveyAnswers (void)
}
/***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
}
/*****************************************************************************/

10
swad_syllabus.c
View File

@ -196,10 +196,7 @@ void Syl_EditSyllabus (void)
if (Gbl.CurrentCrs.Syllabus.EditionIsActive || LstItemsSyllabus.NumItems)
{
/***** Start of table *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_INFO_TITLE[InfoType]);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left;\">"
"<table class=\"CELLS_PAD_1\" style=\"width:100%%;\">");
Lay_StartRoundFrameTable (NULL,1,Txt_INFO_TITLE[InfoType]);
/***** Write the current syllabus *****/
Syl_ShowSyllabus (InfoType);
@ -210,10 +207,7 @@ void Syl_EditSyllabus (void)
Txt_Enter_a_new_item_here,true);
/***** End of table *****/
fprintf (Gbl.F.Out,"</table>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
if (!Gbl.CurrentCrs.Syllabus.EditionIsActive)
fprintf (Gbl.F.Out,"<div class=\"DAT_SMALL\""

62
swad_test.c
View File

@ -718,7 +718,7 @@ static void Tst_WriteTestHead (unsigned NumTst)
extern const char *Txt_Test_No_X_that_you_make_in_this_course;
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,NULL);
Lay_WriteHeaderClassPhoto (3,false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -747,7 +747,7 @@ static void Tst_WriteTestHead (unsigned NumTst)
static void Tst_WriteTestFoot (void)
{
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -1152,7 +1152,7 @@ static void Tst_PutFormToCreateNewTstQst (void)
/***** Put form to create a new test question *****/
Act_FormStart (ActEdiOneTstQst);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("new",Txt_New_question,Txt_New_question);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
}
@ -1389,7 +1389,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
char TagText[Tst_MAX_BYTES_TAG+1];
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Tags);
Lay_StartRoundFrameTable (NULL,0,Txt_Tags);
/***** Select all tags *****/
fprintf (Gbl.F.Out,"<tr>");
@ -1451,7 +1451,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
}
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -1478,17 +1478,7 @@ static void Tst_ShowFormEditTags (void)
else
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Lay_StartRoundFrameTable10 (NULL,0,NULL);
/***** Header of table with title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"%s\""
" style=\"text-align:center;\">"
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Tags);
Lay_StartRoundFrameTable (NULL,2,Txt_Tags);
/***** Show tags *****/
for (NumRow = 0;
@ -1521,8 +1511,7 @@ static void Tst_ShowFormEditTags (void)
}
/***** End table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrameTable ();
}
/* Free structure that stores the query result */
@ -1597,7 +1586,7 @@ static void Tst_ShowFormConfigTst (void)
/***** Start form *****/
Act_FormStart (ActRcvCfgTst);
Lay_StartRoundFrameTable10 (NULL,2,Txt_Configure_tests);
Lay_StartRoundFrameTable (NULL,2,Txt_Configure_tests);
/***** Tests are visible from plugins? *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1701,7 +1690,7 @@ static void Tst_ShowFormConfigTst (void)
"</tr>");
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -2004,7 +1993,7 @@ static void Tst_ShowFormAnswerTypes (void)
const char *Ptr;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Types_of_answers);
Lay_StartRoundFrameTable (NULL,0,Txt_Types_of_answers);
/***** Select all types of answers *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2045,7 +2034,7 @@ static void Tst_ShowFormAnswerTypes (void)
}
/***** End of table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -2392,6 +2381,7 @@ static bool Tst_GetOneQuestionByCod (long QstCod,MYSQL_RES **mysql_res)
static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *mysql_res)
{
extern const char *Txt_Questions;
extern const char *Txt_No_INDEX;
extern const char *Txt_Code;
extern const char *Txt_Date;
@ -2412,7 +2402,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
double TotalScoreThisQst;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,Txt_Questions);
/***** Write the heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2652,7 +2642,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
}
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -4221,10 +4211,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
Par_PutHiddenParamLong ("QstCod",Gbl.Test.QstCod);
sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod);
Lay_StartRoundFrameTable10 (NULL,2,Title);
Lay_StartRoundFrameTable (NULL,2,Title);
}
else
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_question);
Lay_StartRoundFrameTable (NULL,2,Txt_New_question);
/***** Help for text editor *****/
fprintf (Gbl.F.Out,"<tr>"
@ -4513,9 +4503,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Send button and end frame *****/
if (Gbl.Test.QstCod > 0) // The question already has assigned a code
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
else
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_question);
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_question);
/***** End form *****/
Act_FormEnd ();
@ -5979,10 +5969,11 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
"<td colspan=\"2\" style=\"text-align:left;\">");
/***** 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_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -6076,6 +6067,7 @@ static void Tst_StoreScoreOfTestExamInDB (long TstCod,
void Tst_ShowUsrsTestResults (void)
{
extern const char *Txt_Exams;
extern const char *Txt_You_must_select_one_ore_more_users;
const char *Ptr;
@ -6089,7 +6081,7 @@ void Tst_ShowUsrsTestResults (void)
if (Usr_CountNumUsrsInEncryptedList ()) // If some users are selected...
{
/***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,Txt_Exams);
Tst_ShowHeaderTestResults ();
/***** List the assignments and works of the selected users *****/
@ -6105,7 +6097,7 @@ void Tst_ShowUsrsTestResults (void)
}
/***** End of the table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
else // If no users are selected...
{
@ -6180,11 +6172,13 @@ static void Tst_ShowHeaderTestResults (void)
void Tst_ShowMyTestResults (void)
{
extern const char *Txt_Exams;
/***** Get starting and ending dates *****/
Dat_GetIniEndDatesFromForm ();
/***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,Txt_Exams);
Tst_ShowHeaderTestResults ();
/***** List my results in test exams *****/
@ -6192,7 +6186,7 @@ void Tst_ShowMyTestResults (void)
Tst_ShowResultsOfTestExams (&Gbl.Usrs.Me.UsrDat);
/***** End of the table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

10
swad_test_import.c
View File

@ -97,7 +97,7 @@ void TsI_PutFormToExportQuestions (void)
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("export",Txt_Export_questions_to_XML_file,Txt_Export_questions);
Lay_PutIconWithText ("export",Txt_Export_questions_to_XML_file,Txt_Export_questions);
Act_FormEnd ();
}
@ -116,7 +116,7 @@ void TsI_PutFormToImportQuestions (void)
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("import",Txt_Import_questions_from_XML_file,Txt_Import_questions);
Lay_PutIconWithText ("import",Txt_Import_questions_from_XML_file,Txt_Import_questions);
Act_FormEnd ();
}
@ -264,7 +264,7 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP,
Gbl.FileBrowser.TmpPubDir,
The_ClassFormulB[Gbl.Prefs.Theme]);
Lay_PutSendIcon ("file",Txt_XML_file,Txt_XML_file);
Lay_PutIconWithText ("file",Txt_XML_file,Txt_XML_file);
}
/*****************************************************************************/
@ -945,7 +945,7 @@ static void TsI_WriteHeadingListImportedQst (void)
extern const char *Txt_Question;
/***** Table start *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,NULL);
/***** Write the heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -985,7 +985,7 @@ static void TsI_WriteHeadingListImportedQst (void)
static void TsI_WriteEndingListImportedQst (void)
{
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

42
swad_text.c
View File

@ -10395,6 +10395,27 @@ const char *Txt_Exam_of_X = // Warning: it is very important to include %s in th
"Exam of %s"; // Necessita de tradução
#endif
const char *Txt_Exams =
#if L==0
"Ex&agrave;mens";
#elif L==1
"Pr&uuml;fungen";
#elif L==2
"Exams";
#elif L==3
"Ex&aacute;menes";
#elif L==4
"Examens";
#elif L==5
"Ex&aacute;menes"; // Okoteve traducción
#elif L==6
"Esami";
#elif L==7
"Egzaminy";
#elif L==8
"Exames";
#endif
const char *Txt_exams =
#if L==0
"ex&agrave;mens";
@ -37429,27 +37450,6 @@ const char *Txt_Survey_X_is_now_visible = // Warning: it is very important to in
"O inqu&eacute;rito <strong>%s</strong> &eacute; agora vis&iacute;vel.";
#endif
const char *Txt_Survey_questions =
#if L==0
"Preguntas de la encuesta"; // Necessita traduccio
#elif L==1
"Umfrage-Fragen";
#elif L==2
"Survey questions";
#elif L==3
"Preguntas de la encuesta";
#elif L==4
"Questions du sondage";
#elif L==5
"Preguntas de la encuesta"; // Okoteve traducción
#elif L==6
"Domande di sondaggio";
#elif L==7
"Survey questions"; // Potrzebujesz tlumaczenie
#elif L==8
"Quest&otilde;es do inqu&eacute;rito";
#endif
const char *Txt_Survey_X_removed = // Warning: it is very important to include %s in the following sentences
#if L==0
"Encuesta <strong>%s</strong> eliminada."; // Necessita traduccio

4
swad_theme.c
View File

@ -233,7 +233,7 @@ void The_PutIconsToSelectTheme (void)
extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
Lay_StartRoundFrameTable10 (NULL,2,Txt_Theme_SKIN);
Lay_StartRoundFrameTable (NULL,2,Txt_Theme_SKIN);
fprintf (Gbl.F.Out,"<tr>");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;
@ -257,7 +257,7 @@ void The_PutIconsToSelectTheme (void)
fprintf (Gbl.F.Out,"</td>");
}
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/

26
swad_timetable.c
View File

@ -267,7 +267,7 @@ void TT_ShowClassTimeTable (void)
}
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TimeTableType]);
Lay_StartRoundFrameTable (NULL,0,Txt_TIMETABLE_TYPES[TimeTableType]);
/***** Start time table drawing *****/
if (TimeTableType == TT_COURSE_TIMETABLE)
@ -297,7 +297,7 @@ void TT_ShowClassTimeTable (void)
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -314,18 +314,10 @@ void TT_EditCrsTimeTable (void)
Act_PutContextualLink (ActSeeCrsTimTbl,NULL,"clock",Txt_Show_timetable);
fprintf (Gbl.F.Out,"</div>");
/***** Start of table *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]);
/***** Editable time table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]);
TT_ShowTimeTable (TT_COURSE_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
}
/*****************************************************************************/
@ -343,13 +335,9 @@ void TT_ShowMyTutTimeTable (void)
fprintf (Gbl.F.Out,"</div>");
/***** Time table *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
Lay_StartRoundFrame (NULL,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrame ();
}
/*****************************************************************************/
@ -762,7 +750,7 @@ static void TT_DrawTimeTable (void)
}
/***** Table start *****/
fprintf (Gbl.F.Out,"<table style=\"min-width:540px; margin:0 auto;\">");
fprintf (Gbl.F.Out,"<table style=\"min-width:560px; margin:0 auto;\">");
/***** Top row used for column adjustement *****/
TT_TimeTableDrawAdjustRow ();

51
swad_user.c
View File

@ -1366,7 +1366,7 @@ void Usr_WriteFormLogin (void)
The_ClassFormulB[Gbl.Prefs.Theme]);
sprintf (Gbl.Title,Txt_Enter_from_X,
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
Lay_PutSendIcon ("login",Gbl.Title,Gbl.Title);
Lay_PutIconWithText ("login",Gbl.Title,Gbl.Title);
}
/* Link to send a new password */
@ -1377,7 +1377,7 @@ void Usr_WriteFormLogin (void)
/***** Start form *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActAutUsrInt);
Lay_StartRoundFrameTable10 (NULL,2,Txt_Log_in);
Lay_StartRoundFrameTable (NULL,2,Txt_Log_in);
/***** User's ID/nickname and password *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1420,7 +1420,7 @@ void Usr_WriteFormLogin (void)
"</td>"
"</tr>",
Txt_Log_in);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -4721,7 +4721,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
extern const char *Txt_List_type;
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,8,Txt_List_type);
Lay_StartRoundFrameTable (NULL,8,Txt_List_type);
/***** Select USR_CLASS_ROOM *****/
fprintf (Gbl.F.Out,"<tr>"
@ -4759,7 +4759,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
"</tr>");
/***** End of table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/*****************************************************************************/
@ -5750,7 +5750,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
{
/***** Write heading *****/
Sex = Usr_GetSexOfUsrsLst (LstUsrs);
Lay_StartRoundFrameTable10 (NULL,2,Txt_ROLES_PLURAL_Abc[Role][Sex]);
Lay_StartRoundFrameTable (NULL,2,Txt_ROLES_PLURAL_Abc[Role][Sex]);
/* Number of users found */
fprintf (Gbl.F.Out,"<tr>"
@ -5808,9 +5808,9 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
"<td colspan=\"3\"></td>"
"<td colspan=\"%u\">",
Usr_NUM_MAIN_FIELDS_DATA_USR-3);
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable (NULL,2,NULL);
Crs_GetAndWriteCrssOfAUsr (UsrDat.UsrCod,Role);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
@ -5821,7 +5821,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
Usr_UsrDataDestructor (&UsrDat);
/***** Table end *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
/***** Free memory for teachers list *****/
@ -5837,6 +5837,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
void Usr_ListDataAdms (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_No_INDEX;
extern const char *Txt_Photo;
extern const char *Txt_ID;
@ -5904,7 +5905,7 @@ void Usr_ListDataAdms (void)
NumColumns = Usr_NUM_MAIN_FIELDS_DATA_ADM;
/***** Start table with list of administrators *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]);
/***** Heading row with column names *****/
/* Start row */
@ -5941,7 +5942,7 @@ void Usr_ListDataAdms (void)
Usr_UsrDataDestructor (&UsrDat);
/***** End of table *****/
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
else // Gbl.Usrs.LstAdms.NumUsrs == 0
Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_DEG_ADM]);
@ -6358,7 +6359,7 @@ void Usr_SeeGuests (void)
Grp_PutParamsCodGrps ();
/* Header */
Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrameTable (NULL,0,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6384,7 +6385,7 @@ void Usr_SeeGuests (void)
}
/* Send button and end frame */
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Show_records);
/* End form */
Act_FormEnd ();
@ -6527,7 +6528,7 @@ void Usr_SeeStudents (void)
}
/* Header */
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]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6562,11 +6563,11 @@ void Usr_SeeStudents (void)
/* Send button and end frame */
if (ICanViewRecords)
{
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Show_records);
Act_FormEnd ();
}
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
}
else
@ -6661,7 +6662,7 @@ void Usr_SeeTeachers (void)
Act_FormStart (ActSeeRecSevTch);
/* Header */
Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrameTable (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6696,11 +6697,11 @@ void Usr_SeeTeachers (void)
/* Send button and end frame */
if (ICanViewRecords)
{
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Show_records);
Act_FormEnd ();
}
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
fprintf (Gbl.F.Out,"</div>");
}
@ -6751,14 +6752,14 @@ void Usr_SeeGstClassPhotoPrn (void)
if (Gbl.Usrs.LstGsts.NumUsrs)
{
/***** Draw the guests' class photo *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,NULL);
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
(Gbl.Scope.Current == Sco_SCOPE_CTR ||
Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod :
-1L,
-1L,-1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
else
Usr_ShowWarningNoUsersFound (Rol__GUEST_);
@ -6791,7 +6792,7 @@ void Usr_SeeStdClassPhotoPrn (void)
if (Gbl.Usrs.LstStds.NumUsrs)
{
/***** Draw the students' class photo *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,NULL);
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
@ -6804,7 +6805,7 @@ void Usr_SeeStdClassPhotoPrn (void)
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
else
Usr_ShowWarningNoUsersFound (Rol_STUDENT);
@ -6845,7 +6846,7 @@ void Usr_SeeTchClassPhotoPrn (void)
if (Gbl.Usrs.LstTchs.NumUsrs)
{
/***** Draw the teachers' class photo *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable (NULL,0,NULL);
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true,
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
@ -6858,7 +6859,7 @@ void Usr_SeeTchClassPhotoPrn (void)
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER);
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}
else
Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_TEACHER]);

10
swad_zip.c
View File

@ -543,10 +543,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
Str_LimitLengthHTMLStr (FileNameShort,50);
/***** Start frame *****/
Lay_StartRoundFrameTable10Shadow (NULL,0);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"
"<table class=\"CELLS_PAD_2\">");
Lay_StartRoundFrameTableShadow (NULL,2);
/***** Link to download the file *****/
fprintf (Gbl.F.Out,"<tr>"
@ -603,8 +600,5 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"</tr>");
/***** End frame *****/
fprintf (Gbl.F.Out,"</table>"
"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable ();
}