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

Version 16.238

This commit is contained in:
Antonio Cañas Vargas 2017-06-10 20:56:50 +02:00
parent 024de153de
commit 3a6be2aa17
61 changed files with 907 additions and 399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_ID.c
View File

@ -548,7 +548,9 @@ void ID_ShowFormOthIDs (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ID,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_ID,NULL,
NULL,
false); // Not closable
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,

4
swad_MFU.c
View File

@ -223,7 +223,9 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
char TabMenuStr[MFU_MAX_BYTES_TAB + 6 + MFU_MAX_BYTES_MENU + 1];
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_My_frequent_actions,NULL,Hlp_STATS_Frequent);
Lay_StartRoundFrame (NULL,Txt_My_frequent_actions,NULL,
Hlp_STATS_Frequent,
false); // Not closable
fprintf (Gbl.F.Out,"<div id=\"MFU_actions_big\">");
/***** Write list of frequently used actions *****/

40
swad_account.c
View File

@ -109,7 +109,7 @@ void Acc_PutLinkToCreateAccount (void)
void Acc_ShowFormMyAccount (void)
{
extern const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID;
extern const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered;
if (Gbl.Usrs.Me.Logged)
Acc_ShowFormChangeMyAccount ();
@ -123,7 +123,7 @@ void Acc_ShowFormMyAccount (void)
fprintf (Gbl.F.Out,"</div>");
/**** Show form to check if I have an account *****/
Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID);
Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered);
/**** Show form to create a new account *****/
Acc_ShowFormRequestNewAccountWithParams ("","");
@ -138,11 +138,17 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
{
extern const char *Hlp_PROFILE_SignUp;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_If_you_think_you_may_have_been_registered_;
extern const char *Txt_ID;
extern const char *Txt_Check;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Title,NULL,Hlp_PROFILE_SignUp);
Lay_StartRoundFrame (NULL,Title,NULL,
Hlp_PROFILE_SignUp,
true); // Closable
/***** Help alert *****/
Ale_ShowAlert (Ale_INFO,Txt_If_you_think_you_may_have_been_registered_);
/***** Form to request user's ID for possible account already created *****/
Act_FormStart (ActChkUsrAcc);
@ -169,10 +175,10 @@ void Acc_CheckIfEmptyAccountExists (void)
{
extern const char *Txt_Do_you_think_you_are_this_user;
extern const char *Txt_Do_you_think_you_are_one_of_these_users;
extern const char *Txt_There_is_no_empty_account_associated_with_your_ID_X_;
extern const char *Txt_There_is_no_empty_account_associated_with_your_ID_X;
extern const char *Txt_Check_another_ID;
extern const char *Txt_Please_enter_your_ID;
extern const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID;
extern const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered;
char ID[ID_MAX_BYTES_USR_ID + 1];
unsigned NumUsrs;
unsigned NumUsr;
@ -211,7 +217,10 @@ void Acc_CheckIfEmptyAccountExists (void)
Lay_StartRoundFrameTable (NULL,
(NumUsrs == 1) ? Txt_Do_you_think_you_are_this_user :
Txt_Do_you_think_you_are_one_of_these_users,
NULL,NULL,5);
NULL,
NULL,
true, // Closable
5);
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@ -242,7 +251,7 @@ void Acc_CheckIfEmptyAccountExists (void)
}
else
{
sprintf (Gbl.Alert.Txt,Txt_There_is_no_empty_account_associated_with_your_ID_X_,
sprintf (Gbl.Alert.Txt,Txt_There_is_no_empty_account_associated_with_your_ID_X,
ID);
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
}
@ -258,7 +267,7 @@ void Acc_CheckIfEmptyAccountExists (void)
/**** Show again form to check if I have an account *****/
Ale_ShowAlert (Ale_WARNING,Txt_Please_enter_your_ID);
Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID);
Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered);
}
/**** Show form to create a new account *****/
@ -337,8 +346,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Form to enter some data of the new user *****/
Act_FormStart (ActCreUsrAcc);
Lay_StartRoundFrameTable (NULL,Txt_Create_account,
NULL,Hlp_PROFILE_SignUp,2);
Lay_StartRoundFrameTable (NULL,Txt_Create_account,NULL,
Hlp_PROFILE_SignUp,
false, // Not closable
2);
/***** Nickname *****/
if (NewNicknameWithoutArroba[0])
@ -400,7 +411,9 @@ void Acc_ShowFormGoToRequestNewAccount (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_PROFILE_SignUp);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,
Hlp_PROFILE_SignUp,
false); // Not closable
/***** Button to go to request the creation of a new account *****/
Act_FormStart (ActFrmMyAcc);
@ -459,7 +472,10 @@ void Acc_ShowFormChangeMyAccount (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_User_account,NULL,Hlp_PROFILE_Account,2);
Lay_StartRoundFrameTable (NULL,Txt_User_account,NULL,
Hlp_PROFILE_Account,
false, // Not closable
2);
/***** Nickname *****/
if (IMustFillNickname)

15
swad_agenda.c
View File

@ -147,7 +147,9 @@ void Agd_ShowMyAgenda (void)
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_My_agenda,
Agd_PutIconsMyFullAgenda,Hlp_PROFILE_Agenda);
Agd_PutIconsMyFullAgenda,
Hlp_PROFILE_Agenda,
false); // Not closable
/***** Put forms to choice which events to show *****/
Agd_ShowFormToSelPast__FutureEvents ();
@ -367,7 +369,8 @@ void Agd_ShowUsrAgenda (void)
Lay_StartRoundFrame ("100%",Gbl.Title,
ItsMe ? Agd_PutIconsMyPublicAgenda :
Agd_PutIconsOtherPublicAgenda,
Hlp_PROFILE_Agenda_public_agenda);
Hlp_PROFILE_Agenda_public_agenda,
false); // Not closable
/***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_ANOTHER_AGENDA_TODAY);
@ -410,7 +413,8 @@ void Agd_ShowOtherAgendaAfterLogIn (void)
Lay_StartRoundFrame ("100%",Gbl.Title,
ItsMe ? Agd_PutIconToViewEditMyFullAgenda :
Agd_PutIconsOtherPublicAgenda,
Hlp_PROFILE_Agenda_public_agenda);
Hlp_PROFILE_Agenda_public_agenda,
false); // Not closable
/***** Show the current events in the user's agenda *****/
Agd_ShowEventsToday (Agd_ANOTHER_AGENDA_TODAY);
@ -1539,6 +1543,7 @@ void Agd_RequestCreatOrEditEvent (void)
NULL,
ItsANewEvent ? Hlp_PROFILE_Agenda_new_event :
Hlp_PROFILE_Agenda_edit_event,
false, // Not closable
2);
/***** Event *****/
@ -1940,7 +1945,9 @@ void Agd_PrintAgdQRCode (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Where_s_USER,Gbl.Usrs.Me.UsrDat.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,
NULL,
false); // Not closable
/***** Print QR code ****/
QR_PrintQRCode ();

9
swad_announcement.c
View File

@ -122,7 +122,8 @@ void Ann_ShowAllAnnouncements (void)
Lay_StartRoundFrame ("550px",Txt_Announcements,
ICanEdit ? Ann_PutIconToAddNewAnnouncement :
NULL,
Hlp_MESSAGES_Announcements);
Hlp_MESSAGES_Announcements,
false); // Not closable
if (!NumAnnouncements)
Ale_ShowAlert (Ale_INFO,Txt_No_announcements);
@ -410,8 +411,10 @@ void Ann_ShowFormAnnouncement (void)
Act_FormStart (ActRcvAnn);
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_announcement,
NULL,Hlp_MESSAGES_Announcements,2);
Lay_StartRoundFrameTable (NULL,Txt_New_announcement,NULL,
Hlp_MESSAGES_Announcements,
false, // Not closable
2);
/***** Announcement subject and body *****/
Ann_PutSubjectMessage ("Subject",Txt_MSG_Subject, 2);

11
swad_assignment.c
View File

@ -135,8 +135,9 @@ static void Asg_ShowAllAssignments (void)
&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Assignments,
Asg_PutIconsListAssignments,Hlp_ASSESSMENT_Assignments);
Lay_StartRoundFrame ("100%",Txt_Assignments,Asg_PutIconsListAssignments,
Hlp_ASSESSMENT_Assignments,
false); // Not closable
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -1176,6 +1177,7 @@ void Asg_RequestCreatOrEditAsg (void)
NULL,
ItsANewAssignment ? Hlp_ASSESSMENT_Assignments_new_assignment :
Hlp_ASSESSMENT_Assignments_edit_assignment,
false, // Not closable
2);
/***** Assignment title *****/
@ -1266,7 +1268,10 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Groups);
Lay_StartRoundFrameTable ("100%",NULL,NULL,Hlp_USERS_Groups,0);
Lay_StartRoundFrameTable ("100%",NULL,NULL,
Hlp_USERS_Groups,
false, // Not closable
0);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"

32
swad_attendance.c
View File

@ -225,7 +225,8 @@ static void Att_ShowAllAttEvents (void)
Lay_StartRoundFrame ("100%",Txt_Events,
ICanEdit ? Att_PutIconToCreateNewAttEvent :
NULL,
Hlp_USERS_Attendance);
Hlp_USERS_Attendance,
false); // Not closable
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -1092,6 +1093,7 @@ void Att_RequestCreatOrEditAttEvent (void)
NULL,
ItsANewAttEvent ? Hlp_USERS_Attendance_new_event :
Hlp_USERS_Attendance_edit_event,
false, // Not closable
2);
/***** Attendance event title *****/
@ -1191,7 +1193,10 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Groups);
Lay_StartRoundFrameTable ("100%",NULL,NULL,NULL,0);
Lay_StartRoundFrameTable ("100%",NULL,NULL,
NULL,
false, // Not closable
0);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -1821,7 +1826,10 @@ void Att_SeeOneAttEvent (void)
Gbl.AttEvents.CurrentPage = Pag_GetParamPagNum (Pag_ATT_EVENTS);
/***** Show attendance *****/
Lay_StartRoundFrameTable (NULL,Txt_Event,NULL,Hlp_USERS_Attendance,2);
Lay_StartRoundFrameTable (NULL,Txt_Event,NULL,
Hlp_USERS_Attendance,
false, // Not closable
2);
Att.AttCod = Gbl.AttEvents.AttCod;
Att_ShowOneAttEvent (&Att,true);
Lay_EndRoundFrameTable ();
@ -1867,7 +1875,10 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
/***** List students' data *****/
/* Header */
Lay_StartRoundFrameTable (NULL,NULL,NULL,Hlp_USERS_Attendance,2);
Lay_StartRoundFrameTable (NULL,NULL,NULL,
Hlp_USERS_Attendance,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th></th>"
"<th></th>"
@ -1925,7 +1936,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,Hlp_USERS_Attendance);
Lay_StartRoundFrame (NULL,Txt_Attendance,NULL,
Hlp_USERS_Attendance,
false); // Not closable
/***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActSeeOneAtt);
@ -2662,7 +2675,9 @@ void Usr_ReqListStdsAttendanceCrs (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
NULL,Hlp_USERS_Attendance_attendance_list);
NULL,
Hlp_USERS_Attendance_attendance_list,
false); // Not closable
/***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqLstStdAtt);
@ -3094,6 +3109,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
Lay_StartRoundFrameTable (NULL,Txt_Events,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list,
false, // Not closable
2);
/***** Heading row *****/
@ -3207,7 +3223,8 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList :
NULL),
TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list);
Hlp_USERS_Attendance_attendance_list,
false); // Not closable
if (PutButtonShowDetails)
Lay_StartTableWideMargin (2);
else
@ -3427,6 +3444,7 @@ static void Att_ListStdsWithAttEventsDetails (Att_TypeOfView_t TypeOfView,
Lay_StartRoundFrameTable (NULL,Txt_Details,NULL,
TypeOfView == Att_PRINT_VIEW ? NULL :
Hlp_USERS_Attendance_attendance_list,
false, // Not closable
2);
/***** List students with attendance details *****/

14
swad_banner.c
View File

@ -115,8 +115,9 @@ void Ban_SeeBanners (void)
" ORDER BY ShortName");
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Banners,
Ban_PutFormToEditBanners,Hlp_SYSTEM_Banners);
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners,
Hlp_SYSTEM_Banners,
false); // Not closable
/***** Write all frames *****/
if (Gbl.Banners.Num) // There are banners
@ -206,7 +207,8 @@ void Ban_EditBanners (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutIconToViewBanners,
Hlp_SYSTEM_Banners_edit);
Hlp_SYSTEM_Banners_edit,
false); // Not closable
/***** Put a form to create a new banner *****/
Ban_PutFormToCreateBanner ();
@ -829,8 +831,10 @@ static void Ban_PutFormToCreateBanner (void)
Act_FormStart (ActNewBan);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_banner,
NULL,Hlp_SYSTEM_Banners_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_New_banner,NULL,
Hlp_SYSTEM_Banners_edit,
false, // Not closable
2);
/***** Write heading *****/
Ban_PutHeadBanners ();

12
swad_calendar.c
View File

@ -83,9 +83,9 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
extern const char *Hlp_PROFILE_Preferences_calendar;
extern const char *Txt_Calendar;
Lay_StartRoundFrame (NULL,Txt_Calendar,
Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar);
Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,
Hlp_PROFILE_Preferences_calendar,
false); // Not closable
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,NULL,"ICO25x25B");
Lay_EndRoundFrame ();
}
@ -314,10 +314,10 @@ static void Cal_DrawCalendar (Act_Action_t ActionSeeCalendar,
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,
FunctionToDrawContextualIcons,
Lay_StartRoundFrame (NULL,NULL,FunctionToDrawContextualIcons,
PrintView ? NULL :
Hlp_Calendar);
Hlp_Calendar,
false); // Not closable
Lay_WriteHeaderClassPhoto (PrintView,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,

31
swad_centre.c
View File

@ -165,8 +165,10 @@ void Ctr_SeeCtrWithPendingDegs (void)
if ((NumCtrs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get centres with pending degrees")))
{
/***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees,
NULL,Hlp_SYSTEM_Hierarchy_pending,2);
Lay_StartRoundFrameTable (NULL,Txt_Centres_with_pending_degrees,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -311,7 +313,8 @@ static void Ctr_Configuration (bool PrintView)
PrintView ? NULL :
Ctr_PutIconsToPrintAndUpload,
PrintView ? NULL :
Hlp_CENTRE_Information);
Hlp_CENTRE_Information,
false); // Not closable
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
@ -743,8 +746,9 @@ static void Ctr_ListCentres (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,
Ctr_PutIconsListCentres,Hlp_INSTITUTION_Centres);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsListCentres,
Hlp_INSTITUTION_Centres,
false); // Not closable
if (Gbl.Ctrs.Num) // There are centres in the current institution
{
@ -936,7 +940,8 @@ void Ctr_EditCentres (void)
sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
Gbl.CurrentIns.Ins.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsEditingCentres,
Hlp_INSTITUTION_Centres);
Hlp_INSTITUTION_Centres,
false); // Not closable
/***** Put a form to create a new centre *****/
Ctr_PutFormToCreateCentre ();
@ -2216,7 +2221,9 @@ void Ctr_RequestPhoto (void)
Act_FormStart (ActRecCtrPho);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Photo,NULL,
NULL,
false); // Not closable
/***** Write help message *****/
sprintf (Gbl.Alert.Txt,"%s: %s<br />"
@ -2410,7 +2417,10 @@ static void Ctr_PutFormToCreateCentre (void)
Lay_ShowErrorAndExit ("You can not edit centres.");
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_centre,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_centre,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Ctr_PutHeadCentresForEdition ();
@ -2885,7 +2895,10 @@ unsigned Ctr_ListCtrsFound (const char *Query)
sprintf (Gbl.Title,"%u %s",
NumCtrs,(NumCtrs == 1) ? Txt_centre :
Txt_centres);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
Ctr_PutHeadCentresForSeeing (false); // Order not selectable
/***** List the centres (one row per centre) *****/

4
swad_changelog.h
View File

@ -231,6 +231,7 @@
// TODO: Fix bug: Error when a link end in a dot. Example: "A guide to building..." --> "A guide to building._..url" (two dots)
// TODO: List of places in drop-down menu should be ordered by name
// TODO: In centre configuration, place should be editable
// TODO: Cuando sólo se cambian los grupos y no el rol de un profesor ya existente, no sale ningún mensaje. se haga lo que se haga en la edición debería salir un mensaje del tipo "Cambios realizados"
@ -242,13 +243,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.237 (2017-06-09)"
#define Log_PLATFORM_VERSION "SWAD 16.238 (2017-06-10)"
#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.238: Jun 10, 2017 Icon to close frames. (221803 lines)
Version 16.237: Jun 09, 2017 Code refactoring related to users belonging to a course.
Changes in permissions to access students by non-editing teachers. (221303 lines)
Version 16.236: Jun 08, 2017 Changes in permissions related to record card contextual commands.

9
swad_chat.c
View File

@ -123,7 +123,9 @@ void Cht_ShowListOfAvailableChatRooms (void)
Usr_GetMyDegrees ();
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL,
NULL,
false); // Not closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
/***** Title of top level *****/
@ -261,7 +263,10 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
if (NumRows > 0) // If not empty chat rooms found
{
/***** Table start *****/
Lay_StartRoundFrameTable (NULL,Txt_Rooms_with_users,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_Rooms_with_users,NULL,
NULL,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"CENTER_MIDDLE LIGHT_BLUE\">"
"%s"

10
swad_connected.c
View File

@ -97,8 +97,9 @@ void Con_ShowConnectedUsrs (void)
/* Current time */
sprintf (Gbl.Title,"%s<div id=\"connected_current_time\"></div>",
Txt_Connected_users);
Lay_StartRoundFrame (NULL,Gbl.Title,
Con_PutIconToUpdateConnected,Hlp_USERS_Connected);
Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected,
Hlp_USERS_Connected,
false); // Not closable
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateHMSFromUTC('connected_current_time',%ld,"
"%u,',&nbsp;',null,false,true,0x7);"
@ -159,8 +160,9 @@ void Con_ShowLastClicks (void)
extern const char *Txt_Last_clicks_in_real_time;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,
NULL,Hlp_USERS_Connected_last_clicks);
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL,
Hlp_USERS_Connected_last_clicks,
false); // Not closable
/***** Get and show last clicks *****/
fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh

26
swad_country.c
View File

@ -137,7 +137,9 @@ void Cty_SeeCtyWithPendingInss (void)
{
/***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Countries_with_pending_institutions,
NULL,Hlp_SYSTEM_Hierarchy_pending,2);
NULL,Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -243,7 +245,8 @@ static void Cty_Configuration (bool PrintView)
PrintView ? NULL :
Cty_PutIconToPrint,
PrintView ? NULL :
Hlp_COUNTRY_Information);
Hlp_COUNTRY_Information,
false); // Not closable
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
@ -508,8 +511,10 @@ void Cty_ListCountries2 (void)
unsigned NumCty;
/***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Countries,
Cty_PutIconsListCountries,Hlp_SYSTEM_Countries,2);
Lay_StartRoundFrameTable (NULL,Txt_Countries,Cty_PutIconsListCountries,
Hlp_SYSTEM_Countries,
false, // Not closable
2);
Cty_PutHeadCountriesForSeeing (true); // Order selectable
/***** Write all the countries and their number of users and institutions *****/
@ -942,7 +947,8 @@ void Cty_EditCountries (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconToViewCountries,
Hlp_SYSTEM_Countries);
Hlp_SYSTEM_Countries,
false); // Not closable
/***** Put a form to create a new country *****/
Cty_PutFormToCreateCountry ();
@ -1927,7 +1933,10 @@ static void Cty_PutFormToCreateCountry (void)
Act_FormStart (ActNewCty);
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_country,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Cty_PutHeadCountriesForEdition ();
@ -2354,7 +2363,10 @@ unsigned Cty_ListCtysFound (const char *Query)
sprintf (Gbl.Title,"%u %s",
NumCtys,NumCtys == 1 ? Txt_country :
Txt_countries);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
Cty_PutHeadCountriesForSeeing (false); // Order not selectable
/***** List the countries (one row per country) *****/

34
swad_course.c
View File

@ -199,7 +199,8 @@ static void Crs_Configuration (bool PrintView)
PrintView ? NULL :
Crs_PutIconToPrint,
PrintView ? NULL :
Hlp_COURSE_Information);
Hlp_COURSE_Information,
false); // Not closable
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
@ -545,7 +546,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]);
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL,Hlp_PROFILE_Courses);
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL,
Hlp_PROFILE_Courses,
false); // Not closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
/***** Write link to platform *****/
@ -1133,8 +1136,9 @@ static void Crs_ListCourses (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,
Crs_PutIconsListCourses,Hlp_DEGREE_Courses);
Lay_StartRoundFrame (NULL,Gbl.Title,Crs_PutIconsListCourses,
Hlp_DEGREE_Courses,
false); // Not closable
if (Gbl.CurrentDeg.NumCrss) // There are courses in the current degree
{
@ -1333,7 +1337,8 @@ void Crs_EditCourses (void)
/***** Start frame *****/
sprintf (Gbl.Alert.Txt,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Alert.Txt,Crs_PutIconToViewCourses,
Hlp_DEGREE_Courses);
Hlp_DEGREE_Courses,
false); // Not closable
/***** Put a form to create or request a new course *****/
Crs_PutFormToCreateCourse ();
@ -1637,7 +1642,10 @@ static void Crs_PutFormToCreateCourse (void)
Lay_ShowErrorAndExit ("You can not edit courses.");
/***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_New_course,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_course,NULL,
NULL,
false, // Not closable
2);
Crs_PutHeadCoursesForEdition ();
/***** Column to remove course, disabled here *****/
@ -2994,7 +3002,10 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role)
if ((NumCrss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get courses of a user")))
{
/* Start frame and table */
Lay_StartRoundFrameTable ("100%",NULL,NULL,NULL,2);
Lay_StartRoundFrameTable ("100%",NULL,NULL,
NULL,
false, // Not closable
2);
/* Heading row */
sprintf (Gbl.Title,Txt_USER_in_COURSE,
@ -3078,7 +3089,10 @@ unsigned Crs_ListCrssFound (const char *Query)
sprintf (Gbl.Title,"%u %s",
NumCrss,(NumCrss == 1) ? Txt_course :
Txt_courses);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
/* Heading row */
fprintf (Gbl.F.Out,"<tr>"
@ -3314,7 +3328,9 @@ void Crs_AskRemoveOldCrss (void)
Act_FormStart (ActRemOldCrs);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,Hlp_SYSTEM_Hierarchy_eliminate_old_courses);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,
Hlp_SYSTEM_Hierarchy_eliminate_old_courses,
false); // Not closable
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"

3
swad_date.c
View File

@ -103,7 +103,8 @@ void Dat_PutBoxToSelectDateFormat (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Dates,Dat_PutIconsDateFormat,
Hlp_PROFILE_Preferences_dates);
Hlp_PROFILE_Preferences_dates,
false); // Not closable
/***** Form with list of options *****/
Act_FormStart (ActChgDatFmt);

27
swad_degree.c
View File

@ -168,8 +168,10 @@ void Deg_SeeDegWithPendingCrss (void)
if ((NumDegs = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get degrees with pending courses")))
{
/***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses,
NULL,Hlp_SYSTEM_Hierarchy_pending,2);
Lay_StartRoundFrameTable (NULL,Txt_Degrees_with_pending_courses,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -299,7 +301,8 @@ static void Deg_Configuration (bool PrintView)
PrintView ? NULL :
Deg_PutIconsToPrintAndUpload,
PrintView ? NULL :
Hlp_DEGREE_Information);
Hlp_DEGREE_Information,
false); // Not closable
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
@ -937,7 +940,10 @@ static void Deg_PutFormToCreateDegree (void)
Lay_ShowErrorAndExit ("You can not edit degrees.");
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_degree,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_degree,NULL,
NULL,
false, // Not closable
2);
/***** Table head *****/
Deg_PutHeadDegreesForEdition ();
@ -1169,8 +1175,9 @@ static void Deg_ListDegrees (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,Gbl.CurrentCtr.Ctr.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,
Deg_PutIconsListDegrees,Hlp_CENTRE_Degrees);
Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsListDegrees,
Hlp_CENTRE_Degrees,
false); // Not closable
if (Gbl.CurrentCtr.Ctr.Degs.Num) // There are degrees in the current centre
{
@ -1349,7 +1356,8 @@ void Deg_EditDegrees (void)
sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
Gbl.CurrentCtr.Ctr.FullName);
Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsEditingDegrees,
Hlp_CENTRE_Degrees);
Hlp_CENTRE_Degrees,
false); // Not closable
if (Gbl.Degs.DegTypes.Num)
{
@ -2568,7 +2576,10 @@ unsigned Deg_ListDegsFound (const char *Query)
sprintf (Gbl.Title,"%u %s",
NumDegs,(NumDegs == 1) ? Txt_degree :
Txt_degrees);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
Deg_PutHeadDegreesForSeeing ();
/***** List the degrees (one row per degree) *****/

14
swad_degree_type.c
View File

@ -209,11 +209,13 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
{
case ActSeeDegTyp:
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,DT_PutIconsListDegTypes,
Hlp_CENTRE_DegreeTypes);
Hlp_CENTRE_DegreeTypes,
false); // Not closable
break;
case ActSeeUseGbl:
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,DT_PutIconToEditDegTypes,
Hlp_STATS_Figures_types_of_degree);
Hlp_STATS_Figures_types_of_degree,
false); // Not closable
break;
default: // Bad call
return;
@ -262,7 +264,8 @@ void DT_EditDegreeTypes (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,
DT_PutIconToViewDegreeTypesWhenEditing,
Hlp_CENTRE_DegreeTypes_edit);
Hlp_CENTRE_DegreeTypes_edit,
false); // Not closable
/***** Put a form to create a new degree type *****/
DT_PutFormToCreateDegreeType ();
@ -432,7 +435,10 @@ void DT_PutFormToCreateDegreeType (void)
Act_FormStart (ActNewDegTyp);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_degree,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_degree,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
DT_PutHeadDegreeTypesForEdition ();

18
swad_department.c
View File

@ -102,8 +102,10 @@ void Dpt_SeeDepts (void)
/***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Departments,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
NULL,
Hlp_INSTITUTION_Departments,2);
NULL,
Hlp_INSTITUTION_Departments,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>");
for (Order = Dpt_ORDER_BY_DEPARTMENT;
Order <= Dpt_ORDER_BY_NUM_TCHS;
@ -484,8 +486,10 @@ static void Dpt_ListDepartmentsForEdition (void)
struct Instit Ins;
unsigned NumIns;
Lay_StartRoundFrameTable (NULL,Txt_Departments,
NULL,Hlp_INSTITUTION_Departments_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_Departments,NULL,
Hlp_INSTITUTION_Departments_edit,
false, // Not closable
2);
/***** Table head *****/
Dpt_PutHeadDepartments ();
@ -886,8 +890,10 @@ static void Dpt_PutFormToCreateDepartment (void)
Act_FormStart (ActNewDpt);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_department,
NULL,Hlp_INSTITUTION_Departments_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_New_department,NULL,
Hlp_INSTITUTION_Departments_edit,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"

10
swad_duplicate.c
View File

@ -139,8 +139,9 @@ void Dup_ListDuplicateUsrs (void)
unsigned NumInformants;
/***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,
NULL,Hlp_USERS_Duplicates_possibly_duplicate_users);
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL,
Hlp_USERS_Duplicates_possibly_duplicate_users,
false); // Not closable
/***** Build query *****/
sprintf (Query,"SELECT UsrCod,COUNT(*) AS N,MIN(UNIX_TIMESTAMP(InformTime)) AS T"
@ -258,8 +259,9 @@ static void Dup_ListSimilarUsrs (void)
unsigned NumUsr;
/***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Similar_users,
NULL,Hlp_USERS_Duplicates_similar_users);
Lay_StartRoundFrame (NULL,Txt_Similar_users,NULL,
Hlp_USERS_Duplicates_similar_users,
false); // Not closable
/***** Build query *****/
if (Gbl.Usrs.Other.UsrDat.Surname1[0] &&

20
swad_enrolment.c
View File

@ -377,7 +377,8 @@ void Enr_ReqAcceptRegisterInCrs (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrolment,NULL,
Hlp_USERS_SignUp_confirm_enrolment);
Hlp_USERS_SignUp_confirm_enrolment,
false); // Not closable
/***** Show message *****/
sprintf (Gbl.Alert.Txt,Txt_A_teacher_or_administrator_has_enroled_you_as_X_into_the_course_Y,
@ -705,7 +706,8 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Title,NULL,
Hlp_USERS_Administration_administer_multiple_users);
Hlp_USERS_Administration_administer_multiple_users,
false); // Not closable
/***** Step 1: List of students to be enroled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
@ -794,7 +796,9 @@ void Enr_AskRemoveOldUsrs (void)
Act_FormStart (ActRemOldUsr);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL,
NULL,
false); // Not closable
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
@ -1850,7 +1854,8 @@ void Enr_AskRemAllStdsThisCrs (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_all_students,NULL,
Hlp_USERS_Administration_remove_all_students);
Hlp_USERS_Administration_remove_all_students,
false); // Not closable
if (Gbl.CurrentCrs.Crs.NumUsrs[Rol_STD])
{
@ -2301,7 +2306,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Sco_GetScope ("ScopeEnr");
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Enrolment_requests,NULL,Hlp_USERS_Requests);
Lay_StartRoundFrame ("100%",Txt_Enrolment_requests,NULL,
Hlp_USERS_Requests,
false); // Not closable
/***** Selection of scope and roles *****/
/* Start form and table */
@ -3119,7 +3126,8 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Administer_one_user,NULL,
Hlp_USERS_Administration_administer_one_user);
Hlp_USERS_Administration_administer_one_user,
false); // Not closable
/***** Write form to request another user's ID *****/
switch (Role)

8
swad_exam.c
View File

@ -652,7 +652,8 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
Txt_Announcements_of_exams,
ICanEdit ? Exa_PutIconToCreateNewExamAnnouncement :
NULL,
Hlp_ASSESSMENT_Announcements);
Hlp_ASSESSMENT_Announcements,
false); // Not closable
/***** The result of the query may be empty *****/
if (!NumExaAnns)
@ -1073,8 +1074,9 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement :
NULL,
TypeViewExamAnnouncement == Exa_FORM_VIEW ? ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Hlp_ASSESSMENT_Announcements_edit_announcement :
Hlp_ASSESSMENT_Announcements_new_announcement) :
NULL);
Hlp_ASSESSMENT_Announcements_new_announcement) :
NULL,
false); // Not closable
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{

42
swad_file_browser.c
View File

@ -3118,8 +3118,9 @@ void Brw_AskEditWorksCrs (void)
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Draw class photos to select users *****/
Lay_StartRoundFrame (NULL,Txt_Users,
NULL,Hlp_FILES_Homework_for_teachers);
Lay_StartRoundFrame (NULL,Txt_Users,NULL,
Hlp_FILES_Homework_for_teachers,
false); // Not closable
/***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqAsgWrkCrs);
@ -3215,7 +3216,10 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
/***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable ("100%",Txt_Assignments_and_other_works,
Brw_PutIconShowFigure,Hlp_FILES_Homework_for_teachers,0);
Brw_PutIconShowFigure,
Hlp_FILES_Homework_for_teachers,
false, // Not closable
0);
/***** List the assignments and works of the selected users *****/
Ptr = Gbl.Usrs.Select[Rol_UNK];
@ -3685,7 +3689,8 @@ static void Brw_ShowFileBrowser (void)
Lay_StartSection (FileBrowserSectionId);
Lay_StartRoundFrame ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type],
Brw_PutIconsFileBrowser,
Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type]);
Brw_HelpOfFileBrowser[Gbl.FileBrowser.Type],
false); // Not closable
/***** Subtitle *****/
Brw_WriteSubtitleOfFileBrowser ();
@ -7978,7 +7983,9 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL,
NULL,
false); // Not closable
sprintf (Gbl.Alert.Txt,Txt_You_can_create_a_new_folder_inside_the_folder_X,
FileNameToShow);
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
@ -8015,7 +8022,9 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL,NULL);
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL,
NULL,
false); // Not closable
/***** Help message *****/
sprintf (Gbl.Alert.Txt,Txt_or_you_can_upload_new_files_to_the_folder_X,
@ -8076,7 +8085,9 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"classic-upload\" style=\"display:none;\">");
Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL,
NULL,
false); // Not closable
/***** Help message *****/
sprintf (Gbl.Alert.Txt,Txt_or_you_can_upload_a_new_file_to_the_folder_X,
@ -8118,7 +8129,9 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Paste,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Paste,NULL,
NULL,
false); // Not closable
/***** Help message *****/
sprintf (Gbl.Alert.Txt,Txt_or_you_can_make_a_file_copy_to_the_folder_X,
@ -8153,7 +8166,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Brw_IS_FOLDER,-1L);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL,
NULL,
false); // Not closable
/***** Help message *****/
sprintf (Gbl.Alert.Txt,Txt_or_you_can_create_a_new_link_inside_the_folder_X,
@ -11323,7 +11338,10 @@ unsigned Brw_ListDocsFound (const char *Query,
sprintf (Gbl.Title,"%u %s",
NumDocs,(NumDocs == 1) ? TitleSingular :
TitlePlural);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
/* Heading row */
fprintf (Gbl.F.Out,"<tr>"
@ -11680,7 +11698,9 @@ void Brw_AskRemoveOldFiles (void)
Brw_PutHiddenParamFullTreeIfSelected ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL,
NULL,
false); // Not closable
/***** Form to request number of months (to remove files older) *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",

17
swad_follow.c
View File

@ -131,9 +131,10 @@ void Fol_SuggestUsrsToFollowMainZone (void)
&mysql_res)))
{
/***** Start frame *****/
Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow,
Fol_PutIconsWhoToFollow,
Hlp_SOCIAL_Profiles_who_to_follow,2);
Lay_StartRoundFrameTable ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,
Hlp_SOCIAL_Profiles_who_to_follow,
false, // Not closable
2);
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@ -686,7 +687,10 @@ static void Fol_ListFollowingUsr (struct UsrData *UsrDat)
Usr_UsrDataConstructor (&FollowingUsrDat);
/***** Start listing *****/
Lay_StartRoundFrameTable ("560px",Txt_Following,NULL,NULL,2);
Lay_StartRoundFrameTable ("560px",Txt_Following,NULL,
NULL,
false, // Not closable
2);
for (NumUsr = 0;
NumUsr < NumUsrs;
@ -769,7 +773,10 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
Usr_UsrDataConstructor (&FollowerUsrDat);
/***** Start listing *****/
Lay_StartRoundFrameTable ("560px",Txt_Followers,NULL,NULL,2);
Lay_StartRoundFrameTable ("560px",Txt_Followers,NULL,
NULL,
false, // Not closable
2);
for (NumUsr = 0;
NumUsr < NumUsrs;

12
swad_forum.c
View File

@ -1009,7 +1009,8 @@ static void For_ShowPostsOfAThread (Ale_AlertType_t AlertType,const char *Messag
/***** Start frame *****/
sprintf (FrameTitle,"%s: %s",Txt_Thread,Thr.Subject);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewPost,
Hlp_SOCIAL_Forums_posts);
Hlp_SOCIAL_Forums_posts,
false); // Not closable
/***** Get posts of a thread from database *****/
sprintf (Query,"SELECT PstCod,UNIX_TIMESTAMP(CreatTime)"
@ -1605,7 +1606,8 @@ static void For_ShowForumList (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums,
Hlp_SOCIAL_Forums);
Hlp_SOCIAL_Forums,
false); // Not closable
/***** Put a form to select which forums *****/
For_PutFormWhichForums ();
@ -2571,7 +2573,8 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
/***** Start frame for threads of this forum *****/
sprintf (FrameTitle,"%s: %s",Txt_Forum,ForumName);
Lay_StartRoundFrame (NULL,FrameTitle,For_PutIconNewThread,
Hlp_SOCIAL_Forums_threads);
Hlp_SOCIAL_Forums_threads,
false); // Not closable
/***** List the threads *****/
if (NumThrs)
@ -3859,7 +3862,8 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
Txt_New_thread,
NULL,
IsReply ? Hlp_SOCIAL_Forums_new_post :
Hlp_SOCIAL_Forums_new_thread);
Hlp_SOCIAL_Forums_new_thread,
false); // Not closable
/***** Start form *****/
if (IsReply) // Form to write a reply to a post of an existing thread

28
swad_group.c
View File

@ -267,7 +267,8 @@ static void Grp_EditGroupTypes (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_group,
Grp_PutIconsEditingGroupTypes,
Hlp_USERS_Groups);
Hlp_USERS_Groups,
false); // Not closable
/***** Put a form to create a new group type *****/
Grp_PutFormToCreateGroupType ();
@ -298,7 +299,8 @@ static void Grp_EditGroups (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Groups,Grp_PutIconsEditingGroups,
Hlp_USERS_Groups);
Hlp_USERS_Groups,
false); // Not closable
/***** Put a form to create a new group *****/
Grp_PutFormToCreateGroup ();
@ -365,7 +367,8 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
Lay_StartRoundFrame (NULL,Txt_Groups,
ICanEdit ? Grp_PutIconToEditGroups :
NULL,
Hlp_USERS_Groups);
Hlp_USERS_Groups,
true); // Closable
/***** Start form to update the students listed
depending on the groups selected *****/
@ -1725,7 +1728,8 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
Lay_StartRoundFrame (NULL,Txt_My_groups,
ICanEdit ? Grp_PutIconToEditGroups :
NULL,
Hlp_USERS_Groups);
Hlp_USERS_Groups,
false); // Not closable
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups
{
@ -1940,7 +1944,10 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Groups,NULL,Hlp_USERS_Groups,0);
Lay_StartRoundFrameTable (NULL,Txt_Groups,NULL,
Hlp_USERS_Groups,
false, // Not closable
0);
/***** List to select the groups the user belongs to *****/
for (NumGrpTyp = 0;
@ -2341,8 +2348,10 @@ static void Grp_PutFormToCreateGroupType (void)
Act_FormStartAnchor (ActNewGrpTyp,Grp_GROUP_TYPES_SECTION_ID);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_group,
NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_type_of_group,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Grp_WriteHeadingGroupTypes ();
@ -2455,7 +2464,10 @@ static void Grp_PutFormToCreateGroup (void)
Act_FormStartAnchor (ActNewGrp,Grp_GROUPS_SECTION_ID);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_group,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_group,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Grp_WriteHeadingGroups ();

5
swad_help.c
View File

@ -129,7 +129,10 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
/***** Contextual buttons *****/
/* Start table */
Lay_StartRoundFrameTable (NULL,Txt_What_would_you_like_to_do,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_What_would_you_like_to_do,NULL,
NULL,
true, // Closable
2);
if (Gbl.Usrs.Me.Logged) // I am logged
{

15
swad_holiday.c
View File

@ -102,7 +102,8 @@ void Hld_SeeHolidays (void)
Lay_StartRoundFrame (NULL,Txt_Holidays,
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
NULL,
Hlp_INSTITUTION_Holidays);
Hlp_INSTITUTION_Holidays,
false); // Not closable
if (Gbl.Hlds.Num)
{
Lay_StartTableWideMargin (2);
@ -499,8 +500,10 @@ static void Hld_ListHolidaysForEdition (void)
struct Holiday *Hld;
Hld_HolidayType_t HolidayType;
Lay_StartRoundFrameTable (NULL,Txt_Holidays,
NULL,Hlp_INSTITUTION_Holidays_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_Holidays,NULL,
Hlp_INSTITUTION_Holidays_edit,
false, // Not closable
2);
/***** Table head *****/
Hld_PutHeadHolidays ();
@ -957,8 +960,10 @@ static void Hld_PutFormToCreateHoliday (void)
Act_FormStart (ActNewHld);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_holiday,
NULL,Hlp_INSTITUTION_Holidays_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_New_holiday,NULL,
Hlp_INSTITUTION_Holidays_edit,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"

3
swad_icon.c
View File

@ -77,7 +77,8 @@ void Ico_PutIconsToSelectIconSet (void)
Ico_IconSet_t IconSet;
Lay_StartRoundFrame (NULL,Txt_Icons,
Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons);
Ico_PutIconsIconSet,Hlp_PROFILE_Preferences_icons,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (IconSet = (Ico_IconSet_t) 0;
IconSet < Ico_NUM_ICON_SETS;

3
swad_indicator.c
View File

@ -106,7 +106,8 @@ void Ind_ReqIndicatorsCourses (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL,
Hlp_STATS_Indicators);
Hlp_STATS_Indicators,
false); // Not closable
/***** Form to update indicators *****/
/* Start form and table */

33
swad_info.c
View File

@ -444,7 +444,8 @@ void Inf_ShowInfo (void)
Lay_StartRoundFrame ("100%",Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
Help[Gbl.CurrentCrs.Info.Type]);
Help[Gbl.CurrentCrs.Info.Type],
false); // Not closable
Ale_ShowAlert (Ale_INFO,Txt_No_information);
if (ICanEdit)
Inf_PutButtonToEditInfo ();
@ -588,7 +589,9 @@ void Inf_WriteMsgYouMustReadInfo (void)
Inf_InfoType_t InfoType;
/***** Start of frame *****/
Lay_StartRoundFrame (NULL,Txt_Required_reading,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Required_reading,NULL,
NULL,
false); // Not closable
/***** Write message *****/
Ale_ShowAlert (Ale_WARNING,Txt_You_should_read_the_following_information);
@ -1031,7 +1034,8 @@ static void Inf_ShowPage (const char *URL)
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
Help[Gbl.CurrentCrs.Info.Type]);
Help[Gbl.CurrentCrs.Info.Type],
false); // Not closable
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
@ -1114,9 +1118,10 @@ void Inf_FormsToSelSendInfo (void)
/***** Form to choice between alternatives *****/
/* Start of table */
Lay_StartRoundFrameTable (NULL,Txt_Source_of_information,
Inf_PutIconToViewInfo,
HelpEdit[Gbl.CurrentCrs.Info.Type],4);
Lay_StartRoundFrameTable (NULL,Txt_Source_of_information,Inf_PutIconToViewInfo,
HelpEdit[Gbl.CurrentCrs.Info.Type],
false, // Not closable
4);
/* Options */
for (InfoSrc = (Inf_InfoSrc_t) 0;
@ -1786,7 +1791,8 @@ static bool Inf_CheckAndShowPlainTxt (void)
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
Help[Gbl.CurrentCrs.Info.Type]);
Help[Gbl.CurrentCrs.Info.Type],
false); // Not closable
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -1870,7 +1876,8 @@ static bool Inf_CheckAndShowRichTxt (void)
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL,
Help[Gbl.CurrentCrs.Info.Type]);
Help[Gbl.CurrentCrs.Info.Type],
false); // Not closable
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -2055,8 +2062,9 @@ void Inf_EditPlainTxtInfo (void)
/***** Start form and frame *****/
Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
NULL,HelpEdit[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type],
false); // Not closable
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -2106,8 +2114,9 @@ void Inf_EditRichTxtInfo (void)
/***** Start form and frame *****/
Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
NULL,HelpEdit[Gbl.CurrentCrs.Info.Type]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL,
HelpEdit[Gbl.CurrentCrs.Info.Type],
false); // Not closable
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)

27
swad_institution.c
View File

@ -150,8 +150,10 @@ void Ins_SeeInsWithPendingCtrs (void)
if ((NumInss = (unsigned) DB_QuerySELECT (Query,&mysql_res,"can not get institutions with pending centres")))
{
/***** Write heading *****/
Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres,
NULL,Hlp_SYSTEM_Hierarchy_pending,2);
Lay_StartRoundFrameTable (NULL,Txt_Institutions_with_pending_centres,NULL,
Hlp_SYSTEM_Hierarchy_pending,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
@ -309,7 +311,8 @@ static void Ins_Configuration (bool PrintView)
PrintView ? NULL :
Ins_PutIconsToPrintAndUpload,
PrintView ? NULL :
Hlp_INSTITUTION_Information);
Hlp_INSTITUTION_Information,
false); // Not closable
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE FRAME_TITLE_BIG\">");
@ -666,8 +669,9 @@ static void Ins_ListInstitutions (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,
Ins_PutIconsListInstitutions,Hlp_COUNTRY_Institutions);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsListInstitutions,
Hlp_COUNTRY_Institutions,
false); // Not closable
if (Gbl.Inss.Num) // There are institutions in the current country
{
@ -917,7 +921,8 @@ void Ins_EditInstitutions (void)
sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconToViewInstitutions,
Hlp_COUNTRY_Institutions);
Hlp_COUNTRY_Institutions,
false); // Not closable
/***** Put a form to create a new institution *****/
Ins_PutFormToCreateInstitution ();
@ -2152,7 +2157,10 @@ static void Ins_PutFormToCreateInstitution (void)
Lay_ShowErrorAndExit ("You can not edit institutions.");
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_institution,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_institution,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Ins_PutHeadInstitutionsForEdition ();
@ -2511,7 +2519,10 @@ unsigned Ins_ListInssFound (const char *Query)
sprintf (Gbl.Title,"%u %s",
NumInss,NumInss == 1 ? Txt_institution :
Txt_institutions);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
Ins_PutHeadInstitutionsForSeeing (false); // Order not selectable
/***** List the institutions (one row per institution) *****/

75
swad_layout.c
View File

@ -97,7 +97,7 @@ static void Lay_ShowRightColumn (void);
static void Lay_StartRoundFrameInternal (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
const char *HelpLink,bool Closable,
const char *ClassFrame);
static void Lay_WriteAboutZone (void);
@ -1444,10 +1444,12 @@ void Lay_PutRemoveButtonInline (const char *TxtButton)
void Lay_StartRoundFrameTable (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
const char *HelpLink,bool Closable,
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{
Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,HelpLink);
Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,
HelpLink,
Closable);
Lay_StartTableWide (CellPadding);
}
@ -1456,17 +1458,20 @@ void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title,
const char *HelpLink,
unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{
Lay_StartRoundFrameShadow (Width,Title,FunctionToDrawContextualIcons,HelpLink);
Lay_StartRoundFrameShadow (Width,Title,
FunctionToDrawContextualIcons,
HelpLink);
Lay_StartTableWide (CellPadding);
}
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink)
const char *HelpLink,bool Closable)
{
Lay_StartRoundFrameInternal (Width,Title,
FunctionToDrawContextualIcons,
HelpLink,
Closable,
"FRAME");
}
@ -1475,46 +1480,82 @@ void Lay_StartRoundFrameShadow (const char *Width,const char *Title,
const char *HelpLink)
{
Lay_StartRoundFrameInternal (Width,Title,
FunctionToDrawContextualIcons,
FunctionToDrawContextualIcons,
HelpLink,
false, // Not closable
"FRAME_SHADOW");
}
static void Lay_StartRoundFrameInternal (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
const char *HelpLink,bool Closable,
const char *ClassFrame)
{
extern const char *Txt_Help;
extern const char *Txt_Close;
char IdFrame[Act_MAX_BYTES_ID];
fprintf (Gbl.F.Out,"<div class=\"FRAME_CONTAINER\">"
"<div class=\"%s\"",ClassFrame);
/***** Start frame container *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_CONTAINER\"");
if (Closable)
{
/* Create unique id for alert */
Act_SetUniqueId (IdFrame);
fprintf (Gbl.F.Out," id=\"%s\"",IdFrame);
}
fprintf (Gbl.F.Out,">");
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div class=\"%s\"",ClassFrame);
if (Width)
fprintf (Gbl.F.Out," style=\"width:%s;\"",Width);
fprintf (Gbl.F.Out,">");
/***** Row for left and right icons *****/
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO\">");
/* Contextual icons at left */
if (FunctionToDrawContextualIcons)
{
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_LEFT\">");
FunctionToDrawContextualIcons ();
fprintf (Gbl.F.Out,"</div>");
}
if (HelpLink)
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_RIGHT\">"
"<a href=\"%s%s\" target=\"_blank\">"
/* Icons at right: help and close */
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICO_RIGHT\">");
if (HelpLink) // Link to help
fprintf (Gbl.F.Out,"<a href=\"%s%s\" target=\"_blank\">"
"<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
"<img src=\"%s/help64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"</div>"
"</a>"
"</div>",
"</a>",
Hlp_WIKI,HelpLink,
Gbl.Prefs.IconsURL,
Txt_Help,Txt_Help);
if (Closable) // Icon to close the frame
fprintf (Gbl.F.Out,"<a href=\"\""
" onclick=\"toggleDisplay('%s');return false;\" />"
"<div class=\"CONTEXT_OPT HLP_HIGHLIGHT\">"
"<img src=\"%s/close64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"</div>"
"</a>",
IdFrame,
Gbl.Prefs.IconsURL,
Txt_Close,Txt_Close);
fprintf (Gbl.F.Out,"</div>");
/***** End row for left and right icons *****/
fprintf (Gbl.F.Out,"</div>");
/***** Frame title *****/
if (Title)
fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
"%s"
@ -1548,6 +1589,7 @@ void Lay_EndRoundFrame (void)
{
Gbl.Layout.FrameNested--;
/***** End frame and frame container *****/
fprintf (Gbl.F.Out,"</div>"
"</div>");
}
@ -1933,7 +1975,10 @@ void Lay_AdvertisementMobile (void)
fprintf (Gbl.F.Out,"<div style=\"margin-top:25px;\">");
/***** Table start *****/
Lay_StartRoundFrameTable (NULL,NULL,NULL,NULL,8);
Lay_StartRoundFrameTable (NULL,NULL,NULL,
NULL,
false, // Not closable
8);
/***** Show advertisement *****/
fprintf (Gbl.F.Out,"<tr>"

4
swad_layout.h
View File

@ -95,11 +95,11 @@ void Lay_PutRemoveButtonInline (const char *TxtButton);
void Lay_StartRoundFrameTable (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink,
const char *HelpLink,bool Closable,
unsigned CellPadding);
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink);
const char *HelpLink,bool Closable);
void Lay_StartRoundFrameShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink);

13
swad_link.c
View File

@ -112,8 +112,9 @@ void Lnk_SeeLinks (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Links,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Lnk_PutIconToEditLinks :
NULL,
Hlp_SYSTEM_Links);
NULL,
Hlp_SYSTEM_Links,
false); // Not closable
/***** Write all links *****/
if (Gbl.Links.Num) // There are links
@ -228,7 +229,8 @@ void Lnk_EditLinks (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Links,Lnk_PutIconToViewLinks,
Hlp_SYSTEM_Links_edit);
Hlp_SYSTEM_Links_edit,
false); // Not closable
/***** Put a form to create a new link *****/
Lnk_PutFormToCreateLink ();
@ -705,7 +707,10 @@ static void Lnk_PutFormToCreateLink (void)
Act_FormStart (ActNewLnk);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_link,NULL,Hlp_SYSTEM_Links_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_New_link,NULL,
Hlp_SYSTEM_Links_edit,
false, // Not closable
2);
/***** Write heading *****/
Lnk_PutHeadLinks ();

4
swad_logo.c
View File

@ -283,7 +283,9 @@ void Log_RequestLogo (Sco_Scope_t Scope)
Act_FormStart (ActionRec);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Logo,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Logo,NULL,
NULL,
false); // Not closable
/***** Write help message *****/
sprintf (Gbl.Alert.Txt,Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y,

34
swad_mail.c
View File

@ -109,8 +109,10 @@ void Mai_SeeMailDomains (void)
/***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
NULL,
Hlp_MESSAGES_Domains,2);
NULL,
Hlp_MESSAGES_Domains,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>");
for (Order = Mai_ORDER_BY_DOMAIN;
Order <= Mai_ORDER_BY_USERS;
@ -446,8 +448,10 @@ static void Mai_ListMailDomainsForEdition (void)
unsigned NumMai;
struct Mail *Mai;
Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications,
NULL,Hlp_MESSAGES_Domains_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications,NULL,
Hlp_MESSAGES_Domains_edit,
false, // Not closable
2);
/***** Table head *****/
Mai_PutHeadMailDomains ();
@ -713,8 +717,10 @@ static void Mai_PutFormToCreateMailDomain (void)
Act_FormStart (ActNewMai);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_email_domain,
NULL,Hlp_MESSAGES_Domains_edit,2);
Lay_StartRoundFrameTable (NULL,Txt_New_email_domain,NULL,
Hlp_MESSAGES_Domains_edit,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -882,9 +888,10 @@ void Mai_ListEmails (void)
Usr_GetListUsrs (Sco_SCOPE_CRS,Rol_STD);
/***** Start of the frame used to list the emails *****/
Lay_StartRoundFrame (NULL,
Txt_Students_who_have_accepted_and_who_have_email,
NULL,Hlp_MESSAGES_Email);
Lay_StartRoundFrame (NULL,Txt_Students_who_have_accepted_and_who_have_email,
NULL,
Hlp_MESSAGES_Email,
false); // Not closable
/***** Form to select groups *****/
Grp_ShowFormToSelectSeveralGroups (ActMaiStd);
@ -1180,7 +1187,9 @@ void Mai_ShowFormOthEmail (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Email,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Email,NULL,
NULL,
false); // Not closable
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,
@ -1619,8 +1628,9 @@ void Mai_PutButtonToCheckEmailAddress (void)
extern const char *Txt_Check;
/***** Frame with button to check email address *****/
Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,
NULL,Hlp_PROFILE_Account_email);
Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL,
Hlp_PROFILE_Account_email,
true); // Closable
Ale_ShowAlertAndButton (Ale_WARNING,Txt_Please_check_and_confirm_your_email_address,
ActFrmMyAcc,NULL,NULL,NULL,
Lay_CONFIRM_BUTTON,Txt_Check);

5
swad_menu.c
View File

@ -398,8 +398,9 @@ void Mnu_PutIconsToSelectMenu (void)
extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS];
Mnu_Menu_t Menu;
Lay_StartRoundFrame (NULL,Txt_Menu,
Mnu_PutIconsMenu,Hlp_PROFILE_Preferences_menu);
Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu,
Hlp_PROFILE_Preferences_menu,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (Menu = (Mnu_Menu_t) 0;
Menu < Mnu_NUM_MENUS;

16
swad_message.c
View File

@ -226,7 +226,8 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Lay_StartRoundFrame (NULL,
Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message,
NULL,Hlp_MESSAGES_Write);
NULL,Hlp_MESSAGES_Write,
false); // Not closable
if (Gbl.Msg.ShowOnlyOneRecipient)
/***** Form to show several potential recipients *****/
@ -1754,12 +1755,14 @@ static void Msg_ShowSentOrReceivedMessages (void)
/***** Start frame with messages *****/
Lay_StartRoundFrame ("97%",
Msg_WriteNumMsgs (NumUnreadMsgs),
Msg_PutIconsListMsgs,Help[Gbl.Msg.TypeOfMessages]);
Msg_PutIconsListMsgs,Help[Gbl.Msg.TypeOfMessages],
false); // Not closable
/***** Filter messages *****/
/* Start frame with filter */
Lay_StartRoundFrame (NULL,Txt_Filter,
NULL,HelpFilter[Gbl.Msg.TypeOfMessages]);
Lay_StartRoundFrame (NULL,Txt_Filter,NULL,
HelpFilter[Gbl.Msg.TypeOfMessages],
true); // Closable
/* Form to see messages again */
Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]);
@ -3775,7 +3778,10 @@ void Msg_ListBannedUsrs (void)
Usr_UsrDataConstructor (&UsrDat);
/***** Start table with list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Banned_users,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_Banned_users,NULL,
NULL,
false, // Not closable
2);
/***** List users *****/
for (NumUsr = 1;

11
swad_network.c
View File

@ -300,7 +300,10 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Webs_social_networks,
Net_PutIconsWebsSocialNetworks,Hlp_PROFILE_Webs,2);
Net_PutIconsWebsSocialNetworks,
Hlp_PROFILE_Webs,
false, // Not closable
2);
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
NumURL < Net_NUM_WEBS_AND_SOCIAL_NETWORKS;
@ -533,8 +536,10 @@ void Net_ShowWebAndSocialNetworksStats (void)
"can not get number of users with webs / social networks");
/***** Number of users *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],
NULL,Hlp_STATS_Figures_webs_social_networks,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_NETWORKS],NULL,
Hlp_STATS_Figures_webs_social_networks,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"LEFT_MIDDLE\">"

8
swad_notice.c
View File

@ -102,7 +102,9 @@ void Not_ShowFormNotice (void)
Act_FormStart (ActRcvNot);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_New_notice,NULL,Hlp_MESSAGES_Notices);
Lay_StartRoundFrame (NULL,Txt_New_notice,NULL,
Hlp_MESSAGES_Notices,
false); // Not closable
/***** Message body *****/
fprintf (Gbl.F.Out,"<textarea name=\"Content\" cols=\"30\" rows=\"10\""
@ -391,7 +393,9 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
Lay_StartRoundFrame (StrWidth,
Gbl.CurrentCrs.Notices.HighlightNotCod > 0 ? Txt_All_notices :
Txt_Notices,
Not_PutIconsListNotices,Hlp_MESSAGES_Notices);
Not_PutIconsListNotices,
Hlp_MESSAGES_Notices,
false); // Not closable
if (!NumNotices)
Ale_ShowAlert (Ale_INFO,Txt_No_notices);
}

11
swad_notification.c
View File

@ -388,8 +388,9 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,
Ntf_PutIconsNotif,Hlp_MESSAGES_Notifications);
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_MESSAGES_Notifications,
false); // Not closable
/***** List my notifications *****/
if (NumNotifications) // Notifications found
@ -1896,9 +1897,9 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,
Ntf_PutIconsNotif,
Hlp_PROFILE_Preferences_notifications);
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,
Hlp_PROFILE_Preferences_notifications,
false); // Not closable
/***** Start form *****/
Act_FormStart (ActChgNtfPrf);

13
swad_password.c
View File

@ -251,7 +251,9 @@ void Pwd_ShowFormSendNewPwd (void)
Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL,Hlp_PROFILE_Password);
Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL,
Hlp_PROFILE_Password,
false); // Not closable
/***** Help text *****/
Ale_ShowAlert (Ale_INFO,Txt_If_you_have_forgotten_your_password_);
@ -695,7 +697,10 @@ void Pwd_ShowFormChgPwd (void)
Act_FormStart (ActChgPwd);
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Password,NULL,Hlp_PROFILE_Password,2);
Lay_StartRoundFrameTable (NULL,Txt_Password,NULL,
Hlp_PROFILE_Password,
false, // Not closable
2);
/* Current password */
if (IHaveAPasswordInDB) // If I have a password in database...
@ -821,7 +826,9 @@ void Pwd_ShowFormOthPwd (void)
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Password,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Password,NULL,
NULL,
false); // Not closable
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,

10
swad_photo.c
View File

@ -327,7 +327,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
Lay_StartRoundFrame (NULL,Txt_Photo,
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
Pho_PutIconToRequestRemoveOtherUsrPhoto,
Hlp_PROFILE_Photo);
Hlp_PROFILE_Photo,
false); // Not closable
/***** Start form *****/
if (ItsMe)
@ -1692,7 +1693,8 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees,
Pho_PutIconToPrintDegreeStats,
Hlp_STATS_Degrees);
Hlp_STATS_Degrees,
false); // Not closable
Lay_StartTableCenter (2);
/***** Put a selector for the type of average *****/
@ -1708,7 +1710,9 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
break;
case Pho_DEGREES_PRINT:
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees,NULL,NULL);
Lay_StartRoundFrame (NULL,Txt_Degrees,NULL,
NULL,
false); // Not closable
break;
}

11
swad_place.c
View File

@ -119,7 +119,8 @@ void Plc_SeePlaces (void)
Lay_StartRoundFrame (NULL,Txt_Places,
ICanEdit ? Plc_PutIconToEditPlaces :
NULL,
Hlp_INSTITUTION_Places);
Hlp_INSTITUTION_Places,
false); // Not closable
Lay_StartTableWideMargin (2);
fprintf (Gbl.F.Out,"<tr>");
for (Order = Plc_ORDER_BY_PLACE;
@ -248,7 +249,8 @@ void Plc_EditPlaces (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing,
Hlp_INSTITUTION_Places_edit);
Hlp_INSTITUTION_Places_edit,
false); // Not closable
/***** Put a form to create a new place *****/
Plc_PutFormToCreatePlace ();
@ -738,7 +740,10 @@ static void Plc_PutFormToCreatePlace (void)
Act_FormStart (ActNewPlc);
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_place,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_place,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
Plc_PutHeadPlaces ();

16
swad_plugin.c
View File

@ -93,8 +93,10 @@ void Plg_ListPlugins (void)
/***** Table start *****/
Lay_StartRoundFrameTable (NULL,Txt_Plugins,
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
NULL,
NULL,2);
NULL,
NULL,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -344,7 +346,10 @@ static void Plg_ListPluginsForEdition (void)
unsigned NumPlg;
struct Plugin *Plg;
Lay_StartRoundFrameTable (NULL,Txt_Plugins,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_Plugins,NULL,
NULL,
false, // Not closable
2);
/***** Table head *****/
Plg_PutHeadPlugins ();
@ -838,7 +843,10 @@ static void Plg_PutFormToCreatePlugin (void)
Act_FormStart (ActNewPlg);
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_plugin,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Txt_New_plugin,NULL,
NULL,
false, // Not closable
2);
/***** Write heading *****/
fprintf (Gbl.F.Out,"<tr>"

13
swad_preference.c
View File

@ -75,7 +75,8 @@ void Pre_EditPrefs (void)
/***** Internationalization: language, first day of week, date format *****/
Lay_StartRoundFrame (NULL,Txt_Internationalization,NULL,
Hlp_PROFILE_Preferences_internationalization);
Hlp_PROFILE_Preferences_internationalization,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">");
Lan_PutBoxToSelectLanguage (); // 1. Language
fprintf (Gbl.F.Out,"</div>"
@ -88,7 +89,9 @@ void Pre_EditPrefs (void)
Lay_EndRoundFrame ();
/***** Design: icon set, menu, theme, side columns *****/
Lay_StartRoundFrame (NULL,Txt_Design,NULL,Hlp_PROFILE_Preferences_design);
Lay_StartRoundFrame (NULL,Txt_Design,NULL,
Hlp_PROFILE_Preferences_design,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"FRAME_INLINE\">");
Ico_PutIconsToSelectIconSet (); // 4. Icon set
fprintf (Gbl.F.Out,"</div>"
@ -235,9 +238,9 @@ static void Pre_PutIconsToSelectSideCols (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols;
Lay_StartRoundFrame (NULL,Txt_Columns,
Pre_PutIconsSideColumns,
Hlp_PROFILE_Preferences_columns);
Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns,
Hlp_PROFILE_Preferences_columns,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (SideCols = 0;
SideCols <= Lay_SHOW_BOTH_COLUMNS;

4
swad_profile.c
View File

@ -174,7 +174,9 @@ void Prf_RequestUserProfile (void)
Act_FormStart (ActSeeOthPubPrf);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Another_user_s_profile,NULL,Hlp_SOCIAL_Profiles_view_public_profile);
Lay_StartRoundFrame (NULL,Txt_Another_user_s_profile,NULL,
Hlp_SOCIAL_Profiles_view_public_profile,
false); // Not closable
/***** Form to request user's @nickname *****/
/* By default, the nickname is filled with my nickname

29
swad_record.c
View File

@ -183,7 +183,9 @@ void Rec_ReqEditRecordFields (void)
if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found...
{
Lay_StartRoundFrameTable (NULL,Txt_Record_fields,NULL,
Hlp_USERS_Students_course_record_card,2);
Hlp_USERS_Students_course_record_card,
false, // Not closable
2);
Rec_ListFieldsRecordsForEdition ();
Lay_EndRoundFrameTable ();
}
@ -357,7 +359,9 @@ void Rec_ShowFormCreateRecordField (void)
/***** Start of frame *****/
Lay_StartRoundFrameTable (NULL,Txt_New_record_field,NULL,
Hlp_USERS_Students_course_record_card,2);
Hlp_USERS_Students_course_record_card,
false, // Not closable
2);
/***** Write heading *****/
Rec_WriteHeadingRecordFields ();
@ -1357,8 +1361,9 @@ static void Rec_ShowRecordOneTchCrs (void)
{
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
NULL,Hlp_USERS_Teachers_timetable);
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL,
Hlp_USERS_Teachers_timetable,
false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</div>");
@ -1482,7 +1487,9 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
fprintf (Gbl.F.Out,"<div class=\"REC_TT\">");
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
NULL,Hlp_USERS_Teachers_timetable);
NULL,
Hlp_USERS_Teachers_timetable,
false); // Not closable
TT_ShowTimeTable (UsrDat.UsrCod);
Lay_EndRoundFrame ();
fprintf (Gbl.F.Out,"</div>");
@ -1770,8 +1777,10 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/***** Start frame *****/
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Lay_StartRoundFrameTable (StrRecordWidth,NULL,
NULL,Rec_RecordHelp[TypeOfView],2);
Lay_StartRoundFrameTable (StrRecordWidth,NULL,NULL,
Rec_RecordHelp[TypeOfView],
false, // Not closable
2);
/***** Header *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2310,6 +2319,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons
Rec_PutIconsCommands,
Rec_RecordHelp[TypeOfView],
false, // Not closable
2);
/***** Institution and user's photo *****/
@ -3985,7 +3995,10 @@ void Rec_ShowFormMyInsCtrDpt (void)
Lay_StartRoundFrameTable ("800px",
IAmATeacher ? Txt_Institution_centre_and_department :
Txt_Institution,
NULL,Hlp_PROFILE_Institution,2);
NULL,
Hlp_PROFILE_Institution,
false, // Not closable
2);
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"

8
swad_report.c
View File

@ -155,7 +155,9 @@ void Rep_ReqMyUsageReport (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Report);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,
Hlp_STATS_Report,
false); // Not closable
/***** Header *****/
Req_TitleReport (NULL); // NULL means do not write date
@ -259,7 +261,9 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Report_of_use_of_PLATFORM,Cfg_PLATFORM_SHORT_NAME);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Report);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,
Hlp_STATS_Report,
false); // Not closable
/***** Header *****/
Req_TitleReport (&Report->CurrentTimeUTC);

4
swad_search.c
View File

@ -236,7 +236,9 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Act_FormStart (Action);
Lay_StartRoundFrame (NULL,Txt_Search,NULL,Hlp_Search);
Lay_StartRoundFrame (NULL,Txt_Search,NULL,
Hlp_Search,
false); // Not closable
/***** Scope (whole platform, current country, current institution,
current centre, current degree or current course) *****/

13
swad_social.c
View File

@ -921,8 +921,9 @@ static void Soc_ShowTimeline (const char *Query,const char *Title,
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,
Soc_PutIconsTimeline,Hlp_SOCIAL_Timeline);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline,
Hlp_SOCIAL_Timeline,
false); // Not closable
/***** Put form to select users whom public activity is displayed *****/
if (GlobalTimeline)
@ -1274,7 +1275,9 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
/***** Start frame ****/
if (ShowNoteAlone)
{
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,
NULL,
true); // Closable
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
}
@ -2528,7 +2531,9 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
if (ShowCommentAlone)
{
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,
NULL,
false); // Not closable
/***** Write sharer/commenter if distinct to author *****/
Soc_WriteTopMessage (TopMessage,UsrCod);

183
swad_statistic.c
View File

@ -474,7 +474,9 @@ void Sta_AskShowCrsHits (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X,
Gbl.CurrentCrs.Crs.ShrtName);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,Hlp_STATS_Visits_visits_to_course);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,
Hlp_STATS_Visits_visits_to_course,
false); // Not closable
/***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqAccCrs);
@ -671,7 +673,9 @@ void Sta_AskShowGblHits (void)
/***** Start frame *****/
Lay_StartRoundFrameTable (NULL,Txt_Statistics_of_all_visits,NULL,
Hlp_STATS_Visits_global_visits,2);
Hlp_STATS_Visits_global_visits,
false, // Not closable
2);
/***** Start and end dates for the search *****/
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (Gbl.Action.Act == ActReqAccGbl);
@ -1462,11 +1466,14 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
{
/***** Put the table with the clicks *****/
if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
Lay_StartRoundFrame ("100%",Txt_List_of_detailed_clicks,
NULL,NULL);
Lay_StartRoundFrame ("100%",Txt_List_of_detailed_clicks,NULL,
NULL,
false); // Not closable
else
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],
NULL,NULL);
NULL,
NULL,
false); // Not closable
fprintf (Gbl.F.Out,"<table");
if (Sta_CellPadding[Gbl.Stat.ClicksGroupedBy])
@ -3907,7 +3914,9 @@ void Sta_ReqShowFigures (void)
Act_FormStart (ActSeeUseGbl);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Figures,NULL,Hlp_STATS_Figures);
Lay_StartRoundFrame (NULL,Txt_Figures,NULL,
Hlp_STATS_Figures,
false); // Not closable
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
@ -4070,8 +4079,10 @@ static void Sta_GetAndShowUsersStats (void)
extern const char *Txt_Average_number_of_users_belonging_to_a_course;
/***** Number of users *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],
NULL,Hlp_STATS_Figures_users,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS],NULL,
Hlp_STATS_Figures_users,
false, // Not closable
2);
fprintf (Gbl.F.Out,"<tr>"
"<th class=\"RIGHT_MIDDLE\">"
@ -4200,8 +4211,10 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Followers;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],
NULL,Hlp_STATS_Figures_ranking,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING],NULL,
Hlp_STATS_Figures_ranking,
false, // Not closable
2);
/***** Header *****/
fprintf (Gbl.F.Out,"<tr>"
@ -4267,8 +4280,10 @@ static void Sta_GetAndShowHierarchyStats (void)
extern const char *Hlp_STATS_Figures_hierarchy;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],
NULL,Hlp_STATS_Figures_hierarchy,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY],NULL,
Hlp_STATS_Figures_hierarchy,
false, // Not closable
2);
Sta_WriteHeadDegsCrssInSWAD ();
Sta_GetAndShowNumCtysInSWAD ();
Sta_GetAndShowNumInssInSWAD ();
@ -4955,8 +4970,9 @@ static void Sta_GetAndShowInstitutionsStats (void)
extern const char *Txt_Institutions;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Institutions,
NULL,Hlp_STATS_Figures_institutions);
Lay_StartRoundFrame (NULL,Txt_Institutions,NULL,
Hlp_STATS_Figures_institutions,
false); // Not closable
/***** Form to select type of list used to display degree photos *****/
Usr_GetAndUpdatePrefsAboutUsrList ();
@ -4992,8 +5008,10 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_centres,
NULL,NULL,2);
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_centres,NULL,
NULL,
false, // Not closable
2);
/***** Get institutions ordered by number of centres *****/
switch (Gbl.Scope.Current)
@ -5044,8 +5062,10 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_degrees,
NULL,NULL,2);
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_degrees,NULL,
NULL,
false, // Not closable
2);
/***** Get institutions ordered by number of degrees *****/
switch (Gbl.Scope.Current)
@ -5099,8 +5119,10 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
char Query[1024];
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_courses,
NULL,NULL,2);
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_courses,NULL,
NULL,
false, // Not closable
2);
/***** Get institutions ordered by number of courses *****/
switch (Gbl.Scope.Current)
@ -5158,7 +5180,10 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_users_in_courses,
NULL,NULL,2);
NULL,
NULL,
false, // Not closable
2);
/***** Get institutions ordered by number of users in courses *****/
switch (Gbl.Scope.Current)
@ -5220,7 +5245,10 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
/****** Institutions ordered by number of centres ******/
Lay_StartRoundFrameTable ("100%",Txt_Institutions_by_number_of_users_who_claim_to_belong_to_them,
NULL,NULL,2);
NULL,
NULL,
false, // Not closable
2);
/***** Get institutions ordered by number of users who claim to belong to them *****/
switch (Gbl.Scope.Current)
@ -5449,7 +5477,10 @@ static void Sta_GetAndShowFileBrowsersStats (void)
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLDERS_AND_FILES],
NULL,Hlp_STATS_Figures_folders_and_files,2);
NULL,
Hlp_STATS_Figures_folders_and_files,
false, // Not closable
2);
/***** Write table heading *****/
Sta_WriteStatsExpTreesTableHead ();
@ -6524,8 +6555,10 @@ static void Sta_GetAndShowOERsStats (void)
unsigned long NumFiles[2];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],
NULL,Hlp_STATS_Figures_open_educational_resources_oer,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_OER],NULL,
Hlp_STATS_Figures_open_educational_resources_oer,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6714,8 +6747,10 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumAssignmentsPerCourse = (float) NumAssignments / (float) NumCoursesWithAssignments;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],
NULL,Hlp_STATS_Figures_assignments,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ASSIGNMENTS],NULL,
Hlp_STATS_Figures_assignments,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6784,8 +6819,10 @@ static void Sta_GetAndShowTestsStats (void)
struct Tst_Stats Stats;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],
NULL,Hlp_STATS_Figures_tests,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_TESTS],NULL,
Hlp_STATS_Figures_tests,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -6955,7 +6992,10 @@ static void Sta_GetAndShowSocialActivityStats (void)
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SOCIAL_ACTIVITY],
NULL,Hlp_STATS_Figures_timeline,2);
NULL,
Hlp_STATS_Figures_timeline,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7242,8 +7282,10 @@ static void Sta_GetAndShowFollowStats (void)
float Average;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],
NULL,Hlp_STATS_Figures_followed_followers,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FOLLOW],NULL,
Hlp_STATS_Figures_followed_followers,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7503,8 +7545,10 @@ static void Sta_GetAndShowForumStats (void)
StatsForum.NumUsrsToBeNotifiedByEMail = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],
NULL,Hlp_STATS_Figures_forums,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FORUMS],NULL,
Hlp_STATS_Figures_forums,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -7860,8 +7904,10 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
unsigned NumMails[Ntf_NUM_NOTIFY_EVENTS];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],
NULL,Hlp_STATS_Figures_notifications,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTIFY_EVENTS],NULL,
Hlp_STATS_Figures_notifications,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8205,8 +8251,10 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications += NumNotif;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],
NULL,Hlp_STATS_Figures_notices,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_NOTICES],NULL,
Hlp_STATS_Figures_notices,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8288,8 +8336,10 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],
NULL,Hlp_STATS_Figures_messages,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES],NULL,
Hlp_STATS_Figures_messages,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8393,8 +8443,10 @@ static void Sta_GetAndShowSurveysStats (void)
}
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],
NULL,Hlp_STATS_Figures_surveys,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SURVEYS],NULL,
Hlp_STATS_Figures_surveys,
false, // Not closable
2);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8460,8 +8512,10 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],
NULL,Hlp_STATS_Figures_privacy,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_PRIVACY],NULL,
Hlp_STATS_Figures_privacy,
false, // Not closable
2);
/***** Privacy for photo *****/
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Photo,"PhotoVisibility");
@ -8628,8 +8682,10 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
unsigned NumUsrsTotal = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],
NULL,Hlp_STATS_Figures_language,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_LANGUAGES],NULL,
Hlp_STATS_Figures_language,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8770,7 +8826,10 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_FIRST_DAY_OF_WEEK],
NULL,Hlp_STATS_Figures_calendar,2);
NULL,
Hlp_STATS_Figures_calendar,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -8909,8 +8968,10 @@ static void Sta_GetAndShowNumUsrsPerDateFormat (void)
unsigned NumUsrsTotal = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_DATE_FORMAT],
NULL,Hlp_STATS_Figures_dates,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_DATE_FORMAT],NULL,
Hlp_STATS_Figures_dates,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -9047,8 +9108,10 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
unsigned NumUsrsTotal = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],
NULL,Hlp_STATS_Figures_icons,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_ICON_SETS],NULL,
Hlp_STATS_Figures_icons,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -9190,8 +9253,10 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
unsigned NumUsrsTotal = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],
NULL,Hlp_STATS_Figures_menu,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_MENUS],NULL,
Hlp_STATS_Figures_menu,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -9330,8 +9395,10 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
unsigned NumUsrsTotal = 0;
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],
NULL,Hlp_STATS_Figures_theme,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_THEMES],NULL,
Hlp_STATS_Figures_theme,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -9469,8 +9536,10 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],
NULL,Hlp_STATS_Figures_columns,2);
Lay_StartRoundFrameTable (NULL,Txt_STAT_USE_STAT_TYPES[Sta_SIDE_COLUMNS],NULL,
Hlp_STATS_Figures_columns,
false, // Not closable
2);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"

27
swad_survey.c
View File

@ -212,8 +212,9 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Surveys,
Svy_PutIconsListSurveys,Hlp_ASSESSMENT_Surveys);
Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys,
Hlp_ASSESSMENT_Surveys,
false); // Not closable
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -431,7 +432,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Start frame *****/
if (ShowOnlyThisSvyComplete)
Lay_StartRoundFrame (NULL,Txt_Survey,NULL,Hlp_ASSESSMENT_Surveys);
Lay_StartRoundFrame (NULL,Txt_Survey,NULL,
Hlp_ASSESSMENT_Surveys,
false); // Not closable
/***** Get data of this survey *****/
Svy.SvyCod = SvyCod;
@ -1817,6 +1820,7 @@ void Svy_RequestCreatOrEditSvy (void)
Txt_Edit_survey,
NULL,ItsANewSurvey ? Hlp_ASSESSMENT_Surveys_new_survey :
Hlp_ASSESSMENT_Surveys_edit_survey,
false, // Not closable
2);
/***** Scope of the survey *****/
@ -2013,7 +2017,10 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Groups);
Lay_StartRoundFrameTable ("95%",NULL,NULL,NULL,0);
Lay_StartRoundFrameTable ("95%",NULL,NULL,
NULL,
false, // Not closable
0);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2649,11 +2656,14 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
sprintf (Gbl.Title,"%s %u",
Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,...
Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst,NULL);
Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst,
NULL,
false); // Not closable
}
else
Lay_StartRoundFrame (NULL,Txt_New_question,
NULL,Hlp_ASSESSMENT_Surveys_questions);
Lay_StartRoundFrame (NULL,Txt_New_question,NULL,
Hlp_ASSESSMENT_Surveys_questions,
false); // Not closable
/***** Start form *****/
Act_FormStart (ActRcvSvyQst);
@ -3171,7 +3181,8 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Lay_StartRoundFrame (NULL,Txt_Questions,
Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion :
NULL,
Hlp_ASSESSMENT_Surveys_questions);
Hlp_ASSESSMENT_Surveys_questions,
false); // Not closable
if (NumQsts)
{

1
swad_syllabus.c
View File

@ -246,6 +246,7 @@ bool Syl_CheckAndEditSyllabus (void)
NULL,
Gbl.Syllabus.EditionIsActive ? Hlp_COURSE_Syllabus_edit :
Hlp_COURSE_Syllabus,
false, // Not closable
1);
/***** Write the current syllabus *****/

70
swad_test.c
View File

@ -315,8 +315,9 @@ void Tst_ShowFormAskTst (void)
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Take_a_test,
Tst_PutIconsTests,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Get tags *****/
if ((NumRows = Tst_GetEnabledTagsFromThisCrs (&mysql_res)) != 0)
@ -433,7 +434,9 @@ void Tst_ShowNewTest (void)
Tst_UpdateMyNumAccessTst (NumAccessesTst);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test,NULL,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Test,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -531,7 +534,9 @@ void Tst_AssessTest (void)
TstCod = Tst_CreateTestResultInDB ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -1274,8 +1279,9 @@ void Tst_ShowFormAskEditTsts (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_List_edit_questions,
Tst_PutIconsTests,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Get tags already present in the table of questions *****/
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
@ -1730,7 +1736,10 @@ static void Tst_ShowFormEditTags (void)
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
{
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Tags,NULL,Hlp_ASSESSMENT_Tests,2);
Lay_StartRoundFrameTable (NULL,Txt_Tags,NULL,
Hlp_ASSESSMENT_Tests,
false, // Not closable
2);
/***** Show tags *****/
for (NumRow = 0;
@ -1842,8 +1851,9 @@ static void Tst_ShowFormConfigTst (void)
Tst_GetConfigTstFromDB ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Configure_tests,
Tst_PutIconsTests,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Start form *****/
Act_FormStart (ActRcvCfgTst);
@ -2722,8 +2732,9 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
double TotalScoreThisQst;
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Questions,
Tst_PutIconsTests,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Write the heading *****/
Lay_StartTableWideMargin (2);
@ -4513,11 +4524,14 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
if (Gbl.Test.QstCod > 0) // The question already has assigned a code
{
sprintf (Title,Txt_Question_code_X,Gbl.Test.QstCod);
Lay_StartRoundFrame (NULL,Title,
Tst_PutIconToRemoveOneQst,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Title,Tst_PutIconToRemoveOneQst,
Hlp_ASSESSMENT_Tests,
false); // Not closable
}
else
Lay_StartRoundFrame (NULL,Txt_New_question,NULL,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_New_question,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Start form *****/
Act_FormStart (ActRcvTstQst);
@ -6976,8 +6990,9 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_results,
NULL,Hlp_ASSESSMENT_Tests_test_results);
Lay_StartRoundFrame (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable
/***** Show form to select the groups *****/
Grp_ShowFormToSelectSeveralGroups (ActReqSeeUsrTstRes);
@ -7061,8 +7076,10 @@ void Tst_SelDatesToSeeMyTestResults (void)
Act_FormStart (ActSeeMyTstRes);
/***** Starting and ending dates in the search *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,
NULL,Hlp_ASSESSMENT_Tests_test_results,2);
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
/***** Send button and end frame *****/
@ -7134,8 +7151,10 @@ void Tst_ShowUsrsTestResults (void)
if (Usr_CountNumUsrsInListOfSelectedUsrs ()) // If some users are selected...
{
/***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,
NULL,Hlp_ASSESSMENT_Tests_test_results,2);
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
Tst_ShowHeaderTestResults ();
/***** List the assignments and works of the selected users *****/
@ -7227,8 +7246,10 @@ void Tst_ShowMyTestResults (void)
Dat_GetIniEndDatesFromForm ();
/***** Header of the table with the list of users *****/
Lay_StartRoundFrameTable (NULL,Txt_Test_results,
NULL,Hlp_ASSESSMENT_Tests_test_results,2);
Lay_StartRoundFrameTable (NULL,Txt_Test_results,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false, // Not closable
2);
Tst_ShowHeaderTestResults ();
/***** List my test results *****/
@ -7693,8 +7714,9 @@ void Tst_ShowOneTestResult (void)
Tst_GetTestResultQuestionsFromDB (TstCod);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,
NULL,Hlp_ASSESSMENT_Tests_test_results);
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,
Hlp_ASSESSMENT_Tests_test_results,
false); // Not closable
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,

8
swad_test_import.c
View File

@ -135,7 +135,9 @@ void TsI_ShowFormImportQstsFromXML (void)
extern const char *Txt_XML_file;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Write help message *****/
Ale_ShowAlert (Ale_INFO,Txt_You_need_an_XML_file_containing_a_list_of_questions);
@ -506,7 +508,9 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer)
XML_GetTree (XMLBuffer,&RootElem);
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Imported_questions,NULL,Hlp_ASSESSMENT_Tests);
Lay_StartRoundFrame (NULL,Txt_Imported_questions,NULL,
Hlp_ASSESSMENT_Tests,
false); // Not closable
/***** Print XML tree *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""

125
swad_text.c
View File

@ -3772,34 +3772,34 @@ const char *Txt_Banners =
"Banners";
#endif
const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID =
const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered =
#if L==1
"Abans de crear un compte nou,"
" comprovi si ja li han inscrit amb el seu ID";
" comprovi si ja li han inscrit";
#elif L==2
"Bevor ein neues Benutzerkonto erstellen,"
" wenn Sie bereits mit Ihrer ID registriert worden sind";
" wenn Sie bereits registriert worden sind";
#elif L==3
"Before creating a new account,"
" check if you have been already registered with your ID";
" check if you have been already registered";
#elif L==4
"Antes de crear una nueva cuenta,"
" compruebe si ya le han inscrito con su ID";
" compruebe si ya le han inscrito";
#elif L==5
"Avant de cr&eacute;er un nouveau compte,"
" v&eacute;rifiez si vous avez d&eacute;j&agrave; enregistr&eacute; avec votre ID";
" v&eacute;rifiez si vous avez d&eacute;j&agrave; enregistr&eacute;";
#elif L==6
"Antes de crear una nueva cuenta,"
" compruebe si ya le han inscrito con su ID"; // Okoteve traducción
" compruebe si ya le han inscrito"; // Okoteve traducción
#elif L==7
"Prima di creare un nuovo account,"
" verificare se sono stati gi&agrave; registrato con il tuo ID";
" verificare se sono stati gi&agrave; registrato";
#elif L==8
"Przed utworzeniem nowego konta,"
" nale&zdot;y sprawdzi&cacute;, czy zosta&lstrok; on ju&zdot; zarejestrowany z identyfikatorem";
"Przed utworzeniem nowego konta sprawd&zacute;,"
" czy zosta&lstrok;e&sacute; ju&zdot; zarejestrowany";
#elif L==9
"Antes de criar uma nova conta,"
" verifique se voc&ecirc; j&aacute; foi registrado/a com o seu ID";
" verifique se voc&ecirc; j&aacute; foi registrado/a";
#endif
const char *Txt_Before_going_to_any_other_option_you_must_fill_your_nickname =
@ -4741,23 +4741,23 @@ const char *Txt_Check =
const char *Txt_Check_another_ID =
#if L==1
"Comprovar altre ID";
"Comprovar altre ID?";
#elif L==2
"&Uuml;berpr&uuml;fen Sie eine andere ID";
"&Uuml;berpr&uuml;fen Sie eine andere ID?";
#elif L==3
"Check another ID";
"Check another ID?";
#elif L==4
"Comprobar otro ID";
"&iquest;Comprobar otro ID?";
#elif L==5
"V&eacute;rifier un autre ID";
"V&eacute;rifier un autre ID?";
#elif L==6
"Comprobar otro ID"; // Okoteve traducción
"&iquest;Comprobar otro ID?"; // Okoteve traducción
#elif L==7
"Verificare un altro ID";
"Verificare un altro ID?";
#elif L==8
"Sprawdzi&cacute; inny identyfikator";
"Sprawdzi&cacute; inny identyfikator?";
#elif L==9
"Verificar outra ID";
"Verificar outra ID?";
#endif
const char *Txt_Check_marks_in_file_X = // Warning: it is very important to include %s in the following sentences
@ -15321,6 +15321,53 @@ const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_ =
" voc&ecirc; receber&aacute; um email com uma nova senha.";
#endif
const char *Txt_If_you_think_you_may_have_been_registered_ =
#if L==1
"Si creu que pot haver estat inscrit/a"
" per un professor o administrador,"
" comprovi escrivint algun dels seus possibles ID"
" (DNI amb lletra final o sense, passaport, etc.).";
#elif L==2
"Wenn Sie glauben, dass Sie"
" von einem Lehrer oder Administrator registriert worden sind,"
" &uuml;berpr&uuml;fen Sie ihn, indem Sie eine Ihrer m&ouml;glichen IDs"
" (ID, Reisepass usw.) schreiben.";
#elif L==3
"If you think you may have been registered"
" by a teacher or administrator,"
" check it by writing one of your possible IDs (ID, passport, etc.).";
#elif L==4
"Si cree que puede haber sido inscrito/a"
" por un profesor o administrador,"
" compru&eacute;belo escribiendo alguno de sus posibles ID"
" (DNI con letra final o sin ella, c&eacute;dula, pasaporte, etc.).";
#elif L==5
"Si vous pensez que vous avez &eacute;t&eacute; enregistr&eacute;"
" par un enseignant ou un administrateur,"
" v&eacute;rifiez-le en &eacute;crivant l'un de vos identifiants possibles"
" (carte d'identit&eacute;, passeport, etc.).";
#elif L==6
"Si cree que puede haber sido inscrito/a"
" por un profesor o administrador,"
" compru&eacute;belo escribiendo alguno de sus posibles ID"
" (DNI con letra final o sin ella, c&eacute;dula, pasaporte, etc.)."; // Okoteve traducción
#elif L==7
"Se pensi di essere stato registrato"
" da un insegnante o da un amministratore,"
" controllarlo scrivendo uno dei tuoi possibili ID"
" (ID, passaporto, ecc.).";
#elif L==8
"Je&sacute;li uwa&zdot;asz, &zdot;e mo&zdot;esz zosta&cacute; zarejestrowany"
" przez nauczyciela lub administratora,"
" sprawd&zacute; go, wpisuj&aogon;c jeden z mo&zdot;liwych identyfikator&oacute;w"
" (dowodu to&zdot;samo&sacute;ci, paszportu itp.).";
#elif L==9
"Se voc&ecirc; acha que pode ter sido registrado"
" por um professor ou administrador,"
" verifique-o escrevendo uma das suas poss&iacute;veis IDs"
" (identifica&ccedil;&atilde;o, passaporte, etc.).";
#endif
const char *Txt_Image =
#if L==1
"Imatge";
@ -47118,52 +47165,34 @@ const char *Txt_There_is_already_a_non_empty_folder_named_X = // Warning: it is
"There is already a non-empty folder named <strong>%s</strong>."; // Necessita de tradução
#endif
const char *Txt_There_is_no_empty_account_associated_with_your_ID_X_ = // Warning: it is very important to include %s in the following sentences
const char *Txt_There_is_no_empty_account_associated_with_your_ID_X = // Warning: it is very important to include %s in the following sentences
#if L==1
"No hi ha cap compte buida (encara no usada)"
" associada al seu ID <strong>%s</strong>."
" Si creu que pot haver estat inscrit amb un altre ID,"
" comprovi-ho, per favor.";
" associada al seu ID <strong>%s</strong>.";
#elif L==2
"Es gibt keine leeren Benutzerkonto (noch nicht verwendet)"
" im Zusammenhang mit Ihrer ID <strong>%s</strong>."
" Wenn Sie denken, dass Sie mit einer anderen ID registriert worden sein,"
" &uuml;berpr&uuml;fen Sie es bitte.";
" im Zusammenhang mit Ihrer ID <strong>%s</strong>.";
#elif L==3
"There is no empty (not yet used) account"
" associated with your ID <strong>%s</strong>."
" If you think you may have been registered with another ID,"
" check it, please.";
" associated with your ID <strong>%s</strong>.";
#elif L==4
"No existe ninguna cuenta vac&iacute;a (a&uacute;n no usada)"
" asociada a su ID <strong>%s</strong>."
" Si cree que puede haber sido inscrito/a con otro ID"
" (DNI con letra final o sin ella, NIE, c&eacute;dula, etc.), compru&eacute;belo, por favor.";
" asociada a su ID <strong>%s</strong>.";
#elif L==5
"Il n'y a pas de compte vide (pas encore utilis&eacute;)"
" associ&eacute; &agrave; votre ID <strong>%s</strong>."
" Si vous pensez que vous avez &eacute;t&eacute; enregistr&eacute; avec un autre ID,"
" v&eacute;rifier, s'il vous pla&icirc;t.";
" associ&eacute; &agrave; votre ID <strong>%s</strong>.";
#elif L==6
"No existe ninguna cuenta vac&iacute;a (a&uacute;n no usada)"
" asociada a su ID <strong>%s</strong>."
" Si cree que puede haber sido inscrito/a con otro ID,"
" compru&eacute;belo, por favor."; // Okoteve traducción
" asociada a su ID <strong>%s</strong>."; // Okoteve traducción
#elif L==7
"Non vi &egrave; alcun conto vuoto (non ancora utilizzato)"
" associato con il tuo ID <strong>%s</strong>."
" Se si pensa che potrebbe essere stato registrato/a con un altro ID,"
" verificare, per favore.";
" associato con il tuo ID <strong>%s</strong>.";
#elif L==8
"Nie ma pusta konta (jeszcze nie u&zdot;ywany)"
" powi&aogon;zany z identyfikatorem <strong>%s</strong>."
" Je&sacute;li uwa&zdot;asz, &zdot;e mog&lstrok;a zosta&cacute; zarejestrowana w innym ID,"
" sprawd&zacute; to, prosz&eogon;.";
" powi&aogon;zany z identyfikatorem <strong>%s</strong>.";
#elif L==9
"N&atilde;o existe nenhuma conta vazio (ainda n&atilde;o utilizado)"
" associado ao seu ID <strong>%s</strong>."
" Se voc&ecirc; acha que pode ter sido registado/a com outro ID,"
" verifique-o, por favor.";
" associado ao seu ID <strong>%s</strong>.";
#endif
const char *Txt_There_is_no_knowing_how_many_users_not_logged_have_accessed =

5
swad_theme.c
View File

@ -239,8 +239,9 @@ void The_PutIconsToSelectTheme (void)
extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,
The_PutIconsTheme,Hlp_PROFILE_Preferences_theme);
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme,
Hlp_PROFILE_Preferences_theme,
false); // Not closable
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
for (Theme = (The_Theme_t) 0;
Theme < The_NUM_THEMES;

11
swad_timetable.c
View File

@ -355,7 +355,8 @@ void TT_ShowClassTimeTable (void)
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons :
NULL,
Help[Gbl.TimeTable.Type]);
Help[Gbl.TimeTable.Type],
false); // Not closable
/***** Start time table drawing *****/
if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE)
@ -432,7 +433,9 @@ void TT_EditCrsTimeTable (void)
/***** Editable time table *****/
Gbl.TimeTable.Type = TT_COURSE_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewCrsTT,Hlp_COURSE_Timetable);
TT_PutIconToViewCrsTT,
Hlp_COURSE_Timetable,
false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}
@ -449,7 +452,9 @@ void TT_EditMyTutTimeTable (void)
/***** Time table *****/
Gbl.TimeTable.Type = TT_TUTORING_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewMyTT,Hlp_PROFILE_Timetable);
TT_PutIconToViewMyTT,
Hlp_PROFILE_Timetable,
false); // Not closable
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}

34
swad_user.c
View File

@ -2260,7 +2260,10 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
FuncParams ();
/***** Start frame and table *****/
Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL,Hlp_PROFILE_LogIn,2);
Lay_StartRoundFrameTable (NULL,Txt_Log_in,NULL,
Hlp_PROFILE_LogIn,
false, // Not closable
2);
/***** User's ID/nickname *****/
fprintf (Gbl.F.Out,"<div class=\"LEFT_MIDDLE\">"
@ -3150,7 +3153,9 @@ void Usr_ShowFormsLogoutAndRole (void)
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Role,NULL,Hlp_PROFILE_Session_role);
Lay_StartRoundFrame (NULL,Txt_Role,NULL,
Hlp_PROFILE_Session_role,
false); // Not closable
/***** Put a form to change my role *****/
if (Rol_GetNumAvailableRoles () == 1)
@ -6667,7 +6672,10 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
Txt_users[Sex]) :
((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] :
Txt_ROLES_PLURAL_abc[Role][Sex]));
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,NULL,2);
Lay_StartRoundFrameTable (NULL,Gbl.Title,NULL,
NULL,
false, // Not closable
2);
/***** Heading row with column names *****/
Gbl.Usrs.Listing.WithPhotos = true;
@ -6816,7 +6824,9 @@ void Usr_ListDataAdms (void)
/***** Start frame with list of administrators *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],
NULL,Hlp_USERS_Administrators);
NULL,
Hlp_USERS_Administrators,
false); // Not closable
/***** Form to select scope *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
@ -7291,7 +7301,9 @@ void Usr_SeeGuests (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_GST][Usr_SEX_UNKNOWN],
Usr_PutIconsListGsts,Hlp_USERS_Guests);
Usr_PutIconsListGsts,
Hlp_USERS_Guests,
false); // Not closable
/***** Form to select scope *****/
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
@ -7437,7 +7449,9 @@ void Usr_SeeStudents (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],
Usr_PutIconsListStds,Hlp_USERS_Students);
Usr_PutIconsListStds,
Hlp_USERS_Students,
false); // Not closable
/***** Form to select scope *****/
switch (Gbl.Usrs.Me.Role.Logged)
@ -7622,7 +7636,9 @@ void Usr_SeeTeachers (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],
Usr_PutIconsListTchs,Hlp_USERS_Teachers);
Usr_PutIconsListTchs,
Hlp_USERS_Teachers,
false); // Not closable
/***** Form to select scope *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
@ -8793,7 +8809,9 @@ void Usr_PrintUsrQRCode (void)
if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ())
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL,NULL);
Lay_StartRoundFrame (NULL,Gbl.Usrs.Other.UsrDat.FullName,NULL,
NULL,
false); // Not closable
/***** Show QR code *****/
if (Gbl.Usrs.Other.UsrDat.Nickname[0])