diff --git a/swad_ID.c b/swad_ID.c
index c9eaa0c44..7898d2c71 100644
--- a/swad_ID.c
+++ b/swad_ID.c
@@ -449,7 +449,7 @@ static void ID_PutButtonToReqConfirmID (struct UsrData *UsrDat,unsigned NumID)
fprintf (Gbl.F.Out,"",
UsrDat->IDs.List[NumID].ID);
Lay_PutIconLink ("ok_on16x16.gif",Txt_Confirm_ID,Txt_Confirm_ID,
- The_ClassFormBold[Gbl.Prefs.Theme]);
+ The_ClassFormBold[Gbl.Prefs.Theme],NULL);
Act_FormEnd ();
}
@@ -483,14 +483,16 @@ void ID_PutLinkToChangeUsrIDs (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Lay_PutContextualLink (ActFrmUsrAcc,NULL,
"arroba64x64.gif",
- Txt_Change_IDs,Txt_Change_IDs);
+ Txt_Change_IDs,Txt_Change_IDs,
+ NULL);
else // Not me
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,
"arroba64x64.gif",
- Txt_Change_IDs,Txt_Change_IDs);
+ Txt_Change_IDs,Txt_Change_IDs,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_QR.c b/swad_QR.c
index fb24859b2..d54ccc9f9 100644
--- a/swad_QR.c
+++ b/swad_QR.c
@@ -76,9 +76,11 @@ void QR_PutLinkToPrintQRCode (const char *Nickname,bool PrintText)
/***** Link to print QR *****/
Gbl.Usrs.NicknameForQR = Nickname;
- Lay_PutContextualLink (ActPrnUsrQR,QR_PutParamQRString,"qr64x64.gif",
+ Lay_PutContextualLink (ActPrnUsrQR,QR_PutParamQRString,
+ "qr64x64.gif",
Txt_QR_code,PrintText ? Txt_QR_code :
- NULL);
+ NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_account.c b/swad_account.c
index a7b579aa8..730b30438 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -96,7 +96,8 @@ void Acc_PutLinkToCreateAccount (void)
Lay_PutContextualLink (ActFrmUsrAcc,NULL,
"arroba64x64.gif",
- Txt_Create_account,Txt_Create_account);
+ Txt_Create_account,Txt_Create_account,
+ NULL);
}
/*****************************************************************************/
@@ -271,7 +272,8 @@ static void Acc_PutLinkToRemoveMyAccount (void)
Lay_PutContextualLink (ActReqRemMyAcc,Acc_PutLinkToRemoveMyAccountParams,
"remove-on64x64.png",
- Txt_Remove_account,Txt_Remove_account);
+ Txt_Remove_account,Txt_Remove_account,
+ NULL);
}
static void Acc_PutLinkToRemoveMyAccountParams (void)
diff --git a/swad_action.c b/swad_action.c
index b9d21254d..9a3f1985a 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -4690,6 +4690,23 @@ void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *I
Id);
}
+void Act_LinkFormSubmitFunction (const char *Title,const char *LinkStyle,const char *Function)
+ {
+ fprintf (Gbl.F.Out,"",
+ Function,
+ Gbl.Form.Id);
+ }
+
void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle)
{
fprintf (Gbl.F.Out,"",
- Gbl.Form.Num,
- Gbl.Form.Num,
- Gbl.Form.Id);
- */
fprintf (Gbl.F.Out," onclick=\""
"AnimateIcon(%d);"
"document.getElementById('%s').submit();"
diff --git a/swad_action.h b/swad_action.h
index 3609b9c9e..74b3bb82f 100644
--- a/swad_action.h
+++ b/swad_action.h
@@ -1507,6 +1507,7 @@ void Act_FormEnd (void);
void Act_LinkFormSubmit (const char *Title,const char *LinkStyle);
void Act_LinkFormSubmitUnique (const char *Title,const char *LinkStyle);
void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *Id);
+void Act_LinkFormSubmitFunction (const char *Title,const char *LinkStyle,const char *Function);
void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle);
void Act_SetUniqueId (char UniqueId[Act_MAX_LENGTH_ID]);
diff --git a/swad_announcement.c b/swad_announcement.c
index 187e4d3cf..f40fcc8ef 100644
--- a/swad_announcement.c
+++ b/swad_announcement.c
@@ -175,8 +175,10 @@ static void Ann_PutIconToAddNewAnnouncement (void)
{
extern const char *Txt_New_announcement;
- Lay_PutContextualLink (ActWriAnn,NULL,"plus64x64.png",
- Txt_New_announcement,NULL);
+ Lay_PutContextualLink (ActWriAnn,NULL,
+ "plus64x64.png",
+ Txt_New_announcement,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_assignment.c b/swad_assignment.c
index 4b9131314..1d3bbdf17 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -219,7 +219,9 @@ static void Asg_PutIconToCreateNewAsg (void)
/***** Put form to create a new assignment *****/
Lay_PutContextualLink (ActFrmNewAsg,Asg_PutParamsToCreateNewAsg,
- "plus64x64.png",Txt_New_assignment,NULL);
+ "plus64x64.png",
+ Txt_New_assignment,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -516,20 +518,28 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden)
Gbl.Asgs.AsgCodToEdit = AsgCod; // Used as parameter in contextual links
/***** Put form to remove assignment *****/
- Lay_PutContextualLink (ActReqRemAsg,Asg_PutParams,"remove-on64x64.png",
- Txt_Remove,NULL);
+ Lay_PutContextualLink (ActReqRemAsg,Asg_PutParams,
+ "remove-on64x64.png",
+ Txt_Remove,NULL,
+ NULL);
/***** Put form to hide/show assignment *****/
if (Hidden)
- Lay_PutContextualLink (ActShoAsg,Asg_PutParams,"eye-slash-on64x64.png",
- Txt_Show,NULL);
+ Lay_PutContextualLink (ActShoAsg,Asg_PutParams,
+ "eye-slash-on64x64.png",
+ Txt_Show,NULL,
+ NULL);
else
- Lay_PutContextualLink (ActHidAsg,Asg_PutParams,"eye-on64x64.png",
- Txt_Hide,NULL);
+ Lay_PutContextualLink (ActHidAsg,Asg_PutParams,
+ "eye-on64x64.png",
+ Txt_Hide,NULL,
+ NULL);
/***** Put form to edit assignment *****/
- Lay_PutContextualLink (ActEdiOneAsg,Asg_PutParams,"edit64x64.png",
- Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiOneAsg,Asg_PutParams,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_attendance.c b/swad_attendance.c
index 967b99837..ea7f52178 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -295,7 +295,9 @@ static void Att_PutIconToCreateNewAttEvent (void)
/***** Put form to create a new attendance event *****/
Lay_PutContextualLink (ActFrmNewAtt,Att_PutParamsToCreateNewAttEvent,
- "plus64x64.png",Txt_New_event,NULL);
+ "plus64x64.png",
+ Txt_New_event,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -520,7 +522,8 @@ static void Att_PutFormToListMyAttendance (void)
Lay_PutContextualLink (ActSeeLstMyAtt,NULL,
"list64x64.gif",
- Txt_Attendance_list,Txt_Attendance_list);
+ Txt_Attendance_list,Txt_Attendance_list,
+ NULL);
}
/*****************************************************************************/
@@ -533,7 +536,8 @@ static void Att_PutFormToListStdsAttendance (void)
Lay_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams,
"list64x64.gif",
- Txt_Attendance_list,Txt_Attendance_list);
+ Txt_Attendance_list,Txt_Attendance_list,
+ NULL);
}
static void Att_PutFormToListStdsParams (void)
@@ -558,20 +562,28 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden)
Gbl.AttEvents.AttCodToEdit = AttCod; // Used as parameters in contextual links
/***** Put form to remove attendance event *****/
- Lay_PutContextualLink (ActReqRemAtt,Att_PutParams,"remove-on64x64.png",
- Txt_Remove,NULL);
+ Lay_PutContextualLink (ActReqRemAtt,Att_PutParams,
+ "remove-on64x64.png",
+ Txt_Remove,NULL,
+ NULL);
/***** Put form to hide/show attendance event *****/
if (Hidden)
- Lay_PutContextualLink (ActShoAtt,Att_PutParams,"eye-slash-on64x64.png",
- Txt_Show,NULL);
+ Lay_PutContextualLink (ActShoAtt,Att_PutParams,
+ "eye-slash-on64x64.png",
+ Txt_Show,NULL,
+ NULL);
else
- Lay_PutContextualLink (ActHidAtt,Att_PutParams,"eye-on64x64.png",
- Txt_Hide,NULL);
+ Lay_PutContextualLink (ActHidAtt,Att_PutParams,
+ "eye-on64x64.png",
+ Txt_Hide,NULL,
+ NULL);
/***** Put form to edit attendance event *****/
- Lay_PutContextualLink (ActEdiOneAtt,Att_PutParams,"edit64x64.png",
- Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiOneAtt,Att_PutParams,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
fprintf (Gbl.F.Out,"");
}
@@ -2885,7 +2897,9 @@ static void Att_PutIconToPrintMyList (void)
/***** Link to print view *****/
Lay_PutContextualLink (ActPrnLstMyAtt,Att_PutFormToPrintMyListParams,
- "print64x64.png",Txt_Print,NULL);
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
static void Att_PutFormToPrintMyListParams (void)
@@ -2906,7 +2920,9 @@ static void Att_PutIconToPrintStdsList (void)
/***** Link to print view *****/
Lay_PutContextualLink (ActPrnLstStdAtt,Att_PutParamsToPrintStdsList,
- "print64x64.png",Txt_Print,NULL);
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
static void Att_PutParamsToPrintStdsList (void)
diff --git a/swad_banner.c b/swad_banner.c
index 7bcf72ef2..c8a2b0be4 100644
--- a/swad_banner.c
+++ b/swad_banner.c
@@ -128,7 +128,10 @@ static void Ban_PutFormToEditBanners (void)
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
/***** Link to edit banners *****/
- Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiBan,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_calendar.c b/swad_calendar.c
index bd4edd065..09c6b22d2 100644
--- a/swad_calendar.c
+++ b/swad_calendar.c
@@ -286,6 +286,9 @@ static void Cal_PutIconToPrintCalendar (void)
{
extern const char *Txt_Print;
- Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnCal,NULL,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
diff --git a/swad_centre.c b/swad_centre.c
index a2224c548..be424ae02 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -563,7 +563,10 @@ static void Ctr_PutIconsToPrintAndUpload (void)
extern const char *Txt_Print;
/***** Link to print info about centre *****/
- Lay_PutContextualLink (ActPrnCtrInf,NULL,"print64x64.png",Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnCtrInf,NULL,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
{
@@ -596,8 +599,8 @@ static void Ctr_PutIconToChangePhoto (void)
Lay_PutContextualLink (ActReqCtrPho,NULL,
"photo64x64.gif",
PhotoExists ? Txt_Change_photo :
- Txt_Upload_photo,
- NULL);
+ Txt_Upload_photo,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -682,7 +685,10 @@ static void Ctr_PutIconToEditFrames (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiCtr,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiCtr,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_changelog.h b/swad_changelog.h
index 47d909ffe..e40991950 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -133,13 +133,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.238.1 (2016-07-01)"
+#define Log_PLATFORM_VERSION "SWAD 15.239 (2016-07-01)"
#define CSS_FILE "swad15.229.css"
#define JS_FILE "swad15.238.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 15.239: Jul 01, 2015 Code refactoring related to contextual menus. (203531 lines)
Version 15.238.1: Jul 01, 2015 New javascript function to animate icon. (203292 lines)
Version 15.238: Jul 01, 2015 Hidden fields in in selectors of class photo / list with message subject and content. (203274 lines)
Version 15.237.3: Jul 01, 2015 Fixed bug in messages. (203257 lines)
diff --git a/swad_connected.c b/swad_connected.c
index 30230e92d..42ef465d0 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -134,8 +134,10 @@ void Con_PutLinkToLastClicks (void)
{
extern const char *Txt_Last_clicks;
- Lay_PutContextualLink (ActLstClk,NULL,"mouse-pointer64x64.png",
- Txt_Last_clicks,Txt_Last_clicks);
+ Lay_PutContextualLink (ActLstClk,NULL,
+ "mouse-pointer64x64.png",
+ Txt_Last_clicks,Txt_Last_clicks,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_country.c b/swad_country.c
index ab85682e6..beea6c13c 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -463,7 +463,10 @@ static void Cty_PutIconToPrint (void)
{
extern const char *Txt_Print;
- Lay_PutContextualLink (ActPrnCtyInf,NULL,"print64x64.png",Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnCtyInf,NULL,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -692,7 +695,10 @@ static void Cty_PutIconToEditCountries (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiCty,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiCty,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_course.c b/swad_course.c
index e35a9773d..d9ebba947 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -401,7 +401,10 @@ static void Crs_PutIconToPrint (void)
{
extern const char *Txt_Print;
- Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnCrsInf,NULL,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -1155,7 +1158,10 @@ static void Crs_PutIconToEditCourses (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiCrs,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiCrs,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -2889,7 +2895,8 @@ static void Crs_PutLinkToSearchCourses (void)
ActSysReqSch)))),
Sch_PutLinkToSearchCoursesParams,
"search64x64.gif",
- Txt_Search_courses,Txt_Search_courses);
+ Txt_Search_courses,Txt_Search_courses,
+ NULL);
}
static void Sch_PutLinkToSearchCoursesParams (void) // TODO: Move to search module
@@ -2907,8 +2914,10 @@ void Crs_PutFormToSelectMyCourses (void)
extern const char *Txt_My_courses;
/***** Put form to search / select courses *****/
- Lay_PutContextualLink (ActMyCrs,NULL,"hierarchy64x64.gif",
- Txt_My_courses,Txt_My_courses);
+ Lay_PutContextualLink (ActMyCrs,NULL,
+ "hierarchy64x64.gif",
+ Txt_My_courses,Txt_My_courses,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_degree.c b/swad_degree.c
index 2ae568a90..31a4c86d5 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -477,7 +477,10 @@ static void Deg_PutIconsToPrintAndUpload (void)
extern const char *Txt_Print;
/***** Link to print info about degree *****/
- Lay_PutContextualLink (ActPrnDegInf,NULL,"print64x64.png",Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnDegInf,NULL,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)
/***** Link to upload logo of degree *****/
@@ -1627,7 +1630,10 @@ static void Deg_PutIconToEditDegrees (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiDeg,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiDeg,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 5c352c78d..326663491 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -257,7 +257,10 @@ static void DT_PutIconToEditDegTypes (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiDegTyp,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiDegTyp,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_department.c b/swad_department.c
index 2bf32749d..eb134ab8e 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -211,7 +211,10 @@ static void Dpt_PutIconToEditDpts (void)
{
extern const char *Txt_Edit;
- Lay_PutContextualLink (ActEdiDpt,NULL,"edit64x64.png",Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiDpt,NULL,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_duplicate.c b/swad_duplicate.c
index 2a294dbfa..2a867407a 100644
--- a/swad_duplicate.c
+++ b/swad_duplicate.c
@@ -113,8 +113,10 @@ void Dup_PutLinkToListDupUsrs (void)
extern const char *Txt_Duplicate_USERS;
/***** Put form to remove old users *****/
- Lay_PutContextualLink (ActLstDupUsr,NULL,"usrs64x64.gif",
- Txt_Duplicate_USERS,Txt_Duplicate_USERS);
+ Lay_PutContextualLink (ActLstDupUsr,NULL,
+ "usrs64x64.gif",
+ Txt_Duplicate_USERS,Txt_Duplicate_USERS,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_enrollment.c b/swad_enrollment.c
index 34788a1e5..f145275ed 100644
--- a/swad_enrollment.c
+++ b/swad_enrollment.c
@@ -156,8 +156,10 @@ void Enr_PutLinkToRequestSignUp (void)
extern const char *Txt_Sign_up;
/***** Show the form *****/
- Lay_PutContextualLink (ActReqSignUp,NULL,"enrollmentrequest64x64.gif",
- Txt_Sign_up,Txt_Sign_up);
+ Lay_PutContextualLink (ActReqSignUp,NULL,
+ "enrollmentrequest64x64.gif",
+ Txt_Sign_up,Txt_Sign_up,
+ NULL);
}
/*****************************************************************************/
@@ -696,8 +698,10 @@ void Enr_PutLinkToRemOldUsrs (void)
extern const char *Txt_Eliminate_old_users;
/***** Put form to remove old users *****/
- Lay_PutContextualLink (ActReqRemOldUsr,NULL,"remove-on64x64.png",
- Txt_Eliminate_old_users,Txt_Eliminate_old_users);
+ Lay_PutContextualLink (ActReqRemOldUsr,NULL,
+ "remove-on64x64.png",
+ Txt_Eliminate_old_users,Txt_Eliminate_old_users,
+ NULL);
}
/*****************************************************************************/
@@ -1790,7 +1794,8 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void)
/***** Put form to remove all the students in the current course *****/
Lay_PutContextualLink (ActReqRemAllStdCrs,NULL,
"remove-on64x64.png",
- Txt_Remove_all_students,Txt_Remove_all_students);
+ Txt_Remove_all_students,Txt_Remove_all_students,
+ NULL);
}
/*****************************************************************************/
@@ -2946,12 +2951,13 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
{
extern const char *Txt_Admin_me;
extern const char *Txt_Admin_one_user;
+ const char *TitleText = Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
+ Txt_Admin_me;
- Lay_PutContextualLink (NextAction,NULL,"config64x64.gif",
- Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
- Txt_Admin_me,
- Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
- Txt_Admin_me);
+ Lay_PutContextualLink (NextAction,NULL,
+ "config64x64.gif",
+ TitleText,TitleText,
+ NULL);
}
/*****************************************************************************/
@@ -2962,14 +2968,14 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
{
extern const char *Txt_Admin_several_students;
extern const char *Txt_Admin_several_teachers;
+ const char *TitleText = (Role == Rol_STUDENT) ? Txt_Admin_several_students :
+ Txt_Admin_several_teachers;
Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
ActReqEnrSevTch,
NULL,"config64x64.gif",
- Role == Rol_STUDENT ? Txt_Admin_several_students :
- Txt_Admin_several_teachers,
- Role == Rol_STUDENT ? Txt_Admin_several_students :
- Txt_Admin_several_teachers);
+ TitleText,TitleText,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_exam.c b/swad_exam.c
index ab33c4dfa..2e12d4d3f 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -607,7 +607,10 @@ static void Exa_PutIconToCreateNewExamAnnouncement (void)
{
extern const char *Txt_New_announcement_OF_EXAM;
- Lay_PutContextualLink (ActEdiExaAnn,NULL,"plus64x64.png",Txt_New_announcement_OF_EXAM,NULL);
+ Lay_PutContextualLink (ActEdiExaAnn,NULL,
+ "plus64x64.png",
+ Txt_New_announcement_OF_EXAM,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -1361,17 +1364,23 @@ static void Exa_PutIconsExamAnnouncement (void)
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
{
/***** Link to remove this exam announcement *****/
- Lay_PutContextualLink (ActRemExaAnn,Exa_PutParamExaCodToEdit,"remove-on64x64.png",
- Txt_Remove,NULL);
+ Lay_PutContextualLink (ActRemExaAnn,Exa_PutParamExaCodToEdit,
+ "remove-on64x64.png",
+ Txt_Remove,NULL,
+ NULL);
/***** Link to edit this exam announcement *****/
- Lay_PutContextualLink (ActEdiExaAnn,Exa_PutParamExaCodToEdit,"edit64x64.png",
- Txt_Edit,NULL);
+ Lay_PutContextualLink (ActEdiExaAnn,Exa_PutParamExaCodToEdit,
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/***** Link to print view *****/
- Lay_PutContextualLink (ActPrnExaAnn,Exa_PutParamExaCodToEdit,"print64x64.png",
- Txt_Print,NULL);
+ Lay_PutContextualLink (ActPrnExaAnn,Exa_PutParamExaCodToEdit,
+ "print64x64.png",
+ Txt_Print,NULL,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 716c91fae..0db63e846 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3670,7 +3670,9 @@ static void Brw_PutIconToEditFileBrowser (void)
if (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type] != ActUnk)
Lay_PutContextualLink (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type],
Brw_PutParamsContextualLink,
- "edit64x64.png",Txt_Edit,NULL);
+ "edit64x64.png",
+ Txt_Edit,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -3684,7 +3686,9 @@ static void Brw_PutIconToSeeFileBrowser (void)
if (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type] != ActUnk)
Lay_PutContextualLink (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type],
Brw_PutParamsContextualLink,
- "eye-on64x64.png",Txt_View,NULL);
+ "eye-on64x64.png",
+ Txt_View,NULL,
+ NULL);
}
/*****************************************************************************/
@@ -11799,7 +11803,8 @@ static void Brw_PutFormToAskRemOldFiles (void)
Lay_PutContextualLink (ActReqRemOldBrf,Brw_PutParamsContextualLink,
"remove-on64x64.png",
- Txt_Remove_old_files,Txt_Remove_old_files);
+ Txt_Remove_old_files,Txt_Remove_old_files,
+ NULL);
}
/*****************************************************************************/
diff --git a/swad_follow.c b/swad_follow.c
index d0553f2e7..c44c980d3 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -89,7 +89,8 @@ void Fol_PutLinkWhoToFollow (void)
fprintf (Gbl.F.Out,"