diff --git a/swad_ID.c b/swad_ID.c
index e5cb7dfa1..6277c3c5d 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -377,10 +377,10 @@ void ID_PutLinkToChangeUsrIDs (void)
/***** Link for changing the password *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
- Act_PutContextualLink (ActFrmUsrAcc,NULL,
+ Lay_PutContextualLink (ActFrmUsrAcc,NULL,
"arroba64x64.gif",Txt_Change_IDs);
else // Not me
- Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
+ Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
ActFrmIDsOth), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
diff --git a/swad_QR.c b/swad_QR.c
index 7f6e3059d..bff56d8ce 100644
--- a/swad_QR.c
+++ b/swad_QR.c
@@ -82,6 +82,7 @@ void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText)
Act_LinkFormSubmit (Txt_QR_code,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("qr64x64.gif",Txt_QR_code,PrintText ? Txt_QR_code :
NULL);
+ fprintf (Gbl.F.Out,"");
Act_FormEnd ();
}
diff --git a/swad_account.c b/swad_account.c
index e1b8f39b1..98007227e 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -128,7 +128,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Link to log in *****/
fprintf (Gbl.F.Out,"
");
/***** Form to enter some data of the new user *****/
@@ -243,7 +243,7 @@ static void Acc_PutLinkToRemoveMyAccount (void)
{
extern const char *Txt_Remove_account;
- Act_PutContextualLink (ActReqRemMyAcc,Acc_PutLinkToRemoveMyAccountParams,
+ Lay_PutContextualLink (ActReqRemMyAcc,Acc_PutLinkToRemoveMyAccountParams,
"remove-on64x64.png",Txt_Remove_account);
}
diff --git a/swad_action.c b/swad_action.c
index c91f44af8..c59a2bcb1 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -4400,34 +4400,6 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle)
Gbl.FormId);
}
-/*****************************************************************************/
-/***************** Show an icon with a link in contextual menu ***************/
-/*****************************************************************************/
-
-void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
- const char *Icon,const char *Title)
- {
- extern const char *The_ClassFormBold[The_NUM_THEMES];
-
- Act_FormStart (NextAction);
- if (FuncParams)
- FuncParams ();
- Act_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme]);
- Lay_PutIconWithText (Icon,Title,Title);
- Act_FormEnd ();
- }
-
-/*****************************************************************************/
-/****************** Show an icon with a link (without text) ******************/
-/*****************************************************************************/
-
-void Act_PutIconLink (const char *Icon,const char *Title)
- {
- Act_LinkFormSubmit (Title,NULL);
- Lay_PutIconWithText (Icon,Title,NULL);
- Act_FormEnd ();
- }
-
/*****************************************************************************/
/***************** Adjust current action when no user's logged ***************/
/*****************************************************************************/
diff --git a/swad_action.h b/swad_action.h
index e267fcc09..78068fe69 100644
--- a/swad_action.h
+++ b/swad_action.h
@@ -1403,10 +1403,6 @@ void Act_LinkFormSubmit (const char *Title,const char *LinkStyle);
void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *Id);
void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle);
-void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
- const char *Icon,const char *Title);
-void Act_PutIconLink (const char *Icon,const char *Title);
-
void Act_AdjustActionWhenNoUsrLogged (void);
void Act_AdjustCurrentAction (void);
diff --git a/swad_announcement.c b/swad_announcement.c
index d6f59b2e2..d87ed4e0d 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -93,7 +93,7 @@ void Ann_ShowAllAnnouncements (void)
if (ICanEditAnnouncements)
{
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_assignment.c b/swad_assignment.c
index 697a3dc7a..a0cac6abc 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -469,7 +469,7 @@ static void Asg_PutFormToCreateNewAsg (void)
/***** Put form to create a new assignment *****/
fprintf (Gbl.F.Out,"");
}
@@ -500,7 +500,8 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
- Act_PutIconLink ("remove-on64x64.png",Txt_Remove);
+ Lay_PutIconLink ("remove-on64x64.png",Txt_Remove,NULL,NULL);
+ Act_FormEnd ();
/***** Put form to hide/show assignment *****/
Act_FormStart (Hidden ? ActShoAsg :
@@ -510,9 +511,10 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden)
- Act_PutIconLink ("eye-slash-on64x64.png",Txt_Show);
+ Lay_PutIconLink ("eye-slash-on64x64.png",Txt_Show,NULL,NULL);
else
- Act_PutIconLink ("eye-on64x64.png",Txt_Hide);
+ Lay_PutIconLink ("eye-on64x64.png",Txt_Hide,NULL,NULL);
+ Act_FormEnd ();
/***** Put form to edit assignment *****/
Act_FormStart (ActEdiOneAsg);
@@ -520,7 +522,8 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Asg_PutHiddenParamAsgOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
- Act_PutIconLink ("edit64x64.png",Txt_Edit);
+ Lay_PutIconLink ("edit64x64.png",Txt_Edit,NULL,NULL);
+ Act_FormEnd ();
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_attendance.c b/swad_attendance.c
index 694e0de4d..fdce8ae73 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -466,7 +466,7 @@ static void Att_PutFormToListMyAttendance (void)
{
extern const char *Txt_Attendance_list;
- Act_PutContextualLink (ActSeeLstMyAtt,NULL,
+ Lay_PutContextualLink (ActSeeLstMyAtt,NULL,
"list16x16.gif",Txt_Attendance_list);
}
@@ -478,7 +478,7 @@ static void Att_PutFormToListStdsAttendance (void)
{
extern const char *Txt_Attendance_list;
- Act_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams,
+ Lay_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams,
"list16x16.gif",Txt_Attendance_list);
}
@@ -498,7 +498,7 @@ static void Att_PutFormToCreateNewAttEvent (void)
extern const char *Txt_New_event;
/***** Put form to create a new attendance event *****/
- Act_PutContextualLink (ActFrmNewAtt,Att_PutFormToCreateNewAttEventParams,
+ Lay_PutContextualLink (ActFrmNewAtt,Att_PutFormToCreateNewAttEventParams,
"plus64x64.png",Txt_New_event);
}
@@ -528,7 +528,8 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
- Act_PutIconLink ("remove-on64x64.png",Txt_Remove);
+ Lay_PutIconLink ("remove-on64x64.png",Txt_Remove,NULL,NULL);
+ Act_FormEnd ();
/***** Put form to hide/show attendance event *****/
Act_FormStart (Hidden ? ActShoAtt :
@@ -538,9 +539,10 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Hidden)
- Act_PutIconLink ("eye-slash-on64x64.png",Txt_Show);
+ Lay_PutIconLink ("eye-slash-on64x64.png",Txt_Show,NULL,NULL);
else
- Act_PutIconLink ("eye-on64x64.png",Txt_Hide);
+ Lay_PutIconLink ("eye-on64x64.png",Txt_Hide,NULL,NULL);
+ Act_FormEnd ();
/***** Put form to edit attendance event *****/
Act_FormStart (ActEdiOneAtt);
@@ -548,7 +550,8 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Att_PutHiddenParamAttOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
- Act_PutIconLink ("edit64x64.png",Txt_Edit);
+ Lay_PutIconLink ("edit64x64.png",Txt_Edit,NULL,NULL);
+ Act_FormEnd ();
fprintf (Gbl.F.Out,"");
}
@@ -2860,7 +2863,7 @@ static void Att_PutFormToPrintMyList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"");
}
@@ -2883,7 +2886,7 @@ static void Att_PutFormToPrintStdsList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_banner.c b/swad_banner.c
index 82360719e..d8549b75e 100644
--- a/swad_banner.c
+++ b/swad_banner.c
@@ -130,7 +130,7 @@ static void Ban_PutFormToEditBanners (void)
/***** Link to edit banners *****/
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_calendar.c b/swad_calendar.c
index 27eaefc63..9bbbd7395 100644
--- a/swad_calendar.c
+++ b/swad_calendar.c
@@ -251,7 +251,7 @@ void Cal_DrawCalendar (void)
{
/* Link to print view */
fprintf (Gbl.F.Out,"");
}
Lay_StartRoundFrameTable (NULL,0,NULL);
diff --git a/swad_centre.c b/swad_centre.c
index 4136b4925..25bd25557 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -283,7 +283,7 @@ static void Ctr_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"");
}
@@ -2932,6 +2936,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Lay_PutIconWithText ("plus64x64.png",
Txt_New_question,
Txt_New_question);
+ fprintf (Gbl.F.Out,"");
Act_FormEnd ();
fprintf (Gbl.F.Out,""
"");
diff --git a/swad_syllabus.c b/swad_syllabus.c
index 19f45cacb..31b2ba277 100644
--- a/swad_syllabus.c
+++ b/swad_syllabus.c
@@ -200,7 +200,7 @@ void Syl_EditSyllabus (void)
{
/***** Put link to view *****/
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_test.c b/swad_test.c
index d315995a5..9765e3d06 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -318,7 +318,7 @@ static void Tst_PutFormToSeeResultsOfUsersTests (void)
{
extern const char *Txt_Results_tests;
- Act_PutContextualLink (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ? ActReqSeeMyTstExa :
+ Lay_PutContextualLink (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ? ActReqSeeMyTstExa :
ActReqSeeUsrTstExa,
NULL,"file64x64.gif",Txt_Results_tests);
}
@@ -331,7 +331,7 @@ static void Tst_PutFormToEdit (void)
{
extern const char *Txt_Edit;
- Act_PutContextualLink (ActEdiTstQst,NULL,"edit64x64.png",Txt_Edit);
+ Lay_PutContextualLink (ActEdiTstQst,NULL,"edit64x64.png",Txt_Edit);
}
/*****************************************************************************/
@@ -342,7 +342,7 @@ static void Tst_PutFormToConfigure (void)
{
extern const char *Txt_Configure;
- Act_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif",Txt_Configure);
+ Lay_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif",Txt_Configure);
}
/*****************************************************************************/
@@ -1175,6 +1175,7 @@ static void Tst_PutFormToCreateNewTstQst (void)
Lay_PutIconWithText ("plus64x64.png",
Txt_New_question,
Txt_New_question);
+ fprintf (Gbl.F.Out,"");
Act_FormEnd ();
}
diff --git a/swad_test_import.c b/swad_test_import.c
index 675b06e5a..00579e560 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -100,6 +100,7 @@ void TsI_PutFormToExportQuestions (void)
Lay_PutIconWithText ("export16x16.gif",
Txt_Export_questions_to_XML_file,
Txt_Export_questions);
+ fprintf (Gbl.F.Out,"");
Act_FormEnd ();
}
@@ -121,6 +122,7 @@ void TsI_PutFormToImportQuestions (void)
Lay_PutIconWithText ("import16x16.gif",
Txt_Import_questions_from_XML_file,
Txt_Import_questions);
+ fprintf (Gbl.F.Out,"");
Act_FormEnd ();
}
@@ -272,6 +274,7 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
Lay_PutIconWithText ("file64x64.gif",
Txt_XML_file,
Txt_XML_file);
+ fprintf (Gbl.F.Out,"");
}
/*****************************************************************************/
diff --git a/swad_timetable.c b/swad_timetable.c
index 65891fbd7..74b9a0293 100644
--- a/swad_timetable.c
+++ b/swad_timetable.c
@@ -264,14 +264,14 @@ void TT_ShowClassTimeTable (void)
fprintf (Gbl.F.Out,"