Version 15.146

This commit is contained in:
Antonio Cañas Vargas 2016-03-16 11:15:25 +01:00
parent 27e8e0c221
commit 8039f591dc
32 changed files with 91 additions and 76 deletions

View File

@ -1295,6 +1295,10 @@ a:hover /* Default ==> underlined */
text-align:center;
overflow:hidden;
}
.FRAME_ICONS
{
float:left;
}
.FRAME_TABLE
{
box-sizing:border-box;

View File

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

View File

@ -124,7 +124,7 @@ void Ann_ShowAllAnnouncements (void)
if (NumAnnouncements)
/***** Start frame *****/
Lay_StartRoundFrame ("550px",Txt_Announcements);
Lay_StartRoundFrame ("550px",Txt_Announcements,NULL);
else
Lay_ShowAlert (Lay_INFO,Txt_No_announcements);

View File

@ -2518,7 +2518,7 @@ 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]);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL);
/* Form to select type of list used for select several users */
Usr_ShowFormsToSelectUsrListType (ActReqLstStdAtt);

View File

@ -85,14 +85,11 @@ void Ban_SeeBanners (void)
" WHERE Hidden='N'"
" ORDER BY ShortName");
/***** Put banner (form) to edit banners *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Ban_PutFormToEditBanners ();
/***** Table head *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Banners);
/***** Frame head *****/
Lay_StartRoundFrame ("300px",Txt_Banners,Ban_PutFormToEditBanners);
/***** Write all the banners *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
for (NumBan = 0;
NumBan < Gbl.Banners.Num;
NumBan++)
@ -112,9 +109,10 @@ void Ban_SeeBanners (void)
Gbl.Banners.Lst[NumBan].Img,
Gbl.Banners.Lst[NumBan].ShortName,
Gbl.Banners.Lst[NumBan].FullName);
fprintf (Gbl.F.Out,"</table>");
/***** Table end *****/
Lay_EndRoundFrameTable ();
/***** Frame end *****/
Lay_EndRoundFrame ();
/***** Free list of banners *****/
Ban_FreeListBanners ();
@ -128,11 +126,9 @@ static void Ban_PutFormToEditBanners (void)
{
extern const char *Txt_Edit;
/***** Link to edit banners *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
/***** Link to edit banners *****/
Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",Txt_Edit,NULL);
}
/*****************************************************************************/

View File

@ -129,13 +129,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.145.6 (2016-03-16)"
#define CSS_FILE "swad15.145.3.css"
#define Log_PLATFORM_VERSION "SWAD 15.146 (2016-03-16)"
#define CSS_FILE "swad15.146.css"
#define JS_FILE "swad15.131.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 15.146: Mar 16, 2016 Now frame rectangles can have icons at top.
Icon to edit banners integrated in frame. (195772 lines)
Version 15.145.6: Mar 16, 2016 Fixed bug in connected users. (195757 lines)
Version 15.145.5: Mar 15, 2016 Removed links in right column. (195752 lines)
Version 15.145.4: Mar 15, 2016 Link to RSS file is moved to the end of notices in left column. (195751 lines)

View File

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

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);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL);
/***** Put form to update connected users *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
@ -139,7 +139,7 @@ void Con_ShowLastClicks (void)
{
extern const char *Txt_Last_clicks_in_real_time;
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time);
Lay_StartRoundFrame (NULL,Txt_Last_clicks_in_real_time,NULL);
fprintf (Gbl.F.Out,"<div id=\"lastclicks\"" // Used for AJAX based refresh
" class=\"CENTER_MIDDLE\">");

View File

@ -466,7 +466,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
sprintf (ClassHighlight,"%s LIGHT_BLUE",The_ClassFormDark[Gbl.Prefs.Theme]);
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_My_courses);
Lay_StartRoundFrame (NULL,Txt_My_courses,NULL);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"display:inline-block;\">"
"<ul class=\"LIST_LEFT\">");
@ -3197,7 +3197,7 @@ void Crs_AskRemoveOldCrss (void)
Act_FormStart (ActRemOldCrs);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses,NULL);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",

View File

@ -599,8 +599,10 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
ActRcvFrmEnrSevTch);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers);
Lay_StartRoundFrame (NULL,
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers,
NULL);
/***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s LEFT_MIDDLE\">"
@ -706,7 +708,7 @@ void Enr_AskRemoveOldUsrs (void)
Act_FormStart (ActRemOldUsr);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users);
Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users,NULL);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
@ -2184,7 +2186,7 @@ void Enr_ShowEnrollmentRequests (void)
Rol_Role_t DesiredRole;
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Enrollment_requests);
Lay_StartRoundFrame (NULL,Txt_Enrollment_requests,NULL);
/***** Selection of scope and roles *****/
/* Start form */
@ -2976,7 +2978,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);
Lay_StartRoundFrame (NULL,Txt_Admin_one_user,NULL);
/***** Write form to request another user's ID *****/
Enr_WriteFormToReqAnotherUsrID ( Role == Rol_STUDENT ? ActReqMdfStd :

View File

@ -2905,7 +2905,7 @@ void Brw_AskEditWorksCrs (void)
Gbl.Usrs.LstStds.NumUsrs))
{
/***** Draw class photos to select users *****/
Lay_StartRoundFrame (NULL,Txt_Users);
Lay_StartRoundFrame (NULL,Txt_Users,NULL);
/* Form to select type of list used for select several users */
Usr_ShowFormsToSelectUsrListType (ActReqAsgWrkCrs);
@ -7793,7 +7793,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);
Lay_StartRoundFrame (NULL,Txt_Create_folder,NULL);
sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
@ -7828,7 +7828,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrame ("95%",Txt_Upload_files);
Lay_StartRoundFrame ("95%",Txt_Upload_files,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_upload_new_files_to_the_folder_X,
@ -7914,7 +7914,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);
Lay_StartRoundFrame (NULL,Txt_Upload_file,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_upload_a_new_file_to_the_folder_X,
@ -7981,7 +7981,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);
Lay_StartRoundFrame (NULL,Txt_Paste,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X,
@ -8028,7 +8028,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);
Lay_StartRoundFrame (NULL,Txt_Create_link,NULL);
/***** Help message *****/
sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X,
@ -11427,7 +11427,7 @@ void Brw_AskRemoveOldFiles (void)
Brw_PutParamsContextualLink ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Remove_old_files);
Lay_StartRoundFrame (NULL,Txt_Remove_old_files,NULL);
/***** Form to request number of months (to remove files older) *****/
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",

View File

@ -209,7 +209,7 @@ void Fol_SuggestWhoToFollow (void)
if (NumUsrs)
{
/***** Start frame *****/
Lay_StartRoundFrame ("560px",Txt_Who_to_follow);
Lay_StartRoundFrame ("560px",Txt_Who_to_follow,NULL);
/***** Put form to update connected users *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");

View File

@ -909,7 +909,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
ReadTimeUTC = For_GetThrReadTime (ThrCod);
/* Table start */
Lay_StartRoundFrame (NULL,Txt_Thread);
Lay_StartRoundFrame (NULL,Txt_Thread,NULL);
/* Put a form to select which forums */
For_PutFormWhichForums ();
@ -1629,7 +1629,7 @@ void For_ShowForumList (void)
Usr_GetMyInstitutions ();
/***** Table start *****/
Lay_StartRoundFrame (NULL,Txt_Forums);
Lay_StartRoundFrame (NULL,Txt_Forums,NULL);
/***** Put a form to select which forums *****/
For_PutFormWhichForums ();
@ -2472,7 +2472,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);
Lay_StartRoundFrame (NULL,Txt_Forum,NULL);
/* Put a form to select which forums */
For_PutFormWhichForums ();

View File

@ -877,7 +877,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
/***** Start of frame *****/
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[InfoType]);
Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[InfoType],NULL);
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",

View File

@ -1236,7 +1236,7 @@ void Lay_WriteTitle (const char *Title)
void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char *Title)
{
Lay_StartRoundFrame (Width,Title);
Lay_StartRoundFrame (Width,Title,NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE");
if (CellPadding)
@ -1244,7 +1244,7 @@ void Lay_StartRoundFrameTable (const char *Width,unsigned CellPadding,const char
fprintf (Gbl.F.Out,"\">");
}
void Lay_StartRoundFrame (const char *Width,const char *Title)
void Lay_StartRoundFrame (const char *Width,const char *Title,void (*FunctionToDrawContextualIcons) (void))
{
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"box-sizing:border-box; width:100%%;\">"
@ -1253,6 +1253,13 @@ void Lay_StartRoundFrame (const char *Width,const char *Title)
fprintf (Gbl.F.Out," style=\"box-sizing:border-box; width:%s;\"",Width);
fprintf (Gbl.F.Out,">");
if (FunctionToDrawContextualIcons)
{
fprintf (Gbl.F.Out,"<div class=\"FRAME_ICONS\">");
FunctionToDrawContextualIcons ();
fprintf (Gbl.F.Out,"</div>");
}
if (Title)
fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">"
"%s"

View File

@ -99,7 +99,7 @@ void Lay_PutRemoveButton (const char *Text);
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 Lay_StartRoundFrame (const char *Width,const char *Title,void (*FunctionToDrawContextualIcons) (void));
void Lay_StartRoundFrameTableShadow (const char *Width,unsigned CellPadding);
void Lay_EndRoundFrameTable (void);
void Lay_EndRoundFrame (void);

View File

@ -87,7 +87,7 @@ void Lnk_SeeLinks (void)
/***** Write all the links *****/
if (Gbl.Links.Num)
{
Lay_StartRoundFrame (NULL,Txt_Links);
Lay_StartRoundFrame (NULL,Txt_Links,NULL);
Lnk_WriteListOfLinks ();
Lay_EndRoundFrame ();
}

View File

@ -286,7 +286,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
Act_FormStart (ActionRec);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Logo);
Lay_StartRoundFrame (NULL,Txt_Logo,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,

View File

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

View File

@ -325,8 +325,10 @@ static void Msg_PutFormMsgUsrs (const char *Content)
Gbl.Usrs.LstStds.NumUsrs))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message);
Lay_StartRoundFrame (NULL,
Gbl.Msg.Reply.IsReply ? Txt_Reply_message :
Txt_New_message,
NULL);
/***** Form to select type of list used for select several users *****/
if (Gbl.Usrs.LstTchs.NumUsrs ||
@ -1709,8 +1711,10 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
NumMsgs = (unsigned) NumRows;
/***** Start frame with messages *****/
Lay_StartRoundFrame ("97%",TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received :
Txt_Messages_sent);
Lay_StartRoundFrame ("97%",
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received :
Txt_Messages_sent,
NULL);
/* Write number of messages and number of new messages */
fprintf (Gbl.F.Out,"<div class=\"TIT CENTER_MIDDLE\">");

View File

@ -403,7 +403,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,bool ICanEditNotices)
/***** Start frame *****/
sprintf (StrWidth,"%upx",
Not_ContainerWidth[Not_LIST_FULL_NOTICES] + 50);
Lay_StartRoundFrame (StrWidth,Txt_All_notices);
Lay_StartRoundFrame (StrWidth,Txt_All_notices,NULL);
}
else
Lay_ShowAlert (Lay_INFO,Txt_No_notices);

View File

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

View File

@ -1924,7 +1924,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
if (NumRows) // Degrees with students found
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Degrees);
Lay_StartRoundFrame (NULL,Txt_Degrees,NULL);
/***** Form to select type of list used to display degree photos *****/
if (SeeOrPrint == Pho_DEGREES_SEE)
@ -2016,7 +2016,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Class photo start *****/
if (SeeOrPrint == Pho_DEGREES_SEE)
{
Lay_StartRoundFrame (NULL,Txt_Degrees);
Lay_StartRoundFrame (NULL,Txt_Degrees,NULL);
/***** Form to select type of list used to display degree photos *****/
Usr_ShowFormsToSelectUsrListType (ActSeePhoDeg);

View File

@ -72,7 +72,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);
Lay_StartRoundFrame (NULL,Txt_Language,NULL);
fprintf (Gbl.F.Out,"<div style=\"height:42px;\">");
Pre_PutSelectorToSelectLanguage (); // 1. Language
fprintf (Gbl.F.Out,"</div>");

View File

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

View File

@ -1193,7 +1193,7 @@ static void Rec_ShowRecordOneTchCrs (void)
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
/* Office hours */
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE],NULL);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod);
Lay_EndRoundFrame ();
@ -1293,7 +1293,7 @@ void Rec_ListRecordsTchs (void)
/* Office hours */
if (ShowOfficeHours)
{
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
Lay_StartRoundFrame (Width,Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE],NULL);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod);
Lay_EndRoundFrame ();
}

View File

@ -232,7 +232,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);
Lay_StartRoundFrame (NULL,Txt_Search,NULL);
/***** Scope (whole platform, current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"

View File

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

View File

@ -433,7 +433,7 @@ void Sta_AskShowCrsHits (void)
/***** Start frame *****/
sprintf (Gbl.Title,Txt_Statistics_of_visits_to_the_course_X,
Gbl.CurrentCrs.Crs.ShortName);
Lay_StartRoundFrame (NULL,Gbl.Title);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL);
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqAccCrs);
@ -603,7 +603,7 @@ void Sta_AskShowGblHits (void)
/***** Start frame *****/
fprintf (Gbl.F.Out,"<section id=\"stat_form\">");
Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits);
Lay_StartRoundFrame (NULL,Txt_Statistics_of_all_visits,NULL);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto;\">");
@ -1349,9 +1349,9 @@ 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);
Lay_StartRoundFrame ("95%",Txt_List_of_detailed_clicks,NULL);
else
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType]);
Lay_StartRoundFrame (NULL,Txt_STAT_TYPE_COUNT_CAPS[Gbl.Stat.CountType],NULL);
fprintf (Gbl.F.Out,"<table");
if (Sta_CellPadding[Gbl.Stat.ClicksGroupedBy])
@ -3785,7 +3785,7 @@ void Sta_ReqUseOfPlatform (void)
Act_FormStart (ActSeeUseGbl);
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Statistic);
Lay_StartRoundFrame (NULL,Txt_Statistic,NULL);
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
@ -4639,7 +4639,7 @@ static void Sta_GetAndShowInstitutionsStats (void)
Usr_GetAndUpdatePrefsAboutUsrList ();
/***** Form to select type of list used to display degree photos *****/
Lay_StartRoundFrame (NULL,Txt_Institutions);
Lay_StartRoundFrame (NULL,Txt_Institutions,NULL);
Usr_ShowFormsToSelectUsrListType (ActSeeUseGbl);
Lay_EndRoundFrame ();

View File

@ -5948,7 +5948,7 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
Gbl.Usrs.LstStds.NumUsrs))
{
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Exams);
Lay_StartRoundFrame (NULL,Txt_Exams,NULL);
/***** Form to select type of list used for select several users *****/
Usr_ShowFormsToSelectUsrListType (ActReqSeeUsrTstExa);

View File

@ -347,7 +347,7 @@ void TT_EditCrsTimeTable (void)
fprintf (Gbl.F.Out,"</div>");
/***** Editable time table *****/
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE]);
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_COURSE_TIMETABLE],NULL);
TT_ShowTimeTable (TT_COURSE_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}
@ -368,7 +368,7 @@ void TT_ShowMyTutTimeTable (void)
fprintf (Gbl.F.Out,"</div>");
/***** Time table *****/
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE]);
Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[TT_TUTOR_TIMETABLE],NULL);
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod);
Lay_EndRoundFrame ();
}

View File

@ -6179,7 +6179,7 @@ void Usr_ListDataAdms (void)
NumColumns = Usr_NUM_MAIN_FIELDS_DATA_ADM;
/***** Start table with list of administrators *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],NULL);
/****** Show photos? *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
@ -6678,7 +6678,7 @@ void Usr_SeeGuests (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],NULL);
/***** Form to select type of list of users *****/
Usr_ShowFormsToSelectUsrListType (ActLstGst);
@ -6870,7 +6870,7 @@ void Usr_SeeStudents (void)
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],NULL);
/***** Form to select type of list of users *****/
Usr_ShowFormsToSelectUsrListType (ActLstStd);
@ -7039,7 +7039,7 @@ void Usr_SeeTeachers (void)
}
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
Lay_StartRoundFrame (NULL,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],NULL);
/***** Form to select type of list of users *****/
Usr_ShowFormsToSelectUsrListType (ActLstTch);