Version 15.59.4

This commit is contained in:
Antonio Cañas Vargas 2015-12-06 18:24:27 +01:00
parent 1eab745262
commit 6666e617c3
46 changed files with 135 additions and 2033 deletions

File diff suppressed because it is too large Load Diff

BIN
icon/earth64x64.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 560 B

BIN
icon/lock64x64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 955 B

BIN
icon/photo64x64.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 503 B

View File

@ -378,13 +378,13 @@ 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,
"arroba",Txt_Change_IDs);
"arroba16x16.gif",Txt_Change_IDs);
else // Not me
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmIDsStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmIDsTch :
ActFrmIDsOth), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"arroba",Txt_Change_IDs);
"arroba16x16.gif",Txt_Change_IDs);
}
/*****************************************************************************/

View File

@ -80,8 +80,8 @@ void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText)
sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname);
Par_PutHiddenParamString ("QRString",NicknameWithArroba);
Act_LinkFormSubmit (Txt_QR_code,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("qr",Txt_QR_code,PrintText ? Txt_QR_code :
NULL);
Lay_PutIconWithText ("qr16x16.gif",Txt_QR_code,PrintText ? Txt_QR_code :
NULL);
Act_FormEnd ();
}

View File

@ -127,7 +127,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Link to log in *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActFrmLogIn,NULL,"login",Txt_Log_in);
Act_PutContextualLink (ActFrmLogIn,NULL,"login16x16.gif",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,
"delon",Txt_Remove_account);
"delon16x16.gif",Txt_Remove_account);
}
static void Acc_PutLinkToRemoveMyAccountParams (void)

View File

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

View File

@ -470,7 +470,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,
"new",Txt_New_assignment);
"new16x16.gif",Txt_New_assignment);
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -467,7 +467,7 @@ static void Att_PutFormToListMyAttendance (void)
extern const char *Txt_Attendance_list;
Act_PutContextualLink (ActSeeLstMyAtt,NULL,
"list",Txt_Attendance_list);
"list16x16.gif",Txt_Attendance_list);
}
/*****************************************************************************/
@ -479,7 +479,7 @@ static void Att_PutFormToListStdsAttendance (void)
extern const char *Txt_Attendance_list;
Act_PutContextualLink (ActReqLstStdAtt,Att_PutFormToListStdsParams,
"list",Txt_Attendance_list);
"list16x16.gif",Txt_Attendance_list);
}
static void Att_PutFormToListStdsParams (void)
@ -499,7 +499,7 @@ static void Att_PutFormToCreateNewAttEvent (void)
/***** Put form to create a new attendance event *****/
Act_PutContextualLink (ActFrmNewAtt,Att_PutFormToCreateNewAttEventParams,
"new",Txt_New_event);
"new16x16.gif",Txt_New_event);
}
static void Att_PutFormToCreateNewAttEventParams (void)
@ -2861,7 +2861,7 @@ static void Att_PutFormToPrintMyList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnLstMyAtt,Att_PutFormToPrintMyListParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
@ -2884,7 +2884,7 @@ static void Att_PutFormToPrintStdsList (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnLstStdAtt,Att_PutFormToPrintStdsListParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiBan,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

View File

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

View File

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

View File

@ -94,7 +94,6 @@
----------Otros
....Etc.....
*/
// TODO: Change link to Degree in Statistics > Visits > By degree to internal Degree
// TODO: Link to user's country in public profile
// TODO: Show guests in connected users.
// TODO: A teacher should may confirm a student ID? In what conditions? (Necessary in order to a student can view his/her marks)
@ -110,12 +109,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.59.3 (2015/12/06)"
#define CSS_FILE "swad15.57.css"
#define Log_PLATFORM_VERSION "SWAD 15.59.4 (2015/12/06)"
#define CSS_FILE "swad15.59.4.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.59.4: Dec 06, 2015 Changes in some small icons. (186462 lines)
Version 15.59.3: Dec 06, 2015 If photo zoom is out of the screen at left, it is shown at right of the photo. (186445 lines)
Version 15.59.2: Dec 06, 2015 Courses with year not applicable are listed at the end. (186439 lines)
Version 15.59.1: Dec 06, 2015 Removed unused code related to year for optional courses. (186405 lines)

View File

@ -142,7 +142,7 @@ void Con_PutLinkToLastClicks (void)
extern const char *Txt_Last_clicks;
Act_PutContextualLink (ActLstClk,NULL,
"click",Txt_Last_clicks);
"click16x16.gif",Txt_Last_clicks);
}
/*****************************************************************************/

View File

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

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,"print",Txt_Print);
Act_PutContextualLink (ActPrnCrsInf,NULL,"print16x16.gif",Txt_Print);
/* Link to request enrollment in the current course */
if (Gbl.Usrs.Me.LoggedRole == Rol__GUEST_ ||
@ -2896,7 +2896,7 @@ static void Crs_PutLinkToSearchCourses (void)
(Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch :
ActSysReqSch)))),
Crs_PutLinkToSearchCoursesParams,
"search",Txt_Search_courses);
"search16x16.gif",Txt_Search_courses);
}
static void Crs_PutLinkToSearchCoursesParams (void)
@ -2914,7 +2914,7 @@ void Crs_PutFormToSelectMyCourses (void)
extern const char *Txt_My_courses;
/***** Put form to search / select courses *****/
Act_PutContextualLink (ActMyCrs,NULL,"hierarchy",Txt_My_courses);
Act_PutContextualLink (ActMyCrs,NULL,"hierarchy16x16.gif",Txt_My_courses);
}
/*****************************************************************************/

View File

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

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiDpt,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -152,7 +152,7 @@ void Enr_PutLinkToRequestSignUp (void)
extern const char *Txt_Sign_up;
/***** Show the form *****/
Act_PutContextualLink (ActReqSignUp,NULL,"signup",Txt_Sign_up);
Act_PutContextualLink (ActReqSignUp,NULL,"signup16x16.gif",Txt_Sign_up);
}
/*****************************************************************************/
@ -352,12 +352,12 @@ void Enr_ReqAcceptRegisterInCrs (void)
/***** Send button to accept register in the current course *****/
Act_PutContextualLink (Gbl.Usrs.Me.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActAccEnrStd :
ActAccEnrTch,
NULL,"ok_green",Txt_Confirm_my_enrollment);
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 :
ActRemMe_Tch,
NULL,"delon",Txt_Remove_me_from_this_course);
NULL,"delon16x16.gif",Txt_Remove_me_from_this_course);
fprintf (Gbl.F.Out,"</div>");
@ -677,7 +677,7 @@ void Enr_PutLinkToRemOldUsrs (void)
extern const char *Txt_Eliminate_old_users;
/***** Put form to remove old users *****/
Act_PutContextualLink (ActReqRemOldUsr,NULL,"delon",Txt_Eliminate_old_users);
Act_PutContextualLink (ActReqRemOldUsr,NULL,"delon16x16.gif",Txt_Eliminate_old_users);
}
/*****************************************************************************/
@ -1768,7 +1768,7 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void)
/***** Put form to remove all the students in the current course *****/
Act_PutContextualLink (ActReqRemAllStdCrs,NULL,
"delon",Txt_Remove_all_students);
"delon16x16.gif",Txt_Remove_all_students);
}
/*****************************************************************************/
@ -2744,7 +2744,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,"configtest",
Act_PutContextualLink (NextAction,NULL,"configtest16x16.gif",
Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user :
Txt_Admin_me);
}
@ -2760,7 +2760,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
Act_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd :
ActReqEnrSevTch,
NULL,"configtest",
NULL,"configtest16x16.gif",
Role == Rol_STUDENT ? Txt_Admin_several_students :
Txt_Admin_several_teachers);
}

View File

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

View File

@ -4302,11 +4302,11 @@ static void Brw_PutFormToShowOrAdmin (Brw_ShowOrAdmin_t ShowOrAdmin,
{
case Brw_SHOW:
Act_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"visible_on",Txt_View);
"visible_on16x16.gif",Txt_View);
break;
case Brw_ADMIN:
Act_PutContextualLink (Action,Brw_PutFormToShowOrAdminParams,
"edit",Txt_Edit);
"edit16x16.gif",Txt_Edit);
break;
}
fprintf (Gbl.F.Out,"</div>");

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiHld,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -342,7 +342,7 @@ void Inf_ShowInfo (void)
{
case Inf_INFO_SRC_NONE:
if (InfoType != Inf_INTRODUCTION)
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
break;
case Inf_INFO_SRC_EDITOR:
switch (InfoType)
@ -373,7 +373,7 @@ void Inf_ShowInfo (void)
case Inf_FAQ:
case Inf_LINKS:
case Inf_ASSESSMENT:
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
break;
}
break;
@ -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,"edit",Txt_Edit);
Act_PutContextualLink (Inf_ActionsEditInfo[InfoType],NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -745,7 +745,7 @@ static void Inf_CheckAndShowPage (Inf_InfoType_t InfoType)
Inf_ShowPage (InfoType,URL);
}
else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
}
}
@ -837,10 +837,10 @@ static void Inf_CheckAndShowURL (Inf_InfoType_t InfoType)
if (Gbl.CurrentCrs.Info.URL[0])
Inf_ShowPage (InfoType,Gbl.CurrentCrs.Info.URL);
else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
}
else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
}
/*****************************************************************************/
@ -881,7 +881,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
URL,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("fullscreen",
Lay_PutIconWithText ("fullscreen16x16.gif",
Txt_View_in_a_new_window,
Txt_View_in_a_new_window);
@ -922,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,
"visible_on",Txt_View);
"visible_on16x16.gif",Txt_View);
fprintf (Gbl.F.Out,"</div>");
/***** Get info source from database *****/
@ -1597,7 +1597,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType)
Lay_EndRoundFrameTable ();
}
else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
}
/*****************************************************************************/
@ -1701,7 +1701,7 @@ static void Inf_ShowRichTxtInfo (Inf_InfoType_t InfoType)
Lay_EndRoundFrameTable ();
}
else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
Lay_ShowAlert (Lay_INFO,Txt_No_information_available);
}
/*****************************************************************************/

View File

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

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,"visible_on",Txt_View);
Act_PutContextualLink (Action,NULL,"visible_on16x16.gif",Txt_View);
fprintf (Gbl.F.Out,"</div>");
}
@ -935,7 +935,7 @@ void Lay_PutFormToEdit (Act_Action_t Action)
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (Action,NULL,"edit",Txt_Edit);
Act_PutContextualLink (Action,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -947,14 +947,14 @@ void Lay_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
{
// margin is used because this form link may be placed after another one
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_OPT ICON_HIGHLIGHT\">"
"<img src=\"%s/%s16x16.gif\""
"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />",
Gbl.Prefs.IconsURL,Icon,
Alt,Text ? Text : Alt);
if (Text)
if (Text[0])
fprintf (Gbl.F.Out," %s",
fprintf (Gbl.F.Out,"&nbsp;%s",
Text);
fprintf (Gbl.F.Out,"</div>"
"</a>");

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiLnk,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

View File

@ -192,19 +192,19 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
Action = ActReqInsLog;
Cod = Gbl.CurrentIns.Ins.InsCod;
Folder = Cfg_FOLDER_INS;
Icon = "ins";
Icon = "ins16x16.gif";
break;
case Sco_SCOPE_CTR:
Action = ActReqCtrLog;
Cod = Gbl.CurrentCtr.Ctr.CtrCod;
Folder = Cfg_FOLDER_CTR;
Icon = "ctr";
Icon = "ctr16x16.gif";
break;
case Sco_SCOPE_DEG:
Action = ActReqDegLog;
Cod = Gbl.CurrentDeg.Deg.DegCod;
Folder = Cfg_FOLDER_DEG;
Icon = "deg";
Icon = "deg16x16.gif";
break;
default:
return; // Nothing to do
@ -319,7 +319,7 @@ static void Log_PutLinkToRemoveLogo (Act_Action_t Action)
/***** Link for removing the photo *****/
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("delon",Txt_Remove_logo,Txt_Remove_logo);
Lay_PutIconWithText ("delon16x16.gif",Txt_Remove_logo,Txt_Remove_logo);
Act_FormEnd ();
}

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiMai,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}
@ -920,13 +920,13 @@ 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,
"msg",Txt_Change_email);
"msg16x16.gif",Txt_Change_email);
else // Not me
Act_PutContextualLink ( Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_STUDENT ? ActFrmMaiStd :
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmMaiTch :
ActFrmMaiOth),
Usr_PutParamOtherUsrCodEncrypted,
"msg",Txt_Change_email);
"msg16x16.gif",Txt_Change_email);
}
/*****************************************************************************/

View File

@ -225,7 +225,7 @@ void Msg_ListEMails (void)
Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses,
Txt_Create_e_mail_message,
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message);
Lay_PutIconWithText ("editnewmsg16x16.gif",Txt_Create_e_mail_message,Txt_Create_e_mail_message);
fprintf (Gbl.F.Out,"</div>");
}
}
@ -1697,7 +1697,7 @@ static void Msg_PutLinkToViewBannedUsers(void)
{
extern const char *Txt_Banned_users;
Act_PutContextualLink (ActLstBanUsr,NULL,"stop",Txt_Banned_users);
Act_PutContextualLink (ActLstBanUsr,NULL,"stop16x16.gif",Txt_Banned_users);
}
/*****************************************************************************/
@ -2227,7 +2227,7 @@ void Msg_ShowFormDelSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages,unsigned
Act_PutContextualLink ((TypeOfMessages == Msg_MESSAGES_RECEIVED) ? ActReqDelAllRcvMsg :
ActReqDelAllSntMsg,
Msg_PutHiddenParamsMsgsFilters,
"delon",Gbl.Title);
"delon16x16.gif",Gbl.Title);
fprintf (Gbl.F.Out,"</div>");
}
@ -3004,10 +3004,10 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
(Replied ? Txt_Go_to_course_and_reply_again :
Txt_Go_to_course_and_reply),
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("reply",Replied ? Txt_Reply_again :
Txt_Reply,
Replied ? Txt_Reply_again :
Txt_Reply);
Lay_PutIconWithText ("reply16x16.gif",Replied ? Txt_Reply_again :
Txt_Reply,
Replied ? Txt_Reply_again :
Txt_Reply);
Act_FormEnd ();
}

View File

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

View File

@ -1634,7 +1634,7 @@ static void Ntf_PutLinkToChangePrefs (void)
{
extern const char *Txt_Change_preferences;
Act_PutContextualLink (ActEdiPrf,NULL,"heart",Txt_Change_preferences);
Act_PutContextualLink (ActEdiPrf,NULL,"heart16x16.gif",Txt_Change_preferences);
}
/*****************************************************************************/
@ -1648,7 +1648,9 @@ static void Ntf_PutLinkToMarkAllNotifAsSeen (void)
Act_FormStart (ActMrkNtfSee);
Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read);
Lay_PutIconWithText ("visible_on16x16.gif",
Txt_Mark_all_notifications_as_read,
Txt_Mark_all_notifications_as_read);
Act_FormEnd ();
}

View File

@ -218,7 +218,7 @@ void Pwd_PutLinkToSendNewPasswd (void)
extern const char *Txt_I_forgot_my_password;
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
"key",Txt_I_forgot_my_password);
"key16x16.gif",Txt_I_forgot_my_password);
}
static void Pwd_PutLinkToSendNewPasswdParams (void)
@ -842,7 +842,7 @@ void Pwd_PutLinkToChangeMyPassword (void)
extern const char *Txt_Change_password;
/***** Link for changing the password *****/
Act_PutContextualLink (ActFrmChgMyPwd,NULL,"key",Txt_Change_password);
Act_PutContextualLink (ActFrmChgMyPwd,NULL,"key16x16.gif",Txt_Change_password);
}
/*****************************************************************************/
@ -861,7 +861,7 @@ void Pwd_PutLinkToChangeOtherUsrPassword (void)
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActFrmPwdTch :
ActFrmPwdOth),
Usr_PutParamOtherUsrCodEncrypted,
"key",Txt_Change_password);
"key16x16.gif",Txt_Change_password);
}
/*****************************************************************************/

View File

@ -173,9 +173,9 @@ void Pho_PutLinkToChangeMyPhoto (void)
extern const char *Txt_Upload_photo;
/***** Link for changing / uploading the photo *****/
Act_PutContextualLink (ActReqMyPho,NULL,
"photo",Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
Act_PutContextualLink (ActReqMyPho,NULL,"photo64x64.gif",
Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
}
/*****************************************************************************/
@ -200,8 +200,8 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
(Gbl.Usrs.Other.UsrDat.RoleInCurrentCrsDB == Rol_TEACHER ? ActReqTchPho :
ActReqOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"photo",PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
"photo64x64.gif",PhotoExists ? Txt_Change_photo :
Txt_Upload_photo);
}
}
@ -214,7 +214,7 @@ static void Pho_PutLinkToRemoveMyPhoto (void)
extern const char *Txt_Remove_photo;
/***** Link for removing the photo *****/
Act_PutContextualLink (ActRemMyPho,NULL,"delon",Txt_Remove_photo);
Act_PutContextualLink (ActRemMyPho,NULL,"delon16x16.gif",Txt_Remove_photo);
}
/*****************************************************************************/
@ -230,7 +230,7 @@ static void Pho_PutLinkToRemoveOtherUsrPhoto (const struct UsrData *UsrDat)
(UsrDat->RoleInCurrentCrsDB == Rol_TEACHER ? ActRemTchPho :
ActRemOthPho), // Guest, visitor or admin
Usr_PutParamOtherUsrCodEncrypted,
"delon",Txt_Remove_photo);
"delon16x16.gif",Txt_Remove_photo);
}
/*****************************************************************************/
@ -1750,7 +1750,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStats (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnPhoDeg,Pho_PutLinkToPrintViewOfDegreeStatsParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiPlc,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

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,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiPlg,NULL,"edit16x16.gif",Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
}

View File

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

View File

@ -858,7 +858,7 @@ void Rec_PutLinkToEditRecordFields (void)
extern const char *Txt_Edit_record_fields;
/***** Link to edit record fields *****/
Act_PutContextualLink (ActEdiRecFie,NULL,"edit",Txt_Edit_record_fields);
Act_PutContextualLink (ActEdiRecFie,NULL,"edit16x16.gif",Txt_Edit_record_fields);
}
/*****************************************************************************/
@ -1319,7 +1319,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
unsigned i;
Act_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("print",Txt_Print,Txt_Print);
Lay_PutIconWithText ("print16x16.gif",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassForm[Gbl.Prefs.Theme]);
@ -3335,7 +3335,7 @@ static void Rec_PutLinkToChangeMyInsCtrDpt (void)
/***** Link to edit my institution, centre, department... *****/
Act_PutContextualLink (ActReqEdiMyIns,NULL,
"institution",Txt_Edit_my_institution);
"ins64x64.gif",Txt_Edit_my_institution);
}
/*****************************************************************************/
@ -3348,7 +3348,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void)
/***** Link to edit my social networks *****/
Act_PutContextualLink (ActReqEdiMyNet,NULL,
"earth",Txt_Edit_my_webs_networks);
"earth64x64.gif",Txt_Edit_my_webs_networks);
}
/*****************************************************************************/

View File

@ -394,7 +394,9 @@ static void Sta_PutFormToRequestAccessesCrs (void)
Act_FormStart (ActReqAccCrs);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("stats",Txt_Visits_to_course,Txt_Visits_to_course);
Lay_PutIconWithText ("stats16x16.gif",
Txt_Visits_to_course,
Txt_Visits_to_course);
Act_FormEnd ();
}

View File

@ -703,7 +703,7 @@ static void Svy_PutFormToCreateNewSvy (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActFrmNewSvy,Svy_PutFormToCreateNewSvyParams,
"new",Txt_New_survey);
"new16x16.gif",Txt_New_survey);
fprintf (Gbl.F.Out,"</div>");
}
@ -2929,7 +2929,9 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Lay_PutIconWithText ("new16x16.gif",
Txt_New_question,
Txt_New_question);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

View File

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

View File

@ -320,7 +320,7 @@ static void Tst_PutFormToSeeResultsOfUsersTests (void)
Act_PutContextualLink (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT ? ActReqSeeMyTstExa :
ActReqSeeUsrTstExa,
NULL,"file",Txt_Results_tests);
NULL,"file16x16.gif",Txt_Results_tests);
}
/*****************************************************************************/
@ -331,7 +331,7 @@ static void Tst_PutFormToEdit (void)
{
extern const char *Txt_Edit;
Act_PutContextualLink (ActEdiTstQst,NULL,"edit",Txt_Edit);
Act_PutContextualLink (ActEdiTstQst,NULL,"edit16x16.gif",Txt_Edit);
}
/*****************************************************************************/
@ -342,7 +342,7 @@ static void Tst_PutFormToConfigure (void)
{
extern const char *Txt_Configure;
Act_PutContextualLink (ActCfgTst,NULL,"configtest",Txt_Configure);
Act_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif",Txt_Configure);
}
/*****************************************************************************/
@ -1172,7 +1172,9 @@ static void Tst_PutFormToCreateNewTstQst (void)
/***** Put form to create a new test question *****/
Act_FormStart (ActEdiOneTstQst);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Lay_PutIconWithText ("new16x16.gif",
Txt_New_question,
Txt_New_question);
Act_FormEnd ();
}

View File

@ -97,7 +97,9 @@ void TsI_PutFormToExportQuestions (void)
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("export",Txt_Export_questions_to_XML_file,Txt_Export_questions);
Lay_PutIconWithText ("export16x16.gif",
Txt_Export_questions_to_XML_file,
Txt_Export_questions);
Act_FormEnd ();
}
@ -116,7 +118,9 @@ void TsI_PutFormToImportQuestions (void)
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("import",Txt_Import_questions_from_XML_file,Txt_Import_questions);
Lay_PutIconWithText ("import16x16.gif",
Txt_Import_questions_from_XML_file,
Txt_Import_questions);
Act_FormEnd ();
}
@ -265,7 +269,9 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP,
Gbl.FileBrowser.TmpPubDir,
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("file",Txt_XML_file,Txt_XML_file);
Lay_PutIconWithText ("file16x16.gif",
Txt_XML_file,
Txt_XML_file);
}
/*****************************************************************************/

View File

@ -265,15 +265,15 @@ void TT_ShowClassTimeTable (void)
if (PutEditCrsTT)
Act_PutContextualLink (ActEdiCrsTT,Grp_PutParamWhichGrps,
"edit",Txt_Edit);
"edit16x16.gif",Txt_Edit);
if (PutEditOfficeHours)
Act_PutContextualLink (ActEdiTut,NULL,"edit",Txt_Edit_office_hours);
Act_PutContextualLink (ActEdiTut,NULL,"edit16x16.gif",Txt_Edit_office_hours);
if (!PrintView)
Act_PutContextualLink (TimeTableType == TT_COURSE_TIMETABLE ? ActPrnCrsTT :
ActPrnMyTT,
Grp_PutParamWhichGrps,"print",Txt_Print);
Grp_PutParamWhichGrps,"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
@ -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,"clock",Txt_Show_timetable);
Act_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,"clock",Txt_Show_timetable);
Act_PutContextualLink (ActSeeMyTT,NULL,"clock16x16.gif",Txt_Show_timetable);
fprintf (Gbl.F.Out,"</div>");
/***** Time table *****/

View File

@ -1427,7 +1427,7 @@ void Usr_WriteFormLogin (void)
/* Link to create a new account */
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,Cfg_PLATFORM_SHORT_NAME);
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba",Gbl.Title);
Act_PutContextualLink (ActFrmUsrAcc,NULL,"arroba16x16.gif",Gbl.Title);
/* Link to enter from external site */
if (Cfg_EXTERNAL_LOGIN_URL[0] &&
@ -1438,7 +1438,9 @@ void Usr_WriteFormLogin (void)
The_ClassFormBold[Gbl.Prefs.Theme]);
sprintf (Gbl.Title,Txt_Enter_from_X,
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
Lay_PutIconWithText ("login",Gbl.Title,Gbl.Title);
Lay_PutIconWithText ("login16x16.gif",
Gbl.Title,
Gbl.Title);
}
/* Link to send a new password */
@ -2567,7 +2569,7 @@ void Usr_ShowFormsLogoutAndRole (void)
/***** Link to log out *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLogOut,NULL,"logout",Txt_Log_out);
Act_PutContextualLink (ActLogOut,NULL,"logout16x16.gif",Txt_Log_out);
fprintf (Gbl.F.Out,"</div>");
/***** Write message with my new logged role *****/
@ -6456,7 +6458,7 @@ static void Usr_PutLinkToSeeAdmins (void)
extern const char *Txt_See_administrators;
/***** Put form to list admins *****/
Act_PutContextualLink (ActLstOth,NULL,"adm",Txt_See_administrators);
Act_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",Txt_See_administrators);
}
/*****************************************************************************/
@ -6468,7 +6470,7 @@ static void Usr_PutLinkToSeeGuests (void)
extern const char *Txt_See_guests;
/***** Put form to list guests *****/
Act_PutContextualLink (ActLstGst,NULL,"usrs",Txt_See_guests);
Act_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif",Txt_See_guests);
}
/*****************************************************************************/
@ -6545,12 +6547,12 @@ void Usr_SeeGuests (void)
case Usr_CLASS_PHOTO:
/***** Link to print view *****/
Act_PutContextualLink (ActPrnGstPho,Usr_PutLinkToShowGuestsAllDataParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
break;
case Usr_LIST:
/****** Link to show all the data ******/
Act_PutContextualLink (ActLstGstAll,Usr_PutLinkToShowGuestsAllDataParams,
"table",Txt_Show_all_data);
"table16x16.gif",Txt_Show_all_data);
break;
}
fprintf (Gbl.F.Out,"</div>");
@ -6730,7 +6732,7 @@ void Usr_SeeStudents (void)
/***** Link to print view *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnStdPho,Usr_PutLinkToShowStdsAllDataParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
@ -6739,7 +6741,7 @@ void Usr_SeeStudents (void)
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLstStdAll,Usr_PutLinkToShowStdsAllDataParams,
"table",Txt_Show_all_data);
"table16x16.gif",Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
break;
@ -6897,7 +6899,7 @@ void Usr_SeeTeachers (void)
case Usr_CLASS_PHOTO:
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActPrnTchPho,Usr_PutLinkToShowTchsAllDataParams,
"print",Txt_Print);
"print16x16.gif",Txt_Print);
fprintf (Gbl.F.Out,"</div>");
break;
case Usr_LIST:
@ -6906,7 +6908,7 @@ void Usr_SeeTeachers (void)
/****** Link to show all the data ******/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_PutContextualLink (ActLstTchAll,Usr_PutLinkToShowTchsAllDataParams,
"table",Txt_Show_all_data);
"table16x16.gif",Txt_Show_all_data);
fprintf (Gbl.F.Out,"</div>");
}
break;
@ -6994,7 +6996,7 @@ static void Usr_PutLinkToListOfficialStudents (void)
Gbl.Imported.ExternalRole == Rol_TEACHER) // ...as a teacher
/***** Link to list official students *****/
Act_PutContextualLink (ActGetExtLstStd,NULL,
"list",Txt_Official_students);
"list16x16.gif",Txt_Official_students);
}
/*****************************************************************************/

View File

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