Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-27 02:45:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.243

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-06-12 14:16:33 +02:00
parent 47e543e1a7
commit ea27d14911
63 changed files with 619 additions and 544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_ID.c
View File

@ -549,7 +549,7 @@ void ID_ShowFormOthIDs (void)
{
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_ID,NULL,
NULL,
false); // Not closable
@ -564,7 +564,7 @@ void ID_ShowFormOthIDs (void)
(Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me?
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else

4
swad_MFU.c
View File

@ -223,7 +223,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
char MenuStr[MFU_MAX_BYTES_MENU + 1];
char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1];
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_My_frequent_actions,NULL,
Hlp_STATS_Frequent,
false); // Not closable
@ -261,7 +261,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
}
}
/***** End frame *****/
/***** End box *****/
fprintf (Gbl.F.Out,"</div>");
Box_EndBox ();
}

24
swad_account.c
View File

@ -143,7 +143,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
extern const char *Txt_ID;
extern const char *Txt_Check;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Title,NULL,
Hlp_PROFILE_SignUp,
true); // Closable
@ -164,7 +164,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
Btn_PutConfirmButton (Txt_Check);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -214,7 +214,7 @@ void Acc_CheckIfEmptyAccountExists (void)
if (NumUsrs)
{
/***** Start frame and write message with number of accounts found *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,
(NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user :
Txt_Do_you_think_you_are_one_of_these_users,
@ -247,7 +247,7 @@ void Acc_CheckIfEmptyAccountExists (void)
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -345,8 +345,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
extern const char *Txt_Email;
char NewNicknameWithArroba[Nck_MAX_BYTES_NICKNAME_FROM_FORM + 1];
/***** Form to enter some data of the new user *****/
/***** Start form to enter some data of the new user *****/
Act_FormStart (ActCreUsrAcc);
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Create_account,NULL,
Hlp_PROFILE_SignUp,
false, // Not closable
@ -395,8 +397,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Password *****/
Pwd_PutFormToGetNewPasswordOnce ();
/***** Send button and form end *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_account);
/***** End form *****/
Act_FormEnd ();
}
@ -410,7 +414,7 @@ void Acc_ShowFormGoToRequestNewAccount (void)
extern const char *Txt_New_on_PLATFORM_Sign_up;
extern const char *Txt_Create_account;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_PROFILE_SignUp,
@ -421,7 +425,7 @@ void Acc_ShowFormGoToRequestNewAccount (void)
Btn_PutCreateButton (Txt_Create_account);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -472,7 +476,7 @@ void Acc_ShowFormChangeMyAccount (void)
Acc_PutLinkToRemoveMyAccount ();
fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_User_account,NULL,
Hlp_PROFILE_Account,
false, // Not closable
@ -518,7 +522,7 @@ void Acc_ShowFormChangeMyAccount (void)
}
ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true);
/***** End of table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

26
swad_agenda.c
View File

@ -147,7 +147,7 @@ void Agd_ShowMyAgenda (void)
/***** Get parameters *****/
Agd_GetParams (Agd_MY_AGENDA);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_My_agenda,Agd_PutIconsMyFullAgenda,
Hlp_PROFILE_Agenda,
false); // Not closable
@ -163,7 +163,7 @@ void Agd_ShowMyAgenda (void)
/***** Show all my events *****/
Agd_ShowEvents (Agd_MY_AGENDA);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -364,7 +364,7 @@ void Agd_ShowUsrAgenda (void)
{
Error = false;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName);
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
Box_StartBox ("100%",Gbl.Title,
@ -379,7 +379,7 @@ void Agd_ShowUsrAgenda (void)
/***** Show all the visible events in the user's agenda *****/
Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -408,7 +408,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
/* If nickname is correct, user code is already got from nickname */
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat)) // Existing user
{
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Other.UsrDat.FullName);
ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == Gbl.Usrs.Other.UsrDat.UsrCod);
Box_StartBox ("100%",Gbl.Title,
@ -423,7 +423,7 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
/***** Show all the visible events in the user's agenda *****/
Agd_ShowEvents (Agd_ANOTHER_AGENDA);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else
@ -530,7 +530,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
if (Gbl.Agenda.Num)
{
/***** Start frame *****/
/***** Start box and table *****/
switch (AgendaType)
{
case Agd_MY_AGENDA_TODAY:
@ -556,7 +556,7 @@ static void Agd_ShowEventsToday (Agd_AgendaType_t AgendaType)
NumEvent++)
Agd_ShowOneEvent (AgendaType,Gbl.Agenda.LstAgdCods[NumEvent]);
/***** End table and frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -1535,7 +1535,7 @@ void Agd_RequestCreatOrEditEvent (void)
}
Agd_PutCurrentParamsMyAgenda ();
/***** Table start *****/
/***** Start box and table *****/
if (ItsANewEvent)
Box_StartBoxTable (NULL,Txt_New_event,NULL,
Hlp_PROFILE_Agenda_new_event,
@ -1597,11 +1597,13 @@ void Agd_RequestCreatOrEditEvent (void)
"</td>"
"</tr>");
/***** New event *****/
/***** End table, send button and end box *****/
if (ItsANewEvent)
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
else
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
/***** Show current events, if any *****/
@ -1944,7 +1946,7 @@ void Agd_PrintAgdQRCode (void)
{
extern const char *Txt_Where_s_USER;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Where_s_USER,Gbl.Usrs.Me.UsrDat.FullName);
Box_StartBox (NULL,Gbl.Title,NULL,
NULL,
@ -1953,6 +1955,6 @@ void Agd_PrintAgdQRCode (void)
/***** Print QR code ****/
QR_PrintQRCode ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

8
swad_announcement.c
View File

@ -119,7 +119,7 @@ void Ann_ShowAllAnnouncements (void)
(unsigned) (1 << Rol_UNK));
NumAnnouncements = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get announcements");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("550px",Txt_Announcements,
ICanEdit ? Ann_PutIconToAddNewAnnouncement :
NULL,
@ -168,7 +168,7 @@ void Ann_ShowAllAnnouncements (void)
if (ICanEdit)
Ann_PutButtonToAddNewAnnouncement ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free structure that stores the query result *****/
@ -411,7 +411,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Start form *****/
Act_FormStart (ActRcvAnn);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_announcement,NULL,
Hlp_MESSAGES_Announcements,
false, // Not closable
@ -443,7 +443,7 @@ void Ann_ShowFormAnnouncement (void)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Button to create announcement and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_announcement);
/***** End form *****/

16
swad_assignment.c
View File

@ -136,7 +136,7 @@ static void Asg_ShowAllAssignments (void)
0,
&Pagination);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_Assignments,Asg_PutIconsListAssignments,
Hlp_ASSESSMENT_Assignments,
false); // Not closable
@ -171,7 +171,7 @@ static void Asg_ShowAllAssignments (void)
/***** Put link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Write again links to pages *****/
@ -325,7 +325,7 @@ void Asg_PrintOneAssignment (void)
/***** Get the code of the assignment *****/
AsgCod = Asg_GetParamAsgCod ();
/***** Start frame *****/
/***** Write header *****/
Lay_WriteHeaderClassPhoto (true,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -1172,7 +1172,7 @@ void Asg_RequestCreatOrEditAsg (void)
}
Asg_PutParams ();
/***** Table start *****/
/***** Start box and table *****/
if (ItsANewAssignment)
Box_StartBoxTable (NULL,Txt_New_assignment,NULL,
Hlp_ASSESSMENT_Assignments_new_assignment,
@ -1236,11 +1236,13 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Groups *****/
Asg_ShowLstGrpsToEditAssignment (Asg.AsgCod);
/***** New assignment *****/
/***** End table, send button and end box *****/
if (ItsANewAssignment)
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_assignment);
else
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
/***** Show current assignments, if any *****/
@ -1264,7 +1266,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.Num)
{
/***** Start table *****/
/***** Start box and table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
@ -1298,7 +1300,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

41
swad_attendance.c
View File

@ -223,7 +223,7 @@ static void Att_ShowAllAttEvents (void)
0,
&Pagination);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_Events,ICanEdit ? Att_PutIconToCreateNewAttEvent :
NULL,
Hlp_USERS_Attendance,
@ -284,7 +284,7 @@ static void Att_ShowAllAttEvents (void)
if (ICanEdit)
Att_PutButtonToCreateNewAttEvent ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Write again links to pages *****/
@ -1087,7 +1087,7 @@ void Att_RequestCreatOrEditAttEvent (void)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Gbl.AttEvents.CurrentPage);
/***** Table start *****/
/***** Start box and table *****/
if (ItsANewAttEvent)
Box_StartBoxTable (NULL,Txt_New_event,NULL,
Hlp_USERS_Attendance_new_event,
@ -1159,7 +1159,7 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Groups *****/
Att_ShowLstGrpsToEditAttEvent (Att.AttCod);
/***** Button and end frame *****/
/***** End table, send button and end box *****/
if (ItsANewAttEvent)
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
else
@ -1189,7 +1189,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.Num)
{
/***** Start table *****/
/***** Start box and table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
@ -1222,7 +1222,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -1828,13 +1828,16 @@ void Att_SeeOneAttEvent (void)
Grp_GetParamWhichGrps ();
Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS);
/***** Show attendance *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Event,NULL,
Hlp_USERS_Attendance,
false, // Not closable
2);
Att.AttCod = Gbl.AttEvents.AttCod;
Att_ShowOneAttEvent (&Att,true);
/***** End table and box *****/
Box_EndBoxTable ();
switch (Gbl.Usrs.Me.Role.Logged)
@ -1877,7 +1880,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
}
/***** List students' data *****/
/* Header */
/* Start box and table */
Box_StartBoxTable (NULL,NULL,NULL,
Hlp_USERS_Attendance,
false, // Not closable
@ -1905,7 +1908,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
/* List of students (only me) */
Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att);
/* Footer */
/* End table and box */
Box_EndBoxTable ();
if (Att->Open)
@ -1938,7 +1941,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
/***** Get and order list of students in this course *****/
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Attendance,NULL,
Hlp_USERS_Attendance,
false); // Not closable
@ -2017,7 +2020,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for students list *****/
@ -2676,7 +2679,7 @@ void Usr_ReqListStdsAttendanceCrs (void)
/***** Get and order lists of users from current course *****/
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],NULL,
Hlp_USERS_Attendance_attendance_list,
false); // Not closable
@ -2724,7 +2727,7 @@ void Usr_ReqListStdsAttendanceCrs (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for students list *****/
@ -3107,7 +3110,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Select[Rol_UNK]);
}
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Events,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list,
@ -3188,7 +3191,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
"</tr>");
}
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** End form *****/
@ -3219,7 +3222,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Attendance,
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList :
((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList :
@ -3284,7 +3287,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
if (PutButtonShowDetails)
Att_PutButtonToShowDetails ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory used for user's data *****/
@ -3442,7 +3445,7 @@ static void Att_ListStdsWithAttEventsDetails (Att_TypeOfView_t TypeOfView,
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Details,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list,
@ -3463,7 +3466,7 @@ static void Att_ListStdsWithAttEventsDetails (Att_TypeOfView_t TypeOfView,
}
}
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free memory used for user's data *****/

16
swad_banner.c
View File

@ -116,12 +116,12 @@ void Ban_SeeBanners (void)
" WHERE Hidden='N'"
" ORDER BY ShortName");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Banners,Ban_PutFormToEditBanners,
Hlp_SYSTEM_Banners,
false); // Not closable
/***** Write all frames *****/
/***** Write all banners *****/
if (Gbl.Banners.Num) // There are banners
Ban_WriteListOfBanners ();
else // No banners created
@ -135,7 +135,7 @@ void Ban_SeeBanners (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of banners *****/
@ -207,7 +207,7 @@ void Ban_EditBanners (void)
Ban_GetListBanners ("SELECT BanCod,Hidden,ShortName,FullName,Img,WWW"
" FROM banners ORDER BY ShortName");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Banners,Ban_PutIconToViewBanners,
Hlp_SYSTEM_Banners_edit,
false); // Not closable
@ -219,7 +219,7 @@ void Ban_EditBanners (void)
if (Gbl.Banners.Num)
Ban_ListBannersForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of banners *****/
@ -832,7 +832,7 @@ static void Ban_PutFormToCreateBanner (void)
/***** Start form *****/
Act_FormStart (ActNewBan);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_banner,NULL,
Hlp_SYSTEM_Banners_edit,
false, // Not closable
@ -883,10 +883,10 @@ static void Ban_PutFormToCreateBanner (void)
"</tr>",
Cns_MAX_CHARS_WWW,Ban->WWW);
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_banner);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}

16
swad_box.c
View File

@ -62,7 +62,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
const char *ClassFrame);
/*****************************************************************************/
/****************** Start and end a table with rounded frame *****************/
/******************* Start and end a table with rounded box ******************/
/*****************************************************************************/
// CellPadding must be 0, 1, 2, 4 or 8
@ -119,7 +119,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
extern const char *Txt_Close;
char IdFrame[Act_MAX_BYTES_ID];
/***** Start frame container *****/
/***** Start box container *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_CONTAINER\"");
if (Closable)
{
@ -129,7 +129,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
}
fprintf (Gbl.F.Out,">");
/***** Start frame *****/
/***** Start box *****/
fprintf (Gbl.F.Out,"<div class=\"%s\"",ClassFrame);
if (Width)
fprintf (Gbl.F.Out," style=\"width:%s;\"",Width);
@ -161,7 +161,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
Gbl.Prefs.IconsURL,
Txt_Help,Txt_Help);
if (Closable) // Icon to close the frame
if (Closable) // Icon to close the box
fprintf (Gbl.F.Out,"<a href=\"\""
" onclick=\"toggleDisplay('%s');return false;\" />"
"<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
@ -184,11 +184,11 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
"%s"
"</div>",
Gbl.Layout.FrameNested ? "FRAME_TITLE_SMALL" :
Gbl.Layout.NestedBox ? "FRAME_TITLE_SMALL" :
"FRAME_TITLE_BIG",
Title);
Gbl.Layout.FrameNested++;
Gbl.Layout.NestedBox++;
}
void Box_EndBoxTable (void)
@ -211,9 +211,9 @@ void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton)
void Box_EndBox (void)
{
Gbl.Layout.FrameNested--;
Gbl.Layout.NestedBox--;
/***** End frame and frame container *****/
/***** End box and box container *****/
fprintf (Gbl.F.Out,"</div>"
"</div>");
}

4
swad_calendar.c
View File

@ -314,7 +314,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
Hld_GetListHolidays ();
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,NULL,FunctionToDrawContextualIcons,
PrintView ? NULL :
Hlp_Calendar,
@ -352,7 +352,7 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
"</script>",
ParamsStr);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

31
swad_centre.c
View File

@ -166,11 +166,13 @@ void Ctr_SeeCtrWithPendingDegs (void)
/***** Get centres *****/
if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees")))
{
/***** Write heading *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Centres_with_pending_degrees,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
/***** Wrtie heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -216,6 +218,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -310,7 +313,7 @@ static void Ctr_Configuration (bool PrintView)
(unsigned) Gbl.CurrentCtr.Ctr.CtrCod);
PhotoExists = Fil_CheckIfPathExists (PathPhoto);
/***** Start frame *****/
/***** Start box *****/
if (PrintView)
Box_StartBox (NULL,NULL,NULL,
NULL,
@ -635,7 +638,7 @@ static void Ctr_Configuration (bool PrintView)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -748,7 +751,7 @@ static void Ctr_ListCentres (void)
extern const char *Txt_Create_centre;
unsigned NumCtr;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName);
Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsListCentres,
Hlp_INSTITUTION_Centres,
@ -781,7 +784,7 @@ static void Ctr_ListCentres (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -940,7 +943,7 @@ void Ctr_EditCentres (void)
/***** Get list of centres *****/
Ctr_GetListCentres (Gbl.CurrentIns.Ins.InsCod);
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName);
Box_StartBox (NULL,Gbl.Title,Ctr_PutIconsEditingCentres,
@ -954,7 +957,7 @@ void Ctr_EditCentres (void)
if (Gbl.Ctrs.Num)
Ctr_ListCentresForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of centres *****/
@ -2224,7 +2227,7 @@ void Ctr_RequestPhoto (void)
/***** Start form to upload photo *****/
Act_FormStart (ActRecCtrPho);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Photo,NULL,
NULL,
false); // Not closable
@ -2251,7 +2254,7 @@ void Ctr_RequestPhoto (void)
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** End form *****/
@ -2420,7 +2423,7 @@ static void Ctr_PutFormToCreateCentre (void)
else
Lay_ShowErrorAndExit ("You can not edit centres.");
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_centre,NULL,
NULL,
false, // Not closable
@ -2511,7 +2514,7 @@ static void Ctr_PutFormToCreateCentre (void)
"</td>"
"</tr>");
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_centre);
/***** End form *****/
@ -2894,7 +2897,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
/***** Query database *****/
if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres")))
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of centres found */
sprintf (Gbl.Title,"%u %s",
NumCtrs,(NumCtrs == 1) ? Txt_centre :
@ -2903,6 +2906,8 @@ unsigned Ctr_ListCtrsFound (const char *Query)
NULL,
false, // Not closable
2);
/***** Write heading *****/
Ctr_PutHeadCentresForSeeing (false); // Order not selectable
/***** List the centres (one row per centre) *****/
@ -2923,7 +2928,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
Ctr_ListOneCentreForSeeing (&Ctr,NumCtr);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

3
swad_changelog.h
View File

@ -239,13 +239,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.242 (2017-06-11)"
#define Log_PLATFORM_VERSION "SWAD 16.243 (2017-06-11)"
#define CSS_FILE "swad16.235.1.css"
#define JS_FILE "swad16.206.3.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.243: Jun 12, 2017 Code refactoring related with boxes. (222174 lines)
Version 16.242: Jun 11, 2017 Code refactoring related with boxes. (222128 lines)
Version 16.241.2: Jun 11, 2017 Changes in alignment of dates in statistics. (222131 lines)
Version 16.241.1: Jun 11, 2017 Fix bug confirming another user's ID. (222132 lines)

8
swad_chat.c
View File

@ -123,7 +123,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
/***** Fill the list with the degrees I belong to *****/
Usr_GetMyDegrees ();
/***** Table start *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Chat_rooms,NULL,
NULL,
false); // Not closable
@ -263,11 +263,13 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
if (NumRows > 0) // If not empty chat rooms found
{
/***** Table start *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Rooms_with_users,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"CENTER_MIDDLE LIGHT_BLUE\">"
"%s"
@ -297,7 +299,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
row[0],row[1]);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

10
swad_connected.c
View File

@ -95,7 +95,7 @@ void Con_ShowConnectedUsrs (void)
Sco_SetScopesForListingStudents ();
Sco_GetScope ("ScopeCon");
/***** Start frame *****/
/***** Start box *****/
/* Current time */
sprintf (Gbl.Title,"%s<div id=\"connected_current_time\"></div>",
Txt_Connected_users);
@ -117,7 +117,7 @@ void Con_ShowConnectedUsrs (void)
if (Gbl.Scope.Current != Sco_SCOPE_UNK)
Con_ShowConnectedUsrsBelongingToLocation ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -161,7 +161,7 @@ void Con_ShowLastClicks (void)
extern const char *Hlp_USERS_Connected_last_clicks;
extern const char *Txt_Last_clicks_in_real_time;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Last_clicks_in_real_time,NULL,
Hlp_USERS_Connected_last_clicks,
false); // Not closable
@ -172,7 +172,7 @@ void Con_ShowLastClicks (void)
Con_GetAndShowLastClicks ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -381,7 +381,7 @@ void Con_ShowGlobalConnectedUsrs (void)
Gbl.Session.NumSessions,
(Gbl.Session.NumSessions == 1) ? Txt_session :
Txt_sessions);
/* End of link to view more details about connected users */
/* End link to view more details about connected users */
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();

34
swad_country.c
View File

@ -137,11 +137,13 @@ void Cty_SeeCtyWithPendingInss (void)
/***** Get countries *****/
if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries with pending institutions")))
{
/***** Write heading *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Countries_with_pending_institutions,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -189,6 +191,7 @@ void Cty_SeeCtyWithPendingInss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -242,7 +245,7 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0)
{
/***** Start frame *****/
/***** Start box *****/
if (PrintView)
Box_StartBox (NULL,NULL,NULL,
NULL,
@ -445,7 +448,7 @@ static void Cty_Configuration (bool PrintView)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -514,11 +517,13 @@ void Cty_ListCountries2 (void)
extern const char *Txt_Country_unspecified;
unsigned NumCty;
/***** Table head *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Countries,Cty_PutIconsListCountries,
Hlp_SYSTEM_Countries,
false, // Not closable
2);
/***** Write heading *****/
Cty_PutHeadCountriesForSeeing (true); // Order selectable
/***** Write all the countries and their number of users and institutions *****/
@ -601,9 +606,8 @@ void Cty_ListCountries2 (void)
Deg_GetNumDegsInCty (-1L),
Crs_GetNumCrssInCty (-1L));
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Box_EndBox ();
/***** End table and box *****/
Box_EndBoxTable ();
/***** Div for Google Geochart *****/
if (Gbl.Action.Act == ActSeeCty)
@ -949,7 +953,7 @@ void Cty_EditCountries (void)
Gbl.Ctys.SelectedOrder = Cty_ORDER_BY_COUNTRY;
Cty_GetListCountries (Cty_GET_EXTRA_DATA);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Countries,Cty_PutIconToViewCountries,
Hlp_SYSTEM_Countries,
false); // Not closable
@ -961,7 +965,7 @@ void Cty_EditCountries (void)
if (Gbl.Ctys.Num)
Cty_ListCountriesForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of countries *****/
@ -1936,7 +1940,7 @@ static void Cty_PutFormToCreateCountry (void)
/***** Start form *****/
Act_FormStart (ActNewCty);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_country,NULL,
NULL,
false, // Not closable
@ -2019,10 +2023,10 @@ static void Cty_PutFormToCreateCountry (void)
Cty->WWW[Lan]);
}
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_country);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}
@ -2362,7 +2366,7 @@ unsigned Cty_ListCtysFound (const char *Query)
/***** Query database *****/
if ((NumCtys = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get countries")))
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of countries found */
sprintf (Gbl.Title,"%u %s",
NumCtys,NumCtys == 1 ? Txt_country :
@ -2371,6 +2375,8 @@ unsigned Cty_ListCtysFound (const char *Query)
NULL,
false, // Not closable
2);
/***** Write heading *****/
Cty_PutHeadCountriesForSeeing (false); // Order not selectable
/***** List the countries (one row per country) *****/
@ -2391,7 +2397,7 @@ unsigned Cty_ListCtysFound (const char *Query)
Cty_ListOneCountryForSeeing (&Cty,NumCty);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

42
swad_course.c
View File

@ -183,7 +183,7 @@ static void Crs_Configuration (bool PrintView)
bool IsForm = (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_TCH);
bool PutLink = !PrintView && Gbl.CurrentDeg.Deg.WWW[0];
/***** Messages and links above the frame *****/
/***** Messages and links above the box *****/
if (!PrintView)
{
/* Link to request enrolment in the current course */
@ -196,7 +196,7 @@ static void Crs_Configuration (bool PrintView)
}
}
/***** Start frame *****/
/***** Start box *****/
if (PrintView)
Box_StartBox (NULL,NULL,NULL,
NULL,
@ -469,7 +469,7 @@ static void Crs_Configuration (bool PrintView)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -549,7 +549,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
ClassNormal = The_ClassForm[Gbl.Prefs.Theme];
sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]);
/***** Table start *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_My_courses,NULL,
Hlp_PROFILE_Courses,
false); // Not closable
@ -778,7 +778,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/* Free structure that stores the query result */
DB_FreeMySQLResult (&mysql_resCty);
/***** End frame *****/
/***** End box *****/
fprintf (Gbl.F.Out,"</ul>");
Box_EndBox ();
}
@ -1065,7 +1065,7 @@ void Crs_WriteSelectorMyCourses (void)
Act_FormGoToStart (Gbl.Usrs.Me.MyCrss.Num ? ActSeeCrsInf :
ActSysReqSch);
/***** Start of selector of courses *****/
/***** Start selector of courses *****/
fprintf (Gbl.F.Out,"<select id=\"my_courses\" name=\"crs\""
" onchange=\"document.getElementById('%s').submit();\">",
Gbl.Form.Id);
@ -1138,7 +1138,7 @@ static void Crs_ListCourses (void)
extern const char *Txt_Create_course;
unsigned Year;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Box_StartBox (NULL,Gbl.Title,Crs_PutIconsListCourses,
Hlp_DEGREE_Courses,
@ -1173,7 +1173,7 @@ static void Crs_ListCourses (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1338,7 +1338,7 @@ void Crs_EditCourses (void)
/***** Get list of degrees in this centre *****/
Deg_GetListDegsOfCurrentCtr ();
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Alert.Txt,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Box_StartBox (NULL,Gbl.Alert.Txt,Crs_PutIconToViewCourses,
Hlp_DEGREE_Courses,
@ -1351,7 +1351,7 @@ void Crs_EditCourses (void)
if (Gbl.CurrentDeg.NumCrss)
Crs_ListCoursesForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of courses in this degree *****/
@ -1645,11 +1645,13 @@ static void Crs_PutFormToCreateCourse (void)
else
Lay_ShowErrorAndExit ("You can not edit courses.");
/***** Write heading *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_course,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Crs_PutHeadCoursesForEdition ();
/***** Column to remove course, disabled here *****/
@ -1720,7 +1722,7 @@ static void Crs_PutFormToCreateCourse (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_course);
/***** End form *****/
@ -3005,7 +3007,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
/***** List the courses (one row per course) *****/
if ((NumCrss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get courses of a user")))
{
/* Start frame and table */
/* Start box and table */
Box_StartBoxTable ("100%",NULL,NULL,
NULL,
false, // Not closable
@ -3056,7 +3058,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
Crs_WriteRowCrsData (NumCrs,row,true);
}
/* End table and frame */
/* End table and box */
Box_EndBoxTable ();
}
@ -3088,7 +3090,7 @@ unsigned Crs_ListCrssFound (const char *Query)
/***** List the courses (one row per course) *****/
if (NumCrss)
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of courses found */
sprintf (Gbl.Title,"%u %s",
NumCrss,(NumCrss == 1) ? Txt_course :
@ -3098,7 +3100,7 @@ unsigned Crs_ListCrssFound (const char *Query)
false, // Not closable
2);
/* Heading row */
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"BM\"></th>"
"<th class=\"LEFT_MIDDLE\">"
@ -3123,7 +3125,7 @@ unsigned Crs_ListCrssFound (const char *Query)
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
/* Write courses */
/***** Write courses *****/
for (NumCrs = 1;
NumCrs <= NumCrss;
NumCrs++)
@ -3135,7 +3137,7 @@ unsigned Crs_ListCrssFound (const char *Query)
Crs_WriteRowCrsData (NumCrs,row,false);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -3331,7 +3333,7 @@ void Crs_AskRemoveOldCrss (void)
/***** Start form *****/
Act_FormStart (ActRemOldCrs);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Eliminate_old_courses,NULL,
Hlp_SYSTEM_Hierarchy_eliminate_old_courses,
false); // Not closable
@ -3355,7 +3357,7 @@ void Crs_AskRemoveOldCrss (void)
Cfg_PLATFORM_SHORT_NAME);
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/

6
swad_date.c
View File

@ -102,7 +102,7 @@ void Dat_PutBoxToSelectDateFormat (void)
extern const char *Txt_Dates;
Dat_Format_t Format;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Dates,Dat_PutIconsDateFormat,
Hlp_PROFILE_Preferences_dates,
false); // Not closable
@ -131,13 +131,13 @@ void Dat_PutBoxToSelectDateFormat (void)
"</li>");
}
/***** End of list and form *****/
/***** End list and form *****/
fprintf (Gbl.F.Out,"</ul>");
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

32
swad_degree.c
View File

@ -169,11 +169,13 @@ void Deg_SeeDegWithPendingCrss (void)
/***** Get degrees *****/
if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses")))
{
/***** Write heading *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Degrees_with_pending_courses,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -219,6 +221,7 @@ void Deg_SeeDegWithPendingCrss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -298,7 +301,7 @@ static void Deg_Configuration (bool PrintView)
if (Gbl.CurrentDeg.Deg.DegCod > 0)
{
/***** Start frame *****/
/***** Start box *****/
if (PrintView)
Box_StartBox (NULL,NULL,NULL,
NULL,
@ -531,7 +534,7 @@ static void Deg_Configuration (bool PrintView)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -943,13 +946,13 @@ static void Deg_PutFormToCreateDegree (void)
else
Lay_ShowErrorAndExit ("You can not edit degrees.");
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_degree,NULL,
NULL,
false, // Not closable
2);
/***** Table head *****/
/***** Write heading *****/
Deg_PutHeadDegreesForEdition ();
/***** Column to remove degree, disabled here *****/
@ -1023,10 +1026,7 @@ static void Deg_PutFormToCreateDegree (void)
"</td>"
"</tr>");
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_degree);
/***** End form *****/
@ -1177,7 +1177,7 @@ static void Deg_ListDegrees (void)
extern const char *Txt_Create_degree;
unsigned NumDeg;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShrtName);
Box_StartBox (NULL,Gbl.Title,Deg_PutIconsListDegrees,
Hlp_CENTRE_Degrees,
@ -1210,7 +1210,7 @@ static void Deg_ListDegrees (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1356,7 +1356,7 @@ void Deg_EditDegrees (void)
/***** Get list of degree types *****/
DT_GetListDegreeTypes (Sco_SCOPE_SYS,DT_ORDER_BY_DEGREE_TYPE);
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
Gbl.CurrentCtr.Ctr.FullName);
Box_StartBox (NULL,Gbl.Title,Deg_PutIconsEditingDegrees,
@ -1382,7 +1382,7 @@ void Deg_EditDegrees (void)
DT_EditDegreeTypes ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of degree types *****/
@ -2575,7 +2575,7 @@ unsigned Deg_ListDegsFound (const char *Query)
/***** Query database *****/
if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees")))
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of degrees found */
sprintf (Gbl.Title,"%u %s",
NumDegs,(NumDegs == 1) ? Txt_degree :
@ -2584,6 +2584,8 @@ unsigned Deg_ListDegsFound (const char *Query)
NULL,
false, // Not closable
2);
/***** Write heading *****/
Deg_PutHeadDegreesForSeeing ();
/***** List the degrees (one row per degree) *****/
@ -2604,7 +2606,7 @@ unsigned Deg_ListDegsFound (const char *Query)
Deg_ListOneDegreeForSeeing (&Deg,NumDeg);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

12
swad_degree_type.c
View File

@ -206,7 +206,7 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
extern const char *Txt_Create_another_type_of_degree;
extern const char *Txt_Create_type_of_degree;
/***** Start frame *****/
/***** Start box *****/
switch (NextAction)
{
case ActSeeDegTyp:
@ -247,7 +247,7 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -263,7 +263,7 @@ void DT_EditDegreeTypes (void)
/***** Get list of degree types *****/
DT_GetListDegreeTypes (Sco_SCOPE_SYS,DT_ORDER_BY_DEGREE_TYPE);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Types_of_degree,DT_PutIconToViewDegreeTypesWhenEditing,
Hlp_CENTRE_DegreeTypes_edit,
false); // Not closable
@ -275,7 +275,7 @@ void DT_EditDegreeTypes (void)
if (Gbl.Degs.DegTypes.Num)
DT_ListDegreeTypesForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of degree types *****/
@ -435,7 +435,7 @@ void DT_PutFormToCreateDegreeType (void)
/***** Start form *****/
Act_FormStart (ActNewDegTyp);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_type_of_degree,NULL,
NULL,
false, // Not closable
@ -465,7 +465,7 @@ void DT_PutFormToCreateDegreeType (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_degree);
/***** End form *****/

16
swad_department.c
View File

@ -100,13 +100,15 @@ void Dpt_SeeDepts (void)
/***** Get list of departments *****/
Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod);
/***** Table head *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Departments,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
NULL,
Hlp_INSTITUTION_Departments,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>");
for (Order = Dpt_ORDER_BY_DEPARTMENT;
Order <= Dpt_ORDER_BY_NUM_TCHS;
@ -187,7 +189,7 @@ void Dpt_SeeDepts (void)
1 << Rol_TCH) -
NumTchsInsWithDpt);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free list of departments *****/
@ -487,12 +489,13 @@ static void Dpt_ListDepartmentsForEdition (void)
struct Instit Ins;
unsigned NumIns;
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Departments,NULL,
Hlp_INSTITUTION_Departments_edit,
false, // Not closable
2);
/***** Table head *****/
/***** Write heading *****/
Dpt_PutHeadDepartments ();
/***** Write all the departments *****/
@ -593,6 +596,7 @@ static void Dpt_ListDepartmentsForEdition (void)
Dpt->NumTchs);
}
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -890,7 +894,7 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Start form *****/
Act_FormStart (ActNewDpt);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_department,NULL,
Hlp_INSTITUTION_Departments_edit,
false, // Not closable
@ -963,10 +967,10 @@ static void Dpt_PutFormToCreateDepartment (void)
"</tr>",
Cns_MAX_CHARS_WWW,Dpt->WWW);
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_department);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}

8
swad_duplicate.c
View File

@ -140,7 +140,7 @@ void Dup_ListDuplicateUsrs (void)
struct UsrData UsrDat;
unsigned NumInformants;
/***** Start frame with list of possible duplicate users *****/
/***** Start box with list of possible duplicate users *****/
Box_StartBox (NULL,Txt_Possibly_duplicate_users,NULL,
Hlp_USERS_Duplicates_possibly_duplicate_users,
false); // Not closable
@ -230,7 +230,7 @@ void Dup_ListDuplicateUsrs (void)
/***** Show warning indicating no users found *****/
Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -260,7 +260,7 @@ static void Dup_ListSimilarUsrs (void)
unsigned NumUsrs;
unsigned NumUsr;
/***** Start frame with list of possible duplicate users *****/
/***** Start box with list of possible duplicate users *****/
Box_StartBox (NULL,Txt_Similar_users,NULL,
Hlp_USERS_Duplicates_similar_users,
false); // Not closable
@ -372,7 +372,7 @@ static void Dup_ListSimilarUsrs (void)
/***** Show warning indicating no users found *****/
Usr_ShowWarningNoUsersFound (Rol_UNK);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

26
swad_enrolment.c
View File

@ -377,7 +377,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
extern const char *Txt_Remove_me_from_this_course;
Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Enrolment,NULL,
Hlp_USERS_SignUp_confirm_enrolment,
false); // Not closable
@ -424,7 +424,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
Btn_PutRemoveButtonInline (Txt_Remove_me_from_this_course);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Mark possible notification as seen *****/
@ -706,7 +706,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
}
Act_FormStart (NextAction);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Title,NULL,
Hlp_USERS_Administration_administer_multiple_users,
false); // Not closable
@ -759,10 +759,10 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
Txt_Step_4_Confirm_the_enrolment_removing);
Pwd_AskForConfirmationOnDangerousAction ();
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Confirm);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}
@ -797,7 +797,7 @@ void Enr_AskRemoveOldUsrs (void)
/***** Start form *****/
Act_FormStart (ActRemOldUsr);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Eliminate_old_users,NULL,
NULL,
false); // Not closable
@ -821,7 +821,7 @@ void Enr_AskRemoveOldUsrs (void)
Cfg_PLATFORM_SHORT_NAME);
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/
@ -1854,7 +1854,7 @@ void Enr_AskRemAllStdsThisCrs (void)
extern const char *Txt_Remove_all_students;
extern const char *Txt_Do_you_really_want_to_remove_the_X_students_from_the_course_Y_;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Remove_all_students,NULL,
Hlp_USERS_Administration_remove_all_students,
false); // Not closable
@ -1882,7 +1882,7 @@ void Enr_AskRemAllStdsThisCrs (void)
/***** Show warning indicating no students found *****/
Usr_ShowWarningNoUsersFound (Rol_STD);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -2307,7 +2307,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Gbl.Scope.Default = Sco_SCOPE_CRS;
Sco_GetScope ("ScopeEnr");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_Enrolment_requests,NULL,
Hlp_USERS_Requests,
false); // Not closable
@ -2955,7 +2955,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
/***** Put link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -3126,7 +3126,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
extern const char *Txt_Administer_one_user;
Act_Action_t NextAction;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Administer_one_user,NULL,
Hlp_USERS_Administration_administer_one_user,
false); // Not closable
@ -3153,7 +3153,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
}
Enr_WriteFormToReqAnotherUsrID (NextAction);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

19
swad_exam.c
View File

@ -646,7 +646,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
Gbl.CurrentCrs.Crs.CrsCod,SubQueryStatus);
NumExaAnns = DB_QuerySELECT (Query,&mysql_res,"can not get exam announcements in this course for listing");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,
(Gbl.ExamAnns.HighlightExaCod > 0 ||
Gbl.ExamAnns.HighlightDate[0]) ? Txt_All_announcements_of_exams :
@ -698,7 +698,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
/***** Put link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1070,7 +1070,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
break;
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("625px",NULL,
TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement :
NULL,
@ -1521,16 +1521,13 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
/***** End frame *****/
/***** End table, send button and end box *****/
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
Box_EndBoxWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Btn_CONFIRM_BUTTON :
Btn_CREATE_BUTTON,
Txt_Publish_announcement_OF_EXAM);
Box_EndBoxTableWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Btn_CONFIRM_BUTTON :
Btn_CREATE_BUTTON,
Txt_Publish_announcement_OF_EXAM);
else
Box_EndBox ();
Box_EndBoxTable ();
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
QR_ExamAnnnouncement ();

62
swad_file_browser.c
View File

@ -3167,7 +3167,7 @@ void Brw_AskEditWorksCrs (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for users' list *****/
@ -3216,7 +3216,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
/***** Write top before showing file browser *****/
Brw_WriteTopBeforeShowingFileBrowser ();
/***** Header of the table with the list of users *****/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Assignments_and_other_works,
Brw_PutIconShowFigure,
Hlp_FILES_Homework_for_teachers,
@ -3254,7 +3254,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
}
}
/***** End of the table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else // If no users are selected...
@ -3621,7 +3621,7 @@ static void Brw_ShowFileBrowser (void)
Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_CRS] = Hlp_FILES_Private; // Brw_ADMI_TEACH_CRS
Brw_HelpOfFileBrowser[Brw_ADMI_TEACH_GRP] = Hlp_FILES_Private; // Brw_ADMI_TEACH_GRP
/***** Set contextual icon in frame *****/
/***** Set contextual icon in box *****/
Gbl.FileBrowser.IconViewEdit = Brw_ICON_NONE;
switch (Gbl.FileBrowser.Type)
{
@ -3685,7 +3685,7 @@ static void Brw_ShowFileBrowser (void)
/***** Check if the clipboard is in this tree *****/
Gbl.FileBrowser.Clipboard.IsThisTree = Brw_CheckIfClipboardIsInThisTree ();
/***** Start frame *****/
/***** Start box *****/
Gbl.FileBrowser.Id++;
sprintf (FileBrowserSectionId,"file_browser_%u",Gbl.FileBrowser.Id);
Lay_StartSection (FileBrowserSectionId);
@ -3711,7 +3711,7 @@ static void Brw_ShowFileBrowser (void)
/***** Put button to show / edit *****/
Brw_PutButtonToShowEdit ();
/***** End of frame *****/
/***** End box *****/
Box_EndBox ();
Lay_EndSection ();
}
@ -5304,7 +5304,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
}
/***** Indentation depending on level, icon, and file/folder name *****/
/* Start of the column */
/* Start column */
fprintf (Gbl.F.Out,"<td class=\"NO_BR LEFT_TOP COLOR%u\""
" style=\"width:99%%;\">"
"<table>"
@ -5347,7 +5347,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
Brw_WriteFileName (Level,FileMetadata.IsPublic,
PathInTree,FileName,FileNameToShow);
/* End of the column */
/* End column */
fprintf (Gbl.F.Out,"</tr>"
"</table>"
"</td>");
@ -5882,7 +5882,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
/***** Icon depending on the file extension *****/
Brw_PutIconFile (Size,FileMetadata->FileType,FileMetadata->FilFolLnkName);
/* End of the link and of the form */
/* End link and form */
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}
@ -5942,7 +5942,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
/***** Name and link of the folder, file or link *****/
if (Gbl.FileBrowser.FileType == Brw_IS_FOLDER)
{
/***** Start of cell *****/
/***** Start cell *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE",
Gbl.FileBrowser.TxtStyle);
if (Gbl.FileBrowser.Clipboard.IsThisFile)
@ -5989,7 +5989,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic,
fprintf (Gbl.F.Out,"</span>");
}
/***** End of cell *****/
/***** End cell *****/
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</td>");
@ -7984,7 +7984,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Create_folder,NULL,
NULL,
false); // Not closable
@ -8002,7 +8002,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
The_ClassForm[Gbl.Prefs.Theme],Txt_Folder,
Brw_MAX_CHARS_FOLDER);
/* Button to send and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_folder);
/***** End form *****/
@ -8022,7 +8022,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
extern const char *Txt_Done;
/***** Start frame *****/
/***** Start box *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Box_StartBox ("95%",Txt_Upload_files,NULL,
NULL,
@ -8071,7 +8071,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
fprintf (Gbl.F.Out,"</div>");
}
@ -8085,7 +8085,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
extern const char *Txt_Upload_file;
extern const char *Txt_or_you_can_upload_a_new_file_to_the_folder_X;
/***** Start frame *****/
/***** Start box *****/
fprintf (Gbl.F.Out,"<div id=\"classic-upload\" style=\"display:none;\">");
Box_StartBox (NULL,Txt_Upload_file,NULL,
NULL,
@ -8109,7 +8109,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
Btn_PutCreateButton (Txt_Upload_file);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
fprintf (Gbl.F.Out,"</div>");
}
@ -8130,7 +8130,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Paste,NULL,
NULL,
false); // Not closable
@ -8140,7 +8140,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
FileNameToShow);
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Paste);
/***** End form *****/
@ -8167,7 +8167,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Gbl.FileBrowser.FilFolLnkName,
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Create_link,NULL,
NULL,
false); // Not closable
@ -8212,7 +8212,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
The_ClassForm[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional,
Brw_MAX_CHARS_FOLDER);
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
/***** End form *****/
@ -9165,7 +9165,7 @@ void Brw_ShowFileMetadata (void)
FileMetadata.FileType,-1L);
}
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
/***** Link to download the file *****/
@ -9346,13 +9346,17 @@ void Brw_ShowFileMetadata (void)
The_ClassForm[Gbl.Prefs.Theme],Txt_Public_views,
FileMetadata.NumPublicViews);
/***** End frame *****/
/***** End box *****/
if (ICanEdit) // I can edit file properties
{
/* End table, send button and end box */
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_file_properties);
/* End form */
Act_FormEnd ();
}
else
/* End table and box */
Box_EndBoxTable ();
/***** Mark possible notifications as seen *****/
@ -11335,8 +11339,8 @@ unsigned Brw_ListDocsFound (const char *Query,
/***** Query database *****/
if ((NumDocs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get files")))
{
/***** Write heading *****/
/* Write header with number of documents found */
/***** Start box and table *****/
/* Number of documents found */
sprintf (Gbl.Title,"%u %s",
NumDocs,(NumDocs == 1) ? TitleSingular :
TitlePlural);
@ -11345,7 +11349,7 @@ unsigned Brw_ListDocsFound (const char *Query,
false, // Not closable
2);
/* Heading row */
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"BM\"></th>"
"<th class=\"LEFT_MIDDLE\">"
@ -11400,7 +11404,7 @@ unsigned Brw_ListDocsFound (const char *Query,
"</th>"
"</tr>");
/* End table */
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -11699,7 +11703,7 @@ void Brw_AskRemoveOldFiles (void)
Act_FormStart (ActRemOldBrf);
Brw_PutHiddenParamFullTreeIfSelected ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Remove_old_files,NULL,
NULL,
false); // Not closable
@ -11723,7 +11727,7 @@ void Brw_AskRemoveOldFiles (void)
Cfg_PLATFORM_SHORT_NAME);
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Remove);
/***** End form *****/

12
swad_follow.c
View File

@ -131,7 +131,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
false,
&mysql_res)))
{
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,
Hlp_SOCIAL_Profiles_who_to_follow,
false, // Not closable
@ -164,7 +164,7 @@ void Fol_SuggestUsrsToFollowMainZone (void)
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -687,7 +687,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&FollowingUsrDat);
/***** Start listing *****/
/***** Start box and table *****/
Box_StartBoxTable ("560px",Txt_Following,NULL,
NULL,
false, // Not closable
@ -713,7 +713,7 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</tr>");
}
/***** End listing *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free memory used for user's data *****/
@ -773,7 +773,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&FollowerUsrDat);
/***** Start listing *****/
/***** Start box and table *****/
Box_StartBoxTable ("560px",Txt_Followers,NULL,
NULL,
false, // Not closable
@ -799,7 +799,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</tr>");
}
/***** End listing *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free memory used for user's data *****/

16
swad_forum.c
View File

@ -1008,7 +1008,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
if (Message[0])
Ale_ShowAlert (AlertType,Message);
/***** Start frame *****/
/***** Start box *****/
sprintf (FrameTitle,"%s: %s",Txt_Thread,Thr.Subject);
Box_StartBox (NULL,FrameTitle,For_PutIconNewPost,
Hlp_SOCIAL_Forums_posts,
@ -1137,7 +1137,7 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
For_WriteFormForumPst (true,LastSubject);
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
Lay_EndSection ();
}
@ -1606,7 +1606,7 @@ static void For_ShowForumList (void)
/***** Fill the list with the institutions I belong to *****/
Usr_GetMyInstits ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Forums,For_PutIconsForums,
Hlp_SOCIAL_Forums,
false); // Not closable
@ -1760,7 +1760,7 @@ static void For_ShowForumList (void)
/***** End list *****/
fprintf (Gbl.F.Out,"</ul>");
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -2572,7 +2572,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
if (Message[0])
Ale_ShowAlert (AlertType,Message);
/***** Start frame for threads of this forum *****/
/***** Start box for threads of this forum *****/
sprintf (FrameTitle,"%s: %s",Txt_Forum,ForumName);
Box_StartBox (NULL,FrameTitle,For_PutIconNewThread,
Hlp_SOCIAL_Forums_threads,
@ -2654,7 +2654,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
For_WriteFormForumPst (false,NULL);
Lay_EndSection ();
/***** End frame with threads of this forum ****/
/***** End box with threads of this forum ****/
Box_EndBox ();
Lay_EndSection ();
}
@ -3858,7 +3858,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
extern const char *Txt_MSG_Content;
extern const char *Txt_Send;
/***** Start frame *****/
/***** Start box *****/
if (IsReply)
Box_StartBox (NULL,Txt_New_post,NULL,
Hlp_SOCIAL_Forums_new_post,
@ -3931,7 +3931,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

2
swad_global.c
View File

@ -439,7 +439,7 @@ void Gbl_InitializeGlobals (void)
Gbl.WebService.Function = Svc_unknown;
Gbl.Layout.FrameNested = 0;
Gbl.Layout.NestedBox = 0;
}
/*****************************************************************************/

2
swad_global.h
View File

@ -133,7 +133,7 @@ struct Globals
bool HTMLStartWritten; // Used to avoid writing more than once the HTML head
bool DivsEndWritten; // Used to avoid writing more than once the HTML end
bool HTMLEndWritten; // Used to avoid writing more than once the HTML end
unsigned FrameNested;
unsigned NestedBox;
} Layout;
struct
{

30
swad_group.c
View File

@ -266,7 +266,7 @@ static void Grp_EditGroupTypes (void)
extern const char *Txt_Types_of_group;
extern const char *Txt_There_are_no_types_of_group_in_the_course_X;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Types_of_group,Grp_PutIconsEditingGroupTypes,
Hlp_USERS_Groups,
false); // Not closable
@ -284,7 +284,7 @@ static void Grp_EditGroupTypes (void)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -298,7 +298,7 @@ static void Grp_EditGroups (void)
extern const char *Txt_Groups;
extern const char *Txt_No_groups_have_been_created_in_the_course_X;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Groups,Grp_PutIconsEditingGroups,
Hlp_USERS_Groups,
false); // Not closable
@ -316,7 +316,7 @@ static void Grp_EditGroups (void)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -364,7 +364,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
(Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Groups,ICanEdit ? Grp_PutIconToEditGroups :
NULL,
Hlp_USERS_Groups,
@ -409,7 +409,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -1724,7 +1724,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
Grp_ShowWarningToStdsToChangeGrps ();
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_My_groups,ICanEdit ? Grp_PutIconToEditGroups :
NULL,
Hlp_USERS_Groups,
@ -1773,7 +1773,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
}
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups
@ -1942,7 +1942,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
/***** Get list of groups types and groups in current course *****/
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Groups,NULL,
Hlp_USERS_Groups,
false, // Not closable
@ -1955,7 +1955,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)
Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free list of groups types and groups in current course *****/
@ -2346,7 +2346,7 @@ static void Grp_PutFormToCreateGroupType (void)
Lay_StartSection (Grp_NEW_GROUP_TYPE_SECTION_ID);
Act_FormStartAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID);
/***** Start of frame *****/
/***** Start box *****/
Box_StartBoxTable (NULL,Txt_New_type_of_group,NULL,
NULL,
false, // Not closable
@ -2437,7 +2437,7 @@ static void Grp_PutFormToCreateGroupType (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_group);
/***** End form *****/
@ -2462,7 +2462,7 @@ static void Grp_PutFormToCreateGroup (void)
Lay_StartSection (Grp_NEW_GROUP_SECTION_ID);
Act_FormStartAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_group,NULL,
NULL,
false, // Not closable
@ -2533,10 +2533,10 @@ static void Grp_PutFormToCreateGroup (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_group);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
Lay_EndSection ();
}

5
swad_help.c
View File

@ -128,8 +128,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
}
/***** Contextual buttons *****/
/* Start box and table */
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_What_would_you_like_to_do,NULL,
NULL,
true, // Closable
@ -253,7 +252,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Btn_CREATE_BUTTON,Txt_Create_account);
}
/* End table and box */
/***** End table and box *****/
Box_EndBoxTable ();
}

4
swad_hierarchy.c
View File

@ -97,7 +97,7 @@ void Hie_WriteMenuHierarchy (void)
extern const char *Txt_Degree;
extern const char *Txt_Course;
/***** Start of table *****/
/***** Start table *****/
Tbl_StartTableCenter (2);
/***** Write a 1st selector
@ -172,7 +172,7 @@ void Hie_WriteMenuHierarchy (void)
}
}
/***** End of table *****/
/***** End table *****/
Tbl_EndTable ();
}

12
swad_holiday.c
View File

@ -185,7 +185,7 @@ void Hld_SeeHolidays (void)
Act_FormEnd ();
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free list of holidays *****/
@ -502,12 +502,13 @@ static void Hld_ListHolidaysForEdition (void)
struct Holiday *Hld;
Hld_HolidayType_t HolidayType;
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Holidays,NULL,
Hlp_INSTITUTION_Holidays_edit,
false, // Not closable
2);
/***** Table head *****/
/***** Write heading *****/
Hld_PutHeadHolidays ();
/***** Write all the holidays *****/
@ -611,6 +612,7 @@ static void Hld_ListHolidaysForEdition (void)
"</tr>");
}
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -961,7 +963,7 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Start form *****/
Act_FormStart (ActNewHld);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_holiday,NULL,
Hlp_INSTITUTION_Holidays_edit,
false, // Not closable
@ -1052,10 +1054,10 @@ static void Hld_PutFormToCreateHoliday (void)
"</tr>",
Hld_MAX_CHARS_HOLIDAY_NAME,Hld->Name);
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_holiday);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}

6
swad_indicator.c
View File

@ -106,7 +106,7 @@ void Ind_ReqIndicatorsCourses (void)
/***** Get parameters *****/
Ind_GetParamsIndicators ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Indicators_of_courses,NULL,
Hlp_STATS_Indicators,
false); // Not closable
@ -201,7 +201,7 @@ void Ind_ReqIndicatorsCourses (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free structure that stores the query result *****/
@ -710,7 +710,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
unsigned NumIndicators;
struct Ind_IndicatorsCrs Indicators;
/***** Table start *****/
/***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"INDICATORS\">");
/***** Write table heading *****/

28
swad_info.c
View File

@ -589,7 +589,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
extern const char *Txt_You_should_read_the_following_information;
Inf_InfoType_t InfoType;
/***** Start of frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Required_reading,NULL,
NULL,
false); // Not closable
@ -619,7 +619,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
fprintf (Gbl.F.Out,"</ul>"
"</div>");
/***** End of frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1031,7 +1031,7 @@ static void Inf_ShowPage (const char *URL)
Hlp_ASSESSMENT_System, // Inf_ASSESSMENT
};
/***** Start of frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
@ -1046,7 +1046,7 @@ static void Inf_ShowPage (const char *URL)
Txt_View_in_a_new_window);
fprintf (Gbl.F.Out,"</a>");
/***** End of frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1118,7 +1118,7 @@ void Inf_FormsToSelSendInfo (void)
}
/***** Form to choice between alternatives *****/
/* Start of table */
/* Start box and table */
Box_StartBoxTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo,
HelpEdit[Gbl.CurrentCrs.Info.Type],
false, // Not closable
@ -1171,7 +1171,7 @@ void Inf_FormsToSelSendInfo (void)
"</tr>");
}
/* End of table */
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -1788,7 +1788,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
if (TxtHTML[0])
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
@ -1809,7 +1809,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
/***** Write text *****/
fprintf (Gbl.F.Out,"%s",TxtHTML);
/***** End frame *****/
/***** End box *****/
fprintf (Gbl.F.Out,"</div>");
Box_EndBox ();
@ -1873,7 +1873,7 @@ static bool Inf_CheckAndShowRichTxt (void)
if (TxtMD[0])
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
@ -1943,7 +1943,7 @@ static bool Inf_CheckAndShowRichTxt (void)
fclose (FileHTML);
unlink (PathFileHTML);
/***** End frame *****/
/***** End box *****/
fprintf (Gbl.F.Out,"</div>");
Box_EndBox ();
@ -2061,7 +2061,7 @@ void Inf_EditPlainTxtInfo (void)
/***** Set info type *****/
Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType ();
/***** Start form and frame *****/
/***** Start form and box *****/
Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]);
Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type],
@ -2084,7 +2084,7 @@ void Inf_EditPlainTxtInfo (void)
"</div>",
TxtHTML);
/***** End frame and form *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}
@ -2113,7 +2113,7 @@ void Inf_EditRichTxtInfo (void)
/***** Set info type *****/
Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType ();
/***** Start form and frame *****/
/***** Start form and box *****/
Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]);
Box_StartBox (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type],
@ -2136,7 +2136,7 @@ void Inf_EditRichTxtInfo (void)
"</div>",
TxtHTML);
/***** End frame and form *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}

26
swad_institution.c
View File

@ -151,11 +151,13 @@ void Ins_SeeInsWithPendingCtrs (void)
/***** Get institutions *****/
if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres")))
{
/***** Write heading *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Institutions_with_pending_centres,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -201,7 +203,7 @@ void Ins_SeeInsWithPendingCtrs (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -308,7 +310,7 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.InsCod > 0)
{
/***** Start frame *****/
/***** Start box *****/
if (PrintView)
Box_StartBox (NULL,NULL,NULL,
NULL,
@ -590,7 +592,7 @@ static void Ins_Configuration (bool PrintView)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -671,7 +673,7 @@ static void Ins_ListInstitutions (void)
extern const char *Txt_Create_institution;
unsigned NumIns;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Box_StartBox (NULL,Gbl.Title,Ins_PutIconsListInstitutions,
Hlp_COUNTRY_Institutions,
@ -921,7 +923,7 @@ void Ins_EditInstitutions (void)
/***** Get list of institutions *****/
Ins_GetListInstitutions (Gbl.CurrentCty.Cty.CtyCod,Ins_GET_EXTRA_DATA);
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Box_StartBox (NULL,Gbl.Title,Ins_PutIconToViewInstitutions,
@ -935,7 +937,7 @@ void Ins_EditInstitutions (void)
if (Gbl.Inss.Num)
Ins_ListInstitutionsForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of institutions *****/
@ -2160,7 +2162,7 @@ static void Ins_PutFormToCreateInstitution (void)
else
Lay_ShowErrorAndExit ("You can not edit institutions.");
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_institution,NULL,
NULL,
false, // Not closable
@ -2233,7 +2235,7 @@ static void Ins_PutFormToCreateInstitution (void)
"</td>"
"</tr>");
/***** Send button and end of frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_institution);
/***** End form *****/
@ -2518,7 +2520,7 @@ unsigned Ins_ListInssFound (const char *Query)
/***** Query database *****/
if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions")))
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of institutions found */
sprintf (Gbl.Title,"%u %s",
NumInss,NumInss == 1 ? Txt_institution :
@ -2527,6 +2529,8 @@ unsigned Ins_ListInssFound (const char *Query)
NULL,
false, // Not closable
2);
/***** Write heading *****/
Ins_PutHeadInstitutionsForSeeing (false); // Order not selectable
/***** List the institutions (one row per institution) *****/
@ -2547,7 +2551,7 @@ unsigned Ins_ListInssFound (const char *Query)
Ins_ListOneInstitutionForSeeing (&Ins,NumIns);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

20
swad_layout.c
View File

@ -269,7 +269,7 @@ void Lay_WriteStartOfPage (void)
return;
}
/***** Start of box that contains the whole page except the foot *****/
/***** Start box that contains the whole page except the foot *****/
fprintf (Gbl.F.Out,"<div id=\"whole_page\">");
/***** Header of layout *****/
@ -326,7 +326,7 @@ void Lay_WriteStartOfPage (void)
/* Menu */
Mnu_WriteMenuThisTab ();
/* Start of canvas: main zone for actions output */
/* Start canvas: main zone for actions output */
fprintf (Gbl.F.Out,"<div class=\"MAIN_ZONE_CANVAS\">");
/* If it is mandatory to read any information about course */
@ -827,7 +827,7 @@ static void Lay_WritePageTopHeading (void)
fprintf (Gbl.F.Out,"<header>");
/***** 1st. row *****/
/* Start of 1st. row */
/* Start 1st. row */
fprintf (Gbl.F.Out,"<div id=\"head_row_1\" class=\"%s\">",
ClassHeadRow1[Gbl.Prefs.Theme]);
@ -889,11 +889,11 @@ static void Lay_WritePageTopHeading (void)
fprintf (Gbl.F.Out,"</div>" // login_box
"</div>"); // head_row_1_right
/* End of 1st. row */
/* End 1st. row */
fprintf (Gbl.F.Out,"</div>"); // head_row_1
/***** 2nd. row *****/
/* Start of second row */
/* Start second row */
fprintf (Gbl.F.Out,"<div id=\"head_row_2\" class=\"%s\">",
ClassHeadRow2[Gbl.Prefs.Theme]);
@ -901,7 +901,7 @@ static void Lay_WritePageTopHeading (void)
Clock with hour:minute (server hour is shown) */
fprintf (Gbl.F.Out,"<div id=\"head_row_2_time\">");
Dat_ShowClientLocalTime ();
fprintf (Gbl.F.Out,"</div>"); // End of first column
fprintf (Gbl.F.Out,"</div>"); // End first column
/* 2nd. row, 2nd. column: degree and course */
fprintf (Gbl.F.Out,"<div id=\"head_row_2_hierarchy\">");
@ -915,7 +915,7 @@ static void Lay_WritePageTopHeading (void)
Ntf_WriteNumberOfNewNtfs ();
fprintf (Gbl.F.Out,"</div>"); // Used for AJAX based refresh
/* End of 2nd. row */
/* End 2nd. row */
fprintf (Gbl.F.Out,"</div>");
/***** End header *****/
@ -1412,7 +1412,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
Crs.CrsCod = CrsCod;
Crs_GetDataOfCourseByCod (&Crs);
/***** Table start *****/
/***** Start table *****/
fprintf (Gbl.F.Out,"<table style=\"width:100%%; padding:12px;\">"
"<tr>");
@ -1497,7 +1497,7 @@ void Lay_AdvertisementMobile (void)
{
fprintf (Gbl.F.Out,"<div style=\"margin-top:25px;\">");
/***** Table start *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,NULL,NULL,
NULL,
false, // Not closable
@ -1519,7 +1519,7 @@ void Lay_AdvertisementMobile (void)
Gbl.Prefs.IconsURL,
Txt_Stay_connected_with_SWADroid);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</div>");

14
swad_link.c
View File

@ -111,7 +111,7 @@ void Lnk_SeeLinks (void)
/***** Get list of links *****/
Lnk_GetListLinks ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Links,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Lnk_PutIconToEditLinks :
NULL,
@ -132,7 +132,7 @@ void Lnk_SeeLinks (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of links *****/
@ -229,7 +229,7 @@ void Lnk_EditLinks (void)
/***** Get list of links *****/
Lnk_GetListLinks ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Links,Lnk_PutIconToViewLinks,
Hlp_SYSTEM_Links_edit,
false); // Not closable
@ -241,7 +241,7 @@ void Lnk_EditLinks (void)
if (Gbl.Links.Num)
Lnk_ListLinksForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of links *****/
@ -708,7 +708,7 @@ static void Lnk_PutFormToCreateLink (void)
/***** Start form *****/
Act_FormStart (ActNewLnk);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_link,NULL,
Hlp_SYSTEM_Links_edit,
false, // Not closable
@ -750,10 +750,10 @@ static void Lnk_PutFormToCreateLink (void)
"</tr>",
Cns_MAX_CHARS_WWW,Lnk->WWW);
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}

4
swad_logo.c
View File

@ -283,7 +283,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
/***** Start form to upload logo *****/
Act_FormStart (ActionRec);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Logo,NULL,
NULL,
false); // Not closable
@ -304,7 +304,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** End form *****/

26
swad_mail.c
View File

@ -108,13 +108,15 @@ void Mai_SeeMailDomains (void)
/***** Get list of mail domains *****/
Mai_GetListMailDomainsAllowedForNotif ();
/***** Table head *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
NULL,
Hlp_MESSAGES_Domains,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>");
for (Order = Mai_ORDER_BY_DOMAIN;
Order <= Mai_ORDER_BY_USERS;
@ -155,7 +157,7 @@ void Mai_SeeMailDomains (void)
Gbl.Mails.Lst[NumMai].Info,
Gbl.Mails.Lst[NumMai].NumUsrs);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free list of mail domains *****/
@ -450,12 +452,13 @@ static void Mai_ListMailDomainsForEdition (void)
unsigned NumMai;
struct Mail *Mai;
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL,
Hlp_MESSAGES_Domains_edit,
false, // Not closable
2);
/***** Table head *****/
/***** Write heading *****/
Mai_PutHeadMailDomains ();
/***** Write all the mail domains *****/
@ -512,6 +515,7 @@ static void Mai_ListMailDomainsForEdition (void)
Mai->NumUsrs);
}
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -718,7 +722,7 @@ static void Mai_PutFormToCreateMailDomain (void)
/***** Start form *****/
Act_FormStart (ActNewMai);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_email_domain,NULL,
Hlp_MESSAGES_Domains_edit,
false, // Not closable
@ -756,10 +760,10 @@ static void Mai_PutFormToCreateMailDomain (void)
Mai_MAX_CHARS_MAIL_INFO,Mai->Info);
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_email_domain);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}
@ -889,7 +893,7 @@ void Mai_ListEmails (void)
/***** Get and order list of students in this course *****/
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start of the frame used to list the emails *****/
/***** Start the box used to list the emails *****/
Box_StartBox (NULL,Txt_Students_who_have_accepted_and_who_have_email,
NULL,
Hlp_MESSAGES_Email,
@ -994,7 +998,7 @@ void Mai_ListEmails (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End of the frame used to list the emails *****/
/***** End the box used to list the emails *****/
Box_EndBox ();
/***** Free memory for students list *****/
@ -1188,7 +1192,7 @@ void Mai_ShowFormOthEmail (void)
{
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Email,NULL,
NULL,
false); // Not closable
@ -1203,7 +1207,7 @@ void Mai_ShowFormOthEmail (void)
(Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me?
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else
@ -1629,7 +1633,7 @@ void Mai_PutButtonToCheckEmailAddress (void)
extern const char *Txt_Please_check_and_confirm_your_email_address;
extern const char *Txt_Check;
/***** Frame with button to check email address *****/
/***** Box with button to check email address *****/
Box_StartBox (NULL,Txt_Email_unconfirmed,NULL,
Hlp_PROFILE_Account_email,
true); // Closable

12
swad_menu.c
View File

@ -342,15 +342,15 @@ void Mnu_WriteMenuThisTab (void)
Title = Act_GetSubtitleAction (NumAct);
/***** Start of element *****/
/***** Start element *****/
fprintf (Gbl.F.Out,"<li class=\"MENU_LIST_ITEM\">");
/***** Start of container used to highlight this option *****/
/***** Start container used to highlight this option *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
IsTheSelectedAction ? "MENU_OPT_ON" :
"MENU_OPT_OFF");
/***** Start of form and link *****/
/***** Start form and link *****/
Act_FormStart (NumAct);
Act_LinkFormSubmit (Title,
IsTheSelectedAction ? The_ClassTxtMenuOn[Gbl.Prefs.Theme] :
@ -370,15 +370,15 @@ void Mnu_WriteMenuThisTab (void)
The_ClassTxtMenuOff[Gbl.Prefs.Theme],
Txt_MENU_TITLE[Gbl.Action.Tab][NumOptInMenu]);
/***** End of link and form *****/
/***** End link and form *****/
fprintf (Gbl.F.Out,"</div>"
"</a>");
Act_FormEnd ();
/***** End of container used to highlight this option *****/
/***** End container used to highlight this option *****/
fprintf (Gbl.F.Out,"</div>");
/***** End of element *****/
/***** End element *****/
fprintf (Gbl.F.Out,"</li>");
}
}

20
swad_message.c
View File

@ -224,7 +224,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs; // Teachers
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message,
NULL,
@ -331,7 +331,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory used by the list of nicknames *****/
@ -583,7 +583,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
}
else // It's not a reply
{
/* End of message subject */
/* End message subject */
fprintf (Gbl.F.Out,"%s</textarea>"
"</td>"
"</tr>",
@ -1754,13 +1754,13 @@ static void Msg_ShowSentOrReceivedMessages (void)
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get messages");
Gbl.Msg.NumMsgs = (unsigned) NumRows;
/***** Start frame with messages *****/
/***** Start box with messages *****/
Box_StartBox ("97%",Msg_WriteNumMsgs (NumUnreadMsgs),Msg_PutIconsListMsgs,
Help[Gbl.Msg.TypeOfMessages],
false); // Not closable
/***** Filter messages *****/
/* Start frame with filter */
/* Start box with filter */
Box_StartBox (NULL,Txt_Filter,NULL,
HelpFilter[Gbl.Msg.TypeOfMessages],
true); // Closable
@ -1784,7 +1784,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
Act_FormEnd ();
/* End frame */
/* End box */
Box_EndBox ();
@ -1851,7 +1851,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
&Pagination);
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free structure that stores the query result *****/
@ -2578,7 +2578,7 @@ void Msg_ShowFormToFilterMsgs (void)
Txt_MSG_To
};
/***** Table start *****/
/***** Start table *****/
Tbl_StartTableCenter (2);
/***** Filter authors/recipients *****/
@ -3778,7 +3778,7 @@ void Msg_ListBannedUsrs (void)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** Start table with list of users *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Banned_users,NULL,
NULL,
false, // Not closable
@ -3830,7 +3830,7 @@ void Msg_ListBannedUsrs (void)
}
}
/***** End of table *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free memory used for user's data *****/

9
swad_network.c
View File

@ -299,7 +299,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_BYTES_WWW + 1];
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Webs_social_networks,Net_PutIconsWebsSocialNetworks,
Hlp_PROFILE_Webs,
false, // Not closable
@ -362,7 +362,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
"</tr>");
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -535,12 +535,13 @@ void Net_ShowWebAndSocialNetworksStats (void)
NumRows = (unsigned) DB_QuerySELECT (Query,&mysql_res,
"can not get number of users with webs / social networks");
/***** Number of users *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],NULL,
Hlp_STATS_Figures_webs_social_networks,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -602,7 +603,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
}
}
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
/***** Free structure that stores the query result *****/

8
swad_notice.c
View File

@ -102,7 +102,7 @@ void Not_ShowFormNotice (void)
/***** Start form *****/
Act_FormStart (ActRcvNot);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_New_notice,NULL,
Hlp_MESSAGES_Notices,
false); // Not closable
@ -112,7 +112,7 @@ void Not_ShowFormNotice (void)
" autofocus=\"autofocus\" required=\"required\">"
"</textarea>");
/***** Button to create notice and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_notice);
/***** End form *****/
@ -388,7 +388,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
if (TypeNoticesListing == Not_LIST_FULL_NOTICES)
{
/***** Start frame *****/
/***** Start box *****/
sprintf (StrWidth,"%upx",
Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50);
Box_StartBox (StrWidth,
@ -468,7 +468,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
/***** Put link to register students *****/
Enr_CheckStdsAndPutButtonToRegisterStdsInCurrentCrs ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
break;
}

8
swad_notification.c
View File

@ -389,7 +389,7 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_MESSAGES_Notifications,
false); // Not closable
@ -646,7 +646,7 @@ void Ntf_ShowMyNotifications (void)
Ale_ShowAlert (Ale_INFO,AllNotifications ? Txt_You_have_no_notifications :
Txt_You_have_no_unread_notifications);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free structure that stores the query result *****/
@ -1898,7 +1898,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS];
Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_PROFILE_Preferences_notifications,
false); // Not closable
@ -1961,7 +1961,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

18
swad_password.c
View File

@ -249,10 +249,10 @@ void Pwd_ShowFormSendNewPwd (void)
extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Get_a_new_password;
/***** Start of form *****/
/***** Start form *****/
Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Forgotten_password,NULL,
Hlp_PROFILE_Password,
false); // Not closable
@ -269,7 +269,7 @@ void Pwd_ShowFormSendNewPwd (void)
The_ClassForm[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Get_a_new_password);
/***** End form *****/
@ -698,7 +698,7 @@ void Pwd_ShowFormChgPwd (void)
/***** Start form *****/
Act_FormStart (ActChgPwd);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Password,NULL,
Hlp_PROFILE_Password,
false, // Not closable
@ -733,10 +733,10 @@ void Pwd_ShowFormChgPwd (void)
/* New password */
Pwd_PutFormToGetNewPasswordTwice ();
/***** Send button and end form *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
/***** End form *****/
Act_FormEnd ();
@ -827,7 +827,7 @@ void Pwd_ShowFormOthPwd (void)
{
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Password,NULL,
NULL,
false); // Not closable
@ -863,7 +863,7 @@ void Pwd_ShowFormOthPwd (void)
Btn_PutConfirmButton (Txt_Change_password);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else

10
swad_photo.c
View File

@ -325,7 +325,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
bool ItsMe = (UsrDat->UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
Act_Action_t NextAction;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Photo,
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
Pho_PutIconToRequestRemoveOtherUsrPhoto,
@ -376,7 +376,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1692,7 +1692,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Link to computation of average photos *****/
Pho_PutLinkToCalculateDegreeStats ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Degrees,Pho_PutIconToPrintDegreeStats,
Hlp_STATS_Degrees,
false); // Not closable
@ -1710,7 +1710,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
Tbl_EndTable ();
break;
case Pho_DEGREES_PRINT:
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Degrees,NULL,
NULL,
false); // Not closable
@ -1735,7 +1735,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
break;
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

12
swad_place.c
View File

@ -206,7 +206,7 @@ void Plc_SeePlaces (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of places *****/
@ -248,7 +248,7 @@ void Plc_EditPlaces (void)
/***** Get list of places *****/
Plc_GetListPlaces ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing,
Hlp_INSTITUTION_Places_edit,
false); // Not closable
@ -260,7 +260,7 @@ void Plc_EditPlaces (void)
if (Gbl.Plcs.Num)
Plc_ListPlacesForEdition ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free list of places *****/
@ -740,7 +740,7 @@ static void Plc_PutFormToCreatePlace (void)
/***** Start form *****/
Act_FormStart (ActNewPlc);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_place,NULL,
NULL,
false, // Not closable
@ -780,10 +780,10 @@ static void Plc_PutFormToCreatePlace (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_place);
/***** End formn *****/
/***** End form *****/
Act_FormEnd ();
}

9
swad_plugin.c
View File

@ -347,11 +347,13 @@ static void Plg_ListPluginsForEdition (void)
unsigned NumPlg;
struct Plugin *Plg;
/***** Table head *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Plugins,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Plg_PutHeadPlugins ();
/***** Write all the plugins *****/
@ -457,6 +459,7 @@ static void Plg_ListPluginsForEdition (void)
"</tr>");
}
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -842,7 +845,7 @@ static void Plg_PutFormToCreatePlugin (void)
/***** Start form *****/
Act_FormStart (ActNewPlg);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_plugin,NULL,
NULL,
false, // Not closable
@ -925,7 +928,7 @@ static void Plg_PutFormToCreatePlugin (void)
"</tr>",
Cns_MAX_CHARS_IP,Plg->IP);
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_plugin);
/***** End form *****/

6
swad_privacy.c
View File

@ -102,7 +102,7 @@ void Pri_EditMyPrivacy (void)
Gbl.Usrs.Me.UsrDat.ProfileVisibility == Pri_VISIBILITY_UNKNOWN)
Ale_ShowAlert (Ale_WARNING,Txt_Please_review_your_privacy_preferences);
/***** Start frame and table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy,
Hlp_PROFILE_Preferences_privacy,
false, // Not closable
@ -132,7 +132,7 @@ void Pri_EditMyPrivacy (void)
Pri_VISIBILITY_SYSTEM,
(1 << Pri_VISIBILITY_SYSTEM));
/***** End table and frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -197,7 +197,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
Txt_PRIVACY_OPTIONS[Visibility]);
}
/***** End of list and form *****/
/***** End list and form *****/
fprintf (Gbl.F.Out,"</ul>");
if (Action != ActUnk)
Act_FormEnd ();

8
swad_profile.c
View File

@ -174,7 +174,7 @@ void Prf_RequestUserProfile (void)
/***** Start form *****/
Act_FormStart (ActSeeOthPubPrf);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Another_user_s_profile,NULL,
Hlp_SOCIAL_Profiles_view_public_profile,
false); // Not closable
@ -192,7 +192,7 @@ void Prf_RequestUserProfile (void)
Nck_MAX_BYTES_NICKNAME_FROM_FORM,
Gbl.Usrs.Me.UsrDat.Nickname);
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Continue);
/***** End form *****/
@ -468,7 +468,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
Prf_PutLinkToUpdateAction (ActCal1stClkTim,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"</li>");
/***** End of left list *****/
/***** End left list *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>");
@ -591,7 +591,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"</li>");
}
/***** End of right list *****/
/***** End right list *****/
fprintf (Gbl.F.Out,"</ul>"
"</div>");
}

26
swad_record.c
View File

@ -184,11 +184,15 @@ void Rec_ReqEditRecordFields (void)
/***** List the current fields of records for edit them *****/
if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found...
{
/* Start box and table */
Box_StartBoxTable (NULL,Txt_Record_fields,NULL,
Hlp_USERS_Students_course_record_card,
false, // Not closable
2);
Rec_ListFieldsRecordsForEdition ();
/* End table and box */
Box_EndBoxTable ();
}
else // No fields of records found for current course in the database
@ -359,7 +363,7 @@ void Rec_ShowFormCreateRecordField (void)
/***** Start form *****/
Act_FormStart (ActNewFie);
/***** Start of frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_New_record_field,NULL,
Hlp_USERS_Students_course_record_card,
false, // Not closable
@ -408,7 +412,7 @@ void Rec_ShowFormCreateRecordField (void)
"</td>"
"</tr>");
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_record_field);
/***** End form *****/
@ -1777,14 +1781,14 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
Lay_ShowErrorAndExit ("Wrong role.");
}
/***** Start frame *****/
/***** Start box and table *****/
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Box_StartBoxTable (StrRecordWidth,NULL,NULL,
Rec_RecordHelp[TypeOfView],
false, // Not closable
2);
/***** Header *****/
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"LEFT_TOP\">");
Tbl_StartTableWide (0);
@ -1890,13 +1894,17 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
}
}
/***** Button to save changes and end frame *****/
/***** End box *****/
if (ICanEdit)
{
/* End table, send button and end box */
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/* End form */
Act_FormEnd ();
}
else
/* End table and box */
Box_EndBoxTable ();
}
@ -2313,7 +2321,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
if (Ins.InsCod > 0)
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
/***** Start frame *****/
/***** Start box and table *****/
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Gbl.Record.UsrDat = UsrDat;
Gbl.Record.TypeOfView = TypeOfView;
@ -2524,7 +2532,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
"</tr>");
}
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -3993,7 +4001,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
Ale_ShowAlert (Ale_WARNING,Txt_Please_fill_in_your_department);
}
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable ("800px",IAmATeacher ? Txt_Institution_centre_and_department :
Txt_Institution,
NULL,
@ -4226,7 +4234,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
"</tr>");
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

46
swad_report.c
View File

@ -154,7 +154,7 @@ void Rep_ReqMyUsageReport (void)
/***** Form to show my usage report *****/
Act_FormStart (ActSeeMyUsgRep);
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_STATS_Report,
@ -163,10 +163,10 @@ void Rep_ReqMyUsageReport (void)
/***** Header *****/
Req_TitleReport (NULL); // NULL means do not write date
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Generate_report);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}
@ -260,7 +260,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
extern const char *Txt_Report;
extern const char *Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Box_StartBox (NULL,Gbl.Title,NULL,
Hlp_STATS_Report,
@ -286,7 +286,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
fprintf (Gbl.F.Out,"<div class=\"DAT_LIGHT\">%s</div>",
Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -445,7 +445,7 @@ static void Rep_WriteHeader (const struct Rep_Report *Report)
extern const char *Txt_Date;
extern const char *Txt_Permalink;
/***** Start of header *****/
/***** Start header *****/
fprintf (Gbl.F.Rep,"<header>");
/***** Main title *****/
@ -475,7 +475,7 @@ static void Rep_WriteHeader (const struct Rep_Report *Report)
Txt_Permalink,
Report->Permalink,Report->Permalink);
/***** End of header *****/
/***** End header *****/
fprintf (Gbl.F.Rep,"</ul>"
"</header>\n");
}
@ -491,7 +491,7 @@ static void Rep_WriteSectionPlatform (void)
extern const char *Txt_TAGLINE;
extern const char *Txt_URL;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s</h3>"
"<ul>",
@ -511,7 +511,7 @@ static void Rep_WriteSectionPlatform (void)
"</li>",
Txt_URL,Cfg_URL_SWAD_SERVER,Cfg_URL_SWAD_SERVER);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</ul>"
"</section>\n");
}
@ -530,7 +530,7 @@ static void Rep_WriteSectionUsrInfo (void)
char CtyName[Hie_MAX_BYTES_FULL_NAME + 1];
struct Instit Ins;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s</h3>"
"<ul>",
@ -559,7 +559,7 @@ static void Rep_WriteSectionUsrInfo (void)
Txt_Institution,
Ins.FullName);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</ul>"
"</section>\n");
}
@ -592,7 +592,7 @@ static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report)
unsigned NumFiles;
unsigned NumPublicFiles;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s</h3>"
"<ul>",
@ -725,7 +725,7 @@ static void Rep_WriteSectionUsrFigures (const struct Rep_Report *Report)
fprintf (Gbl.F.Rep,"?");
fprintf (Gbl.F.Rep,"</li>");
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</ul>"
"</section>\n");
}
@ -738,7 +738,7 @@ static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report)
{
extern const char *Txt_Hits_per_year;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s</h3>",
Txt_Hits_per_year);
@ -749,7 +749,7 @@ static void Rep_WriteSectionGlobalHits (struct Rep_Report *Report)
Rol_UNK, // Any role
Report);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</section>\n");
}
@ -776,7 +776,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
unsigned long NumClicks;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s</h3>",
Txt_Hits_per_action);
@ -839,7 +839,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</section>\n");
}
@ -852,7 +852,7 @@ static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report)
extern const char *Txt_Courses;
Rol_Role_t Role;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s",
Txt_Courses);
@ -868,7 +868,7 @@ static void Rep_WriteSectionCurrentCourses (struct Rep_Report *Report)
/* List my courses with this role */
Rep_GetAndWriteMyCurrentCrss (Role,Report);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</ul>"
"</section>\n");
}
@ -884,7 +884,7 @@ static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report)
extern const char *Txt_Only_courses_with_more_than_X_clicks_are_shown;
Rol_Role_t Role;
/***** Start of section *****/
/***** Start section *****/
fprintf (Gbl.F.Rep,"<section>"
"<h3>%s (%s)</h3>",
Txt_Courses,Txt_historical_log);
@ -902,7 +902,7 @@ static void Rep_WriteSectionHistoricCourses (struct Rep_Report *Report)
/* List my courses with this role */
Rep_GetAndWriteMyHistoricCrss (Role,Report);
/***** End of section *****/
/***** End section *****/
fprintf (Gbl.F.Rep,"</ul>"
"</section>\n");
}
@ -1066,7 +1066,7 @@ static void Rep_GetAndWriteMyHistoricClicsWithoutCrs (struct Rep_Report *Report)
Report,
false); // Do not write number of users in course
/***** End of list *****/
/***** End list *****/
fprintf (Gbl.F.Rep,"</ol>"
"</li>");
}
@ -1123,7 +1123,7 @@ static void Rep_GetAndWriteMyHistoricCrss (Rol_Role_t Role,
false); // Do not write number of users in course
}
/* End of list */
/* End list */
fprintf (Gbl.F.Rep,"</ol>"
"</li>");
}

2
swad_search.c
View File

@ -284,7 +284,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Magnifying glass icon *****/
Sch_PutMagnifyingGlassButton ("search64x64.png");
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/

8
swad_social.c
View File

@ -921,7 +921,7 @@ static void Soc_ShowTimeline (const char *Query,const char *Title,
/***** Get publishings from database *****/
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline,
Hlp_SOCIAL_Timeline,
false); // Not closable
@ -986,7 +986,7 @@ static void Soc_ShowTimeline (const char *Query,const char *Title,
fprintf (Gbl.F.Out,"<ul id=\"old_timeline_list\"></ul>");
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1273,7 +1273,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
unsigned NumComments;
char IdNewComment[Act_MAX_BYTES_ID];
/***** Start frame ****/
/***** Start box ****/
if (ShowNoteAlone)
{
Box_StartBox (Soc_WIDTH_TIMELINE,NULL,NULL,
@ -1522,7 +1522,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
/***** End list item *****/
fprintf (Gbl.F.Out,"</li>");
/***** End frame ****/
/***** End box ****/
if (ShowNoteAlone)
{
fprintf (Gbl.F.Out,"</ul>");

126
swad_statistic.c
View File

@ -473,7 +473,7 @@ void Sta_AskShowCrsHits (void)
Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs +
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Start frame *****/
/***** Start box *****/
sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X,
Gbl.CurrentCrs.Crs.ShrtName);
Box_StartBox (NULL,Gbl.Title,NULL,
@ -614,7 +614,7 @@ void Sta_AskShowCrsHits (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory used by the lists *****/
@ -673,7 +673,7 @@ void Sta_AskShowGblHits (void)
/***** Start form *****/
Act_FormStartAnchor (ActSeeAccGbl,Sta_STAT_RESULTS_SECTION_ID);
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Statistics_of_all_visits,NULL,
Hlp_STATS_Visits_global_visits,
false, // Not closable
@ -756,13 +756,15 @@ void Sta_AskShowGblHits (void)
fprintf (Gbl.F.Out,"</select>"
"</label>"
"</td>"
"</tr>"
"</table>");
"</tr>");
/***** End table *****/
Tbl_EndTable ();
/***** Hidden param used to get client time zone *****/
Dat_PutHiddenParBrowserTZDiff ();
/***** End frame with button *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_hits);
/***** End form *****/
@ -1545,7 +1547,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
}
fprintf (Gbl.F.Out,"</table>");
/* End of frame */
/* End box and section */
Box_EndBox ();
Lay_EndSection ();
}
@ -3065,7 +3067,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
"</td>",
Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,(Minute + 30) / 60);
/***** Start of cell for the graphic *****/
/***** Start cell for the graphic *****/
fprintf (Gbl.F.Out,"<td colspan=\"%u\" class=\"LEFT_BOTTOM\""
" style=\"width:%upx; height:1px;"
" background-image:url('%s/malla%c48x1.gif');"
@ -3087,7 +3089,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
'b',
BarWidth);
/***** End of cell of graphic and end of row *****/
/***** End cell of graphic and end row *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
@ -3915,7 +3917,7 @@ void Sta_ReqShowFigures (void)
/***** Form to show statistic *****/
Act_FormStart (ActSeeUseGbl);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Figures,NULL,
Hlp_STATS_Figures,
false); // Not closable
@ -3954,10 +3956,10 @@ void Sta_ReqShowFigures (void)
fprintf (Gbl.F.Out,"</select>"
"</label>");
/***** Send button and end frame *****/
/***** Send button and end box *****/
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_statistic);
/***** End of form *****/
/***** End form *****/
Act_FormEnd ();
}
@ -4080,12 +4082,13 @@ static void Sta_GetAndShowUsersStats (void)
extern const char *Txt_Average_number_of_courses_to_which_a_user_belongs;
extern const char *Txt_Average_number_of_users_belonging_to_a_course;
/***** Number of users *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],NULL,
Hlp_STATS_Figures_users,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"RIGHT_MIDDLE\">"
"%s"
@ -4104,6 +4107,7 @@ static void Sta_GetAndShowUsersStats (void)
Txt_No_of_users,
Txt_Average_number_of_courses_to_which_a_user_belongs,
Txt_Average_number_of_users_belonging_to_a_course);
Sta_GetAndShowNumUsrsInCrss (Rol_STD); // Students
Sta_GetAndShowNumUsrsInCrss (Rol_NET); // Non-editing teachers
Sta_GetAndShowNumUsrsInCrss (Rol_TCH); // Teachers
@ -4113,6 +4117,7 @@ static void Sta_GetAndShowUsersStats (void)
"</tr>");
Sta_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -4212,13 +4217,13 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Messages;
extern const char *Txt_Followers;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],NULL,
Hlp_STATS_Figures_ranking,
false, // Not closable
2);
/***** Header *****/
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"CENTER_MIDDLE\">"
"%s"
@ -4268,7 +4273,7 @@ static void Sta_GetAndShowUsersRanking (void)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -4282,16 +4287,20 @@ static void Sta_GetAndShowHierarchyStats (void)
extern const char *Hlp_STATS_Figures_hierarchy;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],NULL,
Hlp_STATS_Figures_hierarchy,
false, // Not closable
2);
Sta_WriteHeadDegsCrssInSWAD ();
Sta_GetAndShowNumCtysInSWAD ();
Sta_GetAndShowNumInssInSWAD ();
Sta_GetAndShowNumCtrsInSWAD ();
Sta_GetAndShowNumDegsInSWAD ();
Sta_GetAndShowNumCrssInSWAD ();
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -4971,7 +4980,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
extern const char *Hlp_STATS_Figures_institutions;
extern const char *Txt_Institutions;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Institutions,NULL,
Hlp_STATS_Figures_institutions,
false); // Not closable
@ -4995,7 +5004,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
/***** Institutions ordered by number of users who claim to belong to them *****/
Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -5009,7 +5018,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
extern const char *Txt_Centres;
char Query[1024];
/****** Institutions ordered by number of centres ******/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_centres,NULL,
NULL,
false, // Not closable
@ -5050,6 +5059,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
}
Sta_GetAndShowInss (Query,Txt_Centres);
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -5063,7 +5073,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
extern const char *Txt_Degrees;
char Query[1024];
/****** Institutions ordered by number of centres ******/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_degrees,NULL,
NULL,
false, // Not closable
@ -5107,6 +5117,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
}
Sta_GetAndShowInss (Query,Txt_Degrees);
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -5120,7 +5131,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
extern const char *Txt_Courses;
char Query[1024];
/****** Institutions ordered by number of centres ******/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_courses,NULL,
NULL,
false, // Not closable
@ -5167,6 +5178,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
}
Sta_GetAndShowInss (Query,Txt_Courses);
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -5180,7 +5192,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
extern const char *Txt_Users;
char Query[1024];
/****** Institutions ordered by number of centres ******/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_in_courses,NULL,
NULL,
false, // Not closable
@ -5230,6 +5242,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
}
Sta_GetAndShowInss (Query,Txt_Users);
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -5244,7 +5257,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
extern const char *Txt_Users;
char Query[1024];
/****** Institutions ordered by number of centres ******/
/***** Start box and table *****/
Box_StartBoxTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them,
NULL,
NULL,
@ -5287,6 +5300,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
}
Sta_GetAndShowInss (Query,Txt_Users);
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -5334,7 +5348,7 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
fprintf (Gbl.F.Out,"<br />%u</td>",
NumberThisRow);
/***** End of user's cell *****/
/***** End user's cell *****/
fprintf (Gbl.F.Out,"</td>");
if ((++NumIns % Gbl.Usrs.ClassPhoto.Cols) == 0)
@ -5476,7 +5490,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
};
unsigned NumStat;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES],NULL,
Hlp_STATS_Figures_folders_and_files,
false, // Not closable
@ -5497,7 +5511,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
/***** Write size of briefcases *****/
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Briefcases);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -6554,7 +6568,7 @@ static void Sta_GetAndShowOERsStats (void)
Brw_License_t License;
unsigned long NumFiles[2];
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],NULL,
Hlp_STATS_Figures_open_educational_resources_oer,
false, // Not closable
@ -6598,7 +6612,7 @@ static void Sta_GetAndShowOERsStats (void)
NumFiles[1]);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -6746,7 +6760,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
if ((NumCoursesWithAssignments = Asg_GetNumCoursesWithAssignments (Gbl.Scope.Current)) != 0)
NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],NULL,
Hlp_STATS_Figures_assignments,
false, // Not closable
@ -6792,7 +6806,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumAssignmentsPerCourse,
NumNotif);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -6818,7 +6832,7 @@ static void Sta_GetAndShowTestsStats (void)
Tst_AnswerType_t AnsType;
struct Tst_Stats Stats;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],NULL,
Hlp_STATS_Figures_tests,
false, // Not closable
@ -6963,7 +6977,7 @@ static void Sta_GetAndShowTestsStats (void)
Stats.AvgHitsPerQuestion,
Stats.AvgScorePerQuestion);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -6990,7 +7004,7 @@ static void Sta_GetAndShowSocialActivityStats (void)
unsigned NumUsrs;
unsigned NumUsrsTotal;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY],NULL,
Hlp_STATS_Figures_timeline,
false, // Not closable
@ -7249,7 +7263,7 @@ static void Sta_GetAndShowSocialActivityStats (void)
NumUsrs ? (float) NumSocialNotes / (float) NumUsrs :
0.0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -7280,7 +7294,7 @@ static void Sta_GetAndShowFollowStats (void)
unsigned NumUsrs;
float Average;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],NULL,
Hlp_STATS_Figures_followed_followers,
false, // Not closable
@ -7514,7 +7528,7 @@ static void Sta_GetAndShowFollowStats (void)
Average);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8211,7 +8225,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
NumEventsTotal,
NumMailsTotal);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8409,7 +8423,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedNotDeleted + NumMsgsReceivedAndDeleted,
NumMsgsReceivedAndNotified);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8441,7 +8455,7 @@ static void Sta_GetAndShowSurveysStats (void)
NumQstsPerSurvey = Svy_GetNumQstsPerCrsSurvey (Gbl.Scope.Current);
}
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],NULL,
Hlp_STATS_Figures_surveys,
false, // Not closable
@ -8495,7 +8509,7 @@ static void Sta_GetAndShowSurveysStats (void)
NumQstsPerSurvey,
NumNotif);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8510,7 +8524,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
extern const char *Txt_Public_profile;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],NULL,
Hlp_STATS_Figures_privacy,
false, // Not closable
@ -8522,7 +8536,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
/***** Privacy for public profile *****/
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility");
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8680,7 +8694,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
unsigned NumUsrs[1 + Txt_NUM_LANGUAGES];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],NULL,
Hlp_STATS_Figures_language,
false, // Not closable
@ -8800,7 +8814,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8823,7 +8837,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
unsigned NumUsrs[7]; // 7: seven days in a week
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK],NULL,
Hlp_STATS_Figures_calendar,
false, // Not closable
@ -8945,7 +8959,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -8965,7 +8979,7 @@ static void Sta_GetAndShowNumUsrsPerDateFormat (void)
unsigned NumUsrs[Dat_NUM_OPTIONS_FORMAT];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_DATE_FORMAT],NULL,
Hlp_STATS_Figures_dates,
false, // Not closable
@ -9083,7 +9097,7 @@ static void Sta_GetAndShowNumUsrsPerDateFormat (void)
0);
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -9105,7 +9119,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
unsigned NumUsrs[Ico_NUM_ICON_SETS];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],NULL,
Hlp_STATS_Figures_icons,
false, // Not closable
@ -9228,7 +9242,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -9250,7 +9264,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
unsigned NumUsrs[Mnu_NUM_MENUS];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],NULL,
Hlp_STATS_Figures_menu,
false, // Not closable
@ -9370,7 +9384,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -9392,7 +9406,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
unsigned NumUsrs[The_NUM_THEMES];
unsigned NumUsrsTotal = 0;
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],NULL,
Hlp_STATS_Figures_theme,
false, // Not closable
@ -9512,7 +9526,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -9533,7 +9547,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
unsigned NumUsrsTotal = 0;
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],NULL,
Hlp_STATS_Figures_columns,
false, // Not closable
@ -9653,7 +9667,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
(float) NumUsrsTotal :
0);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}

24
swad_survey.c
View File

@ -213,7 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
0,
&Pagination);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_Surveys,Svy_PutIconsListSurveys,
Hlp_ASSESSMENT_Surveys,
false); // Not closable
@ -276,7 +276,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
if (Svy_CheckIfICanCreateSvy ())
Svy_PutButtonToCreateNewSvy ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Write again links to pages *****/
@ -432,7 +432,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
struct Survey Svy;
char Txt[Cns_MAX_BYTES_TEXT + 1];
/***** Start frame *****/
/***** Start box *****/
if (ShowOnlyThisSvyComplete)
Box_StartBox (NULL,Txt_Survey,NULL,
Hlp_ASSESSMENT_Surveys,
@ -674,7 +674,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
}
@ -1817,7 +1817,7 @@ void Svy_RequestCreatOrEditSvy (void)
ActChgSvy);
Svy_PutParams ();
/***** Start frame *****/
/***** Start box and table *****/
if (ItsANewSurvey)
Box_StartBoxTable (NULL,Txt_New_survey,NULL,
Hlp_ASSESSMENT_Surveys_new_survey,
@ -1895,7 +1895,7 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Groups *****/
Svy_ShowLstGrpsToEditSurvey (Svy.SvyCod);
/***** Button to create/modify survey and end frame *****/
/***** End table, send button and end box *****/
if (ItsANewSurvey)
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_survey);
else
@ -2015,7 +2015,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.Num)
{
/***** Start table *****/
/***** Start box and table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
@ -2050,7 +2050,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2653,7 +2653,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
}
}
/***** Start frame *****/
/***** Start box *****/
if (SvyQst->QstCod > 0) // If the question already has assigned a code
{
/* Parameters for contextual icon */
@ -2766,7 +2766,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for answers *****/
@ -3182,7 +3182,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Svy->SvyCod);
NumQsts = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get data of a question");
/***** Start frame *****/
/***** Start box *****/
Gbl.Svys.SvyCodToEdit = Svy->SvyCod;
Box_StartBox (NULL,Txt_Questions,Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion :
NULL,
@ -3306,7 +3306,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}

8
swad_syllabus.c
View File

@ -40,6 +40,7 @@
#include "swad_global.h"
#include "swad_parameter.h"
#include "swad_string.h"
#include "swad_table.h"
#include "swad_xml.h"
/*****************************************************************************/
@ -236,12 +237,13 @@ bool Syl_CheckAndEditSyllabus (void)
Gbl.Action.Act == ActEditorSylPra)
Gbl.Syllabus.EditionIsActive = true;
/***** Start frame *****/
if (Gbl.Syllabus.EditionIsActive || LstItemsSyllabus.NumItems)
{
ICanEdit = Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM;
PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive;
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
PutIconToEdit ? Inf_PutIconToEditInfo :
NULL,
@ -258,7 +260,7 @@ bool Syl_CheckAndEditSyllabus (void)
Syl_ShowRowSyllabus (0,1,LstItemsSyllabus.Lst[0].CodItem,"",true);
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
Tbl_EndTable ();
if (Gbl.Syllabus.EditionIsActive)
{
@ -268,7 +270,7 @@ bool Syl_CheckAndEditSyllabus (void)
Act_FormEnd ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
return true;

4
swad_tab.c
View File

@ -263,7 +263,7 @@ static void Tab_WriteBreadcrumbTab (void)
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) Gbl.Action.Tab);
Act_LinkFormSubmit (Txt_TABS_TXT[Gbl.Action.Tab],The_ClassTxtTabOn[Gbl.Prefs.Theme],NULL);
/***** Title and end of form *****/
/***** Title and end form *****/
fprintf (Gbl.F.Out,"%s</a>",Txt_TABS_TXT[Gbl.Action.Tab]);
Act_FormEnd ();
}
@ -282,7 +282,7 @@ static void Tab_WriteBreadcrumbAction (void)
Act_FormStart (Act_Actions[Gbl.Action.Act].SuperAction);
Act_LinkFormSubmit (Title,The_ClassTxtTabOn[Gbl.Prefs.Theme],NULL);
/***** Title and end of form *****/
/***** Title and end form *****/
fprintf (Gbl.F.Out,"%s</a>",
Title);
Act_FormEnd ();

58
swad_test.c
View File

@ -316,7 +316,7 @@ void Tst_ShowFormAskTst (void)
break;
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Take_a_test,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -375,7 +375,7 @@ void Tst_ShowFormAskTst (void)
Tst_PutButtonToAddQuestion ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free structure that stores the query result *****/
@ -435,7 +435,7 @@ void Tst_ShowNewTest (void)
if (Gbl.Usrs.Me.IBelongToCurrentCrs)
Tst_UpdateMyNumAccessTst (NumAccessesTst);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Test,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -474,7 +474,7 @@ void Tst_ShowNewTest (void)
Btn_PutConfirmButton (Txt_Done_assess_test);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Set test status *****/
@ -535,7 +535,7 @@ void Tst_AssessTest (void)
/***** Create new test in database to store the result *****/
TstCod = Tst_CreateTestResultInDB ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -561,7 +561,7 @@ void Tst_AssessTest (void)
if (Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING)
Tst_ShowTstTotalMark (TotalScore);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Store test result in database *****/
@ -1280,7 +1280,7 @@ void Tst_ShowFormAskEditTsts (void)
TsI_PutFormToImportQuestions (); // Put link (form) to import questions from XML file
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_List_edit_questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -1317,7 +1317,7 @@ void Tst_ShowFormAskEditTsts (void)
Tst_PutButtonToAddQuestion ();
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/* Free structure that stores the query result */
@ -1737,7 +1737,7 @@ static void Tst_ShowFormEditTags (void)
/***** Get current tags in current course *****/
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
{
/***** Start table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Tags,NULL,
Hlp_ASSESSMENT_Tests,
false, // Not closable
@ -1773,7 +1773,7 @@ static void Tst_ShowFormEditTags (void)
"</tr>");
}
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else
@ -1852,7 +1852,7 @@ static void Tst_ShowFormConfigTst (void)
/***** Read test configuration from database *****/
Tst_GetConfigTstFromDB ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Configure_tests,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -1954,7 +1954,7 @@ static void Tst_ShowFormConfigTst (void)
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -2733,7 +2733,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
unsigned long NumHitsNotBlankThisQst;
double TotalScoreThisQst;
/***** Table start *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -2989,7 +2989,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
/***** Button to add a new question *****/
Tst_PutButtonToAddQuestion ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -3727,7 +3727,7 @@ static void Tst_WriteChoiceAnsAssessTest (unsigned NumQst,MYSQL_RES *mysql_res,
Tst_WriteScoreEnd ();
}
/***** End of table *****/
/***** End table *****/
Tbl_EndTable ();
}
@ -4522,7 +4522,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
bool AnswerHasContent;
bool DisplayRightColumn;
/***** Start frame *****/
/***** Start box *****/
if (Gbl.Test.QstCod > 0) // The question already has assigned a code
{
sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod);
@ -4881,7 +4881,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/***** End form *****/
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -6991,7 +6991,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
Gbl.Usrs.LstUsrs[Rol_NET].NumUsrs +
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable
@ -7049,7 +7049,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for users' list *****/
@ -7077,14 +7077,14 @@ void Tst_SelDatesToSeeMyTestResults (void)
/***** Start form *****/
Act_FormStart (ActSeeMyTstRes);
/***** Starting and ending dates in the search *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
/***** Send button and end frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_View_test_results);
/***** End form *****/
@ -7152,11 +7152,13 @@ void Tst_ShowUsrsTestResults (void)
/***** Check the number of users whose tests results will be shown *****/
if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected...
{
/***** Header of the table with the list of users *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
/***** Header of the table with the list of users *****/
Tst_ShowHeaderTestResults ();
/***** List the assignments and works of the selected users *****/
@ -7172,7 +7174,7 @@ void Tst_ShowUsrsTestResults (void)
Tst_ShowTestResults (&Gbl.Usrs.Other.UsrDat);
}
/***** End of the table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
else // If no users are selected...
@ -7247,18 +7249,20 @@ void Tst_ShowMyTestResults (void)
/***** Get starting and ending dates *****/
Dat_GetIniEndDatesFromForm ();
/***** Header of the table with the list of users *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
/***** Header of the table with the list of users *****/
Tst_ShowHeaderTestResults ();
/***** List my test results *****/
Tst_GetConfigTstFromDB (); // To get feedback type
Tst_ShowTestResults (&Gbl.Usrs.Me.UsrDat);
/***** End of the table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -7715,7 +7719,7 @@ void Tst_ShowOneTestResult (void)
/***** Get questions and user's answers of the test result from database *****/
Tst_GetTestResultQuestionsFromDB (TstCod);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable
@ -7824,7 +7828,7 @@ void Tst_ShowOneTestResult (void)
/***** End table *****/
Tbl_EndTable ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else // I am not allowed to view this test result

6
swad_test_import.c
View File

@ -136,7 +136,7 @@ void TsI_ShowFormImportQstsFromXML (void)
extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions;
extern const char *Txt_XML_file;
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Import_questions,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
@ -157,7 +157,7 @@ void TsI_ShowFormImportQstsFromXML (void)
Gbl.Form.Id);
Act_FormEnd ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -509,7 +509,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
/***** Allocate and get XML tree *****/
XML_GetTree (XMLBuffer,&RootElem);
/***** Table start *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Imported_questions,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable

14
swad_timetable.c
View File

@ -70,7 +70,7 @@ extern struct Globals Gbl;
#define TT_PERCENT_WIDTH_OF_A_MINICOLUMN 2 // Width (%) of each minicolumn
#define TT_PERCENT_WIDTH_OF_A_DAY (TT_PERCENT_WIDTH_OF_A_MINICOLUMN * TT_NUM_MINICOLUMNS_PER_DAY) // Width (%) of each day
#define TT_PERCENT_WIDTH_OF_ALL_DAYS (TT_PERCENT_WIDTH_OF_A_DAY * TT_DAYS_PER_WEEK) // Width (%) of all days
#define TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN 1 // Width (%) of left and right columns (frame)
#define TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN 1 // Width (%) of left and right columns
#define TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN ((100 - TT_PERCENT_WIDTH_OF_ALL_DAYS - TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN * 2) / 2) // Width (%) of the separation columns
#define TT_MAX_BYTES_STR_CLASS_TYPE 256
@ -350,7 +350,7 @@ void TT_ShowClassTimeTable (void)
/***** Get whether to show only my groups or all groups *****/
Grp_GetParamWhichGrps ();
/***** Start frame *****/
/***** Start box *****/
Box_StartBox ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
(Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT ||
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
@ -384,7 +384,7 @@ void TT_ShowClassTimeTable (void)
/***** Show the time table *****/
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -1151,7 +1151,7 @@ static void TT_DrawTimeTable (void)
unsigned ColumnsToDrawIncludingExtraColumn;
unsigned ContinuousFreeMinicolumns;
/***** Table start *****/
/***** Start table *****/
fprintf (Gbl.F.Out,"<table id=\"timetable\">");
/***** Top row used for column adjustement *****/
@ -1286,7 +1286,7 @@ static void TT_DrawTimeTable (void)
/***** Bottom row used for column adjustement *****/
TT_TimeTableDrawAdjustRow ();
/***** End of the table *****/
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
}
@ -1698,11 +1698,11 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
break;
}
/***** End of form *****/
/***** End form *****/
if (Gbl.TimeTable.View == TT_CRS_EDIT ||
Gbl.TimeTable.View == TT_TUT_EDIT)
Act_FormEnd ();
/***** End of cell *****/
/***** End cell *****/
fprintf (Gbl.F.Out,"</td>");
}

42
swad_user.c
View File

@ -2261,7 +2261,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
if (FuncParams)
FuncParams ();
/***** Start frame and table *****/
/***** Start box and table *****/
Box_StartBoxTable (NULL,Txt_Log_in,NULL,
Hlp_PROFILE_LogIn,
false, // Not closable
@ -2300,7 +2300,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
Pwd_MAX_CHARS_PLAIN_PASSWORD,
Txt_password);
/***** Send button and end table and frame *****/
/***** End table, send button and end box *****/
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Log_in);
/***** End form *****/
@ -3154,7 +3154,7 @@ void Usr_ShowFormsLogoutAndRole (void)
Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt);
}
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_Role,NULL,
Hlp_PROFILE_Session_role,
false); // Not closable
@ -3173,7 +3173,7 @@ void Usr_ShowFormsLogoutAndRole (void)
fprintf (Gbl.F.Out,"</label>");
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
@ -6241,7 +6241,7 @@ void Usr_ListAllDataGsts (void)
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End of table *****/
/***** End table *****/
Tbl_EndTable ();
}
else // Gbl.Usrs.LstUsrs[Rol_GST].NumUsrs == 0
@ -6441,7 +6441,7 @@ void Usr_ListAllDataStds (void)
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End of table *****/
/***** End table *****/
Tbl_EndTable ();
/***** Free memory used by the string with the list of group names where student belongs to *****/
@ -6577,7 +6577,7 @@ void Usr_ListAllDataTchs (void)
Usr_ListRowsAllDataTchs (Rol_TCH,FieldNames,NumColumns);
Usr_ListRowsAllDataTchs (Rol_NET,FieldNames,NumColumns);
/***** End of table *****/
/***** End table *****/
Tbl_EndTable ();
}
else // NumUsrs == 0
@ -6665,7 +6665,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
Usr_SearchListUsrs (Role);
if ((NumUsrs = Gbl.Usrs.LstUsrs[Role].NumUsrs))
{
/***** Write heading *****/
/***** Start box and table *****/
/* Number of users found */
Sex = Usr_GetSexOfUsrsLst (Role);
sprintf (Gbl.Title,"%u %s",
@ -6730,7 +6730,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End table *****/
/***** End table and box *****/
Box_EndBoxTable ();
}
@ -6824,7 +6824,7 @@ void Usr_ListDataAdms (void)
/***** Get list of administrators *****/
Usr_GetAdmsLst (Gbl.Scope.Current);
/***** Start frame with list of administrators *****/
/***** Start box with list of administrators *****/
Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL,
Hlp_USERS_Administrators,
false); // Not closable
@ -6884,14 +6884,14 @@ void Usr_ListDataAdms (void)
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
/***** End of table *****/
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
}
else // Gbl.Usrs.LstUsrs[Rol_DEG_ADM].NumUsrs == 0
/***** Show warning indicating no admins found *****/
Usr_ShowWarningNoUsersFound (Rol_DEG_ADM);
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for administrators list *****/
@ -7300,7 +7300,7 @@ void Usr_SeeGuests (void)
/***** Get list of guests in current scope *****/
Usr_GetGstsLst (Gbl.Scope.Current);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN],Usr_PutIconsListGsts,
Hlp_USERS_Guests,
false); // Not closable
@ -7378,7 +7378,7 @@ void Usr_SeeGuests (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for guests list *****/
@ -7447,7 +7447,7 @@ void Usr_SeeStudents (void)
/***** Get list of students *****/
Usr_GetListUsrs (Gbl.Scope.Current,Rol_STD);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],Usr_PutIconsListStds,
Hlp_USERS_Students,
false); // Not closable
@ -7549,7 +7549,7 @@ void Usr_SeeStudents (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for students list *****/
@ -7633,7 +7633,7 @@ void Usr_SeeTeachers (void)
1 << Rol_NET |
1 << Rol_TCH);
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],Usr_PutIconsListTchs,
Hlp_USERS_Teachers,
false); // Not closable
@ -7728,7 +7728,7 @@ void Usr_SeeTeachers (void)
/***** End section with user list *****/
Lay_EndSection ();
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
/***** Free memory for teachers lists *****/
@ -8151,7 +8151,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
fprintf (Gbl.F.Out,"</div>");
/***** End of user's cell *****/
/***** End user's cell *****/
fprintf (Gbl.F.Out,"</td>");
if ((++NumUsr % Gbl.Usrs.ClassPhoto.Cols) == 0)
@ -8806,7 +8806,7 @@ void Usr_PrintUsrQRCode (void)
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{
/***** Start frame *****/
/***** Start box *****/
Box_StartBox (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL,
NULL,
false); // Not closable
@ -8818,7 +8818,7 @@ void Usr_PrintUsrQRCode (void)
QR_ImageQRCode (NewNicknameWithArroba);
}
/***** End frame *****/
/***** End box *****/
Box_EndBox ();
}
else

4
swad_zip.c
View File

@ -602,7 +602,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
extern const char *Txt_FILE_uncompressed;
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
/***** Start frame *****/
/***** Start box and table *****/
Box_StartBoxTableShadow (NULL,NULL,NULL,NULL,2);
/***** Link to download the file *****/
@ -660,6 +660,6 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
/***** End table and box *****/
Box_EndBoxTable ();
}