Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.64.7

This commit is contained in:
Antonio Cañas Vargas 2015-12-13 19:02:06 +01:00
parent 09f96e842d
commit b5fb9525d7
40 changed files with 188 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_ID.c
View File

@ -378,13 +378,15 @@ void ID_PutLinkToChangeUsrIDs (void)
/***** Link for changing the password *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Lay_PutContextualLink (ActFrmUsrAcc,NULL,
"arroba64x64.gif",Txt_Change_IDs);
"arroba64x64.gif",
Txt_Change_IDs,Txt_Change_IDs);
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);
"arroba64x64.gif",
Txt_Change_IDs,Txt_Change_IDs);
}
/*****************************************************************************/

6
swad_account.c
View File

@ -128,7 +128,8 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Link to log in *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",Txt_Log_in);
Lay_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",
Txt_Log_in,Txt_Log_in);
fprintf (Gbl.F.Out,"</div>");
/***** Form to enter some data of the new user *****/
@ -244,7 +245,8 @@ static void Acc_PutLinkToRemoveMyAccount (void)
extern const char *Txt_Remove_account;
Lay_PutContextualLink (ActReqRemMyAcc,Acc_PutLinkToRemoveMyAccountParams,
"remove-on64x64.png",Txt_Remove_account);
"remove-on64x64.png",
Txt_Remove_account,Txt_Remove_account);
}
static void Acc_PutLinkToRemoveMyAccountParams (void)

3
swad_announcement.c
View File

@ -93,7 +93,8 @@ void Ann_ShowAllAnnouncements (void)
if (ICanEditAnnouncements)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActWriAnn,NULL,"plus64x64.png",Txt_New_announcement);
Lay_PutContextualLink (ActWriAnn,NULL,"plus64x64.png",
Txt_New_announcement,Txt_New_announcement);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_assignment.c
View File

@ -470,7 +470,8 @@ static void Asg_PutFormToCreateNewAsg (void)
/***** Put form to create a new assignment *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActFrmNewAsg,Asg_PutFormToCreateNewAsgParams,
"plus64x64.png",Txt_New_assignment);
"plus64x64.png",
Txt_New_assignment,Txt_New_assignment);
fprintf (Gbl.F.Out,"</div>");
}

15
swad_attendance.c
View File

@ -467,7 +467,8 @@ static void Att_PutFormToListMyAttendance (void)
extern const char *Txt_Attendance_list;
Lay_PutContextualLink (ActSeeLstMyAtt,NULL,
"list16x16.gif",Txt_Attendance_list);
"list16x16.gif",
Txt_Attendance_list,Txt_Attendance_list);
}
/*****************************************************************************/
@ -479,7 +480,8 @@ static void Att_PutFormToListStdsAttendance (void)
extern const char *Txt_Attendance_list;
Lay_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams,
"list16x16.gif",Txt_Attendance_list);
"list16x16.gif",
Txt_Attendance_list,Txt_Attendance_list);
}
static void Att_PutFormToListStdsParams (void)
@ -499,7 +501,8 @@ static void Att_PutFormToCreateNewAttEvent (void)
/***** Put form to create a new attendance event *****/
Lay_PutContextualLink (ActFrmNewAtt,Att_PutFormToCreateNewAttEventParams,
"plus64x64.png",Txt_New_event);
"plus64x64.png",
Txt_New_event,Txt_New_event);
}
static void Att_PutFormToCreateNewAttEventParams (void)
@ -2864,7 +2867,8 @@ static void Att_PutFormToPrintMyList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnLstMyAtt,Att_PutFormToPrintMyListParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
@ -2887,7 +2891,8 @@ static void Att_PutFormToPrintStdsList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnLstStdAtt,Att_PutFormToPrintStdsListParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_banner.c
View File

@ -130,7 +130,8 @@ static void Ban_PutFormToEditBanners (void)
/***** Link to edit banners *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiBan,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_calendar.c
View File

@ -251,7 +251,8 @@ void Cal_DrawCalendar (void)
{
/* Link to print view */
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
Lay_StartRoundFrameTable (NULL,0,NULL);

10
swad_centre.c
View File

@ -283,7 +283,8 @@ static void Ctr_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnCtrInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCtrInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Links to upload logo and photo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
@ -1905,8 +1906,11 @@ static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
/***** Link for changing / uploading the photo *****/
Lay_PutContextualLink (ActReqCtrPho,NULL,
"photo64x64.gif",PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
"photo64x64.gif",
PhotoExists ? Txt_Change_photo :
Txt_Upload_photo,
PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
}
/*****************************************************************************/

3
swad_changelog.h
View File

@ -117,12 +117,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.64.6 (2015/12/13)"
#define Log_PLATFORM_VERSION "SWAD 15.64.7 (2015/12/13)"
#define CSS_FILE "swad15.64.5.css"
// 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.64.7: Dec 13, 2015 Code refactoring in contextual links. (187063 lines)
Version 15.64.6: Dec 13, 2015 Code refactoring in contextual links. (186974 lines)
Version 15.64.5: Dec 13, 2015 Code refactoring in record card. (186944 lines)
Version 15.64.4: Dec 13, 2015 Links to web / social networks are not displayed when printing record card. (186986 lines)

4
swad_connected.c
View File

@ -141,8 +141,8 @@ void Con_PutLinkToLastClicks (void)
{
extern const char *Txt_Last_clicks;
Lay_PutContextualLink (ActLstClk,NULL,
"mouse-pointer64x64.png",Txt_Last_clicks);
Lay_PutContextualLink (ActLstClk,NULL,"mouse-pointer64x64.png",
Txt_Last_clicks,Txt_Last_clicks);
}
/*****************************************************************************/

3
swad_country.c
View File

@ -224,7 +224,8 @@ static void Cty_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnCtyInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCtyInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

9
swad_course.c
View File

@ -192,7 +192,8 @@ static void Crs_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Link to request enrollment in the current course */
if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ ||
@ -2896,7 +2897,8 @@ static void Crs_PutLinkToSearchCourses (void)
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch :
ActSysReqSch)))),
Crs_PutLinkToSearchCoursesParams,
"search64x64.gif",Txt_Search_courses);
"search64x64.gif",
Txt_Search_courses,Txt_Search_courses);
}
static void Crs_PutLinkToSearchCoursesParams (void)
@ -2914,7 +2916,8 @@ 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);
Lay_PutContextualLink (ActMyCrs,NULL,"hierarchy64x64.gif",
Txt_My_courses,Txt_My_courses);
}
/*****************************************************************************/

3
swad_degree.c
View File

@ -317,7 +317,8 @@ static void Deg_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnDegInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnDegInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)

3
swad_department.c
View File

@ -212,7 +212,8 @@ static void Dpt_PutFormToEditDpts (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiDpt,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiDpt,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

19
swad_enrollment.c
View File

@ -152,7 +152,8 @@ void Enr_PutLinkToRequestSignUp (void)
extern const char *Txt_Sign_up;
/***** Show the form *****/
Lay_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif",Txt_Sign_up);
Lay_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif",
Txt_Sign_up,Txt_Sign_up);
}
/*****************************************************************************/
@ -352,12 +353,14 @@ void Enr_ReqAcceptRegisterInCrs (void)
/***** Send button to accept register in the current course *****/
Lay_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActAccEnrStd :
ActAccEnrTch,
NULL,"ok_green16x16.gif",Txt_Confirm_my_enrollment);
NULL,"ok_green16x16.gif",
Txt_Confirm_my_enrollment,Txt_Confirm_my_enrollment);
/***** Send button to refuse register in the current course *****/
Lay_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActRemMe_Std :
ActRemMe_Tch,
NULL,"remove-on64x64.png",Txt_Remove_me_from_this_course);
NULL,"remove-on64x64.png",
Txt_Remove_me_from_this_course,Txt_Remove_me_from_this_course);
fprintf (Gbl.F.Out,"</div>");
@ -682,7 +685,8 @@ 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);
Lay_PutContextualLink (ActReqRemOldUsr,NULL,"remove-on64x64.png",
Txt_Eliminate_old_users,Txt_Eliminate_old_users);
}
/*****************************************************************************/
@ -1773,7 +1777,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);
"remove-on64x64.png",
Txt_Remove_all_students,Txt_Remove_all_students);
}
/*****************************************************************************/
@ -2750,6 +2755,8 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
extern const char *Txt_Admin_one_user;
Lay_PutContextualLink (NextAction,NULL,"configtest16x16.gif",
Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
Txt_Admin_me,
Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
Txt_Admin_me);
}
@ -2766,6 +2773,8 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
ActReqEnrSevTch,
NULL,"configtest16x16.gif",
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers,
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers);
}

3
swad_exam.c
View File

@ -444,7 +444,8 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
case Rol_SYS_ADM:
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiExaAnn,NULL,
"plus64x64.png",Txt_New_announcement_OF_EXAM);
"plus64x64.png",
Txt_New_announcement_OF_EXAM,Txt_New_announcement_OF_EXAM);
fprintf (Gbl.F.Out,"</div>");
break;
default:

6
swad_file_browser.c
View File

@ -4302,11 +4302,13 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
{
case Brw_SHOW:
Lay_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"eye-on64x64.png",Txt_View);
"eye-on64x64.png",
Txt_View,Txt_View);
break;
case Brw_ADMIN:
Lay_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"edit64x64.png",Txt_Edit);
"edit64x64.png",
Txt_Edit,Txt_Edit);
break;
}
fprintf (Gbl.F.Out,"</div>");

3
swad_holiday.c
View File

@ -199,7 +199,8 @@ static void Hld_PutFormToEditHlds (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiHld,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiHld,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

6
swad_info.c
View File

@ -417,7 +417,8 @@ static void Inf_PutFormToEditInfo (Inf_InfoType_t InfoType)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Inf_ActionsEditInfo[InfoType],NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (Inf_ActionsEditInfo[InfoType],NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -923,7 +924,8 @@ void Inf_FormsToSelSendInfo (void)
/***** Put link to view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Inf_ActionsSeeInfo[InfoType],NULL,
"eye-on64x64.png",Txt_View);
"eye-on64x64.png",
Txt_View,Txt_View);
fprintf (Gbl.F.Out,"</div>");
/***** Get info source from database *****/

3
swad_institution.c
View File

@ -261,7 +261,8 @@ static void Ins_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Lay_PutContextualLink (ActPrnInsInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnInsInf,NULL,"print64x64.png",
Txt_Print,Txt_Print);
/* Link to upload logo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM)

21
swad_layout.c
View File

@ -922,7 +922,8 @@ void Lay_PutFormToView (Act_Action_t Action)
extern const char *Txt_View;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Action,NULL,"eye-on64x64.png",Txt_View);
Lay_PutContextualLink (Action,NULL,"eye-on64x64.png",
Txt_View,Txt_View);
fprintf (Gbl.F.Out,"</div>");
}
@ -935,7 +936,8 @@ void Lay_PutFormToEdit (Act_Action_t Action)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Action,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (Action,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -944,27 +946,26 @@ void Lay_PutFormToEdit (Act_Action_t Action)
/*****************************************************************************/
void Lay_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
const char *Icon,const char *Title)
const char *Icon,
const char *Title,const char *Text)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
// fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPTION\">");
Act_FormStart (NextAction);
if (FuncParams)
FuncParams ();
Lay_PutIconLink (Icon,Title,The_ClassFormBold[Gbl.Prefs.Theme],Title);
Lay_PutIconLink (Icon,Title,Text,
Text ? The_ClassFormBold[Gbl.Prefs.Theme] :
NULL);
Act_FormEnd ();
// fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/****************** Show an icon with a link (without text) ******************/
/*****************************************************************************/
void Lay_PutIconLink (const char *Icon,const char *Title,
const char *LinkStyle,const char *Text)
void Lay_PutIconLink (const char *Icon,const char *Title,const char *Text,
const char *LinkStyle)
{
Act_LinkFormSubmit (Title,LinkStyle);
Lay_PutIconWithText (Icon,Title,Text);

7
swad_layout.h
View File

@ -74,9 +74,10 @@ void Lay_WriteTitle (const char *Title);
void Lay_PutFormToView (Act_Action_t Action);
void Lay_PutFormToEdit (Act_Action_t Action);
void Lay_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
const char *Icon,const char *Title);
void Lay_PutIconLink (const char *Icon,const char *Title,
const char *LinkStyle,const char *Text);
const char *Icon,
const char *Title,const char *Text);
void Lay_PutIconLink (const char *Icon,const char *Title,const char *Text,
const char *LinkStyle);
void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text);
void Lay_PutCalculateIconWithText (const char *Alt,const char *Text);

3
swad_link.c
View File

@ -159,7 +159,8 @@ static void Lnk_PutFormToEditLinks (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiLnk,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiLnk,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

7
swad_logo.c
View File

@ -219,8 +219,11 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
LogoExists = Fil_CheckIfPathExists (PathLogo);
/***** Link for changing / uploading the logo *****/
Lay_PutContextualLink (Action,NULL,Icon,LogoExists ? Txt_Change_logo :
Txt_Upload_logo);
Lay_PutContextualLink (Action,NULL,Icon,
LogoExists ? Txt_Change_logo :
Txt_Upload_logo,
LogoExists ? Txt_Change_logo :
Txt_Upload_logo);
}
/*****************************************************************************/

10
swad_mail.c
View File

@ -176,7 +176,8 @@ static void Mai_PutFormToEditMailDomains (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -919,14 +920,15 @@ 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);
Lay_PutContextualLink (ActFrmUsrAcc,NULL,"msg64x64.gif",
Txt_Change_email,Txt_Change_email);
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);
"msg64x64.gif",
Txt_Change_email,Txt_Change_email);
}
/*****************************************************************************/

6
swad_message.c
View File

@ -1698,7 +1698,8 @@ static void Msg_PutLinkToViewBannedUsers(void)
{
extern const char *Txt_Banned_users;
Lay_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif",Txt_Banned_users);
Lay_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif",
Txt_Banned_users,Txt_Banned_users);
}
/*****************************************************************************/
@ -2228,7 +2229,8 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned
Lay_PutContextualLink ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
ActReqDelAllSntMsg,
Msg_PutHiddenParamsMsgsFilters,
"remove-on64x64.png",Gbl.Title);
"remove-on64x64.png",
Gbl.Title,Gbl.Title);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_notice.c
View File

@ -213,7 +213,8 @@ void Not_ListFullNotices (void)
if (ICanEditNotices)
{
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActWriNot,NULL,"plus64x64.png",Txt_New_notice);
Lay_PutContextualLink (ActWriNot,NULL,"plus64x64.png",
Txt_New_notice,Txt_New_notice);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_notification.c
View File

@ -1642,7 +1642,8 @@ static void Ntf_PutLinkToChangePrefs (void)
{
extern const char *Txt_Change_preferences;
Lay_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif",Txt_Change_preferences);
Lay_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif",
Txt_Change_preferences,Txt_Change_preferences);
}
/*****************************************************************************/

10
swad_password.c
View File

@ -218,7 +218,8 @@ void Pwd_PutLinkToSendNewPasswd (void)
extern const char *Txt_Forgotten_password;
Lay_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
"key64x64.gif",Txt_Forgotten_password);
"key64x64.gif",
Txt_Forgotten_password,Txt_Forgotten_password);
}
static void Pwd_PutLinkToSendNewPasswdParams (void)
@ -842,7 +843,8 @@ void Pwd_PutLinkToChangeMyPassword (void)
extern const char *Txt_Change_password;
/***** Link for changing the password *****/
Lay_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif",Txt_Change_password);
Lay_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif",
Txt_Change_password,Txt_Change_password);
}
/*****************************************************************************/
@ -860,8 +862,8 @@ 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);
Usr_PutParamOtherUsrCodEncrypted,"key64x64.gif",
Txt_Change_password,Txt_Change_password);
}
/*****************************************************************************/

18
swad_photo.c
View File

@ -174,6 +174,8 @@ void Pho_PutLinkToChangeMyPhoto (void)
/***** 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);
}
@ -200,8 +202,11 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqTchPho :
ActReqOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"photo64x64.gif",PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
"photo64x64.gif",
PhotoExists ? Txt_Change_photo :
Txt_Upload_photo,
PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
}
}
@ -214,7 +219,8 @@ static void Pho_PutLinkToRemoveMyPhoto (void)
extern const char *Txt_Remove_photo;
/***** Link for removing the photo *****/
Lay_PutContextualLink (ActRemMyPho,NULL,"remove-on64x64.png",Txt_Remove_photo);
Lay_PutContextualLink (ActRemMyPho,NULL,"remove-on64x64.png",
Txt_Remove_photo,Txt_Remove_photo);
}
/*****************************************************************************/
@ -230,7 +236,8 @@ static void Pho_PutLinkToRemoveOtherUsrPhoto (const struct UsrData *UsrDat)
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemTchPho :
ActRemOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"remove-on64x64.png",Txt_Remove_photo);
"remove-on64x64.png",
Txt_Remove_photo,Txt_Remove_photo);
}
/*****************************************************************************/
@ -1750,7 +1757,8 @@ static void Pho_PutLinkToPrintViewOfDegreeStats (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnPhoDeg,Pho_PutLinkToPrintViewOfDegreeStatsParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_place.c
View File

@ -203,7 +203,8 @@ static void Plc_PutFormToEditPlcs (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiPlc,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiPlc,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_plugin.c
View File

@ -155,7 +155,8 @@ static void Plg_PutFormToEditPlugins (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActEdiPlg,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiPlg,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_privacy.c
View File

@ -72,7 +72,8 @@ void Pri_PutLinkToChangeMyPrivacy (void)
extern const char *Txt_Privacy;
/***** Link to edit my privacy *****/
Lay_PutContextualLink (ActEdiPri,NULL,"lock64x64.png",Txt_Privacy);
Lay_PutContextualLink (ActEdiPri,NULL,"lock64x64.png",
Txt_Privacy,Txt_Privacy);
}
/*****************************************************************************/

11
swad_record.c
View File

@ -859,7 +859,8 @@ 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);
Lay_PutContextualLink (ActEdiRecFie,NULL,"edit64x64.png",
Txt_Edit_record_fields,Txt_Edit_record_fields);
}
/*****************************************************************************/
@ -3315,8 +3316,8 @@ static void Rec_PutLinkToChangeMyInsCtrDpt (void)
extern const char *Txt_Edit_my_institution;
/***** Link to edit my institution, centre, department... *****/
Lay_PutContextualLink (ActReqEdiMyIns,NULL,
"ins64x64.gif",Txt_Edit_my_institution);
Lay_PutContextualLink (ActReqEdiMyIns,NULL,"ins64x64.gif",
Txt_Edit_my_institution,Txt_Edit_my_institution);
}
/*****************************************************************************/
@ -3328,8 +3329,8 @@ static void Rec_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);
Lay_PutContextualLink (ActReqEdiMyNet,NULL,"earth64x64.gif",
Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks);
}
/*****************************************************************************/

3
swad_survey.c
View File

@ -703,7 +703,8 @@ static void Svy_PutFormToCreateNewSvy (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActFrmNewSvy,Svy_PutFormToCreateNewSvyParams,
"plus64x64.png",Txt_New_survey);
"plus64x64.png",
Txt_New_survey,Txt_New_survey);
fprintf (Gbl.F.Out,"</div>");
}

3
swad_syllabus.c
View File

@ -201,7 +201,8 @@ void Syl_EditSyllabus (void)
/***** Put link to view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (Inf_ActionsSeeInfo[InfoType],NULL,
"eye-on64x64.png",Txt_View);
"eye-on64x64.png",
Txt_View,Txt_View);
fprintf (Gbl.F.Out,"</div>");
}

9
swad_test.c
View File

@ -320,7 +320,8 @@ static void Tst_PutFormToSeeResultsOfUsersTests (void)
Lay_PutContextualLink (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ? ActReqSeeMyTstExa :
ActReqSeeUsrTstExa,
NULL,"file64x64.gif",Txt_Results_tests);
NULL,"file64x64.gif",
Txt_Results_tests,Txt_Results_tests);
}
/*****************************************************************************/
@ -331,7 +332,8 @@ static void Tst_PutFormToEdit (void)
{
extern const char *Txt_Edit;
Lay_PutContextualLink (ActEdiTstQst,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiTstQst,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
}
/*****************************************************************************/
@ -342,7 +344,8 @@ static void Tst_PutFormToConfigure (void)
{
extern const char *Txt_Configure;
Lay_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif",Txt_Configure);
Lay_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif",
Txt_Configure,Txt_Configure);
}
/*****************************************************************************/

15
swad_timetable.c
View File

@ -265,15 +265,18 @@ void TT_ShowClassTimeTable (void)
if (PutEditCrsTT)
Lay_PutContextualLink (ActEdiCrsTT,Grp_PutParamWhichGrps,
"edit64x64.png",Txt_Edit);
"edit64x64.png",
Txt_Edit,Txt_Edit);
if (PutEditOfficeHours)
Lay_PutContextualLink (ActEdiTut,NULL,"edit64x64.png",Txt_Edit_office_hours);
Lay_PutContextualLink (ActEdiTut,NULL,"edit64x64.png",
Txt_Edit_office_hours,Txt_Edit_office_hours);
if (!PrintView)
Lay_PutContextualLink (TimeTableType == TT_COURSE_TIMETABLE ? ActPrnCrsTT :
ActPrnMyTT,
Grp_PutParamWhichGrps,"print64x64.png",Txt_Print);
Grp_PutParamWhichGrps,"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
@ -339,7 +342,8 @@ void TT_EditCrsTimeTable (void)
/***** Link (form) to see my timetable *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActSeeCrsTT,NULL,"clock16x16.gif",Txt_Show_timetable);
Lay_PutContextualLink (ActSeeCrsTT,NULL,"clock16x16.gif",
Txt_Show_timetable,Txt_Show_timetable);
fprintf (Gbl.F.Out,"</div>");
/***** Editable time table *****/
@ -359,7 +363,8 @@ void TT_ShowMyTutTimeTable (void)
/***** Link (form) to see my timetable *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActSeeMyTT,NULL,"clock16x16.gif",Txt_Show_timetable);
Lay_PutContextualLink (ActSeeMyTT,NULL,"clock16x16.gif",
Txt_Show_timetable,Txt_Show_timetable);
fprintf (Gbl.F.Out,"</div>");
/***** Time table *****/

34
swad_user.c
View File

@ -1426,7 +1426,8 @@ void Usr_WriteFormLogin (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to create a new account */
Lay_PutContextualLink (ActFrmUsrAcc,NULL,"arroba64x64.gif",Txt_Create_account);
Lay_PutContextualLink (ActFrmUsrAcc,NULL,"arroba64x64.gif",
Txt_Create_account,Txt_Create_account);
/* Link to enter from external site */
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
@ -2573,7 +2574,8 @@ void Usr_ShowFormsLogoutAndRole (void)
/***** Link to log out *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLogOut,NULL,"logout64x64.png",Txt_Log_out);
Lay_PutContextualLink (ActLogOut,NULL,"logout64x64.png",
Txt_Log_out,Txt_Log_out);
fprintf (Gbl.F.Out,"</div>");
/***** Write message with my new logged role *****/
@ -6512,7 +6514,8 @@ static void Usr_PutLinkToSeeAdmins (void)
extern const char *Txt_See_administrators;
/***** Put form to list admins *****/
Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",Txt_See_administrators);
Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",
Txt_See_administrators,Txt_See_administrators);
}
/*****************************************************************************/
@ -6524,7 +6527,8 @@ static void Usr_PutLinkToSeeGuests (void)
extern const char *Txt_See_guests;
/***** Put form to list guests *****/
Lay_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif",Txt_See_guests);
Lay_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif",
Txt_See_guests,Txt_See_guests);
}
/*****************************************************************************/
@ -6601,12 +6605,14 @@ void Usr_SeeGuests (void)
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
Lay_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
break;
case Usr_LIST:
/****** Link to show all the data ******/
Lay_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
"table16x16.gif",
Txt_Show_all_data,Txt_Show_all_data);
break;
}
fprintf (Gbl.F.Out,"</div>");
@ -6786,7 +6792,8 @@ void Usr_SeeStudents (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnStdPho,Usr_PutLinkToShowStdsAllDataParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
@ -6795,7 +6802,8 @@ void Usr_SeeStudents (void)
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
"table16x16.gif",
Txt_Show_all_data,Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
break;
@ -6953,7 +6961,8 @@ void Usr_SeeTeachers (void)
case Usr_CLASS_PHOTO:
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnTchPho,Usr_PutLinkToShowTchsAllDataParams,
"print64x64.png",Txt_Print);
"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
@ -6962,7 +6971,8 @@ void Usr_SeeTeachers (void)
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
"table16x16.gif",
Txt_Show_all_data,Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
break;
@ -7049,8 +7059,8 @@ 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,
"list16x16.gif",Txt_Official_students);
Lay_PutContextualLink (ActGetExtLstStd,NULL,"list16x16.gif",
Txt_Official_students,Txt_Official_students);
}
/*****************************************************************************/

3
swad_zip.c
View File

@ -118,7 +118,8 @@ void ZIP_PutButtonToCreateZIPAsgWrk (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActAdmAsgWrkCrs,ZIP_PutButtonToCreateZIPAsgWrkParams,
"download16x16.gif",Txt_Create_ZIP_file);
"download16x16.gif",
Txt_Create_ZIP_file,Txt_Create_ZIP_file);
fprintf (Gbl.F.Out,"</div>");
}