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 16.239

This commit is contained in:
Antonio Cañas Vargas 2017-06-10 21:38:10 +02:00
parent 3a6be2aa17
commit 2f0fae1d86
63 changed files with 571 additions and 685 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -28,7 +28,7 @@
OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \ OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \
swad_announcement.o swad_assignment.o swad_attendance.o \ swad_announcement.o swad_assignment.o swad_attendance.o \
swad_banner.o \ swad_banner.o swad_box.o \
swad_calendar.o swad_centre.o swad_chat.o swad_config.o \ swad_calendar.o swad_centre.o swad_chat.o swad_config.o \
swad_connected.o swad_country.o swad_course.o swad_cryptography.o \ swad_connected.o swad_country.o swad_course.o swad_cryptography.o \
swad_database.o swad_date.o swad_degree.o swad_degree_type.o \ swad_database.o swad_date.o swad_degree.o swad_degree_type.o \
@ -44,8 +44,8 @@ OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \
swad_MFU.o \ swad_MFU.o \
swad_network.o swad_nickname.o swad_notice.o swad_notification.o \ swad_network.o swad_nickname.o swad_notice.o swad_notification.o \
swad_pagination.o swad_parameter.o swad_password.o swad_photo.o \ swad_pagination.o swad_parameter.o swad_password.o swad_photo.o \
swad_place.o swad_plugin.o swad_preference.o swad_profile.o \ swad_place.o swad_plugin.o swad_preference.o swad_privacy.o \
swad_privacy.o \ swad_profile.o \
swad_QR.o \ swad_QR.o \
swad_record.o swad_report.o swad_role.o swad_RSS.o \ swad_record.o swad_report.o swad_role.o swad_RSS.o \
swad_scope.o swad_search.o swad_session.o swad_setup.o swad_social.o \ swad_scope.o swad_search.o swad_session.o swad_setup.o swad_social.o \

5
swad_ID.c
View File

@ -31,6 +31,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_account.h" #include "swad_account.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
@ -548,7 +549,7 @@ void ID_ShowFormOthIDs (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat)) if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ID,NULL, Box_StartBox (NULL,Txt_ID,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -563,7 +564,7 @@ void ID_ShowFormOthIDs (void)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

5
swad_MFU.c
View File

@ -26,6 +26,7 @@
/*****************************************************************************/ /*****************************************************************************/
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -223,7 +224,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1]; char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1];
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_My_frequent_actions,NULL, Box_StartBox (NULL,Txt_My_frequent_actions,NULL,
Hlp_STATS_Frequent, Hlp_STATS_Frequent,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div id=\"MFU_actions_big\">"); fprintf (Gbl.F.Out,"<div id=\"MFU_actions_big\">");
@ -262,7 +263,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

21
swad_account.c
View File

@ -29,6 +29,7 @@
#include "swad_account.h" #include "swad_account.h"
#include "swad_announcement.h" #include "swad_announcement.h"
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_duplicate.h" #include "swad_duplicate.h"
@ -143,7 +144,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
extern const char *Txt_Check; extern const char *Txt_Check;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Title,NULL, Box_StartBox (NULL,Title,NULL,
Hlp_PROFILE_SignUp, Hlp_PROFILE_SignUp,
true); // Closable true); // Closable
@ -164,7 +165,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -214,7 +215,7 @@ void Acc_CheckIfEmptyAccountExists (void)
if (NumUsrs) if (NumUsrs)
{ {
/***** Start frame and write message with number of accounts found *****/ /***** Start frame and write message with number of accounts found *****/
Lay_StartRoundFrameTable (NULL, Box_StartBoxTable (NULL,
(NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user : (NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user :
Txt_Do_you_think_you_are_one_of_these_users, Txt_Do_you_think_you_are_one_of_these_users,
NULL, NULL,
@ -247,7 +248,7 @@ void Acc_CheckIfEmptyAccountExists (void)
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
{ {
@ -346,7 +347,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Form to enter some data of the new user *****/ /***** Form to enter some data of the new user *****/
Act_FormStart (ActCreUsrAcc); Act_FormStart (ActCreUsrAcc);
Lay_StartRoundFrameTable (NULL,Txt_Create_account,NULL, Box_StartBoxTable (NULL,Txt_Create_account,NULL,
Hlp_PROFILE_SignUp, Hlp_PROFILE_SignUp,
false, // Not closable false, // Not closable
2); 2);
@ -395,7 +396,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
Pwd_PutFormToGetNewPasswordOnce (); Pwd_PutFormToGetNewPasswordOnce ();
/***** Send button and form end *****/ /***** Send button and form end *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account);
Act_FormEnd (); Act_FormEnd ();
} }
@ -411,7 +412,7 @@ void Acc_ShowFormGoToRequestNewAccount (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME); sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL, Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_PROFILE_SignUp, Hlp_PROFILE_SignUp,
false); // Not closable false); // Not closable
@ -421,7 +422,7 @@ void Acc_ShowFormGoToRequestNewAccount (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -472,7 +473,7 @@ void Acc_ShowFormChangeMyAccount (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_User_account,NULL, Box_StartBoxTable (NULL,Txt_User_account,NULL,
Hlp_PROFILE_Account, Hlp_PROFILE_Account,
false, // Not closable false, // Not closable
2); 2);
@ -518,7 +519,7 @@ void Acc_ShowFormChangeMyAccount (void)
ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true); ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true);
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

29
swad_agenda.c
View File

@ -31,6 +31,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_agenda.h" #include "swad_agenda.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_group.h" #include "swad_group.h"
@ -146,7 +147,7 @@ void Agd_ShowMyAgenda (void)
Agd_GetParams (Agd_MY_AGENDA); Agd_GetParams (Agd_MY_AGENDA);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_My_agenda, Box_StartBox ("100%",Txt_My_agenda,
Agd_PutIconsMyFullAgenda, Agd_PutIconsMyFullAgenda,
Hlp_PROFILE_Agenda, Hlp_PROFILE_Agenda,
false); // Not closable false); // Not closable
@ -163,7 +164,7 @@ void Agd_ShowMyAgenda (void)
Agd_ShowEvents (Agd_MY_AGENDA); Agd_ShowEvents (Agd_MY_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -366,7 +367,7 @@ void Agd_ShowUsrAgenda (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName); sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName);
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod); ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_StartRoundFrame ("100%",Gbl.Title, Box_StartBox ("100%",Gbl.Title,
ItsMe ? Agd_PutIconsMyPublicAgenda : ItsMe ? Agd_PutIconsMyPublicAgenda :
Agd_PutIconsOtherPublicAgenda, Agd_PutIconsOtherPublicAgenda,
Hlp_PROFILE_Agenda_public_agenda, Hlp_PROFILE_Agenda_public_agenda,
@ -379,7 +380,7 @@ void Agd_ShowUsrAgenda (void)
Agd_ShowEvents (Agd_ANOTHER_AGENDA); Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
if (Error) if (Error)
@ -410,7 +411,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName); sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName);
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod); ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_StartRoundFrame ("100%",Gbl.Title, Box_StartBox ("100%",Gbl.Title,
ItsMe ? Agd_PutIconToViewEditMyFullAgenda : ItsMe ? Agd_PutIconToViewEditMyFullAgenda :
Agd_PutIconsOtherPublicAgenda, Agd_PutIconsOtherPublicAgenda,
Hlp_PROFILE_Agenda_public_agenda, Hlp_PROFILE_Agenda_public_agenda,
@ -423,7 +424,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
Agd_ShowEvents (Agd_ANOTHER_AGENDA); Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
@ -533,13 +534,13 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
Lay_StartRoundFrameTableShadow (NULL,Txt_Today, Box_StartBoxTableShadow (NULL,Txt_Today,
NULL, NULL,
Hlp_PROFILE_Agenda, Hlp_PROFILE_Agenda,
2); 2);
break; break;
case Agd_ANOTHER_AGENDA_TODAY: case Agd_ANOTHER_AGENDA_TODAY:
Lay_StartRoundFrameTableShadow (NULL,Txt_Today, Box_StartBoxTableShadow (NULL,Txt_Today,
NULL, NULL,
Hlp_PROFILE_Agenda_public_agenda, Hlp_PROFILE_Agenda_public_agenda,
2); 2);
@ -558,7 +559,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
Agd_ShowOneEvent (AgendaType,Gbl.Agenda.LstAgdCods[NumEvent]); Agd_ShowOneEvent (AgendaType,Gbl.Agenda.LstAgdCods[NumEvent]);
/***** End table and frame *****/ /***** End table and frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free list of events *****/ /***** Free list of events *****/
@ -1537,7 +1538,7 @@ void Agd_RequestCreatOrEditEvent (void)
Agd_PutCurrentParamsMyAgenda (); Agd_PutCurrentParamsMyAgenda ();
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL, Box_StartBoxTable (NULL,
ItsANewEvent ? Txt_New_event : ItsANewEvent ? Txt_New_event :
Txt_Edit_event, Txt_Edit_event,
NULL, NULL,
@ -1598,9 +1599,9 @@ void Agd_RequestCreatOrEditEvent (void)
/***** New event *****/ /***** New event *****/
if (ItsANewEvent) if (ItsANewEvent)
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event);
else else
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
/***** Show current events, if any *****/ /***** Show current events, if any *****/
@ -1945,7 +1946,7 @@ void Agd_PrintAgdQRCode (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Where_s_USER,Gbl.Usrs.Me.UsrDat.FullName); sprintf (Gbl.Title,Txt_Where_s_USER,Gbl.Usrs.Me.UsrDat.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL, Box_StartBox (NULL,Gbl.Title,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -1953,5 +1954,5 @@ void Agd_PrintAgdQRCode (void)
QR_PrintQRCode (); QR_PrintQRCode ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }

9
swad_announcement.c
View File

@ -26,6 +26,7 @@
/*****************************************************************************/ /*****************************************************************************/
#include "swad_announcement.h" #include "swad_announcement.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -119,7 +120,7 @@ void Ann_ShowAllAnnouncements (void)
NumAnnouncements = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get announcements"); NumAnnouncements = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get announcements");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("550px",Txt_Announcements, Box_StartBox ("550px",Txt_Announcements,
ICanEdit ? Ann_PutIconToAddNewAnnouncement : ICanEdit ? Ann_PutIconToAddNewAnnouncement :
NULL, NULL,
Hlp_MESSAGES_Announcements, Hlp_MESSAGES_Announcements,
@ -168,7 +169,7 @@ void Ann_ShowAllAnnouncements (void)
Ann_PutButtonToAddNewAnnouncement (); Ann_PutButtonToAddNewAnnouncement ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
@ -411,7 +412,7 @@ void Ann_ShowFormAnnouncement (void)
Act_FormStart (ActRcvAnn); Act_FormStart (ActRcvAnn);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_announcement,NULL, Box_StartBoxTable (NULL,Txt_New_announcement,NULL,
Hlp_MESSAGES_Announcements, Hlp_MESSAGES_Announcements,
false, // Not closable false, // Not closable
2); 2);
@ -443,7 +444,7 @@ void Ann_ShowFormAnnouncement (void)
"</tr>"); "</tr>");
/***** Button to create announcement and end frame *****/ /***** Button to create announcement and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_announcement); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_announcement);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

15
swad_assignment.c
View File

@ -31,6 +31,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_assignment.h" #include "swad_assignment.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_group.h" #include "swad_group.h"
@ -135,7 +136,7 @@ static void Asg_ShowAllAssignments (void)
&Pagination); &Pagination);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Assignments,Asg_PutIconsListAssignments, Box_StartBox ("100%",Txt_Assignments,Asg_PutIconsListAssignments,
Hlp_ASSESSMENT_Assignments, Hlp_ASSESSMENT_Assignments,
false); // Not closable false); // Not closable
@ -170,7 +171,7 @@ static void Asg_ShowAllAssignments (void)
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -1171,7 +1172,7 @@ void Asg_RequestCreatOrEditAsg (void)
Asg_PutParams (); Asg_PutParams ();
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL, Box_StartBoxTable (NULL,
ItsANewAssignment ? Txt_New_assignment : ItsANewAssignment ? Txt_New_assignment :
Txt_Edit_assignment, Txt_Edit_assignment,
NULL, NULL,
@ -1234,9 +1235,9 @@ void Asg_RequestCreatOrEditAsg (void)
/***** New assignment *****/ /***** New assignment *****/
if (ItsANewAssignment) if (ItsANewAssignment)
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_assignment); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_assignment);
else else
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
/***** Show current assignments, if any *****/ /***** Show current assignments, if any *****/
@ -1268,7 +1269,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
"<td class=\"LEFT_TOP\">", "<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_Groups); Txt_Groups);
Lay_StartRoundFrameTable ("100%",NULL,NULL, Box_StartBoxTable ("100%",NULL,NULL,
Hlp_USERS_Groups, Hlp_USERS_Groups,
false, // Not closable false, // Not closable
0); 0);
@ -1295,7 +1296,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }

43
swad_attendance.c
View File

@ -32,6 +32,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_attendance.h" #include "swad_attendance.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_group.h" #include "swad_group.h"
@ -222,7 +223,7 @@ static void Att_ShowAllAttEvents (void)
&Pagination); &Pagination);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Events, Box_StartBox ("100%",Txt_Events,
ICanEdit ? Att_PutIconToCreateNewAttEvent : ICanEdit ? Att_PutIconToCreateNewAttEvent :
NULL, NULL,
Hlp_USERS_Attendance, Hlp_USERS_Attendance,
@ -284,7 +285,7 @@ static void Att_ShowAllAttEvents (void)
Att_PutButtonToCreateNewAttEvent (); Att_PutButtonToCreateNewAttEvent ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -1087,7 +1088,7 @@ void Att_RequestCreatOrEditAttEvent (void)
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage);
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL, Box_StartBoxTable (NULL,
ItsANewAttEvent ? Txt_New_event : ItsANewAttEvent ? Txt_New_event :
Txt_Edit_event, Txt_Edit_event,
NULL, NULL,
@ -1158,9 +1159,9 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Button and end frame *****/ /***** Button and end frame *****/
if (ItsANewAttEvent) if (ItsANewAttEvent)
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event);
else else
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1193,7 +1194,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
"</td>" "</td>"
"<td class=\"LEFT_TOP\">", "<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Groups); The_ClassForm[Gbl.Prefs.Theme],Txt_Groups);
Lay_StartRoundFrameTable ("100%",NULL,NULL, Box_StartBoxTable ("100%",NULL,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
0); 0);
@ -1220,7 +1221,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -1826,13 +1827,13 @@ void Att_SeeOneAttEvent (void)
Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS); Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS);
/***** Show attendance *****/ /***** Show attendance *****/
Lay_StartRoundFrameTable (NULL,Txt_Event,NULL, Box_StartBoxTable (NULL,Txt_Event,NULL,
Hlp_USERS_Attendance, Hlp_USERS_Attendance,
false, // Not closable false, // Not closable
2); 2);
Att.AttCod = Gbl.AttEvents.AttCod; Att.AttCod = Gbl.AttEvents.AttCod;
Att_ShowOneAttEvent (&Att,true); Att_ShowOneAttEvent (&Att,true);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
switch (Gbl.Usrs.Me.Role.Logged) switch (Gbl.Usrs.Me.Role.Logged)
{ {
@ -1875,7 +1876,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
/***** List students' data *****/ /***** List students' data *****/
/* Header */ /* Header */
Lay_StartRoundFrameTable (NULL,NULL,NULL, Box_StartBoxTable (NULL,NULL,NULL,
Hlp_USERS_Attendance, Hlp_USERS_Attendance,
false, // Not closable false, // Not closable
2); 2);
@ -1903,7 +1904,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att); Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att);
/* Footer */ /* Footer */
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
if (Att->Open) if (Att->Open)
{ {
@ -1936,7 +1937,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD); Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL, Box_StartBox (NULL,Txt_Attendance,NULL,
Hlp_USERS_Attendance, Hlp_USERS_Attendance,
false); // Not closable false); // Not closable
@ -2015,7 +2016,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for students list *****/ /***** Free memory for students list *****/
Usr_FreeUsrsList (Rol_STD); Usr_FreeUsrsList (Rol_STD);
@ -2674,7 +2675,7 @@ void Usr_ReqListStdsAttendanceCrs (void)
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD); Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN], Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
NULL, NULL,
Hlp_USERS_Attendance_attendance_list, Hlp_USERS_Attendance_attendance_list,
false); // Not closable false); // Not closable
@ -2723,7 +2724,7 @@ void Usr_ReqListStdsAttendanceCrs (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for students list *****/ /***** Free memory for students list *****/
Usr_FreeUsrsList (Rol_STD); Usr_FreeUsrsList (Rol_STD);
@ -3106,7 +3107,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Events,NULL, Box_StartBoxTable (NULL,Txt_Events,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL : TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list, Hlp_USERS_Attendance_attendance_list,
false, // Not closable false, // Not closable
@ -3187,7 +3188,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** End form *****/ /***** End form *****/
if (TypeOfView == Att_NORMAL_VIEW_ONLY_ME || if (TypeOfView == Att_NORMAL_VIEW_ONLY_ME ||
@ -3218,7 +3219,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Attendance, Box_StartBox (NULL,Txt_Attendance,
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList : (TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList :
((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList : ((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList :
NULL), NULL),
@ -3283,7 +3284,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
Att_PutButtonToShowDetails (); Att_PutButtonToShowDetails ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -3441,7 +3442,7 @@ static void Att_ListStdsWithAttEventsDetails (Att_TypeOfView_t TypeOfView,
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Details,NULL, Box_StartBoxTable (NULL,Txt_Details,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL : TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list, Hlp_USERS_Attendance_attendance_list,
false, // Not closable false, // Not closable
@ -3462,7 +3463,7 @@ static void Att_ListStdsWithAttEventsDetails (Att_TypeOfView_t TypeOfView,
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

13
swad_banner.c
View File

@ -30,6 +30,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_banner.h" #include "swad_banner.h"
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -115,7 +116,7 @@ void Ban_SeeBanners (void)
" ORDER BY ShortName"); " ORDER BY ShortName");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners, Box_StartBox (NULL,Txt_Banners,Ban_PutFormToEditBanners,
Hlp_SYSTEM_Banners, Hlp_SYSTEM_Banners,
false); // Not closable false); // Not closable
@ -134,7 +135,7 @@ void Ban_SeeBanners (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of banners *****/ /***** Free list of banners *****/
Ban_FreeListBanners (); Ban_FreeListBanners ();
@ -206,7 +207,7 @@ void Ban_EditBanners (void)
" FROM banners ORDER BY ShortName"); " FROM banners ORDER BY ShortName");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutIconToViewBanners, Box_StartBox (NULL,Txt_Banners,Ban_PutIconToViewBanners,
Hlp_SYSTEM_Banners_edit, Hlp_SYSTEM_Banners_edit,
false); // Not closable false); // Not closable
@ -218,7 +219,7 @@ void Ban_EditBanners (void)
Ban_ListBannersForEdition (); Ban_ListBannersForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of banners *****/ /***** Free list of banners *****/
Ban_FreeListBanners (); Ban_FreeListBanners ();
@ -831,7 +832,7 @@ static void Ban_PutFormToCreateBanner (void)
Act_FormStart (ActNewBan); Act_FormStart (ActNewBan);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_banner,NULL, Box_StartBoxTable (NULL,Txt_New_banner,NULL,
Hlp_SYSTEM_Banners_edit, Hlp_SYSTEM_Banners_edit,
false, // Not closable false, // Not closable
2); 2);
@ -882,7 +883,7 @@ static void Ban_PutFormToCreateBanner (void)
Cns_MAX_CHARS_WWW,Ban->WWW); Cns_MAX_CHARS_WWW,Ban->WWW);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_banner); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_banner);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

11
swad_calendar.c
View File

@ -27,9 +27,10 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_exam.h" #include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_exam.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_preference.h" #include "swad_preference.h"
@ -83,11 +84,11 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
extern const char *Hlp_PROFILE_Preferences_calendar; extern const char *Hlp_PROFILE_Preferences_calendar;
extern const char *Txt_Calendar; extern const char *Txt_Calendar;
Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek, Box_StartBox (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar, Hlp_PROFILE_Preferences_calendar,
false); // Not closable false); // Not closable
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25B"); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25B");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -314,7 +315,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,FunctionToDrawContextualIcons, Box_StartBox (NULL,NULL,FunctionToDrawContextualIcons,
PrintView ? NULL : PrintView ? NULL :
Hlp_Calendar, Hlp_Calendar,
false); // Not closable false); // Not closable
@ -352,7 +353,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
ParamsStr); ParamsStr);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

29
swad_centre.c
View File

@ -32,6 +32,7 @@
#include <sys/wait.h> // For the macro WEXITSTATUS #include <sys/wait.h> // For the macro WEXITSTATUS
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_box.h"
#include "swad_centre.h" #include "swad_centre.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
@ -165,7 +166,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees"))) if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees")))
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees,NULL, Box_StartBoxTable (NULL,Txt_Centres_with_pending_degrees,NULL,
Hlp_SYSTEM_Hierarchy_pending, Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable false, // Not closable
2); 2);
@ -214,7 +215,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed); Ale_ShowAlert (Ale_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed);
@ -309,7 +310,7 @@ static void Ctr_Configuration (bool PrintView)
PhotoExists = Fil_CheckIfPathExists (PathPhoto); PhotoExists = Fil_CheckIfPathExists (PathPhoto);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL, Box_StartBox (NULL,NULL,
PrintView ? NULL : PrintView ? NULL :
Ctr_PutIconsToPrintAndUpload, Ctr_PutIconsToPrintAndUpload,
PrintView ? NULL : PrintView ? NULL :
@ -632,7 +633,7 @@ static void Ctr_Configuration (bool PrintView)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -746,7 +747,7 @@ static void Ctr_ListCentres (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName); sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsListCentres, Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsListCentres,
Hlp_INSTITUTION_Centres, Hlp_INSTITUTION_Centres,
false); // Not closable false); // Not closable
@ -778,7 +779,7 @@ static void Ctr_ListCentres (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -939,7 +940,7 @@ void Ctr_EditCentres (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X, sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName); Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsEditingCentres, Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsEditingCentres,
Hlp_INSTITUTION_Centres, Hlp_INSTITUTION_Centres,
false); // Not closable false); // Not closable
@ -951,7 +952,7 @@ void Ctr_EditCentres (void)
Ctr_ListCentresForEdition (); Ctr_ListCentresForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of centres *****/ /***** Free list of centres *****/
Ctr_FreeListCentres (); Ctr_FreeListCentres ();
@ -2221,7 +2222,7 @@ void Ctr_RequestPhoto (void)
Act_FormStart (ActRecCtrPho); Act_FormStart (ActRecCtrPho);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,NULL, Box_StartBox (NULL,Txt_Photo,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -2248,7 +2249,7 @@ void Ctr_RequestPhoto (void)
Gbl.Form.Id); Gbl.Form.Id);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2417,7 +2418,7 @@ static void Ctr_PutFormToCreateCentre (void)
Lay_ShowErrorAndExit ("You can not edit centres."); Lay_ShowErrorAndExit ("You can not edit centres.");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_centre,NULL, Box_StartBoxTable (NULL,Txt_New_centre,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2508,7 +2509,7 @@ static void Ctr_PutFormToCreateCentre (void)
"</tr>"); "</tr>");
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2895,7 +2896,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumCtrs,(NumCtrs == 1) ? Txt_centre : NumCtrs,(NumCtrs == 1) ? Txt_centre :
Txt_centres); Txt_centres);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2920,7 +2921,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

3
swad_changelog.h
View File

@ -243,13 +243,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.238 (2017-06-10)" #define Log_PLATFORM_VERSION "SWAD 16.239 (2017-06-10)"
#define CSS_FILE "swad16.235.1.css" #define CSS_FILE "swad16.235.1.css"
#define JS_FILE "swad16.206.3.js" #define JS_FILE "swad16.206.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/* /*
Version 16.239: Jun 10, 2017 New module swad_box to draw boxes. (221970 lines)
Version 16.238: Jun 10, 2017 Icon to close frames. (221803 lines) Version 16.238: Jun 10, 2017 Icon to close frames. (221803 lines)
Version 16.237: Jun 09, 2017 Code refactoring related to users belonging to a course. Version 16.237: Jun 09, 2017 Code refactoring related to users belonging to a course.
Changes in permissions to access students by non-editing teachers. (221303 lines) Changes in permissions to access students by non-editing teachers. (221303 lines)

9
swad_chat.c
View File

@ -30,6 +30,7 @@
#include <stdio.h> // For sprintf #include <stdio.h> // For sprintf
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_chat.h" #include "swad_chat.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -123,7 +124,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
Usr_GetMyDegrees (); Usr_GetMyDegrees ();
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL, Box_StartBox (NULL,Txt_Chat_rooms,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">"); fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
@ -238,7 +239,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -263,7 +264,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
if (NumRows > 0) // If not empty chat rooms found if (NumRows > 0) // If not empty chat rooms found
{ {
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL,Txt_Rooms_with_users,NULL, Box_StartBoxTable (NULL,Txt_Rooms_with_users,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -297,7 +298,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

9
swad_connected.c
View File

@ -31,6 +31,7 @@
#include <stdio.h> // For fprintf #include <stdio.h> // For fprintf
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_hierarchy.h" #include "swad_hierarchy.h"
@ -97,7 +98,7 @@ void Con_ShowConnectedUsrs (void)
/* Current time */ /* Current time */
sprintf (Gbl.Title,"%s<div id=\"connected_current_time\"></div>", sprintf (Gbl.Title,"%s<div id=\"connected_current_time\"></div>",
Txt_Connected_users); Txt_Connected_users);
Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected, Box_StartBox (NULL,Gbl.Title,Con_PutIconToUpdateConnected,
Hlp_USERS_Connected, Hlp_USERS_Connected,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">" fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
@ -116,7 +117,7 @@ void Con_ShowConnectedUsrs (void)
Con_ShowConnectedUsrsBelongingToLocation (); Con_ShowConnectedUsrsBelongingToLocation ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -160,7 +161,7 @@ void Con_ShowLastClicks (void)
extern const char *Txt_Last_clicks_in_real_time; extern const char *Txt_Last_clicks_in_real_time;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL, Box_StartBox (NULL,Txt_Last_clicks_in_real_time,NULL,
Hlp_USERS_Connected_last_clicks, Hlp_USERS_Connected_last_clicks,
false); // Not closable false); // Not closable
@ -171,7 +172,7 @@ void Con_ShowLastClicks (void)
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

25
swad_country.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_country.h" #include "swad_country.h"
#include "swad_database.h" #include "swad_database.h"
@ -136,7 +137,7 @@ void Cty_SeeCtyWithPendingInss (void)
if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries with pending institutions"))) if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries with pending institutions")))
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Countries_with_pending_institutions, Box_StartBoxTable (NULL,Txt_Countries_with_pending_institutions,
NULL,Hlp_SYSTEM_Hierarchy_pending, NULL,Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable false, // Not closable
2); 2);
@ -187,7 +188,7 @@ void Cty_SeeCtyWithPendingInss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed); Ale_ShowAlert (Ale_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed);
@ -241,7 +242,7 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0) if (Gbl.CurrentCty.Cty.CtyCod > 0)
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL, Box_StartBox (NULL,NULL,
PrintView ? NULL : PrintView ? NULL :
Cty_PutIconToPrint, Cty_PutIconToPrint,
PrintView ? NULL : PrintView ? NULL :
@ -442,7 +443,7 @@ static void Cty_Configuration (bool PrintView)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -511,7 +512,7 @@ void Cty_ListCountries2 (void)
unsigned NumCty; unsigned NumCty;
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Countries,Cty_PutIconsListCountries, Box_StartBoxTable (NULL,Txt_Countries,Cty_PutIconsListCountries,
Hlp_SYSTEM_Countries, Hlp_SYSTEM_Countries,
false, // Not closable false, // Not closable
2); 2);
@ -599,7 +600,7 @@ void Cty_ListCountries2 (void)
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrame (); Box_EndBox ();
/***** Div for Google Geochart *****/ /***** Div for Google Geochart *****/
if (Gbl.Action.Act == ActSeeCty) if (Gbl.Action.Act == ActSeeCty)
@ -946,7 +947,7 @@ void Cty_EditCountries (void)
Cty_GetListCountries (Cty_GET_EXTRA_DATA); Cty_GetListCountries (Cty_GET_EXTRA_DATA);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconToViewCountries, Box_StartBox (NULL,Txt_Countries,Cty_PutIconToViewCountries,
Hlp_SYSTEM_Countries, Hlp_SYSTEM_Countries,
false); // Not closable false); // Not closable
@ -958,7 +959,7 @@ void Cty_EditCountries (void)
Cty_ListCountriesForEdition (); Cty_ListCountriesForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of countries *****/ /***** Free list of countries *****/
Cty_FreeListCountries (); Cty_FreeListCountries ();
@ -1933,7 +1934,7 @@ static void Cty_PutFormToCreateCountry (void)
Act_FormStart (ActNewCty); Act_FormStart (ActNewCty);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL, Box_StartBoxTable (NULL,Txt_New_country,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2016,7 +2017,7 @@ static void Cty_PutFormToCreateCountry (void)
} }
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_country); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_country);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2363,7 +2364,7 @@ unsigned Cty_ListCtysFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumCtys,NumCtys == 1 ? Txt_country : NumCtys,NumCtys == 1 ? Txt_country :
Txt_countries); Txt_countries);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2388,7 +2389,7 @@ unsigned Cty_ListCtysFound (const char *Query)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

33
swad_course.c
View File

@ -31,6 +31,7 @@
#include <stdlib.h> // For getenv, etc. #include <stdlib.h> // For getenv, etc.
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_course.h" #include "swad_course.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
@ -195,7 +196,7 @@ static void Crs_Configuration (bool PrintView)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL, Box_StartBox (NULL,NULL,
PrintView ? NULL : PrintView ? NULL :
Crs_PutIconToPrint, Crs_PutIconToPrint,
PrintView ? NULL : PrintView ? NULL :
@ -466,7 +467,7 @@ static void Crs_Configuration (bool PrintView)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -546,7 +547,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]); sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]);
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL, Box_StartBox (NULL,Txt_My_courses,NULL,
Hlp_PROFILE_Courses, Hlp_PROFILE_Courses,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">"); fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
@ -776,7 +777,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1136,7 +1137,7 @@ static void Crs_ListCourses (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName); sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,Crs_PutIconsListCourses, Box_StartBox (NULL,Gbl.Title,Crs_PutIconsListCourses,
Hlp_DEGREE_Courses, Hlp_DEGREE_Courses,
false); // Not closable false); // Not closable
@ -1170,7 +1171,7 @@ static void Crs_ListCourses (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1336,7 +1337,7 @@ void Crs_EditCourses (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Alert.Txt,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName); sprintf (Gbl.Alert.Txt,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Alert.Txt,Crs_PutIconToViewCourses, Box_StartBox (NULL,Gbl.Alert.Txt,Crs_PutIconToViewCourses,
Hlp_DEGREE_Courses, Hlp_DEGREE_Courses,
false); // Not closable false); // Not closable
@ -1348,7 +1349,7 @@ void Crs_EditCourses (void)
Crs_ListCoursesForEdition (); Crs_ListCoursesForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of courses in this degree *****/ /***** Free list of courses in this degree *****/
Crs_FreeListCoursesInDegree (&Gbl.CurrentDeg.Deg); Crs_FreeListCoursesInDegree (&Gbl.CurrentDeg.Deg);
@ -1642,7 +1643,7 @@ static void Crs_PutFormToCreateCourse (void)
Lay_ShowErrorAndExit ("You can not edit courses."); Lay_ShowErrorAndExit ("You can not edit courses.");
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_New_course,NULL, Box_StartBoxTable (NULL,Txt_New_course,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -1717,7 +1718,7 @@ static void Crs_PutFormToCreateCourse (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_course); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_course);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -3002,7 +3003,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
if ((NumCrss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get courses of a user"))) if ((NumCrss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get courses of a user")))
{ {
/* Start frame and table */ /* Start frame and table */
Lay_StartRoundFrameTable ("100%",NULL,NULL, Box_StartBoxTable ("100%",NULL,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -3053,7 +3054,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
} }
/* End table and frame */ /* End table and frame */
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -3089,7 +3090,7 @@ unsigned Crs_ListCrssFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumCrss,(NumCrss == 1) ? Txt_course : NumCrss,(NumCrss == 1) ? Txt_course :
Txt_courses); Txt_courses);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -3132,7 +3133,7 @@ unsigned Crs_ListCrssFound (const char *Query)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -3328,7 +3329,7 @@ void Crs_AskRemoveOldCrss (void)
Act_FormStart (ActRemOldCrs); Act_FormStart (ActRemOldCrs);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL, Box_StartBox (NULL,Txt_Eliminate_old_courses,NULL,
Hlp_SYSTEM_Hierarchy_eliminate_old_courses, Hlp_SYSTEM_Hierarchy_eliminate_old_courses,
false); // Not closable false); // Not closable
@ -3352,7 +3353,7 @@ void Crs_AskRemoveOldCrss (void)
fprintf (Gbl.F.Out,"</label>"); fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate); Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

5
swad_date.c
View File

@ -28,6 +28,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include <time.h> // For time functions (mktime...) #include <time.h> // For time functions (mktime...)
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -102,7 +103,7 @@ void Dat_PutBoxToSelectDateFormat (void)
Dat_Format_t Format; Dat_Format_t Format;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Dates,Dat_PutIconsDateFormat, Box_StartBox (NULL,Txt_Dates,Dat_PutIconsDateFormat,
Hlp_PROFILE_Preferences_dates, Hlp_PROFILE_Preferences_dates,
false); // Not closable false); // Not closable
@ -137,7 +138,7 @@ void Dat_PutBoxToSelectDateFormat (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

25
swad_degree.c
View File

@ -33,6 +33,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include <mysql/mysql.h> // To access MySQL databases #include <mysql/mysql.h> // To access MySQL databases
#include "swad_box.h"
#include "swad_changelog.h" #include "swad_changelog.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -168,7 +169,7 @@ void Deg_SeeDegWithPendingCrss (void)
if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses"))) if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses")))
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses,NULL, Box_StartBoxTable (NULL,Txt_Degrees_with_pending_courses,NULL,
Hlp_SYSTEM_Hierarchy_pending, Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable false, // Not closable
2); 2);
@ -217,7 +218,7 @@ void Deg_SeeDegWithPendingCrss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed); Ale_ShowAlert (Ale_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed);
@ -297,7 +298,7 @@ static void Deg_Configuration (bool PrintView)
if (Gbl.CurrentDeg.Deg.DegCod > 0) if (Gbl.CurrentDeg.Deg.DegCod > 0)
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL, Box_StartBox (NULL,NULL,
PrintView ? NULL : PrintView ? NULL :
Deg_PutIconsToPrintAndUpload, Deg_PutIconsToPrintAndUpload,
PrintView ? NULL : PrintView ? NULL :
@ -528,7 +529,7 @@ static void Deg_Configuration (bool PrintView)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -940,7 +941,7 @@ static void Deg_PutFormToCreateDegree (void)
Lay_ShowErrorAndExit ("You can not edit degrees."); Lay_ShowErrorAndExit ("You can not edit degrees.");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_degree,NULL, Box_StartBoxTable (NULL,Txt_New_degree,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -1023,7 +1024,7 @@ static void Deg_PutFormToCreateDegree (void)
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_degree); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_degree);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1175,7 +1176,7 @@ static void Deg_ListDegrees (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShrtName); sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsListDegrees, Box_StartBox (NULL,Gbl.Title,Deg_PutIconsListDegrees,
Hlp_CENTRE_Degrees, Hlp_CENTRE_Degrees,
false); // Not closable false); // Not closable
@ -1207,7 +1208,7 @@ static void Deg_ListDegrees (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1355,7 +1356,7 @@ void Deg_EditDegrees (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X, sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
Gbl.CurrentCtr.Ctr.FullName); Gbl.CurrentCtr.Ctr.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsEditingDegrees, Box_StartBox (NULL,Gbl.Title,Deg_PutIconsEditingDegrees,
Hlp_CENTRE_Degrees, Hlp_CENTRE_Degrees,
false); // Not closable false); // Not closable
@ -1379,7 +1380,7 @@ void Deg_EditDegrees (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of degree types *****/ /***** Free list of degree types *****/
DT_FreeListDegreeTypes (); DT_FreeListDegreeTypes ();
@ -2576,7 +2577,7 @@ unsigned Deg_ListDegsFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumDegs,(NumDegs == 1) ? Txt_degree : NumDegs,(NumDegs == 1) ? Txt_degree :
Txt_degrees); Txt_degrees);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2601,7 +2602,7 @@ unsigned Deg_ListDegsFound (const char *Query)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

15
swad_degree_type.c
View File

@ -33,6 +33,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include <mysql/mysql.h> // To access MySQL databases #include <mysql/mysql.h> // To access MySQL databases
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_degree.h" #include "swad_degree.h"
@ -208,12 +209,12 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
switch (NextAction) switch (NextAction)
{ {
case ActSeeDegTyp: case ActSeeDegTyp:
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,DT_PutIconsListDegTypes, Box_StartBox (NULL,Txt_Types_of_degree,DT_PutIconsListDegTypes,
Hlp_CENTRE_DegreeTypes, Hlp_CENTRE_DegreeTypes,
false); // Not closable false); // Not closable
break; break;
case ActSeeUseGbl: case ActSeeUseGbl:
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,DT_PutIconToEditDegTypes, Box_StartBox (NULL,Txt_Types_of_degree,DT_PutIconToEditDegTypes,
Hlp_STATS_Figures_types_of_degree, Hlp_STATS_Figures_types_of_degree,
false); // Not closable false); // Not closable
break; break;
@ -246,7 +247,7 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -262,7 +263,7 @@ void DT_EditDegreeTypes (void)
DT_GetListDegreeTypes (Sco_SCOPE_SYS,DT_ORDER_BY_DEGREE_TYPE); DT_GetListDegreeTypes (Sco_SCOPE_SYS,DT_ORDER_BY_DEGREE_TYPE);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_degree, Box_StartBox (NULL,Txt_Types_of_degree,
DT_PutIconToViewDegreeTypesWhenEditing, DT_PutIconToViewDegreeTypesWhenEditing,
Hlp_CENTRE_DegreeTypes_edit, Hlp_CENTRE_DegreeTypes_edit,
false); // Not closable false); // Not closable
@ -275,7 +276,7 @@ void DT_EditDegreeTypes (void)
DT_ListDegreeTypesForEdition (); DT_ListDegreeTypesForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of degree types *****/ /***** Free list of degree types *****/
DT_FreeListDegreeTypes (); DT_FreeListDegreeTypes ();
@ -435,7 +436,7 @@ void DT_PutFormToCreateDegreeType (void)
Act_FormStart (ActNewDegTyp); Act_FormStart (ActNewDegTyp);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_degree,NULL, Box_StartBoxTable (NULL,Txt_New_type_of_degree,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -465,7 +466,7 @@ void DT_PutFormToCreateDegreeType (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_degree); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_degree);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

13
swad_department.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_department.h" #include "swad_department.h"
@ -100,7 +101,7 @@ void Dpt_SeeDepts (void)
Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod); Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod);
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Departments, Box_StartBoxTable (NULL,Txt_Departments,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Dpt_PutIconToEditDpts : Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
NULL, NULL,
Hlp_INSTITUTION_Departments, Hlp_INSTITUTION_Departments,
@ -187,7 +188,7 @@ void Dpt_SeeDepts (void)
NumTchsInsWithDpt); NumTchsInsWithDpt);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free list of departments *****/ /***** Free list of departments *****/
Dpt_FreeListDepartments (); Dpt_FreeListDepartments ();
@ -486,7 +487,7 @@ static void Dpt_ListDepartmentsForEdition (void)
struct Instit Ins; struct Instit Ins;
unsigned NumIns; unsigned NumIns;
Lay_StartRoundFrameTable (NULL,Txt_Departments,NULL, Box_StartBoxTable (NULL,Txt_Departments,NULL,
Hlp_INSTITUTION_Departments_edit, Hlp_INSTITUTION_Departments_edit,
false, // Not closable false, // Not closable
2); 2);
@ -592,7 +593,7 @@ static void Dpt_ListDepartmentsForEdition (void)
Dpt->NumTchs); Dpt->NumTchs);
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -890,7 +891,7 @@ static void Dpt_PutFormToCreateDepartment (void)
Act_FormStart (ActNewDpt); Act_FormStart (ActNewDpt);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_department,NULL, Box_StartBoxTable (NULL,Txt_New_department,NULL,
Hlp_INSTITUTION_Departments_edit, Hlp_INSTITUTION_Departments_edit,
false, // Not closable false, // Not closable
2); 2);
@ -963,7 +964,7 @@ static void Dpt_PutFormToCreateDepartment (void)
Cns_MAX_CHARS_WWW,Dpt->WWW); Cns_MAX_CHARS_WWW,Dpt->WWW);
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_department); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_department);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

9
swad_duplicate.c
View File

@ -26,6 +26,7 @@
/*****************************************************************************/ /*****************************************************************************/
#include "swad_account.h" #include "swad_account.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_duplicate.h" #include "swad_duplicate.h"
#include "swad_enrolment.h" #include "swad_enrolment.h"
@ -139,7 +140,7 @@ void Dup_ListDuplicateUsrs (void)
unsigned NumInformants; unsigned NumInformants;
/***** Start frame with list of possible duplicate users *****/ /***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL, Box_StartBox (NULL,Txt_Possibly_duplicate_users,NULL,
Hlp_USERS_Duplicates_possibly_duplicate_users, Hlp_USERS_Duplicates_possibly_duplicate_users,
false); // Not closable false); // Not closable
@ -229,7 +230,7 @@ void Dup_ListDuplicateUsrs (void)
Usr_ShowWarningNoUsersFound (Rol_UNK); Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -259,7 +260,7 @@ static void Dup_ListSimilarUsrs (void)
unsigned NumUsr; unsigned NumUsr;
/***** Start frame with list of possible duplicate users *****/ /***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Similar_users,NULL, Box_StartBox (NULL,Txt_Similar_users,NULL,
Hlp_USERS_Duplicates_similar_users, Hlp_USERS_Duplicates_similar_users,
false); // Not closable false); // Not closable
@ -371,7 +372,7 @@ static void Dup_ListSimilarUsrs (void)
Usr_ShowWarningNoUsersFound (Rol_UNK); Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

25
swad_enrolment.c
View File

@ -30,6 +30,7 @@
#include "swad_account.h" #include "swad_account.h"
#include "swad_announcement.h" #include "swad_announcement.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_duplicate.h" #include "swad_duplicate.h"
#include "swad_enrolment.h" #include "swad_enrolment.h"
@ -376,7 +377,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
Ntf_NotifyEvent_t NotifyEvent; Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrolment,NULL, Box_StartBox (NULL,Txt_Enrolment,NULL,
Hlp_USERS_SignUp_confirm_enrolment, Hlp_USERS_SignUp_confirm_enrolment,
false); // Not closable false); // Not closable
@ -423,7 +424,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Mark possible notification as seen *****/ /***** Mark possible notification as seen *****/
switch (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role) switch (Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role)
@ -705,7 +706,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
Act_FormStart (NextAction); Act_FormStart (NextAction);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Title,NULL, Box_StartBox (NULL,Title,NULL,
Hlp_USERS_Administration_administer_multiple_users, Hlp_USERS_Administration_administer_multiple_users,
false); // Not closable false); // Not closable
@ -758,7 +759,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
Pwd_AskForConfirmationOnDangerousAction (); Pwd_AskForConfirmationOnDangerousAction ();
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Confirm); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Confirm);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -796,7 +797,7 @@ void Enr_AskRemoveOldUsrs (void)
Act_FormStart (ActRemOldUsr); Act_FormStart (ActRemOldUsr);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL, Box_StartBox (NULL,Txt_Eliminate_old_users,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -820,7 +821,7 @@ void Enr_AskRemoveOldUsrs (void)
fprintf (Gbl.F.Out,"</label>"); fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate); Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1853,7 +1854,7 @@ void Enr_AskRemAllStdsThisCrs (void)
extern const char *Txt_Do_you_really_want_to_remove_the_X_students_from_the_course_Y_; extern const char *Txt_Do_you_really_want_to_remove_the_X_students_from_the_course_Y_;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_all_students,NULL, Box_StartBox (NULL,Txt_Remove_all_students,NULL,
Hlp_USERS_Administration_remove_all_students, Hlp_USERS_Administration_remove_all_students,
false); // Not closable false); // Not closable
@ -1881,7 +1882,7 @@ void Enr_AskRemAllStdsThisCrs (void)
Usr_ShowWarningNoUsersFound (Rol_STD); Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2306,7 +2307,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Sco_GetScope ("ScopeEnr"); Sco_GetScope ("ScopeEnr");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Enrolment_requests,NULL, Box_StartBox ("100%",Txt_Enrolment_requests,NULL,
Hlp_USERS_Requests, Hlp_USERS_Requests,
false); // Not closable false); // Not closable
@ -2954,7 +2955,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3125,7 +3126,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
Act_Action_t NextAction; Act_Action_t NextAction;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Administer_one_user,NULL, Box_StartBox (NULL,Txt_Administer_one_user,NULL,
Hlp_USERS_Administration_administer_one_user, Hlp_USERS_Administration_administer_one_user,
false); // Not closable false); // Not closable
@ -3152,7 +3153,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
Enr_WriteFormToReqAnotherUsrID (NextAction); Enr_WriteFormToReqAnotherUsrID (NextAction);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

11
swad_exam.c
View File

@ -35,6 +35,7 @@
#include <stdlib.h> // For exit, system, malloc, calloc, free, etc. #include <stdlib.h> // For exit, system, malloc, calloc, free, etc.
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_exam.h" #include "swad_exam.h"
@ -646,7 +647,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
NumExaAnns = DB_QuerySELECT (Query,&mysql_res,"can not get exam announcements in this course for listing"); NumExaAnns = DB_QuerySELECT (Query,&mysql_res,"can not get exam announcements in this course for listing");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL, Box_StartBox (NULL,
(Gbl.ExamAnns.HighlightExaCod > 0 || (Gbl.ExamAnns.HighlightExaCod > 0 ||
Gbl.ExamAnns.HighlightDate[0]) ? Txt_All_announcements_of_exams : Gbl.ExamAnns.HighlightDate[0]) ? Txt_All_announcements_of_exams :
Txt_Announcements_of_exams, Txt_Announcements_of_exams,
@ -698,7 +699,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1070,7 +1071,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("625px",NULL, Box_StartBox ("625px",NULL,
TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement : TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement :
NULL, NULL,
TypeViewExamAnnouncement == Exa_FORM_VIEW ? ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Hlp_ASSESSMENT_Announcements_edit_announcement : TypeViewExamAnnouncement == Exa_FORM_VIEW ? ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Hlp_ASSESSMENT_Announcements_edit_announcement :
@ -1525,11 +1526,11 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
/***** End frame *****/ /***** End frame *****/
if (TypeViewExamAnnouncement == Exa_FORM_VIEW) if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
Lay_EndRoundFrameWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Lay_CONFIRM_BUTTON : Box_EndBoxWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Lay_CONFIRM_BUTTON :
Lay_CREATE_BUTTON, Lay_CREATE_BUTTON,
Txt_Publish_announcement_OF_EXAM); Txt_Publish_announcement_OF_EXAM);
else else
Lay_EndRoundFrame (); Box_EndBox ();
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
QR_ExamAnnnouncement (); QR_ExamAnnnouncement ();

47
swad_file_browser.c
View File

@ -36,6 +36,7 @@
#include <sys/stat.h> // For lstat #include <sys/stat.h> // For lstat
#include <unistd.h> // For access, lstat, getpid, chdir, symlink #include <unistd.h> // For access, lstat, getpid, chdir, symlink
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_file_browser.h" #include "swad_file_browser.h"
@ -3118,7 +3119,7 @@ void Brw_AskEditWorksCrs (void)
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Draw class photos to select users *****/ /***** Draw class photos to select users *****/
Lay_StartRoundFrame (NULL,Txt_Users,NULL, Box_StartBox (NULL,Txt_Users,NULL,
Hlp_FILES_Homework_for_teachers, Hlp_FILES_Homework_for_teachers,
false); // Not closable false); // Not closable
@ -3166,7 +3167,7 @@ void Brw_AskEditWorksCrs (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for users' list *****/ /***** Free memory for users' list *****/
Usr_FreeUsrsList (Rol_TCH); Usr_FreeUsrsList (Rol_TCH);
@ -3215,7 +3216,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
Brw_WriteTopBeforeShowingFileBrowser (); Brw_WriteTopBeforeShowingFileBrowser ();
/***** Header of the table with the list of users *****/ /***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable ("100%",Txt_Assignments_and_other_works, Box_StartBoxTable ("100%",Txt_Assignments_and_other_works,
Brw_PutIconShowFigure, Brw_PutIconShowFigure,
Hlp_FILES_Homework_for_teachers, Hlp_FILES_Homework_for_teachers,
false, // Not closable false, // Not closable
@ -3253,7 +3254,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
} }
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else // If no users are selected... else // If no users are selected...
{ {
@ -3687,7 +3688,7 @@ static void Brw_ShowFileBrowser (void)
Gbl.FileBrowser.Id++; Gbl.FileBrowser.Id++;
sprintf (FileBrowserSectionId,"file_browser_%u",Gbl.FileBrowser.Id); sprintf (FileBrowserSectionId,"file_browser_%u",Gbl.FileBrowser.Id);
Lay_StartSection (FileBrowserSectionId); Lay_StartSection (FileBrowserSectionId);
Lay_StartRoundFrame ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type], Box_StartBox ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type],
Brw_PutIconsFileBrowser, Brw_PutIconsFileBrowser,
Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type], Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type],
false); // Not closable false); // Not closable
@ -3710,7 +3711,7 @@ static void Brw_ShowFileBrowser (void)
Brw_PutButtonToShowEdit (); Brw_PutButtonToShowEdit ();
/***** End of frame *****/ /***** End of frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
Lay_EndSection (); Lay_EndSection ();
} }
@ -7983,7 +7984,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL, Box_StartBox (NULL,Txt_Create_folder,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
sprintf (Gbl.Alert.Txt,Txt_You_can_create_a_new_folder_inside_the_folder_X, sprintf (Gbl.Alert.Txt,Txt_You_can_create_a_new_folder_inside_the_folder_X,
@ -8001,7 +8002,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
Brw_MAX_CHARS_FOLDER); Brw_MAX_CHARS_FOLDER);
/* Button to send and end frame *****/ /* Button to send and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_folder); Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_folder);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -8022,7 +8023,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Start frame *****/ /***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">"); fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL, Box_StartBox ("95%",Txt_Upload_files,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -8070,7 +8071,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -8085,7 +8086,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
/***** Start frame *****/ /***** 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,NULL, Box_StartBox (NULL,Txt_Upload_file,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -8108,7 +8109,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -8129,7 +8130,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Paste,NULL, Box_StartBox (NULL,Txt_Paste,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -8139,7 +8140,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Paste); Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Paste);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -8166,7 +8167,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Brw_IS_FOLDER,-1L); Brw_IS_FOLDER,-1L);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL, Box_StartBox (NULL,Txt_Create_link,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -8211,7 +8212,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Brw_MAX_CHARS_FOLDER); Brw_MAX_CHARS_FOLDER);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_link); Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -9164,7 +9165,7 @@ void Brw_ShowFileMetadata (void)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTableShadow (NULL,NULL,NULL,NULL,2); Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
/***** Link to download the file *****/ /***** Link to download the file *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -9347,11 +9348,11 @@ void Brw_ShowFileMetadata (void)
/***** End frame *****/ /***** End frame *****/
if (ICanEdit) // I can edit file properties if (ICanEdit) // I can edit file properties
{ {
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save_file_properties); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save_file_properties);
Act_FormEnd (); Act_FormEnd ();
} }
else else
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Mark possible notifications as seen *****/ /***** Mark possible notifications as seen *****/
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
@ -11338,7 +11339,7 @@ unsigned Brw_ListDocsFound (const char *Query,
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumDocs,(NumDocs == 1) ? TitleSingular : NumDocs,(NumDocs == 1) ? TitleSingular :
TitlePlural); TitlePlural);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -11399,7 +11400,7 @@ unsigned Brw_ListDocsFound (const char *Query,
"</tr>"); "</tr>");
/* End table */ /* End table */
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -11698,7 +11699,7 @@ void Brw_AskRemoveOldFiles (void)
Brw_PutHiddenParamFullTreeIfSelected (); Brw_PutHiddenParamFullTreeIfSelected ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL, Box_StartBox (NULL,Txt_Remove_old_files,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -11722,7 +11723,7 @@ void Brw_AskRemoveOldFiles (void)
fprintf (Gbl.F.Out,"</label>"); fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Remove); Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Remove);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

13
swad_follow.c
View File

@ -29,6 +29,7 @@
#include <stdio.h> // For sprintf #include <stdio.h> // For sprintf
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_follow.h" #include "swad_follow.h"
#include "swad_global.h" #include "swad_global.h"
@ -131,7 +132,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
&mysql_res))) &mysql_res)))
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow, Box_StartBoxTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,
Hlp_SOCIAL_Profiles_who_to_follow, Hlp_SOCIAL_Profiles_who_to_follow,
false, // Not closable false, // Not closable
2); 2);
@ -164,7 +165,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_No_user_to_whom_you_can_follow_Try_again_later); Ale_ShowAlert (Ale_INFO,Txt_No_user_to_whom_you_can_follow_Try_again_later);
@ -687,7 +688,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
Usr_UsrDataConstructor (&FollowingUsrDat); Usr_UsrDataConstructor (&FollowingUsrDat);
/***** Start listing *****/ /***** Start listing *****/
Lay_StartRoundFrameTable ("560px",Txt_Following,NULL, Box_StartBoxTable ("560px",Txt_Following,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -713,7 +714,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
} }
/***** End listing *****/ /***** End listing *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&FollowingUsrDat); Usr_UsrDataDestructor (&FollowingUsrDat);
@ -773,7 +774,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
Usr_UsrDataConstructor (&FollowerUsrDat); Usr_UsrDataConstructor (&FollowerUsrDat);
/***** Start listing *****/ /***** Start listing *****/
Lay_StartRoundFrameTable ("560px",Txt_Followers,NULL, Box_StartBoxTable ("560px",Txt_Followers,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -799,7 +800,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
} }
/***** End listing *****/ /***** End listing *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&FollowerUsrDat); Usr_UsrDataDestructor (&FollowerUsrDat);

17
swad_forum.c
View File

@ -32,6 +32,7 @@
#include <time.h> // For time_t #include <time.h> // For time_t
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_forum.h" #include "swad_forum.h"
@ -1008,7 +1009,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
/***** Start frame *****/ /***** Start frame *****/
sprintf (FrameTitle,"%s: %s",Txt_Thread,Thr.Subject); sprintf (FrameTitle,"%s: %s",Txt_Thread,Thr.Subject);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewPost, Box_StartBox (NULL,FrameTitle,For_PutIconNewPost,
Hlp_SOCIAL_Forums_posts, Hlp_SOCIAL_Forums_posts,
false); // Not closable false); // Not closable
@ -1136,7 +1137,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
Lay_EndSection (); Lay_EndSection ();
} }
@ -1605,7 +1606,7 @@ static void For_ShowForumList (void)
Usr_GetMyInstits (); Usr_GetMyInstits ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums, Box_StartBox (NULL,Txt_Forums,For_PutIconsForums,
Hlp_SOCIAL_Forums, Hlp_SOCIAL_Forums,
false); // Not closable false); // Not closable
@ -1759,7 +1760,7 @@ static void For_ShowForumList (void)
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2572,7 +2573,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
/***** Start frame for threads of this forum *****/ /***** Start frame for threads of this forum *****/
sprintf (FrameTitle,"%s: %s",Txt_Forum,ForumName); sprintf (FrameTitle,"%s: %s",Txt_Forum,ForumName);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewThread, Box_StartBox (NULL,FrameTitle,For_PutIconNewThread,
Hlp_SOCIAL_Forums_threads, Hlp_SOCIAL_Forums_threads,
false); // Not closable false); // Not closable
@ -2653,7 +2654,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
Lay_EndSection (); Lay_EndSection ();
/***** End frame with threads of this forum ****/ /***** End frame with threads of this forum ****/
Lay_EndRoundFrame (); Box_EndBox ();
Lay_EndSection (); Lay_EndSection ();
} }
@ -3857,7 +3858,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
extern const char *Txt_Send; extern const char *Txt_Send;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL, Box_StartBox (NULL,
IsReply ? Txt_New_post : IsReply ? Txt_New_post :
Txt_New_thread, Txt_New_thread,
NULL, NULL,
@ -3929,7 +3930,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

29
swad_group.c
View File

@ -30,6 +30,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_group.h" #include "swad_group.h"
@ -265,7 +266,7 @@ static void Grp_EditGroupTypes (void)
extern const char *Txt_There_are_no_types_of_group_in_the_course_X; extern const char *Txt_There_are_no_types_of_group_in_the_course_X;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_group, Box_StartBox (NULL,Txt_Types_of_group,
Grp_PutIconsEditingGroupTypes, Grp_PutIconsEditingGroupTypes,
Hlp_USERS_Groups, Hlp_USERS_Groups,
false); // Not closable false); // Not closable
@ -284,7 +285,7 @@ static void Grp_EditGroupTypes (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -298,7 +299,7 @@ static void Grp_EditGroups (void)
extern const char *Txt_No_groups_have_been_created_in_the_course_X; extern const char *Txt_No_groups_have_been_created_in_the_course_X;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Groups,Grp_PutIconsEditingGroups, Box_StartBox (NULL,Txt_Groups,Grp_PutIconsEditingGroups,
Hlp_USERS_Groups, Hlp_USERS_Groups,
false); // Not closable false); // Not closable
@ -316,7 +317,7 @@ static void Grp_EditGroups (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -364,7 +365,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM); Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Groups, Box_StartBox (NULL,Txt_Groups,
ICanEdit ? Grp_PutIconToEditGroups : ICanEdit ? Grp_PutIconToEditGroups :
NULL, NULL,
Hlp_USERS_Groups, Hlp_USERS_Groups,
@ -410,7 +411,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -1725,7 +1726,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_My_groups, Box_StartBox (NULL,Txt_My_groups,
ICanEdit ? Grp_PutIconToEditGroups : ICanEdit ? Grp_PutIconToEditGroups :
NULL, NULL,
Hlp_USERS_Groups, Hlp_USERS_Groups,
@ -1775,7 +1776,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups
/***** Free list of groups types and groups in this course *****/ /***** Free list of groups types and groups in this course *****/
@ -1944,7 +1945,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Groups,NULL, Box_StartBoxTable (NULL,Txt_Groups,NULL,
Hlp_USERS_Groups, Hlp_USERS_Groups,
false, // Not closable false, // Not closable
0); 0);
@ -1957,7 +1958,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod); Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free list of groups types and groups in current course *****/ /***** Free list of groups types and groups in current course *****/
Grp_FreeListGrpTypesAndGrps (); Grp_FreeListGrpTypesAndGrps ();
@ -2348,7 +2349,7 @@ static void Grp_PutFormToCreateGroupType (void)
Act_FormStartAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID); Act_FormStartAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_group,NULL, Box_StartBoxTable (NULL,Txt_New_type_of_group,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2439,7 +2440,7 @@ static void Grp_PutFormToCreateGroupType (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_group); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_group);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2464,7 +2465,7 @@ static void Grp_PutFormToCreateGroup (void)
Act_FormStartAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID); Act_FormStartAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_group,NULL, Box_StartBoxTable (NULL,Txt_New_group,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2535,7 +2536,7 @@ static void Grp_PutFormToCreateGroup (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_group); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_group);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

5
swad_help.c
View File

@ -28,6 +28,7 @@
#include <stdlib.h> // For exit, system, malloc, free, rand, etc. #include <stdlib.h> // For exit, system, malloc, free, rand, etc.
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_help.h" #include "swad_help.h"
@ -129,7 +130,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
/***** Contextual buttons *****/ /***** Contextual buttons *****/
/* Start table */ /* Start table */
Lay_StartRoundFrameTable (NULL,Txt_What_would_you_like_to_do,NULL, Box_StartBoxTable (NULL,Txt_What_would_you_like_to_do,NULL,
NULL, NULL,
true, // Closable true, // Closable
2); 2);
@ -253,7 +254,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
} }
/* End table */ /* End table */
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

13
swad_holiday.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_holiday.h" #include "swad_holiday.h"
@ -99,7 +100,7 @@ void Hld_SeeHolidays (void)
Hld_GetListHolidays (); Hld_GetListHolidays ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Holidays, Box_StartBox (NULL,Txt_Holidays,
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM ? Hld_PutIconToEditHlds : Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
NULL, NULL,
Hlp_INSTITUTION_Holidays, Hlp_INSTITUTION_Holidays,
@ -184,7 +185,7 @@ void Hld_SeeHolidays (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free list of holidays *****/ /***** Free list of holidays *****/
Hld_FreeListHolidays (); Hld_FreeListHolidays ();
@ -500,7 +501,7 @@ static void Hld_ListHolidaysForEdition (void)
struct Holiday *Hld; struct Holiday *Hld;
Hld_HolidayType_t HolidayType; Hld_HolidayType_t HolidayType;
Lay_StartRoundFrameTable (NULL,Txt_Holidays,NULL, Box_StartBoxTable (NULL,Txt_Holidays,NULL,
Hlp_INSTITUTION_Holidays_edit, Hlp_INSTITUTION_Holidays_edit,
false, // Not closable false, // Not closable
2); 2);
@ -609,7 +610,7 @@ static void Hld_ListHolidaysForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -960,7 +961,7 @@ static void Hld_PutFormToCreateHoliday (void)
Act_FormStart (ActNewHld); Act_FormStart (ActNewHld);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_holiday,NULL, Box_StartBoxTable (NULL,Txt_New_holiday,NULL,
Hlp_INSTITUTION_Holidays_edit, Hlp_INSTITUTION_Holidays_edit,
false, // Not closable false, // Not closable
2); 2);
@ -1051,7 +1052,7 @@ static void Hld_PutFormToCreateHoliday (void)
Hld_MAX_CHARS_HOLIDAY_NAME,Hld->Name); Hld_MAX_CHARS_HOLIDAY_NAME,Hld->Name);
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_holiday); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_holiday);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

5
swad_icon.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> // For fprintf, etc. #include <stdio.h> // For fprintf, etc.
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -76,7 +77,7 @@ void Ico_PutIconsToSelectIconSet (void)
extern const char *Txt_Icons; extern const char *Txt_Icons;
Ico_IconSet_t IconSet; Ico_IconSet_t IconSet;
Lay_StartRoundFrame (NULL,Txt_Icons, Box_StartBox (NULL,Txt_Icons,
Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons, Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">"); fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@ -101,7 +102,7 @@ void Ico_PutIconsToSelectIconSet (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

5
swad_indicator.c
View File

@ -30,6 +30,7 @@
#include <mysql/mysql.h> // To access MySQL databases #include <mysql/mysql.h> // To access MySQL databases
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_indicator.h" #include "swad_indicator.h"
@ -105,7 +106,7 @@ void Ind_ReqIndicatorsCourses (void)
Ind_GetParamsIndicators (); Ind_GetParamsIndicators ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL, Box_StartBox (NULL,Txt_Indicators_of_courses,NULL,
Hlp_STATS_Indicators, Hlp_STATS_Indicators,
false); // Not closable false); // Not closable
@ -200,7 +201,7 @@ void Ind_ReqIndicatorsCourses (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);

33
swad_info.c
View File

@ -34,6 +34,7 @@
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_info.h" #include "swad_info.h"
@ -441,7 +442,7 @@ void Inf_ShowInfo (void)
if (ShowWarningNoInfo) if (ShowWarningNoInfo)
{ {
Lay_StartRoundFrame ("100%",Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], Box_StartBox ("100%",Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo : ICanEdit ? Inf_PutIconToEditInfo :
NULL, NULL,
Help[Gbl.CurrentCrs.Info.Type], Help[Gbl.CurrentCrs.Info.Type],
@ -449,7 +450,7 @@ void Inf_ShowInfo (void)
Ale_ShowAlert (Ale_INFO,Txt_No_information); Ale_ShowAlert (Ale_INFO,Txt_No_information);
if (ICanEdit) if (ICanEdit)
Inf_PutButtonToEditInfo (); Inf_PutButtonToEditInfo ();
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -589,7 +590,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
Inf_InfoType_t InfoType; Inf_InfoType_t InfoType;
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrame (NULL,Txt_Required_reading,NULL, Box_StartBox (NULL,Txt_Required_reading,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -619,7 +620,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
"</div>"); "</div>");
/***** End of frame *****/ /***** End of frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1031,7 +1032,7 @@ static void Inf_ShowPage (const char *URL)
}; };
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo : ICanEdit ? Inf_PutIconToEditInfo :
NULL, NULL,
Help[Gbl.CurrentCrs.Info.Type], Help[Gbl.CurrentCrs.Info.Type],
@ -1046,7 +1047,7 @@ static void Inf_ShowPage (const char *URL)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
/***** End of frame *****/ /***** End of frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1118,7 +1119,7 @@ void Inf_FormsToSelSendInfo (void)
/***** Form to choice between alternatives *****/ /***** Form to choice between alternatives *****/
/* Start of table */ /* Start of table */
Lay_StartRoundFrameTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo, Box_StartBoxTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo,
HelpEdit[Gbl.CurrentCrs.Info.Type], HelpEdit[Gbl.CurrentCrs.Info.Type],
false, // Not closable false, // Not closable
4); 4);
@ -1171,7 +1172,7 @@ void Inf_FormsToSelSendInfo (void)
} }
/* End of table */ /* End of table */
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1788,7 +1789,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
if (TxtHTML[0]) if (TxtHTML[0])
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo : ICanEdit ? Inf_PutIconToEditInfo :
NULL, NULL,
Help[Gbl.CurrentCrs.Info.Type], Help[Gbl.CurrentCrs.Info.Type],
@ -1810,7 +1811,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
return true; return true;
} }
@ -1873,7 +1874,7 @@ static bool Inf_CheckAndShowRichTxt (void)
if (TxtMD[0]) if (TxtMD[0])
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo : ICanEdit ? Inf_PutIconToEditInfo :
NULL, NULL,
Help[Gbl.CurrentCrs.Info.Type], Help[Gbl.CurrentCrs.Info.Type],
@ -1944,7 +1945,7 @@ static bool Inf_CheckAndShowRichTxt (void)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
return true; return true;
} }
@ -2062,7 +2063,7 @@ void Inf_EditPlainTxtInfo (void)
/***** Start form and frame *****/ /***** Start form and frame *****/
Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]); Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL, Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type], HelpEdit[Gbl.CurrentCrs.Info.Type],
false); // Not closable false); // Not closable
@ -2084,7 +2085,7 @@ void Inf_EditPlainTxtInfo (void)
TxtHTML); TxtHTML);
/***** End frame and form *****/ /***** End frame and form *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }
@ -2114,7 +2115,7 @@ void Inf_EditRichTxtInfo (void)
/***** Start form and frame *****/ /***** Start form and frame *****/
Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]); Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL, Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type], HelpEdit[Gbl.CurrentCrs.Info.Type],
false); // Not closable false); // Not closable
@ -2136,7 +2137,7 @@ void Inf_EditRichTxtInfo (void)
TxtHTML); TxtHTML);
/***** End frame and form *****/ /***** End frame and form *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }

25
swad_institution.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
@ -150,7 +151,7 @@ void Ins_SeeInsWithPendingCtrs (void)
if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres"))) if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres")))
{ {
/***** Write heading *****/ /***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres,NULL, Box_StartBoxTable (NULL,Txt_Institutions_with_pending_centres,NULL,
Hlp_SYSTEM_Hierarchy_pending, Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable false, // Not closable
2); 2);
@ -200,7 +201,7 @@ void Ins_SeeInsWithPendingCtrs (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed); Ale_ShowAlert (Ale_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed);
@ -307,7 +308,7 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.InsCod > 0) if (Gbl.CurrentIns.Ins.InsCod > 0)
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL, Box_StartBox (NULL,NULL,
PrintView ? NULL : PrintView ? NULL :
Ins_PutIconsToPrintAndUpload, Ins_PutIconsToPrintAndUpload,
PrintView ? NULL : PrintView ? NULL :
@ -587,7 +588,7 @@ static void Ins_Configuration (bool PrintView)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -669,7 +670,7 @@ static void Ins_ListInstitutions (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsListInstitutions, Box_StartBox (NULL,Gbl.Title,Ins_PutIconsListInstitutions,
Hlp_COUNTRY_Institutions, Hlp_COUNTRY_Institutions,
false); // Not closable false); // Not closable
@ -700,7 +701,7 @@ static void Ins_ListInstitutions (void)
Act_FormEnd (); Act_FormEnd ();
} }
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -920,7 +921,7 @@ void Ins_EditInstitutions (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X, sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconToViewInstitutions, Box_StartBox (NULL,Gbl.Title,Ins_PutIconToViewInstitutions,
Hlp_COUNTRY_Institutions, Hlp_COUNTRY_Institutions,
false); // Not closable false); // Not closable
@ -932,7 +933,7 @@ void Ins_EditInstitutions (void)
Ins_ListInstitutionsForEdition (); Ins_ListInstitutionsForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of institutions *****/ /***** Free list of institutions *****/
Ins_FreeListInstitutions (); Ins_FreeListInstitutions ();
@ -2157,7 +2158,7 @@ static void Ins_PutFormToCreateInstitution (void)
Lay_ShowErrorAndExit ("You can not edit institutions."); Lay_ShowErrorAndExit ("You can not edit institutions.");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_institution,NULL, Box_StartBoxTable (NULL,Txt_New_institution,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2230,7 +2231,7 @@ static void Ins_PutFormToCreateInstitution (void)
"</tr>"); "</tr>");
/***** Send button and end of frame *****/ /***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_institution); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_institution);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2519,7 +2520,7 @@ unsigned Ins_ListInssFound (const char *Query)
sprintf (Gbl.Title,"%u %s", sprintf (Gbl.Title,"%u %s",
NumInss,NumInss == 1 ? Txt_institution : NumInss,NumInss == 1 ? Txt_institution :
Txt_institutions); Txt_institutions);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -2544,7 +2545,7 @@ unsigned Ins_ListInssFound (const char *Query)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

165
swad_layout.c
View File

@ -30,6 +30,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_changelog.h" #include "swad_changelog.h"
#include "swad_config.h" #include "swad_config.h"
@ -95,11 +96,6 @@ static void Lay_WriteTitleAction (void);
static void Lay_ShowLeftColumn (void); static void Lay_ShowLeftColumn (void);
static void Lay_ShowRightColumn (void); static void Lay_ShowRightColumn (void);
static void Lay_StartRoundFrameInternal (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable,
const char *ClassFrame);
static void Lay_WriteAboutZone (void); static void Lay_WriteAboutZone (void);
static void Lay_WriteFootFromHTMLFile (void); static void Lay_WriteFootFromHTMLFile (void);
@ -1438,161 +1434,8 @@ void Lay_PutRemoveButtonInline (const char *TxtButton)
} }
/*****************************************************************************/ /*****************************************************************************/
/****************** Start and end a table with rounded frame *****************/ /******************************* Start/end table *****************************/
/*****************************************************************************/ /*****************************************************************************/
// CellPadding must be 0, 1, 2, 4 or 8
void Lay_StartRoundFrameTable (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable,
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{
Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,
HelpLink,
Closable);
Lay_StartTableWide (CellPadding);
}
void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{
Lay_StartRoundFrameShadow (Width,Title,
FunctionToDrawContextualIcons,
HelpLink);
Lay_StartTableWide (CellPadding);
}
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable)
{
Lay_StartRoundFrameInternal (Width,Title,
FunctionToDrawContextualIcons,
HelpLink,
Closable,
"FRAME");
}
void Lay_StartRoundFrameShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink)
{
Lay_StartRoundFrameInternal (Width,Title,
FunctionToDrawContextualIcons,
HelpLink,
false, // Not closable
"FRAME_SHADOW");
}
static void Lay_StartRoundFrameInternal (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable,
const char *ClassFrame)
{
extern const char *Txt_Help;
extern const char *Txt_Close;
char IdFrame[Act_MAX_BYTES_ID];
/***** Start frame container *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_CONTAINER\"");
if (Closable)
{
/* Create unique id for alert */
Act_SetUniqueId (IdFrame);
fprintf (Gbl.F.Out," id=\"%s\"",IdFrame);
}
fprintf (Gbl.F.Out,">");
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div class=\"%s\"",ClassFrame);
if (Width)
fprintf (Gbl.F.Out," style=\"width:%s;\"",Width);
fprintf (Gbl.F.Out,">");
/***** Row for left and right icons *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
/* Contextual icons at left */
if (FunctionToDrawContextualIcons)
{
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_LEFT\">");
FunctionToDrawContextualIcons ();
fprintf (Gbl.F.Out,"</div>");
}
/* Icons at right: help and close */
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_RIGHT\">");
if (HelpLink) // Link to help
fprintf (Gbl.F.Out,"<a href=\"%s%s\" target=\"_blank\">"
"<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
"<img src=\"%s/help64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"</div>"
"</a>",
Hlp_WIKI,HelpLink,
Gbl.Prefs.IconsURL,
Txt_Help,Txt_Help);
if (Closable) // Icon to close the frame
fprintf (Gbl.F.Out,"<a href=\"\""
" onclick=\"toggleDisplay('%s');return false;\" />"
"<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
"<img src=\"%s/close64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"</div>"
"</a>",
IdFrame,
Gbl.Prefs.IconsURL,
Txt_Close,Txt_Close);
fprintf (Gbl.F.Out,"</div>");
/***** End row for left and right icons *****/
fprintf (Gbl.F.Out,"</div>");
/***** Frame title *****/
if (Title)
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
"%s"
"</div>",
Gbl.Layout.FrameNested ? "FRAME_TITLE_SMALL" :
"FRAME_TITLE_BIG",
Title);
Gbl.Layout.FrameNested++;
}
void Lay_EndRoundFrameTable (void)
{
Lay_EndTable ();
Lay_EndRoundFrame ();
}
void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton)
{
Lay_EndTable ();
Lay_EndRoundFrameWithButton (Button,TxtButton);
}
void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton)
{
Lay_PutButton (Button,TxtButton);
Lay_EndRoundFrame ();
}
void Lay_EndRoundFrame (void)
{
Gbl.Layout.FrameNested--;
/***** End frame and frame container *****/
fprintf (Gbl.F.Out,"</div>"
"</div>");
}
void Lay_StartTable (unsigned CellPadding) void Lay_StartTable (unsigned CellPadding)
{ {
@ -1975,7 +1818,7 @@ void Lay_AdvertisementMobile (void)
fprintf (Gbl.F.Out,"<div style=\"margin-top:25px;\">"); fprintf (Gbl.F.Out,"<div style=\"margin-top:25px;\">");
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL,NULL,NULL, Box_StartBoxTable (NULL,NULL,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
8); 8);
@ -1997,7 +1840,7 @@ void Lay_AdvertisementMobile (void)
Txt_Stay_connected_with_SWADroid); Txt_Stay_connected_with_SWADroid);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

19
swad_layout.h
View File

@ -93,25 +93,6 @@ void Lay_PutConfirmButtonInline (const char *TxtButton);
void Lay_PutRemoveButton (const char *TxtButton); void Lay_PutRemoveButton (const char *TxtButton);
void Lay_PutRemoveButtonInline (const char *TxtButton); void Lay_PutRemoveButtonInline (const char *TxtButton);
void Lay_StartRoundFrameTable (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable,
unsigned CellPadding);
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,bool Closable);
void Lay_StartRoundFrameShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink);
void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
unsigned CellPadding);
void Lay_EndRoundFrameTable (void);
void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton);
void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton);
void Lay_EndRoundFrame (void);
void Lay_StartTable (unsigned CellPadding); void Lay_StartTable (unsigned CellPadding);
void Lay_StartTableCenter (unsigned CellPadding); void Lay_StartTableCenter (unsigned CellPadding);
void Lay_StartTableWide (unsigned CellPadding); void Lay_StartTableWide (unsigned CellPadding);

13
swad_link.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -110,7 +111,7 @@ void Lnk_SeeLinks (void)
Lnk_GetListLinks (); Lnk_GetListLinks ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Links, Box_StartBox (NULL,Txt_Links,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Lnk_PutIconToEditLinks : Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Lnk_PutIconToEditLinks :
NULL, NULL,
Hlp_SYSTEM_Links, Hlp_SYSTEM_Links,
@ -131,7 +132,7 @@ void Lnk_SeeLinks (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of links *****/ /***** Free list of links *****/
Lnk_FreeListLinks (); Lnk_FreeListLinks ();
@ -228,7 +229,7 @@ void Lnk_EditLinks (void)
Lnk_GetListLinks (); Lnk_GetListLinks ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Links,Lnk_PutIconToViewLinks, Box_StartBox (NULL,Txt_Links,Lnk_PutIconToViewLinks,
Hlp_SYSTEM_Links_edit, Hlp_SYSTEM_Links_edit,
false); // Not closable false); // Not closable
@ -240,7 +241,7 @@ void Lnk_EditLinks (void)
Lnk_ListLinksForEdition (); Lnk_ListLinksForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of links *****/ /***** Free list of links *****/
Lnk_FreeListLinks (); Lnk_FreeListLinks ();
@ -707,7 +708,7 @@ static void Lnk_PutFormToCreateLink (void)
Act_FormStart (ActNewLnk); Act_FormStart (ActNewLnk);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_link,NULL, Box_StartBoxTable (NULL,Txt_New_link,NULL,
Hlp_SYSTEM_Links_edit, Hlp_SYSTEM_Links_edit,
false, // Not closable false, // Not closable
2); 2);
@ -749,7 +750,7 @@ static void Lnk_PutFormToCreateLink (void)
Cns_MAX_CHARS_WWW,Lnk->WWW); Cns_MAX_CHARS_WWW,Lnk->WWW);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_link); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

5
swad_logo.c
View File

@ -28,6 +28,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_scope.h" #include "swad_scope.h"
#include "swad_theme.h" #include "swad_theme.h"
@ -283,7 +284,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
Act_FormStart (ActionRec); Act_FormStart (ActionRec);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Logo,NULL, Box_StartBox (NULL,Txt_Logo,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -304,7 +305,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
Gbl.Form.Id); Gbl.Form.Id);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

25
swad_mail.c
View File

@ -32,6 +32,7 @@
#include <unistd.h> // For access, lstat, getpid, chdir, symlink, unlink #include <unistd.h> // For access, lstat, getpid, chdir, symlink, unlink
#include "swad_account.h" #include "swad_account.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_mail.h" #include "swad_mail.h"
@ -107,7 +108,7 @@ void Mai_SeeMailDomains (void)
Mai_GetListMailDomainsAllowedForNotif (); Mai_GetListMailDomainsAllowedForNotif ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications, Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains : Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
NULL, NULL,
Hlp_MESSAGES_Domains, Hlp_MESSAGES_Domains,
@ -154,7 +155,7 @@ void Mai_SeeMailDomains (void)
Gbl.Mails.Lst[NumMai].NumUsrs); Gbl.Mails.Lst[NumMai].NumUsrs);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free list of mail domains *****/ /***** Free list of mail domains *****/
Mai_FreeListMailDomains (); Mai_FreeListMailDomains ();
@ -448,7 +449,7 @@ static void Mai_ListMailDomainsForEdition (void)
unsigned NumMai; unsigned NumMai;
struct Mail *Mai; struct Mail *Mai;
Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL, Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL,
Hlp_MESSAGES_Domains_edit, Hlp_MESSAGES_Domains_edit,
false, // Not closable false, // Not closable
2); 2);
@ -510,7 +511,7 @@ static void Mai_ListMailDomainsForEdition (void)
Mai->NumUsrs); Mai->NumUsrs);
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -717,7 +718,7 @@ static void Mai_PutFormToCreateMailDomain (void)
Act_FormStart (ActNewMai); Act_FormStart (ActNewMai);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_email_domain,NULL, Box_StartBoxTable (NULL,Txt_New_email_domain,NULL,
Hlp_MESSAGES_Domains_edit, Hlp_MESSAGES_Domains_edit,
false, // Not closable false, // Not closable
2); 2);
@ -755,7 +756,7 @@ static void Mai_PutFormToCreateMailDomain (void)
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_email_domain); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_email_domain);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -888,7 +889,7 @@ void Mai_ListEmails (void)
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD); Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start of the frame used to list the emails *****/ /***** Start of the frame used to list the emails *****/
Lay_StartRoundFrame (NULL,Txt_Students_who_have_accepted_and_who_have_email, Box_StartBox (NULL,Txt_Students_who_have_accepted_and_who_have_email,
NULL, NULL,
Hlp_MESSAGES_Email, Hlp_MESSAGES_Email,
false); // Not closable false); // Not closable
@ -993,7 +994,7 @@ void Mai_ListEmails (void)
Lay_EndSection (); Lay_EndSection ();
/***** End of the frame used to list the emails *****/ /***** End of the frame used to list the emails *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for students list *****/ /***** Free memory for students list *****/
Usr_FreeUsrsList (Rol_STD); Usr_FreeUsrsList (Rol_STD);
@ -1187,7 +1188,7 @@ void Mai_ShowFormOthEmail (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat)) if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Email,NULL, Box_StartBox (NULL,Txt_Email,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -1202,7 +1203,7 @@ void Mai_ShowFormOthEmail (void)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
@ -1628,13 +1629,13 @@ void Mai_PutButtonToCheckEmailAddress (void)
extern const char *Txt_Check; extern const char *Txt_Check;
/***** Frame with button to check email address *****/ /***** Frame with button to check email address *****/
Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL, Box_StartBox (NULL,Txt_Email_unconfirmed,NULL,
Hlp_PROFILE_Account_email, Hlp_PROFILE_Account_email,
true); // Closable true); // Closable
Ale_ShowAlertAndButton (Ale_WARNING,Txt_Please_check_and_confirm_your_email_address, Ale_ShowAlertAndButton (Ale_WARNING,Txt_Please_check_and_confirm_your_email_address,
ActFrmMyAcc,NULL,NULL,NULL, ActFrmMyAcc,NULL,NULL,NULL,
Lay_CONFIRM_BUTTON,Txt_Check); Lay_CONFIRM_BUTTON,Txt_Check);
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

5
swad_menu.c
View File

@ -27,6 +27,7 @@
#include <stdio.h> // For fprintf, etc. #include <stdio.h> // For fprintf, etc.
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_layout.h" #include "swad_layout.h"
@ -398,7 +399,7 @@ void Mnu_PutIconsToSelectMenu (void)
extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS]; extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS];
Mnu_Menu_t Menu; Mnu_Menu_t Menu;
Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu, Box_StartBox (NULL,Txt_Menu,Mnu_PutIconsMenu,
Hlp_PROFILE_Preferences_menu, Hlp_PROFILE_Preferences_menu,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">"); fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@ -421,7 +422,7 @@ void Mnu_PutIconsToSelectMenu (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

17
swad_message.c
View File

@ -32,6 +32,7 @@
#include <time.h> // For time #include <time.h> // For time
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_course.h" #include "swad_course.h"
#include "swad_database.h" #include "swad_database.h"
@ -223,7 +224,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL, Box_StartBox (NULL,
Gbl.Msg.Reply.IsReply ? Txt_Reply_message : Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message, Txt_New_message,
NULL,Hlp_MESSAGES_Write, NULL,Hlp_MESSAGES_Write,
@ -330,7 +331,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory used by the list of nicknames *****/ /***** Free memory used by the list of nicknames *****/
Usr_FreeListOtherRecipients (); Usr_FreeListOtherRecipients ();
@ -1753,14 +1754,14 @@ static void Msg_ShowSentOrReceivedMessages (void)
Gbl.Msg.NumMsgs = (unsigned) NumRows; Gbl.Msg.NumMsgs = (unsigned) NumRows;
/***** Start frame with messages *****/ /***** Start frame with messages *****/
Lay_StartRoundFrame ("97%", Box_StartBox ("97%",
Msg_WriteNumMsgs (NumUnreadMsgs), Msg_WriteNumMsgs (NumUnreadMsgs),
Msg_PutIconsListMsgs,Help[Gbl.Msg.TypeOfMessages], Msg_PutIconsListMsgs,Help[Gbl.Msg.TypeOfMessages],
false); // Not closable false); // Not closable
/***** Filter messages *****/ /***** Filter messages *****/
/* Start frame with filter */ /* Start frame with filter */
Lay_StartRoundFrame (NULL,Txt_Filter,NULL, Box_StartBox (NULL,Txt_Filter,NULL,
HelpFilter[Gbl.Msg.TypeOfMessages], HelpFilter[Gbl.Msg.TypeOfMessages],
true); // Closable true); // Closable
@ -1784,7 +1785,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
Act_FormEnd (); Act_FormEnd ();
/* End frame */ /* End frame */
Lay_EndRoundFrame (); Box_EndBox ();
if (Gbl.Msg.NumMsgs) // If there are messages... if (Gbl.Msg.NumMsgs) // If there are messages...
@ -1851,7 +1852,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
@ -3778,7 +3779,7 @@ void Msg_ListBannedUsrs (void)
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Start table with list of users *****/ /***** Start table with list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Banned_users,NULL, Box_StartBoxTable (NULL,Txt_Banned_users,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -3830,7 +3831,7 @@ void Msg_ListBannedUsrs (void)
} }
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

9
swad_network.c
View File

@ -27,6 +27,7 @@
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -299,7 +300,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
char URL[Cns_MAX_BYTES_WWW + 1]; char URL[Cns_MAX_BYTES_WWW + 1];
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Webs_social_networks, Box_StartBoxTable (NULL,Txt_Webs_social_networks,
Net_PutIconsWebsSocialNetworks, Net_PutIconsWebsSocialNetworks,
Hlp_PROFILE_Webs, Hlp_PROFILE_Webs,
false, // Not closable false, // Not closable
@ -363,7 +364,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -536,7 +537,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
"can not get number of users with webs / social networks"); "can not get number of users with webs / social networks");
/***** Number of users *****/ /***** Number of users *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],NULL,
Hlp_STATS_Figures_webs_social_networks, Hlp_STATS_Figures_webs_social_networks,
false, // Not closable false, // Not closable
2); 2);
@ -603,7 +604,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);

9
swad_notice.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> // For exit, system, malloc, calloc, free, etc. #include <stdlib.h> // For exit, system, malloc, calloc, free, etc.
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_notice.h" #include "swad_notice.h"
@ -102,7 +103,7 @@ void Not_ShowFormNotice (void)
Act_FormStart (ActRcvNot); Act_FormStart (ActRcvNot);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_New_notice,NULL, Box_StartBox (NULL,Txt_New_notice,NULL,
Hlp_MESSAGES_Notices, Hlp_MESSAGES_Notices,
false); // Not closable false); // Not closable
@ -112,7 +113,7 @@ void Not_ShowFormNotice (void)
"</textarea>"); "</textarea>");
/***** Button to create notice and end frame *****/ /***** Button to create notice and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_notice); Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_notice);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -390,7 +391,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
/***** Start frame *****/ /***** Start frame *****/
sprintf (StrWidth,"%upx", sprintf (StrWidth,"%upx",
Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50); Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50);
Lay_StartRoundFrame (StrWidth, Box_StartBox (StrWidth,
Gbl.CurrentCrs.Notices.HighlightNotCod > 0 ? Txt_All_notices : Gbl.CurrentCrs.Notices.HighlightNotCod > 0 ? Txt_All_notices :
Txt_Notices, Txt_Notices,
Not_PutIconsListNotices, Not_PutIconsListNotices,
@ -468,7 +469,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs (); Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
break; break;
} }

9
swad_notification.c
View File

@ -32,6 +32,7 @@
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -388,7 +389,7 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif, Box_StartBox (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_MESSAGES_Notifications, Hlp_MESSAGES_Notifications,
false); // Not closable false); // Not closable
@ -645,7 +646,7 @@ void Ntf_ShowMyNotifications (void)
Txt_You_have_no_unread_notifications); Txt_You_have_no_unread_notifications);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
@ -1897,7 +1898,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Ntf_NotifyEvent_t NotifyEvent; Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif, Box_StartBox (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_PROFILE_Preferences_notifications, Hlp_PROFILE_Preferences_notifications,
false); // Not closable false); // Not closable
@ -1960,7 +1961,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

13
swad_password.c
View File

@ -30,6 +30,7 @@
#include <sys/wait.h> // For the macro WEXITSTATUS #include <sys/wait.h> // For the macro WEXITSTATUS
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_enrolment.h" #include "swad_enrolment.h"
#include "swad_global.h" #include "swad_global.h"
@ -251,7 +252,7 @@ void Pwd_ShowFormSendNewPwd (void)
Act_FormStart (ActSndNewPwd); Act_FormStart (ActSndNewPwd);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL, Box_StartBox (NULL,Txt_Forgotten_password,NULL,
Hlp_PROFILE_Password, Hlp_PROFILE_Password,
false); // Not closable false); // Not closable
@ -268,7 +269,7 @@ void Pwd_ShowFormSendNewPwd (void)
Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin); Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Get_a_new_password); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Get_a_new_password);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -697,7 +698,7 @@ void Pwd_ShowFormChgPwd (void)
Act_FormStart (ActChgPwd); Act_FormStart (ActChgPwd);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Password,NULL, Box_StartBoxTable (NULL,Txt_Password,NULL,
Hlp_PROFILE_Password, Hlp_PROFILE_Password,
false, // Not closable false, // Not closable
2); 2);
@ -732,7 +733,7 @@ void Pwd_ShowFormChgPwd (void)
Pwd_PutFormToGetNewPasswordTwice (); Pwd_PutFormToGetNewPasswordTwice ();
/***** Send button and end form *****/ /***** Send button and end form *****/
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON, Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password : IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password); Txt_Set_password);
@ -826,7 +827,7 @@ void Pwd_ShowFormOthPwd (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat)) if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Password,NULL, Box_StartBox (NULL,Txt_Password,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -862,7 +863,7 @@ void Pwd_ShowFormOthPwd (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

11
swad_photo.c
View File

@ -34,6 +34,7 @@
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_enrolment.h" #include "swad_enrolment.h"
@ -324,7 +325,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
Act_Action_t NextAction; Act_Action_t NextAction;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo, Box_StartBox (NULL,Txt_Photo,
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto : ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
Pho_PutIconToRequestRemoveOtherUsrPhoto, Pho_PutIconToRequestRemoveOtherUsrPhoto,
Hlp_PROFILE_Photo, Hlp_PROFILE_Photo,
@ -375,7 +376,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1691,7 +1692,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
Pho_PutLinkToCalculateDegreeStats (); Pho_PutLinkToCalculateDegreeStats ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees, Box_StartBox (NULL,Txt_Degrees,
Pho_PutIconToPrintDegreeStats, Pho_PutIconToPrintDegreeStats,
Hlp_STATS_Degrees, Hlp_STATS_Degrees,
false); // Not closable false); // Not closable
@ -1710,7 +1711,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
break; break;
case Pho_DEGREES_PRINT: case Pho_DEGREES_PRINT:
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees,NULL, Box_StartBox (NULL,Txt_Degrees,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
break; break;
@ -1735,7 +1736,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

13
swad_place.c
View File

@ -29,6 +29,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -116,7 +117,7 @@ void Plc_SeePlaces (void)
Plc_GetListPlaces (); Plc_GetListPlaces ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Places, Box_StartBox (NULL,Txt_Places,
ICanEdit ? Plc_PutIconToEditPlaces : ICanEdit ? Plc_PutIconToEditPlaces :
NULL, NULL,
Hlp_INSTITUTION_Places, Hlp_INSTITUTION_Places,
@ -206,7 +207,7 @@ void Plc_SeePlaces (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of places *****/ /***** Free list of places *****/
Plc_FreeListPlaces (); Plc_FreeListPlaces ();
@ -248,7 +249,7 @@ void Plc_EditPlaces (void)
Plc_GetListPlaces (); Plc_GetListPlaces ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing, Box_StartBox (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing,
Hlp_INSTITUTION_Places_edit, Hlp_INSTITUTION_Places_edit,
false); // Not closable false); // Not closable
@ -260,7 +261,7 @@ void Plc_EditPlaces (void)
Plc_ListPlacesForEdition (); Plc_ListPlacesForEdition ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free list of places *****/ /***** Free list of places *****/
Plc_FreeListPlaces (); Plc_FreeListPlaces ();
@ -740,7 +741,7 @@ static void Plc_PutFormToCreatePlace (void)
Act_FormStart (ActNewPlc); Act_FormStart (ActNewPlc);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_place,NULL, Box_StartBoxTable (NULL,Txt_New_place,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -780,7 +781,7 @@ static void Plc_PutFormToCreatePlace (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_place); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_place);
/***** End formn *****/ /***** End formn *****/
Act_FormEnd (); Act_FormEnd ();

13
swad_plugin.c
View File

@ -34,6 +34,7 @@ TODO: Check if web service is called from an authorized IP.
#include <stdlib.h> // For calloc, free #include <stdlib.h> // For calloc, free
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_cryptography.h" #include "swad_cryptography.h"
@ -91,7 +92,7 @@ void Plg_ListPlugins (void)
Plg_GetListPlugins (); Plg_GetListPlugins ();
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrameTable (NULL,Txt_Plugins, Box_StartBoxTable (NULL,Txt_Plugins,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins : Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
NULL, NULL,
NULL, NULL,
@ -141,7 +142,7 @@ void Plg_ListPlugins (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
/***** Free list of plugins *****/ /***** Free list of plugins *****/
Plg_FreeListPlugins (); Plg_FreeListPlugins ();
@ -346,7 +347,7 @@ static void Plg_ListPluginsForEdition (void)
unsigned NumPlg; unsigned NumPlg;
struct Plugin *Plg; struct Plugin *Plg;
Lay_StartRoundFrameTable (NULL,Txt_Plugins,NULL, Box_StartBoxTable (NULL,Txt_Plugins,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -457,7 +458,7 @@ static void Plg_ListPluginsForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -843,7 +844,7 @@ static void Plg_PutFormToCreatePlugin (void)
Act_FormStart (ActNewPlg); Act_FormStart (ActNewPlg);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_plugin,NULL, Box_StartBoxTable (NULL,Txt_New_plugin,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -926,7 +927,7 @@ static void Plg_PutFormToCreatePlugin (void)
Cns_MAX_CHARS_IP,Plg->IP); Cns_MAX_CHARS_IP,Plg->IP);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_plugin); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_plugin);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

13
swad_preference.c
View File

@ -30,6 +30,7 @@
#include <stdio.h> // For fprintf, etc. #include <stdio.h> // For fprintf, etc.
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -74,7 +75,7 @@ void Pre_EditPrefs (void)
extern const char *Txt_Design; extern const char *Txt_Design;
/***** Internationalization: language, first day of week, date format *****/ /***** Internationalization: language, first day of week, date format *****/
Lay_StartRoundFrame (NULL,Txt_Internationalization,NULL, Box_StartBox (NULL,Txt_Internationalization,NULL,
Hlp_PROFILE_Preferences_internationalization, Hlp_PROFILE_Preferences_internationalization,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">");
@ -86,10 +87,10 @@ void Pre_EditPrefs (void)
"<div class=\"FRAME_INLINE\">"); "<div class=\"FRAME_INLINE\">");
Dat_PutBoxToSelectDateFormat (); // 3. Date format Dat_PutBoxToSelectDateFormat (); // 3. Date format
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
/***** Design: icon set, menu, theme, side columns *****/ /***** Design: icon set, menu, theme, side columns *****/
Lay_StartRoundFrame (NULL,Txt_Design,NULL, Box_StartBox (NULL,Txt_Design,NULL,
Hlp_PROFILE_Preferences_design, Hlp_PROFILE_Preferences_design,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">");
@ -104,7 +105,7 @@ void Pre_EditPrefs (void)
"<div class=\"FRAME_INLINE\">"); "<div class=\"FRAME_INLINE\">");
Pre_PutIconsToSelectSideCols (); // 7. Side columns Pre_PutIconsToSelectSideCols (); // 7. Side columns
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
{ {
@ -238,7 +239,7 @@ static void Pre_PutIconsToSelectSideCols (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols; unsigned SideCols;
Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns, Box_StartBox (NULL,Txt_Columns,Pre_PutIconsSideColumns,
Hlp_PROFILE_Preferences_columns, Hlp_PROFILE_Preferences_columns,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">"); fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@ -261,7 +262,7 @@ static void Pre_PutIconsToSelectSideCols (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

9
swad_privacy.c
View File

@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_privacy.h" #include "swad_privacy.h"
@ -102,8 +103,10 @@ void Pri_EditMyPrivacy (void)
Ale_ShowAlert (Ale_WARNING,Txt_Please_review_your_privacy_preferences); Ale_ShowAlert (Ale_WARNING,Txt_Please_review_your_privacy_preferences);
/***** Start frame and table *****/ /***** Start frame and table *****/
Lay_StartRoundFrameTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy, Box_StartBoxTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy,
Hlp_PROFILE_Preferences_privacy,2); Hlp_PROFILE_Preferences_privacy,
false, // Not closable
2);
/***** Edit photo visibility *****/ /***** Edit photo visibility *****/
Pri_PutFormVisibility (Txt_Photo, Pri_PutFormVisibility (Txt_Photo,
@ -130,7 +133,7 @@ void Pri_EditMyPrivacy (void)
(1 << Pri_VISIBILITY_SYSTEM)); (1 << Pri_VISIBILITY_SYSTEM));
/***** End table and frame *****/ /***** End table and frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

5
swad_profile.c
View File

@ -28,6 +28,7 @@
#include <linux/stddef.h> // For NULL #include <linux/stddef.h> // For NULL
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_follow.h" #include "swad_follow.h"
@ -174,7 +175,7 @@ void Prf_RequestUserProfile (void)
Act_FormStart (ActSeeOthPubPrf); Act_FormStart (ActSeeOthPubPrf);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Another_user_s_profile,NULL, Box_StartBox (NULL,Txt_Another_user_s_profile,NULL,
Hlp_SOCIAL_Profiles_view_public_profile, Hlp_SOCIAL_Profiles_view_public_profile,
false); // Not closable false); // Not closable
@ -192,7 +193,7 @@ void Prf_RequestUserProfile (void)
Gbl.Usrs.Me.UsrDat.Nickname); Gbl.Usrs.Me.UsrDat.Nickname);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Continue); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Continue);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

31
swad_record.c
View File

@ -31,6 +31,7 @@
#include <string.h> #include <string.h>
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_enrolment.h" #include "swad_enrolment.h"
@ -182,12 +183,12 @@ void Rec_ReqEditRecordFields (void)
/***** List the current fields of records for edit them *****/ /***** List the current fields of records for edit them *****/
if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found... if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found...
{ {
Lay_StartRoundFrameTable (NULL,Txt_Record_fields,NULL, Box_StartBoxTable (NULL,Txt_Record_fields,NULL,
Hlp_USERS_Students_course_record_card, Hlp_USERS_Students_course_record_card,
false, // Not closable false, // Not closable
2); 2);
Rec_ListFieldsRecordsForEdition (); Rec_ListFieldsRecordsForEdition ();
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else // No fields of records found for current course in the database else // No fields of records found for current course in the database
{ {
@ -358,7 +359,7 @@ void Rec_ShowFormCreateRecordField (void)
Act_FormStart (ActNewFie); Act_FormStart (ActNewFie);
/***** Start of frame *****/ /***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_record_field,NULL, Box_StartBoxTable (NULL,Txt_New_record_field,NULL,
Hlp_USERS_Students_course_record_card, Hlp_USERS_Students_course_record_card,
false, // Not closable false, // Not closable
2); 2);
@ -407,7 +408,7 @@ void Rec_ShowFormCreateRecordField (void)
"</tr>"); "</tr>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_record_field); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_record_field);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1361,11 +1362,11 @@ static void Rec_ShowRecordOneTchCrs (void)
{ {
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">"); fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE; Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL, Box_StartBox (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL,
Hlp_USERS_Teachers_timetable, Hlp_USERS_Teachers_timetable,
false); // Not closable false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod); TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_EndRoundFrame (); Box_EndBox ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -1486,12 +1487,12 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
{ {
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">"); fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE; Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], Box_StartBox (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
NULL, NULL,
Hlp_USERS_Teachers_timetable, Hlp_USERS_Teachers_timetable,
false); // Not closable false); // Not closable
TT_ShowTimeTable (UsrDat.UsrCod); TT_ShowTimeTable (UsrDat.UsrCod);
Lay_EndRoundFrame (); Box_EndBox ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -1777,7 +1778,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/***** Start frame *****/ /***** Start frame *****/
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Lay_StartRoundFrameTable (StrRecordWidth,NULL,NULL, Box_StartBoxTable (StrRecordWidth,NULL,NULL,
Rec_RecordHelp[TypeOfView], Rec_RecordHelp[TypeOfView],
false, // Not closable false, // Not closable
2); 2);
@ -1891,11 +1892,11 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/***** Button to save changes and end frame *****/ /***** Button to save changes and end frame *****/
if (ICanEdit) if (ICanEdit)
{ {
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }
else else
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2315,7 +2316,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH); sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Gbl.Record.UsrDat = UsrDat; Gbl.Record.UsrDat = UsrDat;
Gbl.Record.TypeOfView = TypeOfView; Gbl.Record.TypeOfView = TypeOfView;
Lay_StartRoundFrameTable (StrRecordWidth,NULL, Box_StartBoxTable (StrRecordWidth,NULL,
TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons
Rec_PutIconsCommands, Rec_PutIconsCommands,
Rec_RecordHelp[TypeOfView], Rec_RecordHelp[TypeOfView],
@ -2523,7 +2524,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3992,7 +3993,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
} }
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable ("800px", Box_StartBoxTable ("800px",
IAmATeacher ? Txt_Institution_centre_and_department : IAmATeacher ? Txt_Institution_centre_and_department :
Txt_Institution, Txt_Institution,
NULL, NULL,
@ -4226,7 +4227,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

9
swad_report.c
View File

@ -28,6 +28,7 @@
#include <sys/stat.h> // For mkdir #include <sys/stat.h> // For mkdir
#include <sys/types.h> // For mkdir #include <sys/types.h> // For mkdir
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
@ -155,7 +156,7 @@ void Rep_ReqMyUsageReport (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME); sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL, Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_STATS_Report, Hlp_STATS_Report,
false); // Not closable false); // Not closable
@ -163,7 +164,7 @@ void Rep_ReqMyUsageReport (void)
Req_TitleReport (NULL); // NULL means do not write date Req_TitleReport (NULL); // NULL means do not write date
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Generate_report); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Generate_report);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -261,7 +262,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME); sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL, Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_STATS_Report, Hlp_STATS_Report,
false); // Not closable false); // Not closable
@ -286,7 +287,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists); Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

5
swad_search.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> // For fprintf... #include <stdio.h> // For fprintf...
#include <string.h> // For string functions... #include <string.h> // For string functions...
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_layout.h" #include "swad_layout.h"
@ -236,7 +237,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Start form *****/ /***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"); fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (Action); Act_FormStart (Action);
Lay_StartRoundFrame (NULL,Txt_Search,NULL, Box_StartBox (NULL,Txt_Search,NULL,
Hlp_Search, Hlp_Search,
false); // Not closable false); // Not closable
@ -284,7 +285,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Sch_PutMagnifyingGlassButton ("search64x64.png"); Sch_PutMagnifyingGlassButton ("search64x64.png");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Search); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

13
swad_social.c
View File

@ -30,6 +30,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include <sys/types.h> // For time_t #include <sys/types.h> // For time_t
#include "swad_box.h"
#include "swad_constant.h" #include "swad_constant.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_exam.h" #include "swad_exam.h"
@ -921,7 +922,7 @@ static void Soc_ShowTimeline (const char *Query,const char *Title,
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline"); NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline, Box_StartBox (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline,
Hlp_SOCIAL_Timeline, Hlp_SOCIAL_Timeline,
false); // Not closable false); // Not closable
@ -986,7 +987,7 @@ static void Soc_ShowTimeline (const char *Query,const char *Title,
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1275,7 +1276,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
/***** Start frame ****/ /***** Start frame ****/
if (ShowNoteAlone) if (ShowNoteAlone)
{ {
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL, Box_StartBox (Soc_WIDTH_TIMELINE,NULL,NULL,
NULL, NULL,
true); // Closable true); // Closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">"); fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
@ -1525,7 +1526,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
if (ShowNoteAlone) if (ShowNoteAlone)
{ {
fprintf (Gbl.F.Out,"</ul>"); fprintf (Gbl.F.Out,"</ul>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -2531,7 +2532,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
if (ShowCommentAlone) if (ShowCommentAlone)
{ {
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL, Box_StartBox (Soc_WIDTH_TIMELINE,NULL,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -2619,7 +2620,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
{ {
fprintf (Gbl.F.Out,"</ul>" fprintf (Gbl.F.Out,"</ul>"
"</div>"); // SOCIAL_NOTE_RIGHT_CONTAINER "</div>"); // SOCIAL_NOTE_RIGHT_CONTAINER
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }

131
swad_statistic.c
View File

@ -34,6 +34,7 @@
#include <unistd.h> // For unlink #include <unistd.h> // For unlink
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_course.h" #include "swad_course.h"
#include "swad_database.h" #include "swad_database.h"
@ -474,7 +475,7 @@ void Sta_AskShowCrsHits (void)
/***** Start frame *****/ /***** Start frame *****/
sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X, sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X,
Gbl.CurrentCrs.Crs.ShrtName); Gbl.CurrentCrs.Crs.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL, Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_STATS_Visits_visits_to_course, Hlp_STATS_Visits_visits_to_course,
false); // Not closable false); // Not closable
@ -613,7 +614,7 @@ void Sta_AskShowCrsHits (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory used by the lists *****/ /***** Free memory used by the lists *****/
Usr_FreeUsrsList (Rol_TCH); Usr_FreeUsrsList (Rol_TCH);
@ -672,7 +673,7 @@ void Sta_AskShowGblHits (void)
Act_FormStartAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID); Act_FormStartAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Statistics_of_all_visits,NULL, Box_StartBoxTable (NULL,Txt_Statistics_of_all_visits,NULL,
Hlp_STATS_Visits_global_visits, Hlp_STATS_Visits_global_visits,
false, // Not closable false, // Not closable
2); 2);
@ -761,7 +762,7 @@ void Sta_AskShowGblHits (void)
Dat_PutHiddenParBrowserTZDiff (); Dat_PutHiddenParBrowserTZDiff ();
/***** End frame with button *****/ /***** End frame with button *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1466,11 +1467,11 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
{ {
/***** Put the table with the clicks *****/ /***** Put the table with the clicks *****/
if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST) if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
Lay_StartRoundFrame ("100%",Txt_List_of_detailed_clicks,NULL, Box_StartBox ("100%",Txt_List_of_detailed_clicks,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
else else
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType], Box_StartBox (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],
NULL, NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -1545,7 +1546,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
/* End of frame */ /* End of frame */
Lay_EndRoundFrame (); Box_EndBox ();
Lay_EndSection (); Lay_EndSection ();
} }
@ -3914,7 +3915,7 @@ void Sta_ReqShowFigures (void)
Act_FormStart (ActSeeUseGbl); Act_FormStart (ActSeeUseGbl);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Figures,NULL, Box_StartBox (NULL,Txt_Figures,NULL,
Hlp_STATS_Figures, Hlp_STATS_Figures,
false); // Not closable false); // Not closable
@ -3953,7 +3954,7 @@ void Sta_ReqShowFigures (void)
"</label>"); "</label>");
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Show_statistic); Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Show_statistic);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -4079,7 +4080,7 @@ static void Sta_GetAndShowUsersStats (void)
extern const char *Txt_Average_number_of_users_belonging_to_a_course; extern const char *Txt_Average_number_of_users_belonging_to_a_course;
/***** Number of users *****/ /***** Number of users *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],NULL,
Hlp_STATS_Figures_users, Hlp_STATS_Figures_users,
false, // Not closable false, // Not closable
2); 2);
@ -4111,7 +4112,7 @@ static void Sta_GetAndShowUsersStats (void)
"</tr>"); "</tr>");
Sta_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course Sta_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4211,7 +4212,7 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Followers; extern const char *Txt_Followers;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],NULL,
Hlp_STATS_Figures_ranking, Hlp_STATS_Figures_ranking,
false, // Not closable false, // Not closable
2); 2);
@ -4267,7 +4268,7 @@ static void Sta_GetAndShowUsersRanking (void)
"</tr>"); "</tr>");
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4280,7 +4281,7 @@ static void Sta_GetAndShowHierarchyStats (void)
extern const char *Hlp_STATS_Figures_hierarchy; extern const char *Hlp_STATS_Figures_hierarchy;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES]; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],NULL,
Hlp_STATS_Figures_hierarchy, Hlp_STATS_Figures_hierarchy,
false, // Not closable false, // Not closable
2); 2);
@ -4290,7 +4291,7 @@ static void Sta_GetAndShowHierarchyStats (void)
Sta_GetAndShowNumCtrsInSWAD (); Sta_GetAndShowNumCtrsInSWAD ();
Sta_GetAndShowNumDegsInSWAD (); Sta_GetAndShowNumDegsInSWAD ();
Sta_GetAndShowNumCrssInSWAD (); Sta_GetAndShowNumCrssInSWAD ();
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4970,7 +4971,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
extern const char *Txt_Institutions; extern const char *Txt_Institutions;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Institutions,NULL, Box_StartBox (NULL,Txt_Institutions,NULL,
Hlp_STATS_Figures_institutions, Hlp_STATS_Figures_institutions,
false); // Not closable false); // Not closable
@ -4994,7 +4995,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (); Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5008,7 +5009,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
char Query[1024]; char Query[1024];
/****** Institutions ordered by number of centres ******/ /****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_centres,NULL, Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_centres,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -5048,7 +5049,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
} }
Sta_GetAndShowInss (Query,Txt_Centres); Sta_GetAndShowInss (Query,Txt_Centres);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5062,7 +5063,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
char Query[1024]; char Query[1024];
/****** Institutions ordered by number of centres ******/ /****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_degrees,NULL, Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_degrees,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -5105,7 +5106,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
} }
Sta_GetAndShowInss (Query,Txt_Degrees); Sta_GetAndShowInss (Query,Txt_Degrees);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5119,7 +5120,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
char Query[1024]; char Query[1024];
/****** Institutions ordered by number of centres ******/ /****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_courses,NULL, Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_courses,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -5165,7 +5166,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
} }
Sta_GetAndShowInss (Query,Txt_Courses); Sta_GetAndShowInss (Query,Txt_Courses);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5179,7 +5180,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
char Query[1024]; char Query[1024];
/****** Institutions ordered by number of centres ******/ /****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_users_in_courses, Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_in_courses,
NULL, NULL,
NULL, NULL,
false, // Not closable false, // Not closable
@ -5229,7 +5230,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
} }
Sta_GetAndShowInss (Query,Txt_Users); Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5244,7 +5245,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
char Query[1024]; char Query[1024];
/****** Institutions ordered by number of centres ******/ /****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them, Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them,
NULL, NULL,
NULL, NULL,
false, // Not closable false, // Not closable
@ -5286,7 +5287,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
} }
Sta_GetAndShowInss (Query,Txt_Users); Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5476,7 +5477,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
unsigned NumStat; unsigned NumStat;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES], Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES],
NULL, NULL,
Hlp_STATS_Figures_folders_and_files, Hlp_STATS_Figures_folders_and_files,
false, // Not closable false, // Not closable
@ -5498,7 +5499,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Briefcases); Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Briefcases);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6555,7 +6556,7 @@ static void Sta_GetAndShowOERsStats (void)
unsigned long NumFiles[2]; unsigned long NumFiles[2];
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],NULL,
Hlp_STATS_Figures_open_educational_resources_oer, Hlp_STATS_Figures_open_educational_resources_oer,
false, // Not closable false, // Not closable
2); 2);
@ -6599,7 +6600,7 @@ static void Sta_GetAndShowOERsStats (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6747,7 +6748,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments; NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],NULL,
Hlp_STATS_Figures_assignments, Hlp_STATS_Figures_assignments,
false, // Not closable false, // Not closable
2); 2);
@ -6793,7 +6794,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumNotif); NumNotif);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6819,7 +6820,7 @@ static void Sta_GetAndShowTestsStats (void)
struct Tst_Stats Stats; struct Tst_Stats Stats;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],NULL,
Hlp_STATS_Figures_tests, Hlp_STATS_Figures_tests,
false, // Not closable false, // Not closable
2); 2);
@ -6964,7 +6965,7 @@ static void Sta_GetAndShowTestsStats (void)
Stats.AvgScorePerQuestion); Stats.AvgScorePerQuestion);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6991,7 +6992,7 @@ static void Sta_GetAndShowSocialActivityStats (void)
unsigned NumUsrsTotal; unsigned NumUsrsTotal;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY], Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY],
NULL, NULL,
Hlp_STATS_Figures_timeline, Hlp_STATS_Figures_timeline,
false, // Not closable false, // Not closable
@ -7251,7 +7252,7 @@ static void Sta_GetAndShowSocialActivityStats (void)
0.0); 0.0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7282,7 +7283,7 @@ static void Sta_GetAndShowFollowStats (void)
float Average; float Average;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],NULL,
Hlp_STATS_Figures_followed_followers, Hlp_STATS_Figures_followed_followers,
false, // Not closable false, // Not closable
2); 2);
@ -7516,7 +7517,7 @@ static void Sta_GetAndShowFollowStats (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7545,7 +7546,7 @@ static void Sta_GetAndShowForumStats (void)
StatsForum.NumUsrsToBeNotifiedByEMail = 0; StatsForum.NumUsrsToBeNotifiedByEMail = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],NULL,
Hlp_STATS_Figures_forums, Hlp_STATS_Figures_forums,
false, // Not closable false, // Not closable
2); 2);
@ -7657,7 +7658,7 @@ static void Sta_GetAndShowForumStats (void)
Sta_WriteForumTotalStats (&StatsForum); Sta_WriteForumTotalStats (&StatsForum);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7904,7 +7905,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS]; unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS];
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],NULL,
Hlp_STATS_Figures_notifications, Hlp_STATS_Figures_notifications,
false, // Not closable false, // Not closable
2); 2);
@ -8213,7 +8214,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
NumMailsTotal); NumMailsTotal);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8251,7 +8252,7 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications += NumNotif; NumTotalNotifications += NumNotif;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],NULL,
Hlp_STATS_Figures_notices, Hlp_STATS_Figures_notices,
false, // Not closable false, // Not closable
2); 2);
@ -8305,7 +8306,7 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications); NumTotalNotifications);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8336,7 +8337,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED); NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],NULL,
Hlp_STATS_Figures_messages, Hlp_STATS_Figures_messages,
false, // Not closable false, // Not closable
2); 2);
@ -8411,7 +8412,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified); NumMsgsReceivedAndNotified);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8443,7 +8444,7 @@ static void Sta_GetAndShowSurveysStats (void)
} }
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],NULL,
Hlp_STATS_Figures_surveys, Hlp_STATS_Figures_surveys,
false, // Not closable false, // Not closable
2); 2);
@ -8497,7 +8498,7 @@ static void Sta_GetAndShowSurveysStats (void)
NumNotif); NumNotif);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8512,7 +8513,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES]; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],NULL,
Hlp_STATS_Figures_privacy, Hlp_STATS_Figures_privacy,
false, // Not closable false, // Not closable
2); 2);
@ -8524,7 +8525,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility"); Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility");
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8682,7 +8683,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],NULL,
Hlp_STATS_Figures_language, Hlp_STATS_Figures_language,
false, // Not closable false, // Not closable
2); 2);
@ -8802,7 +8803,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8825,7 +8826,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK], Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK],
NULL, NULL,
Hlp_STATS_Figures_calendar, Hlp_STATS_Figures_calendar,
false, // Not closable false, // Not closable
@ -8948,7 +8949,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8968,7 +8969,7 @@ static void Sta_GetAndShowNumUsrsPerDateFormat (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_DATE_FORMAT],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_DATE_FORMAT],NULL,
Hlp_STATS_Figures_dates, Hlp_STATS_Figures_dates,
false, // Not closable false, // Not closable
2); 2);
@ -9086,7 +9087,7 @@ static void Sta_GetAndShowNumUsrsPerDateFormat (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -9108,7 +9109,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],NULL,
Hlp_STATS_Figures_icons, Hlp_STATS_Figures_icons,
false, // Not closable false, // Not closable
2); 2);
@ -9231,7 +9232,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -9253,7 +9254,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],NULL,
Hlp_STATS_Figures_menu, Hlp_STATS_Figures_menu,
false, // Not closable false, // Not closable
2); 2);
@ -9373,7 +9374,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -9395,7 +9396,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
unsigned NumUsrsTotal = 0; unsigned NumUsrsTotal = 0;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],NULL,
Hlp_STATS_Figures_theme, Hlp_STATS_Figures_theme,
false, // Not closable false, // Not closable
2); 2);
@ -9515,7 +9516,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -9536,7 +9537,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4]; extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],NULL, Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],NULL,
Hlp_STATS_Figures_columns, Hlp_STATS_Figures_columns,
false, // Not closable false, // Not closable
2); 2);
@ -9656,7 +9657,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
0); 0);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

29
swad_survey.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> // For calloc #include <stdlib.h> // For calloc
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_group.h" #include "swad_group.h"
@ -212,7 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
&Pagination); &Pagination);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys, Box_StartBox ("100%",Txt_Surveys,Svy_PutIconsListSurveys,
Hlp_ASSESSMENT_Surveys, Hlp_ASSESSMENT_Surveys,
false); // Not closable false); // Not closable
@ -275,7 +276,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Svy_PutButtonToCreateNewSvy (); Svy_PutButtonToCreateNewSvy ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -432,7 +433,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Start frame *****/ /***** Start frame *****/
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
Lay_StartRoundFrame (NULL,Txt_Survey,NULL, Box_StartBox (NULL,Txt_Survey,NULL,
Hlp_ASSESSMENT_Surveys, Hlp_ASSESSMENT_Surveys,
false); // Not closable false); // Not closable
@ -673,7 +674,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
} }
@ -1816,7 +1817,7 @@ void Svy_RequestCreatOrEditSvy (void)
Svy_PutParams (); Svy_PutParams ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable (NULL,ItsANewSurvey ? Txt_New_survey : Box_StartBoxTable (NULL,ItsANewSurvey ? Txt_New_survey :
Txt_Edit_survey, Txt_Edit_survey,
NULL,ItsANewSurvey ? Hlp_ASSESSMENT_Surveys_new_survey : NULL,ItsANewSurvey ? Hlp_ASSESSMENT_Surveys_new_survey :
Hlp_ASSESSMENT_Surveys_edit_survey, Hlp_ASSESSMENT_Surveys_edit_survey,
@ -1891,9 +1892,9 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Button to create/modify survey and end frame *****/ /***** Button to create/modify survey and end frame *****/
if (ItsANewSurvey) if (ItsANewSurvey)
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_survey); Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_survey);
else else
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2017,7 +2018,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"<td class=\"LEFT_TOP\">", "<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_Groups); Txt_Groups);
Lay_StartRoundFrameTable ("95%",NULL,NULL, Box_StartBoxTable ("95%",NULL,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
0); 0);
@ -2045,7 +2046,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -2656,12 +2657,12 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
sprintf (Gbl.Title,"%s %u", sprintf (Gbl.Title,"%s %u",
Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,... Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,...
Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst, Box_StartBox (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst,
NULL, NULL,
false); // Not closable false); // Not closable
} }
else else
Lay_StartRoundFrame (NULL,Txt_New_question,NULL, Box_StartBox (NULL,Txt_New_question,NULL,
Hlp_ASSESSMENT_Surveys_questions, Hlp_ASSESSMENT_Surveys_questions,
false); // Not closable false); // Not closable
@ -2761,7 +2762,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for answers *****/ /***** Free memory for answers *****/
Svy_FreeTextChoiceAnswers (SvyQst,NumAnswers); Svy_FreeTextChoiceAnswers (SvyQst,NumAnswers);
@ -3178,7 +3179,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
/***** Start frame *****/ /***** Start frame *****/
Gbl.Svys.SvyCodToEdit = Svy->SvyCod; Gbl.Svys.SvyCodToEdit = Svy->SvyCod;
Lay_StartRoundFrame (NULL,Txt_Questions, Box_StartBox (NULL,Txt_Questions,
Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion : Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion :
NULL, NULL,
Hlp_ASSESSMENT_Surveys_questions, Hlp_ASSESSMENT_Surveys_questions,
@ -3302,7 +3303,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

5
swad_syllabus.c
View File

@ -33,6 +33,7 @@
#include <string.h> // For string functions #include <string.h> // For string functions
#include <time.h> // For time () #include <time.h> // For time ()
#include "swad_box.h"
#include "swad_changelog.h" #include "swad_changelog.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
@ -241,7 +242,7 @@ bool Syl_CheckAndEditSyllabus (void)
ICanEdit = Gbl.Usrs.Me.Role.Logged == Rol_TCH || ICanEdit = Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM; Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM;
PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive; PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive;
Lay_StartRoundFrameTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
PutIconToEdit ? Inf_PutIconToEditInfo : PutIconToEdit ? Inf_PutIconToEditInfo :
NULL, NULL,
Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit : Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit :
@ -268,7 +269,7 @@ bool Syl_CheckAndEditSyllabus (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
return true; return true;
} }

55
swad_test.c
View File

@ -37,6 +37,7 @@
#include <sys/types.h> // For mkdir #include <sys/types.h> // For mkdir
#include "swad_action.h" #include "swad_action.h"
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
@ -315,7 +316,7 @@ void Tst_ShowFormAskTst (void)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests, Box_StartBox (NULL,Txt_Take_a_test,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -374,7 +375,7 @@ void Tst_ShowFormAskTst (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
@ -434,7 +435,7 @@ void Tst_ShowNewTest (void)
Tst_UpdateMyNumAccessTst (NumAccessesTst); Tst_UpdateMyNumAccessTst (NumAccessesTst);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test,NULL, Box_StartBox (NULL,Txt_Test,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
Lay_WriteHeaderClassPhoto (false,false, Lay_WriteHeaderClassPhoto (false,false,
@ -473,7 +474,7 @@ void Tst_ShowNewTest (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Set test status *****/ /***** Set test status *****/
Tst_SetTstStatus (NumAccessesTst,Tst_STATUS_SHOWN_BUT_NOT_ASSESSED); Tst_SetTstStatus (NumAccessesTst,Tst_STATUS_SHOWN_BUT_NOT_ASSESSED);
@ -534,7 +535,7 @@ void Tst_AssessTest (void)
TstCod = Tst_CreateTestResultInDB (); TstCod = Tst_CreateTestResultInDB ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL, Box_StartBox (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
Lay_WriteHeaderClassPhoto (false,false, Lay_WriteHeaderClassPhoto (false,false,
@ -560,7 +561,7 @@ void Tst_AssessTest (void)
Tst_ShowTstTotalMark (TotalScore); Tst_ShowTstTotalMark (TotalScore);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Store test result in database *****/ /***** Store test result in database *****/
Tst_StoreScoreOfTestResultInDB (TstCod, Tst_StoreScoreOfTestResultInDB (TstCod,
@ -1279,7 +1280,7 @@ void Tst_ShowFormAskEditTsts (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests, Box_StartBox (NULL,Txt_List_edit_questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -1316,7 +1317,7 @@ void Tst_ShowFormAskEditTsts (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/* Free structure that stores the query result */ /* Free structure that stores the query result */
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
@ -1736,7 +1737,7 @@ static void Tst_ShowFormEditTags (void)
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res))) if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
{ {
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Tags,NULL, Box_StartBoxTable (NULL,Txt_Tags,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false, // Not closable false, // Not closable
2); 2);
@ -1772,7 +1773,7 @@ static void Tst_ShowFormEditTags (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else else
Ale_ShowAlert (Ale_INFO,Txt_No_test_questions); Ale_ShowAlert (Ale_INFO,Txt_No_test_questions);
@ -1851,7 +1852,7 @@ static void Tst_ShowFormConfigTst (void)
Tst_GetConfigTstFromDB (); Tst_GetConfigTstFromDB ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests, Box_StartBox (NULL,Txt_Configure_tests,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -1953,7 +1954,7 @@ static void Tst_ShowFormConfigTst (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2732,7 +2733,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
double TotalScoreThisQst; double TotalScoreThisQst;
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests, Box_StartBox (NULL,Txt_Questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -2988,7 +2989,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
Tst_PutButtonToAddQuestion (); Tst_PutButtonToAddQuestion ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4524,12 +4525,12 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
if (Gbl.Test.QstCod > 0) // The question already has assigned a code if (Gbl.Test.QstCod > 0) // The question already has assigned a code
{ {
sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod); sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod);
Lay_StartRoundFrame (NULL,Title,Tst_PutIconToRemoveOneQst, Box_StartBox (NULL,Title,Tst_PutIconToRemoveOneQst,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
} }
else else
Lay_StartRoundFrame (NULL,Txt_New_question,NULL, Box_StartBox (NULL,Txt_New_question,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -4880,7 +4881,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6990,7 +6991,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_results,NULL, Box_StartBox (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results, Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable false); // Not closable
@ -7048,7 +7049,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for users' list *****/ /***** Free memory for users' list *****/
Usr_FreeUsrsList (Rol_TCH); Usr_FreeUsrsList (Rol_TCH);
@ -7076,14 +7077,14 @@ void Tst_SelDatesToSeeMyTestResults (void)
Act_FormStart (ActSeeMyTstRes); Act_FormStart (ActSeeMyTstRes);
/***** Starting and ending dates in the search *****/ /***** Starting and ending dates in the search *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL, Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results, Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable false, // Not closable
2); 2);
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
/***** Send button and end frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_test_results); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_test_results);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -7151,7 +7152,7 @@ void Tst_ShowUsrsTestResults (void)
if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected... if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected...
{ {
/***** Header of the table with the list of users *****/ /***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL, Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results, Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable false, // Not closable
2); 2);
@ -7171,7 +7172,7 @@ void Tst_ShowUsrsTestResults (void)
} }
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
else // If no users are selected... else // If no users are selected...
{ {
@ -7246,7 +7247,7 @@ void Tst_ShowMyTestResults (void)
Dat_GetIniEndDatesFromForm (); Dat_GetIniEndDatesFromForm ();
/***** Header of the table with the list of users *****/ /***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL, Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results, Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable false, // Not closable
2); 2);
@ -7257,7 +7258,7 @@ void Tst_ShowMyTestResults (void)
Tst_ShowTestResults (&Gbl.Usrs.Me.UsrDat); Tst_ShowTestResults (&Gbl.Usrs.Me.UsrDat);
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7714,7 +7715,7 @@ void Tst_ShowOneTestResult (void)
Tst_GetTestResultQuestionsFromDB (TstCod); Tst_GetTestResultQuestionsFromDB (TstCod);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL, Box_StartBox (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests_test_results, Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable false); // Not closable
Lay_WriteHeaderClassPhoto (false,false, Lay_WriteHeaderClassPhoto (false,false,
@ -7823,7 +7824,7 @@ void Tst_ShowOneTestResult (void)
Lay_EndTable (); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else // I am not allowed to view this test result else // I am not allowed to view this test result
Lay_ShowErrorAndExit ("You can not view this test result."); Lay_ShowErrorAndExit ("You can not view this test result.");

9
swad_test_import.c
View File

@ -30,6 +30,7 @@
#include <sys/stat.h> // For mkdir #include <sys/stat.h> // For mkdir
#include <sys/types.h> // For mkdir #include <sys/types.h> // For mkdir
#include "swad_box.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -135,7 +136,7 @@ void TsI_ShowFormImportQstsFromXML (void)
extern const char *Txt_XML_file; extern const char *Txt_XML_file;
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL, Box_StartBox (NULL,Txt_Import_questions,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -156,7 +157,7 @@ void TsI_ShowFormImportQstsFromXML (void)
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -508,7 +509,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
XML_GetTree (XMLBuffer,&RootElem); XML_GetTree (XMLBuffer,&RootElem);
/***** Table start *****/ /***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Imported_questions,NULL, Box_StartBox (NULL,Txt_Imported_questions,NULL,
Hlp_ASSESSMENT_Tests, Hlp_ASSESSMENT_Tests,
false); // Not closable false); // Not closable
@ -676,7 +677,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
Ale_ShowAlert (Ale_ERROR,"Root element &lt;test&gt; not found."); Ale_ShowAlert (Ale_ERROR,"Root element &lt;test&gt; not found.");
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free XML tree *****/ /***** Free XML tree *****/
XML_FreeTree (RootElem); XML_FreeTree (RootElem);

5
swad_theme.c
View File

@ -28,6 +28,7 @@
#include <stdio.h> // For fprintf, etc. #include <stdio.h> // For fprintf, etc.
#include <string.h> #include <string.h>
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -239,7 +240,7 @@ void The_PutIconsToSelectTheme (void)
extern const char *Txt_Theme_SKIN; extern const char *Txt_Theme_SKIN;
The_Theme_t Theme; The_Theme_t Theme;
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme, Box_StartBox (NULL,Txt_Theme_SKIN,The_PutIconsTheme,
Hlp_PROFILE_Preferences_theme, Hlp_PROFILE_Preferences_theme,
false); // Not closable false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">"); fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@ -264,7 +265,7 @@ void The_PutIconsToSelectTheme (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

13
swad_timetable.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> // For malloc, calloc, free #include <stdlib.h> // For malloc, calloc, free
#include <string.h> // For string functions #include <string.h> // For string functions
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
@ -350,7 +351,7 @@ void TT_ShowClassTimeTable (void)
Grp_GetParamWhichGrps (); Grp_GetParamWhichGrps ();
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], Box_StartBox ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
(Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT ||
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons : Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons :
@ -384,7 +385,7 @@ void TT_ShowClassTimeTable (void)
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -432,12 +433,12 @@ void TT_EditCrsTimeTable (void)
/***** Editable time table *****/ /***** Editable time table *****/
Gbl.TimeTable.Type = TT_COURSE_TIMETABLE; Gbl.TimeTable.Type = TT_COURSE_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], Box_StartBox ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewCrsTT, TT_PutIconToViewCrsTT,
Hlp_COURSE_Timetable, Hlp_COURSE_Timetable,
false); // Not closable false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -451,12 +452,12 @@ void TT_EditMyTutTimeTable (void)
/***** Time table *****/ /***** Time table *****/
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE; Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], Box_StartBox ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewMyTT, TT_PutIconToViewMyTT,
Hlp_PROFILE_Timetable, Hlp_PROFILE_Timetable,
false); // Not closable false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/

33
swad_user.c
View File

@ -36,6 +36,7 @@
#include "swad_account.h" #include "swad_account.h"
#include "swad_announcement.h" #include "swad_announcement.h"
#include "swad_box.h"
#include "swad_calendar.h" #include "swad_calendar.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_connected.h" #include "swad_connected.h"
@ -2260,7 +2261,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
FuncParams (); FuncParams ();
/***** Start frame and table *****/ /***** Start frame and table *****/
Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL, Box_StartBoxTable (NULL,Txt_Log_in,NULL,
Hlp_PROFILE_LogIn, Hlp_PROFILE_LogIn,
false, // Not closable false, // Not closable
2); 2);
@ -2299,7 +2300,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
Txt_password); Txt_password);
/***** Send button and end table and frame *****/ /***** Send button and end table and frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Log_in); Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Log_in);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -3153,7 +3154,7 @@ void Usr_ShowFormsLogoutAndRole (void)
} }
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Role,NULL, Box_StartBox (NULL,Txt_Role,NULL,
Hlp_PROFILE_Session_role, Hlp_PROFILE_Session_role,
false); // Not closable false); // Not closable
@ -3172,7 +3173,7 @@ void Usr_ShowFormsLogoutAndRole (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6672,7 +6673,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
Txt_users[Sex]) : Txt_users[Sex]) :
((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] : ((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] :
Txt_ROLES_PLURAL_abc[Role][Sex])); Txt_ROLES_PLURAL_abc[Role][Sex]));
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL, Box_StartBoxTable (NULL,Gbl.Title,NULL,
NULL, NULL,
false, // Not closable false, // Not closable
2); 2);
@ -6729,7 +6730,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }
/***** Free memory for teachers list *****/ /***** Free memory for teachers list *****/
@ -6823,7 +6824,7 @@ void Usr_ListDataAdms (void)
Usr_GetAdmsLst (Gbl.Scope.Current); Usr_GetAdmsLst (Gbl.Scope.Current);
/***** Start frame with list of administrators *****/ /***** Start frame with list of administrators *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],
NULL, NULL,
Hlp_USERS_Administrators, Hlp_USERS_Administrators,
false); // Not closable false); // Not closable
@ -6891,7 +6892,7 @@ void Usr_ListDataAdms (void)
Usr_ShowWarningNoUsersFound (Rol_DEG_ADM); Usr_ShowWarningNoUsersFound (Rol_DEG_ADM);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for administrators list *****/ /***** Free memory for administrators list *****/
Usr_FreeUsrsList (Rol_DEG_ADM); Usr_FreeUsrsList (Rol_DEG_ADM);
@ -7300,7 +7301,7 @@ void Usr_SeeGuests (void)
Usr_GetGstsLst (Gbl.Scope.Current); Usr_GetGstsLst (Gbl.Scope.Current);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN], Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN],
Usr_PutIconsListGsts, Usr_PutIconsListGsts,
Hlp_USERS_Guests, Hlp_USERS_Guests,
false); // Not closable false); // Not closable
@ -7379,7 +7380,7 @@ void Usr_SeeGuests (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for guests list *****/ /***** Free memory for guests list *****/
Usr_FreeUsrsList (Rol_GST); Usr_FreeUsrsList (Rol_GST);
@ -7448,7 +7449,7 @@ void Usr_SeeStudents (void)
Usr_GetListUsrs (Gbl.Scope.Current,Rol_STD); Usr_GetListUsrs (Gbl.Scope.Current,Rol_STD);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN], Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
Usr_PutIconsListStds, Usr_PutIconsListStds,
Hlp_USERS_Students, Hlp_USERS_Students,
false); // Not closable false); // Not closable
@ -7551,7 +7552,7 @@ void Usr_SeeStudents (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for students list *****/ /***** Free memory for students list *****/
Usr_FreeUsrsList (Rol_STD); Usr_FreeUsrsList (Rol_STD);
@ -7635,7 +7636,7 @@ void Usr_SeeTeachers (void)
1 << Rol_TCH); 1 << Rol_TCH);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN], Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],
Usr_PutIconsListTchs, Usr_PutIconsListTchs,
Hlp_USERS_Teachers, Hlp_USERS_Teachers,
false); // Not closable false); // Not closable
@ -7731,7 +7732,7 @@ void Usr_SeeTeachers (void)
Lay_EndSection (); Lay_EndSection ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
/***** Free memory for teachers lists *****/ /***** Free memory for teachers lists *****/
Usr_FreeUsrsList (Rol_TCH); // Teachers Usr_FreeUsrsList (Rol_TCH); // Teachers
@ -8809,7 +8810,7 @@ void Usr_PrintUsrQRCode (void)
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ()) if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL, Box_StartBox (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL,
NULL, NULL,
false); // Not closable false); // Not closable
@ -8821,7 +8822,7 @@ void Usr_PrintUsrQRCode (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Box_EndBox ();
} }
else else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

5
swad_zip.c
View File

@ -34,6 +34,7 @@
#include <sys/types.h> // For mkdir... #include <sys/types.h> // For mkdir...
#include <unistd.h> // For chdir... #include <unistd.h> // For chdir...
#include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_file_browser.h" #include "swad_file_browser.h"
@ -602,7 +603,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTableShadow (NULL,NULL,NULL,NULL,2); Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
/***** Link to download the file *****/ /***** Link to download the file *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -660,5 +661,5 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"</tr>"); "</tr>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable (); Box_EndBoxTable ();
} }