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

This commit is contained in:
Antonio Cañas Vargas 2016-11-12 22:00:50 +01:00
parent 8199c09afa
commit 39f5f45114
58 changed files with 190 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_ID.c
View File

@ -509,7 +509,7 @@ void ID_ShowFormOthIDs (void)
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ID,NULL);
Lay_StartRoundFrame (NULL,Txt_ID,NULL,NULL);
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);

2
swad_MFU.c
View File

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

4
swad_account.c
View File

@ -141,7 +141,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
extern const char *Txt_Check;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Title,NULL);
Lay_StartRoundFrame (NULL,Title,NULL,NULL);
/***** Form to request user's ID for possible account already created *****/
Act_FormStart (ActChkUsrAcc);
@ -391,7 +391,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL);
/***** Button to go to request the creation of a new account *****/
Act_FormStart (ActFrmMyAcc);

3
swad_announcement.c
View File

@ -116,7 +116,8 @@ void Ann_ShowAllAnnouncements (void)
/***** Start frame *****/
Lay_StartRoundFrame ("550px",Txt_Announcements,
ICanEdit ? Ann_PutIconToAddNewAnnouncement :
NULL);
NULL,
NULL);
if (!NumAnnouncements)
Lay_ShowAlert (Lay_INFO,Txt_No_announcements);

3
swad_assignment.c
View File

@ -136,7 +136,8 @@ static void Asg_ShowAllAssignments (void)
Pag_WriteLinksToPagesCentered (Pag_ASSIGNMENTS,0,&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Assignments,Asg_PutIconsListAssignments);
Lay_StartRoundFrame ("100%",Txt_Assignments,
Asg_PutIconsListAssignments,NULL);
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)

9
swad_attendance.c
View File

@ -208,7 +208,8 @@ static void Att_ShowAllAttEvents (void)
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Events,
ICanEdit ? Att_PutIconToCreateNewAttEvent :
NULL);
NULL,
NULL);
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -2598,7 +2599,8 @@ void Usr_ReqListStdsAttendanceCrs (void)
/***** Draw a class photo with students of the course *****/
/* Start frame */
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
NULL,NULL);
/* Form to select type of list used for select several users */
Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt);
@ -3129,7 +3131,8 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView,
Lay_StartRoundFrame (NULL,Txt_Attendance,
(TypeOfView == Att_NORMAL_VIEW_ONLY_ME) ? Att_PutIconToPrintMyList :
((TypeOfView == Att_NORMAL_VIEW_STUDENTS) ? Att_PutIconToPrintStdsList :
NULL));
NULL),
NULL);
fprintf (Gbl.F.Out,"<table class=\"%s CELLS_PAD_2\">",
PutButtonShowDetails ? "FRAME_TABLE_MARGIN" :
"FRAME_TABLE");

2
swad_banner.c
View File

@ -86,7 +86,7 @@ void Ban_SeeBanners (void)
" ORDER BY ShortName");
/***** Frame head *****/
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners);
Lay_StartRoundFrame (NULL,Txt_Banners,Ban_PutFormToEditBanners,NULL);
/***** Write all the banners *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");

5
swad_calendar.c
View File

@ -73,7 +73,7 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
{
extern const char *Txt_Calendar;
Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek);
Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek,NULL);
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40B");
Lay_EndRoundFrame ();
}
@ -242,7 +242,8 @@ void Cal_DrawCalendar (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Cal_PutIconToPrintCalendar);
Cal_PutIconToPrintCalendar,
NULL);
Lay_WriteHeaderClassPhoto (PrintView,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,

7
swad_centre.c
View File

@ -295,7 +295,8 @@ static void Ctr_Configuration (bool PrintView)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Ctr_PutIconsToPrintAndUpload);
Ctr_PutIconsToPrintAndUpload,
NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
@ -739,7 +740,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,Ctr_PutIconsListCentres,NULL);
if (Gbl.Ctrs.Num) // There are centres in the current institution
{
@ -2180,7 +2181,7 @@ void Ctr_RequestPhoto (void)
Act_FormStart (ActRecCtrPho);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,NULL);
Lay_StartRoundFrame (NULL,Txt_Photo,NULL,NULL);
/***** Write help message *****/
sprintf (Gbl.Message,"%s: %s<br />"

3
swad_changelog.h
View File

@ -156,13 +156,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.51 (2016-11-12)"
#define Log_PLATFORM_VERSION "SWAD 16.52 (2016-11-12)"
#define CSS_FILE "swad16.51.css"
#define JS_FILE "swad16.46.1.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.52: Nov 12, 2016 Code refactoring in frames to include contextual help. (206653 lines)
Version 16.51: Nov 12, 2016 Contextual help on the top right corner of frames. (206606 lines)
Copy icon/help64x64.png to icon directory

2
swad_chat.c
View File

@ -116,7 +116,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
Usr_GetMyDegrees ();
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL);
Lay_StartRoundFrame (NULL,Txt_Chat_rooms,NULL,NULL);
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT\">");

4
swad_connected.c
View File

@ -98,7 +98,7 @@ void Con_ShowConnectedUsrs (void)
Gbl.Now.Date.Day,
Gbl.Now.Time.Hour,
Gbl.Now.Time.Minute);
Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected);
Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected,NULL);
/***** Number of connected users in the whole platform *****/
Con_ShowGlobalConnectedUsrs ();
@ -149,7 +149,7 @@ void Con_ShowLastClicks (void)
{
extern const char *Txt_Last_clicks_in_real_time;
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL);
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL,NULL);
fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh
" class=\"CENTER_MIDDLE\">");

5
swad_country.c
View File

@ -227,7 +227,8 @@ static void Cty_Configuration (bool PrintView)
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Cty_PutIconToPrint);
Cty_PutIconToPrint,
NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
@ -515,7 +516,7 @@ void Cty_ListCountries2 (void)
const char *BgColor;
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconsListCountries);
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconsListCountries,NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Cty_ORDER_BY_COUNTRY;

9
swad_course.c
View File

@ -189,7 +189,8 @@ static void Crs_Configuration (bool PrintView)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Crs_PutIconToPrint);
Crs_PutIconToPrint,
NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
@ -538,7 +539,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]);
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL);
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL,NULL);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<ul class=\"LIST_LEFT\">");
@ -1179,7 +1180,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,Crs_PutIconsListCourses,NULL);
if (Gbl.CurrentDeg.NumCrss) // There are courses in the current degree
{
@ -3337,7 +3338,7 @@ void Crs_AskRemoveOldCrss (void)
Act_FormStart (ActRemOldCrs);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL,NULL);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",

5
swad_degree.c
View File

@ -309,7 +309,8 @@ static void Deg_Configuration (bool PrintView)
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Deg_PutIconsToPrintAndUpload);
Deg_PutIconsToPrintAndUpload,
NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
@ -1620,7 +1621,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,Deg_PutIconsListDegrees,NULL);
if (Gbl.CurrentCtr.Ctr.Degs.Num) // There are degrees in the current centre
{

3
swad_degree_type.c
View File

@ -199,7 +199,8 @@ static void DT_ListDegreeTypesForSeeing (void)
/***** Write heading *****/
Lay_StartRoundFrame (NULL,Txt_Types_of_degree,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
DT_PutHeadDegreeTypesForSeeing ();

3
swad_department.c
View File

@ -98,7 +98,8 @@ void Dpt_SeeDepts (void)
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Departments,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Dpt_PutIconToEditDpts :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Dpt_ORDER_BY_DEPARTMENT;

4
swad_duplicate.c
View File

@ -137,7 +137,7 @@ void Dup_ListDuplicateUsrs (void)
unsigned NumInformants;
/***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL);
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL,NULL);
/***** Build query *****/
sprintf (Query,"SELECT UsrCod,COUNT(*) AS N,MIN(UNIX_TIMESTAMP(InformTime)) AS T"
@ -254,7 +254,7 @@ static void Dup_ListSimilarUsrs (void)
unsigned NumUsr;
/***** Start frame with list of possible duplicate users *****/
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL);
Lay_StartRoundFrame (NULL,Txt_Possibly_duplicate_users,NULL,NULL);
/***** Build query *****/
if (Gbl.Usrs.Other.UsrDat.Surname1[0] &&

10
swad_enrollment.c
View File

@ -351,7 +351,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
extern const char *Txt_Remove_me_from_this_course;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL);
Lay_StartRoundFrame (NULL,Txt_Enrollment,NULL,NULL);
/***** Show message *****/
sprintf (Gbl.Message,Txt_A_teacher_or_administrator_has_enrolled_you_into_the_course_,
@ -609,7 +609,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
Lay_StartRoundFrame (NULL,
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers,
NULL);
NULL,NULL);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
@ -698,7 +698,7 @@ void Enr_AskRemoveOldUsrs (void)
Act_FormStart (ActRemOldUsr);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL,NULL);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
@ -2125,7 +2125,7 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected)
Sco_GetScope ("ScopeEnr");
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Enrollment_requests,NULL);
Lay_StartRoundFrame ("100%",Txt_Enrollment_requests,NULL,NULL);
/***** Selection of scope and roles *****/
/* Start form */
@ -2913,7 +2913,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (Rol_Role_t Role)
extern const char *Txt_Admin_one_user;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL);
Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL,NULL);
/***** Write form to request another user's ID *****/
Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd :

6
swad_exam.c
View File

@ -554,7 +554,8 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
Gbl.ExamAnnouncements.HighlightDate[0]) ? Txt_All_announcements_of_exam :
Txt_Announcements_of_exam,
ICanEdit ? Exa_PutIconToCreateNewExamAnnouncement :
NULL);
NULL,
NULL);
/***** The result of the query may be empty *****/
if (!NumExaAnns)
@ -932,7 +933,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t
Gbl.ExamAnnouncements.ExaCodToEdit = ExaCod; // Used as parameter in contextual links
Lay_StartRoundFrame ("625px",NULL,
TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement :
NULL);
NULL,
NULL);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{

16
swad_file_browser.c
View File

@ -3063,7 +3063,7 @@ void Brw_AskEditWorksCrs (void)
Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs,NULL))
{
/***** Draw class photos to select users *****/
Lay_StartRoundFrame (NULL,Txt_Users,NULL);
Lay_StartRoundFrame (NULL,Txt_Users,NULL,NULL);
/* Form to select type of list used for select several users */
Usr_ShowFormsToSelectUsrListType (ActReqAsgWrkCrs);
@ -3585,7 +3585,7 @@ static void Brw_ShowFileBrowser (void)
Gbl.FileBrowser.Id++;
fprintf (Gbl.F.Out,"<section id=\"file_browser_%u\">",Gbl.FileBrowser.Id);
Lay_StartRoundFrame ("100%",Brw_TitleOfFileBrowser[Gbl.FileBrowser.Type],
Brw_PutIconsFileBrowser);
Brw_PutIconsFileBrowser,NULL);
/***** Subtitle *****/
Brw_WriteSubtitleOfFileBrowser ();
@ -8027,7 +8027,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL);
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL,NULL);
sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
@ -8062,7 +8062,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL);
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_upload_new_files_to_the_folder_X,
@ -8150,7 +8150,7 @@ 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);
Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_upload_a_new_file_to_the_folder_X,
@ -8218,7 +8218,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Paste,NULL);
Lay_StartRoundFrame (NULL,Txt_Paste,NULL,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X,
@ -8266,7 +8266,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeUntilFilFolLnk,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL);
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X,
@ -11764,7 +11764,7 @@ void Brw_AskRemoveOldFiles (void)
Brw_PutParamsContextualLink ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL);
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL,NULL);
/***** Form to request number of months (to remove files older) *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",

2
swad_follow.c
View File

@ -224,7 +224,7 @@ void Fol_SuggestWhoToFollow (void)
if (NumUsrs)
{
/***** Start frame *****/
Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow);
Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_PutIconsWhoToFollow,NULL);
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);

8
swad_forum.c
View File

@ -972,7 +972,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
ReadTimeUTC = For_GetThrReadTime (ThrCod);
/* Table start */
Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums);
Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums,NULL);
/* Put a form to select which forums */
For_PutFormWhichForums ();
@ -1740,7 +1740,7 @@ void For_ShowForumList (void)
Usr_GetMyInstits ();
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums);
Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums,NULL);
/***** Put a form to select which forums *****/
For_PutFormWhichForums ();
@ -2591,7 +2591,7 @@ void For_ShowForumThrs (void)
/***** Header whith the name of this forum, the number of threads, and the total number of posts *****/
/* Table start */
Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums);
Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums,NULL);
/* Put a form to select which forums */
For_PutFormWhichForums ();
@ -3807,7 +3807,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Lay_StartRoundFrame (NULL,
IsReply ? Txt_New_message :
Txt_New_thread,
NULL);
NULL,NULL);
/***** Start form *****/
if (IsReply) // Form to write a reply to a message of an existing thread

6
swad_group.c
View File

@ -243,7 +243,8 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Groups,
ICanEdit ? Grp_PutIconToEditGroups :
NULL);
NULL,
NULL);
/***** Start form to update the students listed
depending on the groups selected *****/
@ -1570,7 +1571,8 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_My_groups,
ICanEdit ? Grp_PutIconToEditGroups :
NULL);
NULL,
NULL);
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups
{

3
swad_holiday.c
View File

@ -94,7 +94,8 @@ void Hld_SeeHolidays (void)
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Holidays,
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Hld_ORDER_BY_PLACE;

2
swad_icon.c
View File

@ -75,7 +75,7 @@ void Ico_PutIconsToSelectIconSet (void)
extern const char *Txt_Icons;
Ico_IconSet_t IconSet;
Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet);
Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (IconSet = (Ico_IconSet_t) 0;

2
swad_indicator.c
View File

@ -103,7 +103,7 @@ void Ind_ReqIndicatorsCourses (void)
Ind_GetParamsIndicators ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL);
Lay_StartRoundFrame (NULL,Txt_Indicators_of_courses,NULL,NULL);
/***** Form to update indicators *****/
/* Start form */

18
swad_info.c
View File

@ -401,7 +401,8 @@ void Inf_ShowInfo (void)
{
Lay_StartRoundFrame ("100%",Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL);
NULL,
NULL);
Lay_ShowAlert (Lay_INFO,Txt_No_information);
if (ICanEdit)
Inf_PutButtonToEditInfo ();
@ -996,7 +997,8 @@ static void Inf_ShowPage (const char *URL)
/***** Start of frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL);
NULL,
NULL);
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
@ -1733,7 +1735,8 @@ static bool Inf_CheckAndShowPlainTxt (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL);
NULL,
NULL);
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -1805,7 +1808,8 @@ static bool Inf_CheckAndShowRichTxt (void)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
ICanEdit ? Inf_PutIconToEditInfo :
NULL);
NULL,
NULL);
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -1979,7 +1983,8 @@ 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);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
NULL,NULL);
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)
@ -2018,7 +2023,8 @@ 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);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
NULL,NULL);
if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION ||
Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE)

5
swad_institution.c
View File

@ -293,7 +293,8 @@ static void Ins_Configuration (bool PrintView)
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Ins_PutIconsToPrintAndUpload);
Ins_PutIconsToPrintAndUpload,
NULL);
/***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">");
@ -662,7 +663,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,Ins_PutIconsListInstitutions,NULL);
if (Gbl.Inss.Num) // There are institutions in the current country
{

23
swad_layout.c
View File

@ -1239,7 +1239,7 @@ void Lay_WriteTitle (const char *Title)
void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,
const char *Title)
{
Lay_StartRoundFrame (Width,Title,NULL);
Lay_StartRoundFrame (Width,Title,NULL,NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE");
if (CellPadding)
@ -1248,7 +1248,8 @@ void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,
}
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void))
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink)
{
extern const char *Txt_Help;
@ -1266,17 +1267,15 @@ void Lay_StartRoundFrame (const char *Width,const char *Title,
FunctionToDrawContextualIcons ();
fprintf (Gbl.F.Out,"</div>");
}
// if (HelpLink)
// {
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS_RIGHT\">");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",
"https://github.com/acanas/swad-core/wiki/User%20guide");
if (HelpLink)
{
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS_RIGHT\">"
"<a href=\"%s\" target=\"_blank\">",
HelpLink);
Lay_PutIconWithText ("help64x64.png",Txt_Help,NULL);
fprintf (Gbl.F.Out,"</a>");
fprintf (Gbl.F.Out,"</div>");
// }
fprintf (Gbl.F.Out,"</a>"
"</div>");
}
fprintf (Gbl.F.Out,"</div>");
if (Title)

3
swad_layout.h
View File

@ -97,7 +97,8 @@ void Lay_PutRemoveButtonInline (const char *Text);
void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,
const char *Title);
void Lay_StartRoundFrame (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void));
void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink);
void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding);
void Lay_EndRoundFrameTable (void);
void Lay_EndRoundFrame (void);

3
swad_link.c
View File

@ -85,7 +85,8 @@ void Lnk_SeeLinks (void)
{
Lay_StartRoundFrame (NULL,Txt_Links,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Lnk_PutIconToEditLinks :
NULL);
NULL,
NULL);
Lnk_WriteListOfLinks ();
Lay_EndRoundFrame ();
}

2
swad_logo.c
View File

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

7
swad_mail.c
View File

@ -103,7 +103,8 @@ void Mai_SeeMailDomains (void)
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Mail_domains_allowed_for_notifications,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Mai_ORDER_BY_DOMAIN;
@ -1122,7 +1123,7 @@ void Mai_ShowFormOthEmail (void)
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Email,NULL);
Lay_StartRoundFrame (NULL,Txt_Email,NULL,NULL);
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
@ -1524,7 +1525,7 @@ void Mai_PutButtonToCheckEmailAddress (void)
Act_FormStart (ActFrmMyAcc);
/***** Frame with button to go to account *****/
Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL);
Lay_StartRoundFrame (NULL,Txt_Email_unconfirmed,NULL,NULL);
Lay_ShowAlert (Lay_WARNING,Txt_Please_check_and_confirm_your_email_address);
Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Check);

2
swad_menu.c
View File

@ -311,7 +311,7 @@ void Mnu_PutIconsToSelectMenu (void)
extern const char *Txt_MENU_NAMES[Mnu_NUM_MENUS];
Mnu_Menu_t Menu;
Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu);
Lay_StartRoundFrame (NULL,Txt_Menu,Mnu_PutIconsMenu,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (Menu = (Mnu_Menu_t) 0;

4
swad_message.c
View File

@ -202,7 +202,7 @@ static void Msg_PutFormMsgUsrs (char *Content)
Lay_StartRoundFrame (NULL,
Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message,
NULL);
NULL,NULL);
if (Gbl.Msg.ShowOnlyOneRecipient)
/***** Form to show several potential recipients *****/
@ -1716,7 +1716,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
/***** Start frame with messages *****/
Lay_StartRoundFrame ("97%",
Msg_WriteNumMsgs (NumUnreadMsgs),
Msg_PutIconsListMsgs);
Msg_PutIconsListMsgs,NULL);
if (Gbl.Msg.NumMsgs) // If there are messages...
{

2
swad_network.c
View File

@ -296,7 +296,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/***** Start table *****/
Lay_StartRoundFrame (NULL,Txt_Webs_social_networks,
Net_PutIconsWebsSocialNetworks);
Net_PutIconsWebsSocialNetworks,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;

2
swad_notice.c
View File

@ -393,7 +393,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
Lay_StartRoundFrame (StrWidth,
Gbl.CurrentCrs.Notices.HighlightNotCod > 0 ? Txt_All_notices :
Txt_Notices,
Not_PutIconsListNotices);
Not_PutIconsListNotices,NULL);
if (!NumNotices)
Lay_ShowAlert (Lay_INFO,Txt_No_notices);
}

4
swad_notification.c
View File

@ -371,7 +371,7 @@ void Ntf_ShowMyNotifications (void)
Usr_UsrDataConstructor (&UsrDat);
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif);
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"
"<th colspan=\"2\" class=\"LEFT_MIDDLE\">"
@ -1880,7 +1880,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Ntf_NotifyEvent_t NotifyEvent;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif);
Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif,NULL);
/***** Start form *****/
Act_FormStart (ActChgNtfPrf);

4
swad_password.c
View File

@ -244,7 +244,7 @@ void Pwd_ShowFormSendNewPwd (void)
Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL);
Lay_StartRoundFrame (NULL,Txt_Forgotten_password,NULL,NULL);
/***** Help text *****/
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
@ -804,7 +804,7 @@ void Pwd_ShowFormOthPwd (void)
if (Pwd_CheckIfICanChangeOtherUsrPassword (Gbl.Usrs.Other.UsrDat.UsrCod))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Password,NULL);
Lay_StartRoundFrame (NULL,Txt_Password,NULL,NULL);
/***** Show user's record *****/
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);

15
swad_photo.c
View File

@ -311,7 +311,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
Pho_PutIconToRequestRemoveOtherUsrPhoto);
Pho_PutIconToRequestRemoveOtherUsrPhoto,
NULL);
/***** Start form *****/
if (ItsMe)
@ -425,7 +426,8 @@ void Pho_ReqRemoveMyPhoto (void)
if (Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,Pho_PutIconToRequestRemoveMyPhoto);
Lay_StartRoundFrame (NULL,Txt_Photo,
Pho_PutIconToRequestRemoveMyPhoto,NULL);
/***** Show current photo and help message *****/
Pho_ShowUsrPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL,
@ -490,7 +492,8 @@ void Pho_ReqRemoveUsrPhoto (void)
if (Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Photo,Pho_PutIconToRequestRemoveOtherUsrPhoto);
Lay_StartRoundFrame (NULL,Txt_Photo,
Pho_PutIconToRequestRemoveOtherUsrPhoto,NULL);
Pho_ShowUsrPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,
"PHOTO186x248",Pho_NO_ZOOM,false);
@ -2037,7 +2040,8 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees,
SeeOrPrint == Pho_DEGREES_SEE ? Pho_PutIconToPrintDegreeStats :
NULL);
NULL,
NULL);
if (NumRows) // Degrees with students found
{
@ -2129,7 +2133,8 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees,
SeeOrPrint == Pho_DEGREES_SEE ? Pho_PutIconToPrintDegreeStats :
NULL);
NULL,
NULL);
if (NumRows) // Degrees with students found
{

3
swad_place.c
View File

@ -95,7 +95,8 @@ void Plc_SeePlaces (void)
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Places,
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Plc_PutIconToEditPlaces :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Plc_ORDER_BY_PLACE;

3
swad_plugin.c
View File

@ -93,7 +93,8 @@ void Plg_ListPlugins (void)
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Plugins,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Plg_PutIconToEditPlugins :
NULL);
NULL,
NULL);
/***** Write table heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"

4
swad_preference.c
View File

@ -73,7 +73,7 @@ void Pre_EditPrefs (void)
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:16px 0;\">"
"<tr>"
"<td>");
Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage);
Lay_StartRoundFrame (NULL,Txt_Language,Pre_PutIconsLanguage,NULL);
fprintf (Gbl.F.Out,"<div style=\"height:42px;\">");
Pre_PutSelectorToSelectLanguage (); // 1. Language
fprintf (Gbl.F.Out,"</div>");
@ -380,7 +380,7 @@ static void Pre_PutIconsToSelectSideCols (void)
extern const char *Txt_LAYOUT_SIDE_COLUMNS[4];
unsigned SideCols;
Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns);
Lay_StartRoundFrame (NULL,Txt_Columns,Pre_PutIconsSideColumns,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (SideCols = 0;

2
swad_privacy.c
View File

@ -101,7 +101,7 @@ void Pri_EditMyPrivacy (void)
Lay_ShowAlert (Lay_WARNING,Txt_Please_review_your_privacy_preferences);
/***** Start table *****/
Lay_StartRoundFrame (NULL,Txt_Privacy,Pri_PutIconsPrivacy);
Lay_StartRoundFrame (NULL,Txt_Privacy,Pri_PutIconsPrivacy,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
/***** Edit photo visibility *****/

2
swad_profile.c
View File

@ -168,7 +168,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
Act_FormStart (ActSeePubPrf);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_View_public_profile,NULL);
Lay_StartRoundFrame (NULL,Txt_View_public_profile,NULL,NULL);
/***** Form to request user's @nickname *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"

8
swad_record.c
View File

@ -1259,7 +1259,8 @@ static void Rec_ShowRecordOneTchCrs (void)
/* Office hours */
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL);
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
NULL,NULL);
TT_ShowTimeTable (Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_EndRoundFrame ();
@ -1360,7 +1361,8 @@ void Rec_ListRecordsTchs (void)
if (ShowOfficeHours)
{
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],NULL);
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
NULL,NULL);
TT_ShowTimeTable (UsrDat.UsrCod);
Lay_EndRoundFrame ();
}
@ -2072,7 +2074,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
sprintf (StrRecordWidth,"%upx",Rec_RECORD_WIDTH);
Gbl.Record.UsrDat = UsrDat;
Gbl.Record.TypeOfView = TypeOfView;
Lay_StartRoundFrame (StrRecordWidth,NULL,Rec_PutIconsCommands);
Lay_StartRoundFrame (StrRecordWidth,NULL,Rec_PutIconsCommands,NULL);
/***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">");

4
swad_report.c
View File

@ -154,7 +154,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL);
/***** Header *****/
Req_TitleReport (NULL); // NULL means do not write date
@ -258,7 +258,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL);
/***** Header *****/
Req_TitleReport (&Report->CurrentTimeUTC);

2
swad_search.c
View File

@ -231,7 +231,7 @@ 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);
Lay_StartRoundFrame (NULL,Txt_Search,NULL,NULL);
/***** Scope (whole platform, current country, current institution,
current centre, current degree or current course) *****/

6
swad_social.c
View File

@ -852,7 +852,7 @@ 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);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title,Soc_PutIconsTimeline,NULL);
/***** Form to write a new post *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0 || // Global timeline
@ -1096,7 +1096,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
/***** Start frame ****/
if (ShowNoteAlone)
{
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL);
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
}
@ -2349,7 +2349,7 @@ static void Soc_WriteSocialComment (struct SocialComment *SocCom,
if (ShowCommentAlone)
{
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL);
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,NULL,NULL,NULL);
/***** Write sharer/commenter if distinct to author *****/
Soc_WriteTopMessage (TopMessage,UsrCod);

14
swad_statistic.c
View File

@ -438,7 +438,7 @@ 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);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL,NULL);
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqAccCrs);
@ -609,7 +609,7 @@ void Sta_AskShowGblHits (void)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<section id=\"stat_form\">");
Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL);
Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL,NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">");
/***** Start and end dates for the search *****/
@ -1360,9 +1360,11 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
/* Write start of table frame */
fprintf (Gbl.F.Out,"<section id=\"stat_results\">");
if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks,NULL);
Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks,
NULL,NULL);
else
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],NULL);
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],
NULL,NULL);
fprintf (Gbl.F.Out,"<table");
if (Sta_CellPadding[Gbl.Stat.ClicksGroupedBy])
@ -3801,7 +3803,7 @@ void Sta_ReqShowFigures (void)
Act_FormStart (ActSeeUseGbl);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Statistic,NULL);
Lay_StartRoundFrame (NULL,Txt_Statistic,NULL,NULL);
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
@ -4712,7 +4714,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
Usr_GetAndUpdatePrefsAboutUsrList ();
/***** Form to select type of list used to display degree photos *****/
Lay_StartRoundFrame (NULL,Txt_Institutions,NULL);
Lay_StartRoundFrame (NULL,Txt_Institutions,NULL,NULL);
Usr_ShowFormsToSelectUsrListType (ActSeeUseGbl);
Lay_EndRoundFrame ();

9
swad_survey.c
View File

@ -211,7 +211,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Pag_WriteLinksToPagesCentered (Pag_SURVEYS,0,&Pagination);
/***** Start frame *****/
Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys);
Lay_StartRoundFrame ("100%",Txt_Surveys,Svy_PutIconsListSurveys,NULL);
/***** Select whether show only my groups or all groups *****/
if (Gbl.CurrentCrs.Grps.NumGrps)
@ -2648,10 +2648,10 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
sprintf (Gbl.Title,"%s %u",
Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,...
Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst);
Lay_StartRoundFrame (NULL,Gbl.Title,Svy_PutIconToRemoveOneQst,NULL);
}
else
Lay_StartRoundFrame (NULL,Txt_New_question,NULL);
Lay_StartRoundFrame (NULL,Txt_New_question,NULL,NULL);
/***** Start form *****/
Act_FormStart (ActRcvSvyQst);
@ -3174,7 +3174,8 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Gbl.Svys.SvyCodToEdit = Svy->SvyCod;
Lay_StartRoundFrame (NULL,Txt_Questions,
Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion :
NULL);
NULL,
NULL);
if (NumQsts)
{

3
swad_syllabus.c
View File

@ -237,7 +237,8 @@ bool Syl_CheckAndEditSyllabus (void)
PutIconToEdit = ICanEdit && !Gbl.Syllabus.EditionIsActive;
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],
PutIconToEdit ? Inf_PutIconToEditInfo :
NULL);
NULL,
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_1\">");

22
swad_test.c
View File

@ -301,7 +301,7 @@ void Tst_ShowFormAskTst (void)
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests);
Lay_StartRoundFrame (NULL,Txt_Take_a_test,Tst_PutIconsTests,NULL);
/***** Get tags *****/
if ((NumRows = Tst_GetEnabledTagsFromThisCrs (&mysql_res)) != 0)
@ -411,7 +411,7 @@ void Tst_ShowNewTestExam (void)
Tst_UpdateMyNumAccessTst (NumAccessesTst);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test,NULL);
Lay_StartRoundFrame (NULL,Txt_Test,NULL,NULL);
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -506,7 +506,7 @@ void Tst_AssessTestExam (void)
TstCod = Tst_CreateTestExamInDB ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL);
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,NULL);
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -653,7 +653,7 @@ static bool Tst_CheckIfNextTstAllowed (void)
if (NumSecondsFromNowToNextAccTst > 0)
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test,NULL);
Lay_StartRoundFrame (NULL,Txt_Test,NULL,NULL);
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -1248,7 +1248,7 @@ void Tst_ShowFormAskEditTsts (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests);
Lay_StartRoundFrame (NULL,Txt_List_edit_questions,Tst_PutIconsTests,NULL);
/***** Get tags already present in the table of questions *****/
if ((NumRows = Tst_GetAllTagsFromCurrentCrs (&mysql_res)))
@ -1811,7 +1811,7 @@ static void Tst_ShowFormConfigTst (void)
Tst_GetConfigTstFromDB ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests);
Lay_StartRoundFrame (NULL,Txt_Configure_tests,Tst_PutIconsTests,NULL);
/***** Start form *****/
Act_FormStart (ActRcvCfgTst);
@ -2662,7 +2662,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
double TotalScoreThisQst;
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests);
Lay_StartRoundFrame (NULL,Txt_Questions,Tst_PutIconsTests,NULL);
/***** Write the heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE_MARGIN CELLS_PAD_2\">"
@ -4445,10 +4445,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
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);
Lay_StartRoundFrame (NULL,Title,Tst_PutIconToRemoveOneQst,NULL);
}
else
Lay_StartRoundFrame (NULL,Txt_New_question,NULL);
Lay_StartRoundFrame (NULL,Txt_New_question,NULL,NULL);
/***** Start form *****/
Act_FormStart (ActRcvTstQst);
@ -6856,7 +6856,7 @@ void Tst_SelUsrsToSeeUsrsExams (void)
if (Usr_GetIfShowBigList (NumTotalUsrs,NULL))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Exams,NULL);
Lay_StartRoundFrame (NULL,Txt_Exams,NULL,NULL);
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstExa);
@ -7474,7 +7474,7 @@ void Tst_ShowOneExam (void)
Tst_GetExamQuestionsFromDB (TstCod);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL);
Lay_StartRoundFrame (NULL,Txt_Test_result,NULL,NULL);
Lay_WriteHeaderClassPhoto (false,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,

2
swad_test_import.c
View File

@ -135,7 +135,7 @@ void TsI_ShowFormImportQstsFromXML (void)
extern const char *Txt_XML_file;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL);
Lay_StartRoundFrame (NULL,Txt_Import_questions,NULL,NULL);
/***** Write help message *****/
Lay_ShowAlert (Lay_INFO,Txt_You_need_an_XML_file_containing_a_list_of_questions);

2
swad_theme.c
View File

@ -254,7 +254,7 @@ void The_PutIconsToSelectTheme (void)
extern const char *Txt_Theme_SKIN;
The_Theme_t Theme;
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme);
Lay_StartRoundFrame (NULL,Txt_Theme_SKIN,The_PutIconsTheme,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (Theme = (The_Theme_t) 0;

7
swad_timetable.c
View File

@ -258,7 +258,8 @@ void TT_ShowClassTimeTable (void)
(Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT ||
Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours ||
Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons :
NULL);
NULL,
NULL);
/***** Start time table drawing *****/
if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE)
@ -340,7 +341,7 @@ void TT_EditCrsTimeTable (void)
/***** Editable time table *****/
Gbl.TimeTable.Type = TT_COURSE_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewCrsTT);
TT_PutIconToViewCrsTT,NULL);
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}
@ -356,7 +357,7 @@ void TT_ShowMyTutTimeTable (void)
/***** Time table *****/
Gbl.TimeTable.Type = TT_TUTOR_TIMETABLE;
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type],
TT_PutIconToViewMyTT);
TT_PutIconToViewMyTT,NULL);
TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}

18
swad_user.c
View File

@ -6258,7 +6258,8 @@ void Usr_ListDataAdms (void)
Usr_GetAdmsLst (Gbl.Scope.Current);
/***** Start frame with list of administrators *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],
NULL,NULL);
/***** Form to select range of administrators *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
@ -6734,7 +6735,8 @@ void Usr_SeeGuests (void)
Usr_GetListsSelectedUsrsCods ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],Usr_PutIconsListGsts);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],
Usr_PutIconsListGsts,NULL);
/***** Form to select range of guests *****/
switch (Gbl.Usrs.Me.LoggedRole)
@ -6878,7 +6880,8 @@ void Usr_SeeStudents (void)
Usr_GetListsSelectedUsrsCods ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],Usr_PutIconsListStds);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_PutIconsListStds,NULL);
/***** Form to select range of students *****/
switch (Gbl.Usrs.Me.LoggedRole)
@ -7031,7 +7034,8 @@ void Usr_SeeTeachers (void)
if (Usr_GetIfShowBigList (Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs,NULL))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],Usr_PutIconsListTchs);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_PutIconsListTchs,NULL);
/***** Form to select scope *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
@ -7279,7 +7283,7 @@ void Usr_SeeGstClassPhotoPrn (void)
if (Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs)
{
/***** Draw the guests' class photo *****/
Lay_StartRoundFrame (NULL,NULL,NULL);
Lay_StartRoundFrame (NULL,NULL,NULL,NULL);
Lay_WriteHeaderClassPhoto (true,true,
(Gbl.Scope.Current == Sco_SCOPE_CTR ||
Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod :
@ -7321,7 +7325,7 @@ void Usr_SeeStdClassPhotoPrn (void)
if (Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs)
{
/***** Draw the students' class photo *****/
Lay_StartRoundFrame (NULL,NULL,NULL);
Lay_StartRoundFrame (NULL,NULL,NULL,NULL);
Lay_WriteHeaderClassPhoto (true,true,
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
Gbl.Scope.Current == Sco_SCOPE_DEG ||
@ -7377,7 +7381,7 @@ void Usr_SeeTchClassPhotoPrn (void)
if (Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs)
{
/***** Draw the teachers' class photo *****/
Lay_StartRoundFrame (NULL,NULL,NULL);
Lay_StartRoundFrame (NULL,NULL,NULL,NULL);
Lay_WriteHeaderClassPhoto (true,true,
(Gbl.Scope.Current == Sco_SCOPE_CRS ||
Gbl.Scope.Current == Sco_SCOPE_DEG ||