From 70a93af3c9a99137c4c1febc47966d2a56969657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 1 Jul 2016 16:32:42 +0200 Subject: [PATCH] Version 15.239 --- swad_ID.c | 8 ++++--- swad_QR.c | 6 +++-- swad_account.c | 6 +++-- swad_action.c | 27 ++++++++++++++--------- swad_action.h | 1 + swad_announcement.c | 6 +++-- swad_assignment.c | 28 +++++++++++++++-------- swad_attendance.c | 42 ++++++++++++++++++++++++----------- swad_banner.c | 5 ++++- swad_calendar.c | 5 ++++- swad_centre.c | 14 ++++++++---- swad_changelog.h | 3 ++- swad_connected.c | 6 +++-- swad_country.c | 10 +++++++-- swad_course.c | 19 +++++++++++----- swad_degree.c | 10 +++++++-- swad_degree_type.c | 5 ++++- swad_department.c | 5 ++++- swad_duplicate.c | 6 +++-- swad_enrollment.c | 34 ++++++++++++++++------------ swad_exam.c | 23 +++++++++++++------ swad_file_browser.c | 11 ++++++--- swad_follow.c | 3 ++- swad_group.c | 5 ++++- swad_holiday.c | 5 ++++- swad_info.c | 4 +++- swad_institution.c | 10 +++++++-- swad_layout.c | 29 +++++++++--------------- swad_layout.h | 9 +++----- swad_link.c | 5 ++++- swad_logo.c | 11 +++++---- swad_mail.c | 14 ++++++++---- swad_message.c | 25 +++++++++++++++------ swad_network.c | 6 +++-- swad_notice.c | 5 ++++- swad_notification.c | 13 +++++++---- swad_password.c | 15 ++++++++----- swad_photo.c | 30 +++++++++++++++---------- swad_place.c | 5 ++++- swad_plugin.c | 5 ++++- swad_preference.c | 3 ++- swad_privacy.c | 6 +++-- swad_profile.c | 3 ++- swad_record.c | 48 ++++++++++++++++++++++++++-------------- swad_statistic.c | 3 ++- swad_survey.c | 42 ++++++++++++++++++++++++----------- swad_test.c | 25 ++++++++++++++------- swad_test_import.c | 6 +++-- swad_timetable.c | 29 +++++++++++++++--------- swad_user.c | 54 +++++++++++++++++++++++++++++++-------------- swad_zip.c | 3 ++- 51 files changed, 470 insertions(+), 231 deletions(-) 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,""); } diff --git a/swad_layout.h b/swad_layout.h index 6e5160ca2..ea681f31b 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -74,13 +74,10 @@ void Lay_WriteTitle (const char *Title); void Lay_PutContextualLink (Act_Action_t NextAction, void (*FuncParams) (), const char *Icon, - const char *Title,const char *Text); -void Lay_PutContextualLinkAnchor (Act_Action_t NextAction,const char *Anchor, - void (*FuncParams) (), - const char *Icon, - const char *Title,const char *Text); + const char *Title,const char *Text, + const char *Function); void Lay_PutIconLink (const char *Icon,const char *Title,const char *Text, - const char *LinkStyle); + const char *LinkStyle,const char *Function); void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text); void Lay_PutCalculateIcon (const char *Alt); void Lay_PutCalculateIconWithText (const char *Alt,const char *Text); diff --git a/swad_link.c b/swad_link.c index 45841cb3d..6ae6329ae 100644 --- a/swad_link.c +++ b/swad_link.c @@ -102,7 +102,10 @@ static void Lnk_PutIconToEditLinks (void) { extern const char *Txt_Edit; - Lay_PutContextualLink (ActEdiLnk,NULL,"edit64x64.png",Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiLnk,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_logo.c b/swad_logo.c index 63e8e2fbe..eda78a155 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -213,9 +213,10 @@ void Log_PutIconToChangeLogo (Sco_Scope_t Scope) LogoExists = Fil_CheckIfPathExists (PathLogo); /***** Link for changing / uploading the logo *****/ - Lay_PutContextualLink (Action,NULL,"logo64x64.png", + Lay_PutContextualLink (Action,NULL, + "logo64x64.png", LogoExists ? Txt_Change_logo : - Txt_Upload_logo, + Txt_Upload_logo,NULL, NULL); } @@ -271,8 +272,10 @@ void Log_RequestLogo (Sco_Scope_t Scope) { /***** Form to remove photo *****/ fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActionRem,NULL,"remove-on64x64.png", - Txt_Remove_logo,Txt_Remove_logo); + Lay_PutContextualLink (ActionRem,NULL, + "remove-on64x64.png", + Txt_Remove_logo,Txt_Remove_logo, + NULL); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_mail.c b/swad_mail.c index bf78548a5..a3c39f7aa 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -174,7 +174,10 @@ static void Mai_PutIconToEditMailDomains (void) { extern const char *Txt_Edit; - Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiMai,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); } /*****************************************************************************/ @@ -1046,15 +1049,18 @@ void Mai_PutLinkToChangeOtherUsrEmail (void) /***** Link for changing the password *****/ if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me - Lay_PutContextualLink (ActFrmUsrAcc,NULL,"msg64x64.gif", - Txt_Change_email,Txt_Change_email); + Lay_PutContextualLink (ActFrmUsrAcc,NULL, + "msg64x64.gif", + Txt_Change_email,Txt_Change_email, + NULL); else // Not me Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmMaiStd : (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmMaiTch : ActFrmMaiOth), Usr_PutParamOtherUsrCodEncrypted, "msg64x64.gif", - Txt_Change_email,Txt_Change_email); + Txt_Change_email,Txt_Change_email, + NULL); } /*****************************************************************************/ diff --git a/swad_message.c b/swad_message.c index c5a71ae45..4bffc4d40 100644 --- a/swad_message.c +++ b/swad_message.c @@ -339,7 +339,8 @@ static void Msg_PutLinkToShowMorePotentialRecipients (void) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActReqMsgUsr,Msg_PutParamsShowMorePotentialRecipients, "usrs64x64.gif", - Txt_Show_more_recipients,Txt_Show_more_recipients); + Txt_Show_more_recipients,Txt_Show_more_recipients, + NULL); fprintf (Gbl.F.Out,"
"); } @@ -1807,8 +1808,10 @@ static void Msg_PutLinkToViewBannedUsers(void) { extern const char *Txt_Banned_users; - Lay_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif", - Txt_Banned_users,Txt_Banned_users); + Lay_PutContextualLink (ActLstBanUsr,NULL, + "stop16x16.gif", + Txt_Banned_users,Txt_Banned_users, + NULL); } /*****************************************************************************/ @@ -2317,7 +2320,9 @@ static void Msg_PutIconToRemoveOneRcvMsg (void) extern const char *Txt_Remove_this_message; Lay_PutContextualLink (ActReqDelAllRcvMsg,Msg_PutHiddenParamsMsgsFilters, - "remove-on64x64.png",Txt_Remove_this_message,NULL); + "remove-on64x64.png", + Txt_Remove_this_message,NULL, + NULL); } /*****************************************************************************/ @@ -2329,7 +2334,9 @@ static void Msg_PutIconToRemoveSevRcvMsgs (void) extern const char *Txt_Remove_these_messages; Lay_PutContextualLink (ActReqDelAllRcvMsg,Msg_PutHiddenParamsMsgsFilters, - "remove-on64x64.png",Txt_Remove_these_messages,NULL); + "remove-on64x64.png", + Txt_Remove_these_messages,NULL, + NULL); } /*****************************************************************************/ @@ -2341,7 +2348,9 @@ static void Msg_PutIconToRemoveOneSntMsg (void) extern const char *Txt_Remove_this_message; Lay_PutContextualLink (ActReqDelAllSntMsg,Msg_PutHiddenParamsMsgsFilters, - "remove-on64x64.png",Txt_Remove_this_message,NULL); + "remove-on64x64.png", + Txt_Remove_this_message,NULL, + NULL); } /*****************************************************************************/ @@ -2353,7 +2362,9 @@ static void Msg_PutIconToRemoveSevSntMsgs (void) extern const char *Txt_Remove_these_messages; Lay_PutContextualLink (ActReqDelAllSntMsg,Msg_PutHiddenParamsMsgsFilters, - "remove-on64x64.png",Txt_Remove_these_messages,NULL); + "remove-on64x64.png", + Txt_Remove_these_messages,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_network.c b/swad_network.c index e2f5a5d3f..f04874406 100644 --- a/swad_network.c +++ b/swad_network.c @@ -269,8 +269,10 @@ void Net_PutLinkToChangeMySocialNetworks (void) extern const char *Txt_Edit_my_webs_networks; /***** Link to edit my social networks *****/ - Lay_PutContextualLink (ActReqEdiMyNet,NULL,"earth64x64.gif", - Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks); + Lay_PutContextualLink (ActReqEdiMyNet,NULL, + "earth64x64.gif", + Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks, + NULL); } /*****************************************************************************/ diff --git a/swad_notice.c b/swad_notice.c index b994d7fa3..1a822ebf0 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -491,7 +491,10 @@ static void Not_PutIconToAddNewNotice (void) { extern const char *Txt_New_notice; - Lay_PutContextualLink (ActWriNot,NULL,"plus64x64.png",Txt_New_notice,NULL); + Lay_PutContextualLink (ActWriNot,NULL, + "plus64x64.png", + Txt_New_notice,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_notification.c b/swad_notification.c index e0bc9032c..5fe1301bb 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -341,12 +341,17 @@ void Ntf_ShowMyNotifications (void) /***** Buttons to change preferences and to mark all notifications as seen *****/ fprintf (Gbl.F.Out,"
"); // Put form to change notification preferences - Lay_PutContextualLink (ActEdiPrf,NULL,"heart64x64.gif", - Txt_Change_preferences,Txt_Change_preferences); + Lay_PutContextualLink (ActEdiPrf,NULL, + "heart64x64.gif", + Txt_Change_preferences,Txt_Change_preferences, + NULL); if (NumNotifications) // Put form to change notification preferences - Lay_PutContextualLink (ActMrkNtfSee,NULL,"eye-on64x64.png", - Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read); + Lay_PutContextualLink (ActMrkNtfSee,NULL, + "eye-on64x64.png", + Txt_Mark_all_notifications_as_read, + Txt_Mark_all_notifications_as_read, + NULL); fprintf (Gbl.F.Out,"
"); /***** Write form to show all notifications *****/ diff --git a/swad_password.c b/swad_password.c index 15b5368cb..0f80361a9 100644 --- a/swad_password.c +++ b/swad_password.c @@ -219,7 +219,8 @@ void Pwd_PutLinkToSendNewPasswd (void) Lay_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams, "key64x64.gif", - Txt_Forgotten_password,Txt_Forgotten_password); + Txt_Forgotten_password,Txt_Forgotten_password, + NULL); } static void Pwd_PutLinkToSendNewPasswdParams (void) @@ -843,8 +844,10 @@ void Pwd_PutLinkToChangeMyPassword (void) extern const char *Txt_Change_password; /***** Link for changing the password *****/ - Lay_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif", - Txt_Change_password,Txt_Change_password); + Lay_PutContextualLink (ActFrmChgMyPwd,NULL, + "key64x64.gif", + Txt_Change_password,Txt_Change_password, + NULL); } /*****************************************************************************/ @@ -862,8 +865,10 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void) Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmPwdStd : (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch : ActFrmPwdOth), - Usr_PutParamOtherUsrCodEncrypted,"key64x64.gif", - Txt_Change_password,Txt_Change_password); + Usr_PutParamOtherUsrCodEncrypted, + "key64x64.gif", + Txt_Change_password,Txt_Change_password, + NULL); } /*****************************************************************************/ diff --git a/swad_photo.c b/swad_photo.c index cd5bade95..2f57a3e86 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -179,13 +179,13 @@ void Pho_PutLinkToChangeMyPhoto (void) { extern const char *Txt_Change_photo; extern const char *Txt_Upload_photo; + const char *TitleText = Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo : + Txt_Upload_photo; /***** Link for changing / uploading the photo *****/ Lay_PutContextualLink (ActReqMyPho,NULL,"photo64x64.gif", - Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo : - Txt_Upload_photo, - Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo : - Txt_Upload_photo); + TitleText,TitleText, + NULL); } /*****************************************************************************/ @@ -198,6 +198,7 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void) extern const char *Txt_Upload_photo; bool PhotoExists; char PhotoURL[PATH_MAX+1]; + const char *TitleText; /***** Link for changing / uploading the photo *****/ if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me @@ -206,15 +207,15 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void) if (Pho_CheckIfICanChangeOtherUsrPhoto (&Gbl.Usrs.Other.UsrDat)) { PhotoExists = Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true); + TitleText = PhotoExists ? Txt_Change_photo : + Txt_Upload_photo; Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActReqStdPho : (Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqTchPho : ActReqOthPho), // Guest, visitor or admin Usr_PutParamOtherUsrCodEncrypted, "photo64x64.gif", - PhotoExists ? Txt_Change_photo : - Txt_Upload_photo, - PhotoExists ? Txt_Change_photo : - Txt_Upload_photo); + TitleText,TitleText, + NULL); } } @@ -228,8 +229,10 @@ static void Pho_PutIconToRequestRemoveMyPhoto (void) /***** Link to request the removal of my photo *****/ if (Gbl.Usrs.Me.MyPhotoExists) - Lay_PutContextualLink (ActReqRemMyPho,NULL,"remove-on64x64.png", - Txt_Remove_photo,NULL); + Lay_PutContextualLink (ActReqRemMyPho,NULL, + "remove-on64x64.png", + Txt_Remove_photo,NULL, + NULL); } /*****************************************************************************/ @@ -250,7 +253,8 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void) ActReqRemOthPho), // Guest, visitor or admin Usr_PutParamOtherUsrCodEncrypted, "remove-on64x64.png", - Txt_Remove_photo,NULL); + Txt_Remove_photo,NULL, + NULL); } /*****************************************************************************/ @@ -1874,7 +1878,9 @@ static void Pho_PutIconToPrintDegreeStats (void) extern const char *Txt_Print; Lay_PutContextualLink (ActPrnPhoDeg,Pho_PutLinkToPrintViewOfDegreeStatsParams, - "print64x64.png",Txt_Print,NULL); + "print64x64.png", + Txt_Print,NULL, + NULL); } static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void) diff --git a/swad_place.c b/swad_place.c index dad0bccd0..8c704ad69 100644 --- a/swad_place.c +++ b/swad_place.c @@ -202,7 +202,10 @@ static void Plc_PutIconToEditPlaces (void) { extern const char *Txt_Edit; - Lay_PutContextualLink (ActEdiPlc,NULL,"edit64x64.png",Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiPlc,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_plugin.c b/swad_plugin.c index d37c9ea34..a42c8e571 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -154,7 +154,10 @@ static void Plg_PutIconToEditPlugins (void) { extern const char *Txt_Edit; - Lay_PutContextualLink (ActEdiPlg,NULL,"edit64x64.png",Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiPlg,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_preference.c b/swad_preference.c index 8569f9edb..55183ed27 100644 --- a/swad_preference.c +++ b/swad_preference.c @@ -238,7 +238,8 @@ void Pre_PutLinkToChangeLanguage (void) { Lay_PutContextualLink (ActEdiPrf,NULL, "cty64x64.gif", - "Change language","Change language"); + "Change language","Change language", + NULL); } /*****************************************************************************/ diff --git a/swad_privacy.c b/swad_privacy.c index e5b25f425..cac8dab96 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -75,8 +75,10 @@ void Pri_PutLinkToChangeMyPrivacy (void) extern const char *Txt_Privacy; /***** Link to edit my privacy *****/ - Lay_PutContextualLink (ActEdiPri,NULL,"lock64x64.png", - Txt_Privacy,Txt_Privacy); + Lay_PutContextualLink (ActEdiPri,NULL, + "lock64x64.png", + Txt_Privacy,Txt_Privacy, + NULL); } /*****************************************************************************/ diff --git a/swad_profile.c b/swad_profile.c index f6c19d7cf..ed0c4b6e5 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -143,7 +143,8 @@ void Prf_PutLinkRequestUserProfile (void) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActReqPubPrf,NULL, "usr64x64.gif", - Txt_View_public_profile,Txt_View_public_profile); + Txt_View_public_profile,Txt_View_public_profile, + NULL); fprintf (Gbl.F.Out,"
"); } diff --git a/swad_record.c b/swad_record.c index 7e21c79e9..f177ce4b0 100644 --- a/swad_record.c +++ b/swad_record.c @@ -924,8 +924,10 @@ void Rec_PutLinkToEditRecordFields (void) extern const char *Txt_Edit_record_fields; /***** Link to edit record fields *****/ - Lay_PutContextualLink (ActEdiRecFie,NULL,"edit64x64.png", - Txt_Edit_record_fields,Txt_Edit_record_fields); + Lay_PutContextualLink (ActEdiRecFie,NULL, + "edit64x64.png", + Txt_Edit_record_fields,Txt_Edit_record_fields, + NULL); } /*****************************************************************************/ @@ -2273,8 +2275,10 @@ static void Rec_PutIconsCommands (void) /***** Button to edit my record card *****/ if (ItsMe) - Lay_PutContextualLink (ActReqEdiRecCom,NULL,"edit64x64.png", - Txt_Edit_my_personal_data,NULL); + Lay_PutContextualLink (ActReqEdiRecCom,NULL, + "edit64x64.png", + Txt_Edit_my_personal_data,NULL, + NULL); /***** Button to view user's record card in course when: - a course is selected && the user belongs to it && @@ -2287,7 +2291,8 @@ static void Rec_PutIconsCommands (void) ActSeeRecOneTch, Rec_PutParamUsrCodEncrypted, "card64x64.gif", - Txt_View_record_for_this_course,NULL); + Txt_View_record_for_this_course,NULL, + NULL); /***** Button to admin user *****/ if (ItsMe || @@ -2301,7 +2306,8 @@ static void Rec_PutIconsCommands (void) ActReqMdfOth), Rec_PutParamUsrCodEncrypted, "config64x64.gif", - Txt_Admin_user,NULL); + Txt_Admin_user,NULL, + NULL); if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected Gbl.Record.UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // He/she is a student in the current course @@ -2311,21 +2317,25 @@ static void Rec_PutIconsCommands (void) if (ItsMe) // I am a student Lay_PutContextualLink (ActAdmAsgWrkUsr,NULL, "folder64x64.gif", - Txt_View_works,NULL); + Txt_View_works,NULL, + NULL); else // I am a teacher or superuser Lay_PutContextualLink (ActAdmAsgWrkCrs,Rec_PutParamsWorks, "folder64x64.gif", - Txt_View_works,NULL); + Txt_View_works,NULL, + NULL); /***** Button to view user's test exams *****/ if (ItsMe) Lay_PutContextualLink (ActSeeMyTstExa,NULL, "file64x64.gif", - Txt_See_exams,NULL); + Txt_See_exams,NULL, + NULL); else Lay_PutContextualLink (ActSeeUsrTstExa,Rec_PutParamsStudent, "file64x64.gif", - Txt_See_exams,NULL); + Txt_See_exams,NULL, + NULL); /***** Button to view user's attendance *****/ if (IAmLoggedAsStudent || @@ -2336,19 +2346,22 @@ static void Rec_PutIconsCommands (void) // As student, I can see my attendance Lay_PutContextualLink (ActSeeLstMyAtt,NULL, "rollcall64x64.gif", - Txt_Attendance,NULL); + Txt_Attendance,NULL, + NULL); else // IAmLoggedAsTeacher || IAmLoggedAsSysAdm // As teacher, I can see attendance of the student Lay_PutContextualLink (ActSeeLstStdAtt,Rec_PutParamsStudent, "rollcall64x64.gif", - Txt_Attendance,NULL); + Txt_Attendance,NULL, + NULL); } } /***** Button to send a message *****/ Lay_PutContextualLink (ActReqMsgUsr,Rec_PutParamsMsgUsr, "msg64x64.gif", - Txt_Write_a_message,NULL); + Txt_Write_a_message,NULL, + NULL); /***** Button to follow / unfollow *****/ if (Gbl.Record.TypeOfView == Rec_RECORD_PUBLIC && @@ -2357,11 +2370,13 @@ static void Rec_PutIconsCommands (void) if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,Gbl.Record.UsrDat->UsrCod)) // I follow user Lay_PutContextualLink (ActUnfUsr,Rec_PutParamUsrCodEncrypted, "following64x64.png", - Txt_Following_unfollow,NULL); + Txt_Following_unfollow,NULL, + NULL); else // I do not follow user Lay_PutContextualLink (ActFolUsr,Rec_PutParamUsrCodEncrypted, "follow64x64.png", - Txt_Follow,NULL); + Txt_Follow,NULL, + NULL); } fprintf (Gbl.F.Out,""); @@ -3472,7 +3487,8 @@ void Rec_PutLinkToChangeMyInsCtrDpt (void) /***** Link to edit my institution, centre, department... *****/ Lay_PutContextualLink (ActReqEdiMyIns,NULL,"ins64x64.gif", - Txt_Edit_my_institution,Txt_Edit_my_institution); + Txt_Edit_my_institution,Txt_Edit_my_institution, + NULL); } /*****************************************************************************/ diff --git a/swad_statistic.c b/swad_statistic.c index 599fa30eb..625893015 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -591,7 +591,8 @@ void Sta_AskShowGblHits (void) Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)) Lay_PutContextualLink (ActReqAccCrs,NULL, "stats64x64.gif", - Txt_Visits_to_course,Txt_Visits_to_course); + Txt_Visits_to_course,Txt_Visits_to_course, + NULL); /* Link to show last clicks in real time */ Con_PutLinkToLastClicks (); diff --git a/swad_survey.c b/swad_survey.c index a44210521..a2e8ce3b7 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -303,7 +303,9 @@ static void Svy_PutIconToCreateNewSvy (void) extern const char *Txt_New_survey; Lay_PutContextualLink (ActFrmNewSvy,Svy_PutParamsToCreateNewSvy, - "plus64x64.png",Txt_New_survey,NULL); + "plus64x64.png", + Txt_New_survey,NULL, + NULL); } /*****************************************************************************/ @@ -752,24 +754,34 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) Gbl.Svys.SvyCodToEdit = SvyCod; // Used as parameters in contextual links /***** Put form to remove survey *****/ - Lay_PutContextualLink (ActReqRemSvy,Svy_PutParams,"remove-on64x64.png", - Txt_Remove,NULL); + Lay_PutContextualLink (ActReqRemSvy,Svy_PutParams, + "remove-on64x64.png", + Txt_Remove,NULL, + NULL); /***** Put form to reset survey *****/ - Lay_PutContextualLink (ActReqRstSvy,Svy_PutParams,"recycle64x64.png", - Txt_Reset,NULL); + Lay_PutContextualLink (ActReqRstSvy,Svy_PutParams, + "recycle64x64.png", + Txt_Reset,NULL, + NULL); /***** Put form to hide/show survey *****/ if (Visible) - Lay_PutContextualLink (ActHidSvy,Svy_PutParams,"eye-on64x64.png", - Txt_Hide,NULL); + Lay_PutContextualLink (ActHidSvy,Svy_PutParams, + "eye-on64x64.png", + Txt_Hide,NULL, + NULL); else - Lay_PutContextualLink (ActShoSvy,Svy_PutParams,"eye-slash-on64x64.png", - Txt_Show,NULL); + Lay_PutContextualLink (ActShoSvy,Svy_PutParams, + "eye-slash-on64x64.png", + Txt_Show,NULL, + NULL); /***** Put form to edit survey *****/ - Lay_PutContextualLink (ActEdiOneSvy,Svy_PutParams,"edit64x64.png", - Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiOneSvy,Svy_PutParams, + "edit64x64.png", + Txt_Edit,NULL, + NULL); fprintf (Gbl.F.Out,""); } @@ -2967,7 +2979,9 @@ static void Svy_PutIconToAddNewQuestion (void) /***** Put form to create a new question *****/ Lay_PutContextualLink (ActEdiOneSvyQst,Svy_PutParams, - "plus64x64.png",Txt_New_question,NULL); + "plus64x64.png", + Txt_New_question,NULL, + NULL); } /*****************************************************************************/ @@ -3144,7 +3158,9 @@ static void Svy_PutIconToRemoveOneQst (void) extern const char *Txt_Remove; Lay_PutContextualLink (ActReqRemSvyQst,Svy_PutParamsRemoveOneQst, - "remove-on64x64.png",Txt_Remove,NULL); + "remove-on64x64.png", + Txt_Remove,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_test.c b/swad_test.c index 195dbc7fe..16801f849 100644 --- a/swad_test.c +++ b/swad_test.c @@ -371,7 +371,8 @@ static void Tst_PutFormToSeeResultsOfUsersTests (Act_Action_t Action) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (Action,NULL,"file64x64.gif", - Txt_Results_tests,Txt_Results_tests); + Txt_Results_tests,Txt_Results_tests, + NULL); fprintf (Gbl.F.Out,"
"); } @@ -1301,18 +1302,24 @@ static void Tst_PutIconsToEditAndConfig (void) /***** Put form to edit existing test questions *****/ if (Gbl.Action.Act != ActEdiTstQst) - Lay_PutContextualLink (ActEdiTstQst,NULL,"edit64x64.png", - Txt_Edit,NULL); + Lay_PutContextualLink (ActEdiTstQst,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); /***** Put form to create a new test question *****/ if (Gbl.Action.Act != ActEdiOneTstQst) - Lay_PutContextualLink (ActEdiOneTstQst,NULL,"plus64x64.png", - Txt_New_question,NULL); + Lay_PutContextualLink (ActEdiOneTstQst,NULL, + "plus64x64.png", + Txt_New_question,NULL, + NULL); /***** Put form to go to test configuration *****/ if (Gbl.Action.Act != ActCfgTst) - Lay_PutContextualLink (ActCfgTst,NULL,"config64x64.gif", - Txt_Configure,NULL); + Lay_PutContextualLink (ActCfgTst,NULL, + "config64x64.gif", + Txt_Configure,NULL, + NULL); } /*****************************************************************************/ @@ -5718,7 +5725,9 @@ static void Tst_PutIconToRemoveOneQst (void) extern const char *Txt_Remove; Lay_PutContextualLink (ActReqRemTstQst,Tst_PutParamsRemoveOneQst, - "remove-on64x64.png",Txt_Remove,NULL); + "remove-on64x64.png", + Txt_Remove,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_test_import.c b/swad_test_import.c index cbf39c8b0..b15e006e2 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -89,7 +89,8 @@ void TsI_PutFormToExportQuestions (void) /***** Put a link to create a file with questions *****/ Lay_PutContextualLink (ActLstTstQst,TsI_PutParamsExportQsts, "export16x16.gif", - Txt_Export_questions_to_XML_file,Txt_Export_questions); + Txt_Export_questions_to_XML_file,Txt_Export_questions, + NULL); } /*****************************************************************************/ @@ -118,7 +119,8 @@ void TsI_PutFormToImportQuestions (void) Lay_PutContextualLink (ActReqImpTstQst,NULL, "import16x16.gif", Txt_Import_questions_from_XML_file, - Txt_Import_questions); + Txt_Import_questions, + NULL); } /*****************************************************************************/ diff --git a/swad_timetable.c b/swad_timetable.c index 97b181039..96092c03f 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -299,17 +299,22 @@ static void TT_PutContextualIcons (void) if (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT) Lay_PutContextualLink (ActEdiCrsTT,Grp_PutParamWhichGrps, "edit64x64.png", - Txt_Edit,NULL); + Txt_Edit,NULL, + NULL); if (Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours) - Lay_PutContextualLink (ActEdiTut,NULL,"edit64x64.png", - Txt_Edit_office_hours,NULL); + Lay_PutContextualLink (ActEdiTut,NULL, + "edit64x64.png", + Txt_Edit_office_hours,NULL, + NULL); if (Gbl.TimeTable.ContextualIcons.PutIconPrint) Lay_PutContextualLink (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActPrnCrsTT : - ActPrnMyTT, - Grp_PutParamWhichGrps,"print64x64.png", - Txt_Print,NULL); + ActPrnMyTT, + Grp_PutParamWhichGrps, + "print64x64.png", + Txt_Print,NULL, + NULL); } /*****************************************************************************/ @@ -364,8 +369,10 @@ static void TT_PutIconToViewCrsTT (void) extern const char *Txt_Show_timetable; /***** Link (form) to see course timetable *****/ - Lay_PutContextualLink (ActSeeCrsTT,NULL,"clock64x64.gif", - Txt_Show_timetable,NULL); + Lay_PutContextualLink (ActSeeCrsTT,NULL, + "clock64x64.gif", + Txt_Show_timetable,NULL, + NULL); } /*****************************************************************************/ @@ -377,8 +384,10 @@ static void TT_PutIconToViewMyTT (void) extern const char *Txt_Show_timetable; /***** Link (form) to see my timetable *****/ - Lay_PutContextualLink (ActSeeMyTT,NULL,"clock64x64.gif", - Txt_Show_timetable,NULL); + Lay_PutContextualLink (ActSeeMyTT,NULL, + "clock64x64.gif", + Txt_Show_timetable,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_user.c b/swad_user.c index 89df094d5..fd346641f 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1520,8 +1520,10 @@ void Usr_PutLinkToLogin (void) { extern const char *Txt_Log_in; - Lay_PutContextualLink (ActFrmLogIn,NULL,"login-green64x64.png", - Txt_Log_in,Txt_Log_in); + Lay_PutContextualLink (ActFrmLogIn,NULL, + "login-green64x64.png", + Txt_Log_in,Txt_Log_in, + NULL); } /*****************************************************************************/ @@ -2661,8 +2663,10 @@ void Usr_ShowFormsLogoutAndRole (void) /***** Link to log out *****/ fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActLogOut,NULL,"logout-red64x64.png", - Txt_Log_out,Txt_Log_out); + Lay_PutContextualLink (ActLogOut,NULL, + "logout-red64x64.png", + Txt_Log_out,Txt_Log_out, + NULL); fprintf (Gbl.F.Out,"
"); /***** Write message with my new logged role *****/ @@ -6368,9 +6372,11 @@ static void Usr_PutLinkToSeeAdmins (void) extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; /***** Put form to list admins *****/ - Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif", + Lay_PutContextualLink (ActLstOth,NULL, + "adm16x16.gif", Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], - Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]); + Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN], + NULL); } /*****************************************************************************/ @@ -6382,9 +6388,11 @@ static void Usr_PutLinkToSeeGuests (void) extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; /***** Put form to list guests *****/ - Lay_PutContextualLink (ActLstGst,NULL,"usrs64x64.gif", + Lay_PutContextualLink (ActLstGst,NULL, + "usrs64x64.gif", Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], - Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]); + Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN], + NULL); } /*****************************************************************************/ @@ -6832,7 +6840,9 @@ static void Usr_PutIconToPrintGsts (void) extern const char *Txt_Print; Lay_PutContextualLink (ActPrnGstPho,Usr_ShowGstsAllDataParams, - "print64x64.png",Txt_Print,NULL); + "print64x64.png", + Txt_Print,NULL, + NULL); } static void Usr_PutIconToPrintStds (void) @@ -6840,7 +6850,9 @@ static void Usr_PutIconToPrintStds (void) extern const char *Txt_Print; Lay_PutContextualLink (ActPrnStdPho,Usr_ShowStdsAllDataParams, - "print64x64.png",Txt_Print,NULL); + "print64x64.png", + Txt_Print,NULL, + NULL); } static void Usr_PutIconToPrintTchs (void) @@ -6848,7 +6860,9 @@ static void Usr_PutIconToPrintTchs (void) extern const char *Txt_Print; Lay_PutContextualLink (ActPrnTchPho,Usr_ShowTchsAllDataParams, - "print64x64.png",Txt_Print,NULL); + "print64x64.png", + Txt_Print,NULL, + NULL); } static void Usr_PutIconToShowGstsAllData (void) @@ -6856,7 +6870,9 @@ static void Usr_PutIconToShowGstsAllData (void) extern const char *Txt_Show_all_data; Lay_PutContextualLink (ActLstGstAll,Usr_ShowGstsAllDataParams, - "table64x64.gif",Txt_Show_all_data,NULL); + "table64x64.gif", + Txt_Show_all_data,NULL, + NULL); } static void Usr_PutIconToShowStdsAllData (void) @@ -6864,7 +6880,9 @@ static void Usr_PutIconToShowStdsAllData (void) extern const char *Txt_Show_all_data; Lay_PutContextualLink (ActLstStdAll,Usr_ShowStdsAllDataParams, - "table64x64.gif",Txt_Show_all_data,NULL); + "table64x64.gif", + Txt_Show_all_data,NULL, + NULL); } static void Usr_PutIconToShowTchsAllData (void) @@ -6872,7 +6890,9 @@ static void Usr_PutIconToShowTchsAllData (void) extern const char *Txt_Show_all_data; Lay_PutContextualLink (ActLstTchAll,Usr_ShowTchsAllDataParams, - "table64x64.gif",Txt_Show_all_data,NULL); + "table64x64.gif", + Txt_Show_all_data,NULL, + NULL); } static void Usr_ShowGstsAllDataParams (void) @@ -6909,8 +6929,10 @@ static void Usr_PutLinkToListOfficialStudents (void) Gbl.Imported.ExternalSesId[0] && Gbl.Imported.ExternalRole == Rol_TEACHER) // ...as a teacher /***** Link to list official students *****/ - Lay_PutContextualLink (ActGetExtLstStd,NULL,"list64x64.gif", - Txt_Official_students,Txt_Official_students); + Lay_PutContextualLink (ActGetExtLstStd,NULL, + "list64x64.gif", + Txt_Official_students,Txt_Official_students, + NULL); } /*****************************************************************************/ diff --git a/swad_zip.c b/swad_zip.c index 915f07da8..e09bd42e3 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -120,7 +120,8 @@ void ZIP_PutButtonToCreateZIPAsgWrk (void) fprintf (Gbl.F.Out,"
"); Lay_PutContextualLink (ActAdmAsgWrkCrs,ZIP_PutButtonToCreateZIPAsgWrkParams, "download64x64.png", - Txt_Create_ZIP_file,Txt_Create_ZIP_file); + Txt_Create_ZIP_file,Txt_Create_ZIP_file, + NULL); fprintf (Gbl.F.Out,"
"); }