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.6

This commit is contained in:
Antonio Cañas Vargas 2015-12-13 18:32:37 +01:00
parent 41bbf78357
commit 09f96e842d
45 changed files with 167 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_ID.c
View File

@ -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,

1
swad_QR.c
View File

@ -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,"</a>");
Act_FormEnd ();
}

4
swad_account.c
View File

@ -128,7 +128,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Link to log in *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",Txt_Log_in);
Lay_PutContextualLink (ActFrmLogIn,NULL,"login64x64.png",Txt_Log_in);
fprintf (Gbl.F.Out,"</div>");
/***** 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);
}

28
swad_action.c
View File

@ -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 ***************/
/*****************************************************************************/

4
swad_action.h
View File

@ -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);

2
swad_announcement.c
View File

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

13
swad_assignment.c
View File

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

21
swad_attendance.c
View File

@ -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,"</div>");
}
@ -2860,7 +2863,7 @@ static void Att_PutFormToPrintMyList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnLstMyAtt,Att_PutFormToPrintMyListParams,
Lay_PutContextualLink (ActPrnLstMyAtt,Att_PutFormToPrintMyListParams,
"print64x64.png",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
@ -2883,7 +2886,7 @@ static void Att_PutFormToPrintStdsList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnLstStdAtt,Att_PutFormToPrintStdsListParams,
Lay_PutContextualLink (ActPrnLstStdAtt,Att_PutFormToPrintStdsListParams,
"print64x64.png",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

2
swad_banner.c
View File

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

2
swad_calendar.c
View File

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

4
swad_centre.c
View File

@ -283,7 +283,7 @@ static void Ctr_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Act_PutContextualLink (ActPrnCtrInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCtrInf,NULL,"print64x64.png",Txt_Print);
/* Links to upload logo and photo */
if (Gbl.Usrs.Me.LoggedRole >= Rol_CTR_ADM)
@ -1904,7 +1904,7 @@ static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
extern const char *Txt_Upload_photo;
/***** Link for changing / uploading the photo *****/
Act_PutContextualLink (ActReqCtrPho,NULL,
Lay_PutContextualLink (ActReqCtrPho,NULL,
"photo64x64.gif",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.5 (2015/12/13)"
#define Log_PLATFORM_VERSION "SWAD 15.64.6 (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.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)
Version 15.64.3: Dec 13, 2015 Changes in layout of records. (186979 lines)

2
swad_connected.c
View File

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

2
swad_country.c
View File

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

6
swad_course.c
View File

@ -192,7 +192,7 @@ static void Crs_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to print view */
Act_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",Txt_Print);
Lay_PutContextualLink (ActPrnCrsInf,NULL,"print64x64.png",Txt_Print);
/* Link to request enrollment in the current course */
if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ ||
@ -2889,7 +2889,7 @@ static void Crs_PutLinkToSearchCourses (void)
extern const char *Txt_Search_courses;
/***** Put form to search / select courses *****/
Act_PutContextualLink ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsReqSch :
Lay_PutContextualLink ( Gbl.CurrentCrs.Crs.CrsCod > 0 ? ActCrsReqSch :
(Gbl.CurrentDeg.Deg.DegCod > 0 ? ActDegReqSch :
(Gbl.CurrentCtr.Ctr.CtrCod > 0 ? ActCtrReqSch :
(Gbl.CurrentIns.Ins.InsCod > 0 ? ActInsReqSch :
@ -2914,7 +2914,7 @@ void Crs_PutFormToSelectMyCourses (void)
extern const char *Txt_My_courses;
/***** Put form to search / select courses *****/
Act_PutContextualLink (ActMyCrs,NULL,"hierarchy64x64.gif",Txt_My_courses);
Lay_PutContextualLink (ActMyCrs,NULL,"hierarchy64x64.gif",Txt_My_courses);
}
/*****************************************************************************/

2
swad_degree.c
View File

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

2
swad_department.c
View File

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

14
swad_enrollment.c
View File

@ -152,7 +152,7 @@ void Enr_PutLinkToRequestSignUp (void)
extern const char *Txt_Sign_up;
/***** Show the form *****/
Act_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif",Txt_Sign_up);
Lay_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif",Txt_Sign_up);
}
/*****************************************************************************/
@ -350,12 +350,12 @@ void Enr_ReqAcceptRegisterInCrs (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/***** Send button to accept register in the current course *****/
Act_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActAccEnrStd :
Lay_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActAccEnrStd :
ActAccEnrTch,
NULL,"ok_green16x16.gif",Txt_Confirm_my_enrollment);
/***** Send button to refuse register in the current course *****/
Act_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActRemMe_Std :
Lay_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActRemMe_Std :
ActRemMe_Tch,
NULL,"remove-on64x64.png",Txt_Remove_me_from_this_course);
@ -682,7 +682,7 @@ void Enr_PutLinkToRemOldUsrs (void)
extern const char *Txt_Eliminate_old_users;
/***** Put form to remove old users *****/
Act_PutContextualLink (ActReqRemOldUsr,NULL,"remove-on64x64.png",Txt_Eliminate_old_users);
Lay_PutContextualLink (ActReqRemOldUsr,NULL,"remove-on64x64.png",Txt_Eliminate_old_users);
}
/*****************************************************************************/
@ -1772,7 +1772,7 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void)
extern const char *Txt_Remove_all_students;
/***** Put form to remove all the students in the current course *****/
Act_PutContextualLink (ActReqRemAllStdCrs,NULL,
Lay_PutContextualLink (ActReqRemAllStdCrs,NULL,
"remove-on64x64.png",Txt_Remove_all_students);
}
@ -2749,7 +2749,7 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
extern const char *Txt_Admin_me;
extern const char *Txt_Admin_one_user;
Act_PutContextualLink (NextAction,NULL,"configtest16x16.gif",
Lay_PutContextualLink (NextAction,NULL,"configtest16x16.gif",
Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
Txt_Admin_me);
}
@ -2763,7 +2763,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
extern const char *Txt_Admin_several_students;
extern const char *Txt_Admin_several_teachers;
Act_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
ActReqEnrSevTch,
NULL,"configtest16x16.gif",
Role == Rol_STUDENT ? Txt_Admin_several_students :

11
swad_exam.c
View File

@ -443,7 +443,7 @@ static void Exa_ListExamAnnouncements (Exa_TypeViewExamAnnouncement_t TypeViewEx
case Rol_TEACHER:
case Rol_SYS_ADM:
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActEdiExaAnn,NULL,
Lay_PutContextualLink (ActEdiExaAnn,NULL,
"plus64x64.png",Txt_New_announcement_OF_EXAM);
fprintf (Gbl.F.Out,"</div>");
break;
@ -775,18 +775,21 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t
/***** Link to remove this exam announcement *****/
Act_FormStart (ActRemExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("remove-on64x64.png",Txt_Remove);
Lay_PutIconLink ("remove-on64x64.png",Txt_Remove,NULL,NULL);
Act_FormEnd ();
/***** Link to edit this exam announcement *****/
Act_FormStart (ActEdiExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("edit64x64.png",Txt_Edit);
Lay_PutIconLink ("edit64x64.png",Txt_Edit,NULL,NULL);
Act_FormEnd ();
}
/***** Link to print view *****/
Act_FormStart (ActPrnExaAnn);
Par_PutHiddenParamLong ("ExaCod",ExaCod);
Act_PutIconLink ("print64x64.png",Txt_Print);
Lay_PutIconLink ("print64x64.png",Txt_Print,NULL,NULL);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

4
swad_file_browser.c
View File

@ -4301,11 +4301,11 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
switch (ShowOrAdmin)
{
case Brw_SHOW:
Act_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
Lay_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"eye-on64x64.png",Txt_View);
break;
case Brw_ADMIN:
Act_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
Lay_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"edit64x64.png",Txt_Edit);
break;
}

2
swad_holiday.c
View File

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

5
swad_info.c
View File

@ -417,7 +417,7 @@ static void Inf_PutFormToEditInfo (Inf_InfoType_t InfoType)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (Inf_ActionsEditInfo[InfoType],NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (Inf_ActionsEditInfo[InfoType],NULL,"edit64x64.png",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -884,6 +884,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
Lay_PutIconWithText ("fullscreen16x16.gif",
Txt_View_in_a_new_window,
Txt_View_in_a_new_window);
fprintf (Gbl.F.Out,"</a>");
/***** End of frame *****/
Lay_EndRoundFrame ();
@ -921,7 +922,7 @@ void Inf_FormsToSelSendInfo (void)
/***** Put link to view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (Inf_ActionsSeeInfo[InfoType],NULL,
Lay_PutContextualLink (Inf_ActionsSeeInfo[InfoType],NULL,
"eye-on64x64.png",Txt_View);
fprintf (Gbl.F.Out,"</div>");

2
swad_institution.c
View File

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

39
swad_layout.c
View File

@ -922,7 +922,7 @@ void Lay_PutFormToView (Act_Action_t Action)
extern const char *Txt_View;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (Action,NULL,"eye-on64x64.png",Txt_View);
Lay_PutContextualLink (Action,NULL,"eye-on64x64.png",Txt_View);
fprintf (Gbl.F.Out,"</div>");
}
@ -935,10 +935,42 @@ void Lay_PutFormToEdit (Act_Action_t Action)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (Action,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (Action,NULL,"edit64x64.png",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/***************** Show an icon with a link in contextual menu ***************/
/*****************************************************************************/
void Lay_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
const char *Icon,const char *Title)
{
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);
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)
{
Act_LinkFormSubmit (Title,LinkStyle);
Lay_PutIconWithText (Icon,Title,Text);
fprintf (Gbl.F.Out,"</a>");
}
/*****************************************************************************/
/**************** Put a icon with a text to submit a form ********************/
/*****************************************************************************/
@ -956,8 +988,7 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
if (Text[0])
fprintf (Gbl.F.Out,"&nbsp;%s",
Text);
fprintf (Gbl.F.Out,"</div>"
"</a>");
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

4
swad_layout.h
View File

@ -73,6 +73,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);
void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text);
void Lay_PutCalculateIconWithText (const char *Alt,const char *Text);

2
swad_link.c
View File

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

3
swad_logo.c
View File

@ -219,7 +219,7 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
LogoExists = Fil_CheckIfPathExists (PathLogo);
/***** Link for changing / uploading the logo *****/
Act_PutContextualLink (Action,NULL,Icon,LogoExists ? Txt_Change_logo :
Lay_PutContextualLink (Action,NULL,Icon,LogoExists ? Txt_Change_logo :
Txt_Upload_logo);
}
@ -320,6 +320,7 @@ static void Log_PutLinkToRemoveLogo (Act_Action_t Action)
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("remove-on64x64.png",Txt_Remove_logo,Txt_Remove_logo);
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}

6
swad_mail.c
View File

@ -176,7 +176,7 @@ static void Mai_PutFormToEditMailDomains (void)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",Txt_Edit);
Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -919,10 +919,10 @@ void Mai_PutLinkToChangeOtherUsrEmail (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,
"msg64x64.gif",Txt_Change_email);
else // Not me
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmMaiStd :
Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmMaiStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmMaiTch :
ActFrmMaiOth),
Usr_PutParamOtherUsrCodEncrypted,

8
swad_message.c
View File

@ -226,7 +226,8 @@ void Msg_ListEMails (void)
Txt_Create_e_mail_message,
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("editnewmsg16x16.gif",Txt_Create_e_mail_message,Txt_Create_e_mail_message);
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"</a>"
"</div>");
}
}
else
@ -1697,7 +1698,7 @@ static void Msg_PutLinkToViewBannedUsers(void)
{
extern const char *Txt_Banned_users;
Act_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif",Txt_Banned_users);
Lay_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif",Txt_Banned_users);
}
/*****************************************************************************/
@ -2224,7 +2225,7 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned
Txt_from_A_COURSE,
Gbl.Msg.FilterCrsShortName,
StrFilterContent);
Act_PutContextualLink ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
Lay_PutContextualLink ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
ActReqDelAllSntMsg,
Msg_PutHiddenParamsMsgsFilters,
"remove-on64x64.png",Gbl.Title);
@ -3008,6 +3009,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
Txt_Reply,
Replied ? Txt_Reply_again :
Txt_Reply);
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}

2
swad_notice.c
View File

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

3
swad_notification.c
View File

@ -1642,7 +1642,7 @@ static void Ntf_PutLinkToChangePrefs (void)
{
extern const char *Txt_Change_preferences;
Act_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif",Txt_Change_preferences);
Lay_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif",Txt_Change_preferences);
}
/*****************************************************************************/
@ -1659,6 +1659,7 @@ static void Ntf_PutLinkToMarkAllNotifAsSeen (void)
Lay_PutIconWithText ("eye-on64x64.png",
Txt_Mark_all_notifications_as_read,
Txt_Mark_all_notifications_as_read);
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}

6
swad_password.c
View File

@ -217,7 +217,7 @@ void Pwd_PutLinkToSendNewPasswd (void)
{
extern const char *Txt_Forgotten_password;
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
Lay_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
"key64x64.gif",Txt_Forgotten_password);
}
@ -842,7 +842,7 @@ void Pwd_PutLinkToChangeMyPassword (void)
extern const char *Txt_Change_password;
/***** Link for changing the password *****/
Act_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif",Txt_Change_password);
Lay_PutContextualLink (ActFrmChgMyPwd,NULL,"key64x64.gif",Txt_Change_password);
}
/*****************************************************************************/
@ -857,7 +857,7 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
Pwd_PutLinkToChangeMyPassword ();
else // Not me
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmPwdStd :
Lay_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmPwdStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
ActFrmPwdOth),
Usr_PutParamOtherUsrCodEncrypted,

10
swad_photo.c
View File

@ -173,7 +173,7 @@ void Pho_PutLinkToChangeMyPhoto (void)
extern const char *Txt_Upload_photo;
/***** Link for changing / uploading the photo *****/
Act_PutContextualLink (ActReqMyPho,NULL,"photo64x64.gif",
Lay_PutContextualLink (ActReqMyPho,NULL,"photo64x64.gif",
Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
}
@ -196,7 +196,7 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
if (Pho_CheckIfICanChangeOtherUsrPhoto (&Gbl.Usrs.Other.UsrDat))
{
PhotoExists = Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true);
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActReqStdPho :
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,
@ -214,7 +214,7 @@ static void Pho_PutLinkToRemoveMyPhoto (void)
extern const char *Txt_Remove_photo;
/***** Link for removing the photo *****/
Act_PutContextualLink (ActRemMyPho,NULL,"remove-on64x64.png",Txt_Remove_photo);
Lay_PutContextualLink (ActRemMyPho,NULL,"remove-on64x64.png",Txt_Remove_photo);
}
/*****************************************************************************/
@ -226,7 +226,7 @@ static void Pho_PutLinkToRemoveOtherUsrPhoto (const struct UsrData *UsrDat)
extern const char *Txt_Remove_photo;
/***** Link for removing the photo *****/
Act_PutContextualLink ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdPho :
Lay_PutContextualLink ( UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActRemStdPho :
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemTchPho :
ActRemOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
@ -1749,7 +1749,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStats (void)
extern const char *Txt_Print;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnPhoDeg,Pho_PutLinkToPrintViewOfDegreeStatsParams,
Lay_PutContextualLink (ActPrnPhoDeg,Pho_PutLinkToPrintViewOfDegreeStatsParams,
"print64x64.png",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

2
swad_place.c
View File

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

2
swad_plugin.c
View File

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

2
swad_privacy.c
View File

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

9
swad_record.c
View File

@ -859,7 +859,7 @@ void Rec_PutLinkToEditRecordFields (void)
extern const char *Txt_Edit_record_fields;
/***** Link to edit record fields *****/
Act_PutContextualLink (ActEdiRecFie,NULL,"edit64x64.png",Txt_Edit_record_fields);
Lay_PutContextualLink (ActEdiRecFie,NULL,"edit64x64.png",Txt_Edit_record_fields);
}
/*****************************************************************************/
@ -1321,7 +1321,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
Act_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("print64x64.png",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\">(</span>"
fprintf (Gbl.F.Out,"</a>"
"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassForm[Gbl.Prefs.Theme]);
@ -3314,7 +3315,7 @@ static void Rec_PutLinkToChangeMyInsCtrDpt (void)
extern const char *Txt_Edit_my_institution;
/***** Link to edit my institution, centre, department... *****/
Act_PutContextualLink (ActReqEdiMyIns,NULL,
Lay_PutContextualLink (ActReqEdiMyIns,NULL,
"ins64x64.gif",Txt_Edit_my_institution);
}
@ -3327,7 +3328,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void)
extern const char *Txt_Edit_my_webs_networks;
/***** Link to edit my social networks *****/
Act_PutContextualLink (ActReqEdiMyNet,NULL,
Lay_PutContextualLink (ActReqEdiMyNet,NULL,
"earth64x64.gif",Txt_Edit_my_webs_networks);
}

1
swad_statistic.c
View File

@ -397,6 +397,7 @@ static void Sta_PutFormToRequestAccessesCrs (void)
Lay_PutIconWithText ("stats64x64.gif",
Txt_Visits_to_course,
Txt_Visits_to_course);
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
}

17
swad_survey.c
View File

@ -702,7 +702,7 @@ static void Svy_PutFormToCreateNewSvy (void)
extern const char *Txt_New_survey;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActFrmNewSvy,Svy_PutFormToCreateNewSvyParams,
Lay_PutContextualLink (ActFrmNewSvy,Svy_PutFormToCreateNewSvyParams,
"plus64x64.png",Txt_New_survey);
fprintf (Gbl.F.Out,"</div>");
}
@ -734,7 +734,8 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType ();
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 reset survey *****/
Act_FormStart (ActReqRstSvy);
@ -742,7 +743,8 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_PutIconLink ("reset16x16.gif",Txt_Reset);
Lay_PutIconLink ("reset16x16.gif",Txt_Reset,NULL,NULL);
Act_FormEnd ();
/***** Put form to hide/show survey *****/
Act_FormStart (Visible ? ActHidSvy :
@ -752,9 +754,10 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
if (Visible)
Act_PutIconLink ("eye-on64x64.png",Txt_Hide);
Lay_PutIconLink ("eye-on64x64.png",Txt_Hide,NULL,NULL);
else
Act_PutIconLink ("eye-slash-on64x64.png",Txt_Show);
Lay_PutIconLink ("eye-slash-on64x64.png",Txt_Show,NULL,NULL);
Act_FormEnd ();
/***** Put form to edit survey *****/
Act_FormStart (ActEdiOneSvy);
@ -762,7 +765,8 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible)
Svy_PutHiddenParamSvyOrderType ();
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,"</div>");
}
@ -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,"</a>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

2
swad_syllabus.c
View File

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

7
swad_test.c
View File

@ -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,"</a>");
Act_FormEnd ();
}

3
swad_test_import.c
View File

@ -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,"</a>");
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,"</a>");
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,"</a>");
}
/*****************************************************************************/

10
swad_timetable.c
View File

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

23
swad_user.c
View File

@ -1426,7 +1426,7 @@ void Usr_WriteFormLogin (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
/* Link to create a new account */
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba64x64.gif",Txt_Create_account);
Lay_PutContextualLink (ActFrmUsrAcc,NULL,"arroba64x64.gif",Txt_Create_account);
/* Link to enter from external site */
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
@ -1440,6 +1440,7 @@ void Usr_WriteFormLogin (void)
Lay_PutIconWithText ("login64x64.png",
Gbl.Title,
Gbl.Title);
fprintf (Gbl.F.Out,"</a>");
}
/* Link to send a new password */
@ -2572,7 +2573,7 @@ void Usr_ShowFormsLogoutAndRole (void)
/***** Link to log out *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLogOut,NULL,"logout64x64.png",Txt_Log_out);
Lay_PutContextualLink (ActLogOut,NULL,"logout64x64.png",Txt_Log_out);
fprintf (Gbl.F.Out,"</div>");
/***** Write message with my new logged role *****/
@ -6511,7 +6512,7 @@ static void Usr_PutLinkToSeeAdmins (void)
extern const char *Txt_See_administrators;
/***** Put form to list admins *****/
Act_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",Txt_See_administrators);
Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",Txt_See_administrators);
}
/*****************************************************************************/
@ -6523,7 +6524,7 @@ static void Usr_PutLinkToSeeGuests (void)
extern const char *Txt_See_guests;
/***** Put form to list guests *****/
Act_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif",Txt_See_guests);
Lay_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif",Txt_See_guests);
}
/*****************************************************************************/
@ -6599,12 +6600,12 @@ void Usr_SeeGuests (void)
{
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
Act_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams,
Lay_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams,
"print64x64.png",Txt_Print);
break;
case Usr_LIST:
/****** Link to show all the data ******/
Act_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams,
Lay_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
break;
}
@ -6784,7 +6785,7 @@ void Usr_SeeStudents (void)
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnStdPho,Usr_PutLinkToShowStdsAllDataParams,
Lay_PutContextualLink (ActPrnStdPho,Usr_PutLinkToShowStdsAllDataParams,
"print64x64.png",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
@ -6793,7 +6794,7 @@ void Usr_SeeStudents (void)
{
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams,
Lay_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
@ -6951,7 +6952,7 @@ void Usr_SeeTeachers (void)
{
case Usr_CLASS_PHOTO:
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnTchPho,Usr_PutLinkToShowTchsAllDataParams,
Lay_PutContextualLink (ActPrnTchPho,Usr_PutLinkToShowTchsAllDataParams,
"print64x64.png",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
@ -6960,7 +6961,7 @@ void Usr_SeeTeachers (void)
{
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams,
Lay_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams,
"table16x16.gif",Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
@ -7048,7 +7049,7 @@ static void Usr_PutLinkToListOfficialStudents (void)
Gbl.Imported.ExternalSesId[0] &&
Gbl.Imported.ExternalRole == Rol_TEACHER) // ...as a teacher
/***** Link to list official students *****/
Act_PutContextualLink (ActGetExtLstStd,NULL,
Lay_PutContextualLink (ActGetExtLstStd,NULL,
"list16x16.gif",Txt_Official_students);
}

2
swad_zip.c
View File

@ -117,7 +117,7 @@ void ZIP_PutButtonToCreateZIPAsgWrk (void)
extern const char *Txt_Create_ZIP_file;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActAdmAsgWrkCrs,ZIP_PutButtonToCreateZIPAsgWrkParams,
Lay_PutContextualLink (ActAdmAsgWrkCrs,ZIP_PutButtonToCreateZIPAsgWrkParams,
"download16x16.gif",Txt_Create_ZIP_file);
fprintf (Gbl.F.Out,"</div>");
}