Version 21.103.1: Jun 29, 2022 Code refactoring in icons.

This commit is contained in:
acanas 2022-06-29 18:34:15 +02:00
parent 668d873713
commit dfa638c26c
41 changed files with 121 additions and 296 deletions

View File

@ -59,8 +59,7 @@ void QR_PutLinkToPrintQRCode (Act_Action_t Action,
{
Lay_PutContextualLinkOnlyIcon (Action,NULL,
FuncParams,Args,
"qrcode.svg",Ico_BLACK,
Act_GetActionText (Action));
"qrcode.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -574,8 +574,7 @@ void Acc_PutLinkToRemoveMyAccount (__attribute__((unused)) void *Args)
if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Me.UsrDat.UsrCod))
Lay_PutContextualLinkOnlyIcon (ActReqRemMyAcc,NULL,
Acc_PutParamsToRemoveMyAccount,Gbl.Usrs.Me.UsrDat.EnUsrCod,
"trash.svg",Ico_RED,
Act_GetActionText (ActReqRemMyAcc));
"trash.svg",Ico_RED);
}
static void Acc_PutParamsToRemoveMyAccount (void *EncryptedUsrCod)
@ -1131,12 +1130,10 @@ void Acc_PutIconToChangeUsrAccount (void)
if (Usr_ItsMe (Gbl.Record.UsrDat->UsrCod))
Lay_PutContextualLinkOnlyIcon (ActFrmMyAcc,NULL,
NULL,NULL,
"at.svg",Ico_BLACK,
Act_GetActionText (ActFrmMyAcc));
"at.svg",Ico_BLACK);
else // Not me
if (Usr_ICanEditOtherUsr (Gbl.Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"at.svg",Ico_BLACK,
Act_GetActionText (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs]));
"at.svg",Ico_BLACK);
}

View File

@ -722,21 +722,18 @@ static void Agd_PutIconsOtherPublicAgenda (void *EncryptedUsrCod)
&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeOthPubPrf,NULL,
Usr_PutParamOtherUsrCodEncrypted,EncryptedUsrCod,
"user.svg",Ico_BLACK,
Act_GetActionText (ActSeeOthPubPrf));
"user.svg",Ico_BLACK);
/***** Button to view user's record card *****/
if (Usr_CheckIfICanViewRecordStd (&Gbl.Usrs.Other.UsrDat))
/* View student's records: common record card and course record card */
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL,
Usr_PutParamOtherUsrCodEncrypted,EncryptedUsrCod,
"address-card.svg",Ico_BLACK,
Act_GetActionText (ActSeeRecOneStd));
"address-card.svg",Ico_BLACK);
else if (Usr_CheckIfICanViewRecordTch (&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL,
Usr_PutParamOtherUsrCodEncrypted,EncryptedUsrCod,
"address-card.svg",Ico_BLACK,
Act_GetActionText (ActSeeRecOneTch));
"address-card.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -891,9 +888,6 @@ static void Agd_PutFormsToRemEditOneEvent (struct Agd_Agenda *Agenda,
struct Agd_Event *AgdEvent,
const char *Anchor)
{
extern const char *Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses;
extern const char *Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private;
Agenda->AgdCodToEdit = AgdEvent->AgdCod; // Used as parameter in contextual links
/***** Put form to remove event *****/
@ -916,13 +910,11 @@ static void Agd_PutFormsToRemEditOneEvent (struct Agd_Agenda *Agenda,
if (AgdEvent->Public)
Lay_PutContextualLinkOnlyIcon (ActPrvEvtMyAgd,NULL,
Agd_PutCurrentParamsMyAgenda,Agenda,
"unlock.svg",Ico_GREEN,
Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private);
"unlock.svg",Ico_GREEN);
else
Lay_PutContextualLinkOnlyIcon (ActPubEvtMyAgd,NULL,
Agd_PutCurrentParamsMyAgenda,Agenda,
"lock.svg",Ico_RED,
Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses);
"lock.svg",Ico_RED);
}
/*****************************************************************************/

View File

@ -389,8 +389,7 @@ void Ban_PutIconToViewBanners (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeBan,NULL,
NULL,NULL,
"flag.svg",Ico_BLACK,
Act_GetActionText (ActSeeBan));
"flag.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -293,8 +293,7 @@ void Bld_PutIconToViewBuildings (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeBld,NULL,
NULL,NULL,
"building.svg",Ico_BLACK,
Act_GetActionText (ActSeeBld));
"building.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -324,8 +324,7 @@ void Cal_PutIconToSeeCalendar (__attribute__((unused)) void *Args)
{
Lay_PutContextualLinkOnlyIcon (ActSeeCal,NULL,
NULL,NULL,
"calendar.svg",Ico_BLACK,
Act_GetActionText (ActSeeCal));
"calendar.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -503,8 +503,7 @@ void Ctr_PutIconToViewCenters (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeCtr,NULL,
NULL,NULL,
"building.svg",Ico_BLACK,
Act_GetActionText (ActSeeCtr));
"building.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -1926,8 +1925,7 @@ static void Ctr_FormToGoToMap (struct Ctr_Center *Ctr)
Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the center
Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL,
Ctr_PutParamGoToCtr,&Ctr_EditingCtr->CtrCod,
"map-marker-alt.svg",Ico_BLACK,
Act_GetActionText (ActSeeCtrInf));
"map-marker-alt.svg",Ico_BLACK);
}
}

View File

@ -276,20 +276,9 @@ static void CtrCfg_PutIconsCtrConfig (__attribute__((unused)) void *Args)
static void CtrCfg_PutIconToChangePhoto (void)
{
char PathPhoto[PATH_MAX + 1];
bool PhotoExists;
/***** Link to upload photo of center *****/
snprintf (PathPhoto,sizeof (PathPhoto),"%s/%02u/%u/%u.jpg",
Cfg_PATH_CTR_PUBLIC,
(unsigned) (Gbl.Hierarchy.Ctr.CtrCod % 100),
(unsigned) Gbl.Hierarchy.Ctr.CtrCod,
(unsigned) Gbl.Hierarchy.Ctr.CtrCod);
PhotoExists = Fil_CheckIfPathExists (PathPhoto);
Lay_PutContextualLinkOnlyIcon (ActReqCtrPho,NULL,
NULL,NULL,
"camera.svg",Ico_BLACK,
Act_GetActionText (ActReqCtrPho));
"camera.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -299,12 +288,12 @@ static void CtrCfg_PutIconToChangePhoto (void)
static void CtrCfg_Title (bool PutLink)
{
HieCfg_Title (PutLink,
HieLvl_CTR, // Logo scope
Gbl.Hierarchy.Ctr.CtrCod, // Logo code
Gbl.Hierarchy.Ctr.ShrtName, // Logo short name
Gbl.Hierarchy.Ctr.FullName, // Logo full name
Gbl.Hierarchy.Ctr.WWW, // Logo www
Gbl.Hierarchy.Ctr.FullName); // Text full name
HieLvl_CTR, // Logo scope
Gbl.Hierarchy.Ctr.CtrCod, // Logo code
Gbl.Hierarchy.Ctr.ShrtName, // Logo short name
Gbl.Hierarchy.Ctr.FullName, // Logo full name
Gbl.Hierarchy.Ctr.WWW, // Logo www
Gbl.Hierarchy.Ctr.FullName); // Text full name
}
/*****************************************************************************/

View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia.
*/
#define Log_PLATFORM_VERSION "SWAD 21.103 (2022-06-29)"
#define Log_PLATFORM_VERSION "SWAD 21.103.1 (2022-06-29)"
#define CSS_FILE "swad21.100.css"
#define JS_FILE "swad21.100.js"
/*
Version 21.103.1: Jun 29, 2022 Code refactoring in icons. (328305 lines)
Version 21.103: Jun 29, 2022 Text in buttons got from text of actions.
Preparation for Turkish translation. (328476 lines)
Version 21.102.1: Jun 28, 2022 Text in buttons got from text of actions.

View File

@ -136,8 +136,7 @@ static void Con_PutIconToUpdateConnected (__attribute__((unused)) void *Args)
{
Lay_PutContextualLinkOnlyIcon (ActLstCon,NULL,
Con_PutParamScope,NULL,
"recycle.svg",Ico_BLACK,
Act_GetActionText (ActLstCon));
"recycle.svg",Ico_BLACK);
}
static void Con_PutParamScope (__attribute__((unused)) void *Args)

View File

@ -730,8 +730,7 @@ static void Cty_PutIconToViewCountries (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeCty,NULL,
NULL,NULL,
"globe-americas.svg",Ico_BLACK,
Act_GetActionText (ActSeeCty));
"globe-americas.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -1904,8 +1903,7 @@ static void Cty_FormToGoToMap (struct Cty_Countr *Cty)
Cty_EditingCty = Cty; // Used to pass parameter with the code of the country
Lay_PutContextualLinkOnlyIcon (ActSeeCtyInf,NULL,
Cty_PutParamGoToCty,&Cty_EditingCty->CtyCod,
"map-marker-alt.svg",Ico_BLACK,
Act_GetActionText (ActSeeCtyInf));
"map-marker-alt.svg",Ico_BLACK);
}
}

View File

@ -1099,8 +1099,7 @@ static void Crs_PutIconToViewCourses (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeCrs,NULL,
NULL,NULL,
"chalkboard-teacher.svg",Ico_BLACK,
Act_GetActionText (ActSeeCrs));
"chalkboard-teacher.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -2191,8 +2190,7 @@ static void Crs_PutIconToSearchCourses (__attribute__((unused)) void *Args)
{
Lay_PutContextualLinkOnlyIcon (ActReqSch,NULL,
Sch_PutLinkToSearchCoursesParams,NULL,
"search.svg",Ico_BLACK,
Act_GetActionText (ActReqSch));
"search.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -2227,8 +2225,7 @@ void Crs_PutIconToSelectMyCourses (__attribute__((unused)) void *Args)
if (Gbl.Usrs.Me.Logged) // I am logged
Lay_PutContextualLinkOnlyIcon (ActMyCrs,NULL,
NULL,NULL,
"sitemap.svg",Ico_BLACK,
Act_GetActionText (ActMyCrs));
"sitemap.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -962,8 +962,7 @@ void Deg_PutIconToViewDegrees (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeDeg,NULL,
NULL,NULL,
"graduation-cap.svg",Ico_BLACK,
Act_GetActionText (ActSeeDeg));
"graduation-cap.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -303,8 +303,7 @@ void DegTyp_PutIconToViewDegreeTypes (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeDegTyp,NULL,
NULL,NULL,
"sitemap.svg",Ico_BLACK,
Act_GetActionText (ActSeeDegTyp));
"sitemap.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -645,8 +645,7 @@ static void ExaSes_ListOneOrMoreSessionsResultStd (struct Exa_Exams *Exams,
Exams->SesCod = Session->SesCod;
Lay_PutContextualLinkOnlyIcon (ActSeeMyExaResSes,ExaRes_RESULTS_BOX_ID,
ExaSes_PutParamsEdit,Exams,
"trophy.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyExaResSes));
"trophy.svg",Ico_BLACK);
}
else
/* Result is forbidden to me */
@ -666,8 +665,7 @@ static void ExaSes_ListOneOrMoreSessionsResultTch (struct Exa_Exams *Exams,
if (ExaSes_CheckIfICanEditThisSession (Session->UsrCod))
Lay_PutContextualLinkOnlyIcon (ActSeeUsrExaResSes,ExaRes_RESULTS_BOX_ID,
ExaSes_PutParamsEdit,Exams,
"trophy.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrExaResSes));
"trophy.svg",Ico_BLACK);
/***** Check if visibility of session results can be changed *****/
if (ExaSes_CheckIfVisibilityOfResultsCanBeChanged (Session))
@ -676,13 +674,11 @@ static void ExaSes_ListOneOrMoreSessionsResultTch (struct Exa_Exams *Exams,
if (Session->ShowUsrResults)
Lay_PutContextualLinkOnlyIcon (ActChgVisExaRes,NULL,
ExaSes_PutParamsEdit,Exams,
"eye.svg",Ico_GREEN,
Act_GetActionText (ActChgVisExaRes));
"eye.svg",Ico_GREEN);
else
Lay_PutContextualLinkOnlyIcon (ActChgVisExaRes,NULL,
ExaSes_PutParamsEdit,Exams,
"eye-slash.svg",Ico_RED,
Act_GetActionText (ActChgVisExaRes));
"eye-slash.svg",Ico_RED);
}
else // Don't put form
{

View File

@ -782,8 +782,7 @@ static void ExaSet_ListOneOrMoreSetsForEdition (struct Exa_Exams *Exams,
if (ICanEditSets && Set.SetInd > 1)
Lay_PutContextualLinkOnlyIcon (ActUp_ExaSet,Anchor,
ExaSet_PutParamsOneSet,Exams,
"arrow-up.svg",Ico_BLACK,
Act_GetActionText (ActUp_ExaSet));
"arrow-up.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-up.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -792,8 +791,7 @@ static void ExaSet_ListOneOrMoreSetsForEdition (struct Exa_Exams *Exams,
if (ICanEditSets && Set.SetInd < MaxSetInd)
Lay_PutContextualLinkOnlyIcon (ActDwnExaSet,Anchor,
ExaSet_PutParamsOneSet,Exams,
"arrow-down.svg",Ico_BLACK,
Act_GetActionText (ActDwnExaSet));
"arrow-down.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-down.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -991,8 +989,7 @@ static void ExaSet_ListOneOrMoreQuestionsForEdition (struct Exa_Exams *Exams,
Lay_PutContextualLinkOnlyIcon (ValInv[Question.Validity].NextAction,Anchor,
ExaSet_PutParamsOneQst,Exams,
ValInv[Question.Validity].Icon,
ValInv[Question.Validity].Color,
Act_GetActionText (ValInv[Question.Validity].NextAction));
ValInv[Question.Validity].Color);
HTM_TD_End ();

View File

@ -149,8 +149,7 @@ void Fig_PutIconToShowFigure (Fig_FigureType_t FigureType)
Figures.FigureType = FigureType;
Lay_PutContextualLinkOnlyIcon (ActSeeUseGbl,NULL,
Fig_PutHiddenParamFigures,&Figures,
"chart-pie.svg",Ico_BLACK,
Act_GetActionText (ActSeeUseGbl));
"chart-pie.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -267,8 +267,7 @@ static void Fol_PutIconToUpdateWhoToFollow (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeSocPrf,NULL,
NULL,NULL,
"recycle.svg",Ico_BLACK,
Act_GetActionText (ActSeeSocPrf));
"recycle.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -1758,8 +1758,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games,
if (ICanEditQuestions && QstInd > 1)
Lay_PutContextualLinkOnlyIcon (ActUp_GamQst,Anchor,
Gam_PutParamsOneQst,Games,
"arrow-up.svg",Ico_BLACK,
Act_GetActionText (ActUp_GamQst));
"arrow-up.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-up.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -1768,8 +1767,7 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games,
if (ICanEditQuestions && QstInd < MaxQstInd)
Lay_PutContextualLinkOnlyIcon (ActDwnGamQst,Anchor,
Gam_PutParamsOneQst,Games,
"arrow-down.svg",Ico_BLACK,
Act_GetActionText (ActDwnGamQst));
"arrow-down.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-down.svg",Ico_BLACK,
Txt_Movement_not_allowed);

View File

@ -252,8 +252,7 @@ void Hld_PutIconToSeeHlds (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeHld,NULL,
NULL,NULL,
"calendar-day.svg",Ico_BLACK,
Act_GetActionText (ActSeeHld));
"calendar-day.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -236,8 +236,7 @@ void Ico_PutContextualIconToAdd (Act_Action_t NextAction,const char *Anchor,
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"plus.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"plus.svg",Ico_BLACK);
}
void Ico_PutContextualIconToRemove (Act_Action_t NextAction,const char *Anchor,
@ -245,8 +244,7 @@ void Ico_PutContextualIconToRemove (Act_Action_t NextAction,const char *Anchor,
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"trash.svg",Ico_RED,
Act_GetActionText (NextAction));
"trash.svg",Ico_RED);
}
void Ico_PutContextualIconToEdit (Act_Action_t NextAction,const char *Anchor,
@ -254,8 +252,7 @@ void Ico_PutContextualIconToEdit (Act_Action_t NextAction,const char *Anchor,
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"pen.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"pen.svg",Ico_BLACK);
}
void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,
@ -263,8 +260,7 @@ void Ico_PutContextualIconToViewFiles (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"folder-open.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"folder-open.svg",Ico_BLACK);
}
void Ico_PutContextualIconToView (Act_Action_t NextAction,
@ -272,8 +268,7 @@ void Ico_PutContextualIconToView (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"list.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"list.svg",Ico_BLACK);
}
void Ico_PutContextualIconToConfigure (Act_Action_t NextAction,
@ -281,8 +276,7 @@ void Ico_PutContextualIconToConfigure (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"cog.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"cog.svg",Ico_BLACK);
}
void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,
@ -290,8 +284,7 @@ void Ico_PutContextualIconToHide (Act_Action_t NextAction,const char *Anchor,
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"eye.svg",Ico_GREEN,
Act_GetActionText (NextAction));
"eye.svg",Ico_GREEN);
}
void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,
@ -299,8 +292,7 @@ void Ico_PutContextualIconToUnhide (Act_Action_t NextAction,const char *Anchor,
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"eye-slash.svg",Ico_RED,
Act_GetActionText (NextAction));
"eye-slash.svg",Ico_RED);
}
void Ico_PutContextualIconToPrint (Act_Action_t NextAction,
@ -308,8 +300,7 @@ void Ico_PutContextualIconToPrint (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"print.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"print.svg",Ico_BLACK);
}
void Ico_PutContextualIconToCopy (Act_Action_t NextAction,
@ -317,8 +308,7 @@ void Ico_PutContextualIconToCopy (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"copy.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"copy.svg",Ico_BLACK);
}
void Ico_PutContextualIconToPaste (Act_Action_t NextAction,
@ -326,8 +316,7 @@ void Ico_PutContextualIconToPaste (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"paste.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"paste.svg",Ico_BLACK);
}
void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,
@ -338,8 +327,7 @@ void Ico_PutContextualIconToCreateInFolder (Act_Action_t NextAction,
FuncParams,Args,
Open ? "folder-open-yellow-plus.png" :
"folder-yellow-plus.png",
Ico_UNCHANGED,
Act_GetActionText (NextAction));
Ico_UNCHANGED);
}
void Ico_PutContextualIconToShowResults (Act_Action_t NextAction,const char *Anchor,
@ -347,8 +335,7 @@ void Ico_PutContextualIconToShowResults (Act_Action_t NextAction,const char *Anc
{
Lay_PutContextualLinkOnlyIcon (NextAction,Anchor,
FuncParams,Args,
"trophy.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"trophy.svg",Ico_BLACK);
}
void Ico_PutContextualIconToShowAttendanceList (Act_Action_t NextAction,
@ -356,8 +343,7 @@ void Ico_PutContextualIconToShowAttendanceList (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"tasks.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"tasks.svg",Ico_BLACK);
}
void Ico_PutContextualIconToZIP (Act_Action_t NextAction,
@ -365,8 +351,7 @@ void Ico_PutContextualIconToZIP (Act_Action_t NextAction,
{
Lay_PutContextualLinkOnlyIcon (NextAction,NULL,
FuncParams,Args,
"download.svg",Ico_BLACK,
Act_GetActionText (NextAction));
"download.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -596,8 +596,7 @@ static void Ins_PutIconToViewInstitutions (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeIns,NULL,
NULL,NULL,
"university.svg",Ico_BLACK,
Act_GetActionText (ActSeeIns));
"university.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -1899,8 +1898,7 @@ static void Ins_FormToGoToMap (struct Ins_Instit *Ins)
Ins_EditingIns = Ins; // Used to pass parameter with the code of the institution
Lay_PutContextualLinkOnlyIcon (ActSeeInsInf,NULL,
Ins_PutParamGoToIns,&Ins_EditingIns->InsCod,
"map-marker-alt.svg",Ico_BLACK,
Act_GetActionText (ActSeeInsInf));
"map-marker-alt.svg",Ico_BLACK);
}
}

View File

@ -1178,8 +1178,7 @@ static void Lay_ShowRightColumn (void)
void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (void *Args),void *Args,
const char *Icon,Ico_Color_t Color,
const char *Title)
const char *Icon,Ico_Color_t Color)
{
/***** Begin form *****/
Frm_BeginFormAnchor (NextAction,Anchor);
@ -1187,7 +1186,7 @@ void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
FuncParams (Args);
/***** Put icon with link *****/
Ico_PutIconLink (Icon,Color,Title);
Ico_PutIconLink (Icon,Color,Act_GetActionText (NextAction));
/***** End form *****/
Frm_EndForm ();

View File

@ -51,8 +51,7 @@ void Lay_WriteEndOfPage (void);
void Lay_PutContextualLinkOnlyIcon (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (void *Args),void *Args,
const char *Icon,Ico_Color_t Color,
const char *Title);
const char *Icon,Ico_Color_t Color);
void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
void (*FuncParams) (void *Args),void *Args,
const char *Icon,Ico_Color_t Color,

View File

@ -270,8 +270,7 @@ void Lnk_PutIconToViewLinks (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeLnk,NULL,
NULL,NULL,
"link.svg",Ico_BLACK,
Act_GetActionText (ActSeeLnk));
"link.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -214,8 +214,7 @@ void Lgo_PutIconToChangeLogo (HieLvl_Level_t Scope)
Lay_PutContextualLinkOnlyIcon (Action[Scope],NULL,
NULL,NULL,
"shield-alt.svg",Ico_BLACK,
Act_GetActionText (Action[Scope]));
"shield-alt.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -317,8 +316,7 @@ static void Lgo_PutIconToRemoveLogo (Act_Action_t ActionRem)
{
Lay_PutContextualLinkOnlyIcon (ActionRem,NULL,
NULL,NULL,
"trash.svg",Ico_RED,
Act_GetActionText (ActionRem));
"trash.svg",Ico_RED);
}
/*****************************************************************************/

View File

@ -744,9 +744,7 @@ static void Mch_ListOneOrMoreMatchesStatus (struct Mch_Match *Match,unsigned Num
NULL,
Mch_PutParamsPlay,&Match->MchCod,
Match->Status.Showing == Mch_END ? "flag-checkered.svg" :
"play.svg",Ico_BLACK,
Act_GetActionText (Gbl.Usrs.Me.Role.Logged == Rol_STD ? ActJoiMch :
ActResMch));
"play.svg",Ico_BLACK);
HTM_TD_End ();
}
@ -789,8 +787,7 @@ static void Mch_ListOneOrMoreMatchesResultStd (struct Gam_Games *Games,
Games->MchCod.Current = Match->MchCod;
Lay_PutContextualLinkOnlyIcon (ActSeeMyMchResMch,MchRes_RESULTS_BOX_ID,
Mch_PutParamsEdit,Games,
"trophy.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyMchResMch));
"trophy.svg",Ico_BLACK);
}
else
/* Result is forbidden to me */
@ -810,8 +807,7 @@ static void Mch_ListOneOrMoreMatchesResultTch (struct Gam_Games *Games,
if (Mch_CheckIfICanEditThisMatch (Match))
Lay_PutContextualLinkOnlyIcon (ActSeeUsrMchResMch,MchRes_RESULTS_BOX_ID,
Mch_PutParamsEdit,Games,
"trophy.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrMchResMch));
"trophy.svg",Ico_BLACK);
/***** Check if visibility of session results can be changed *****/
if (Mch_CheckIfVisibilityOfResultsCanBeChanged (Match))
@ -820,13 +816,11 @@ static void Mch_ListOneOrMoreMatchesResultTch (struct Gam_Games *Games,
if (Match->Status.ShowUsrResults)
Lay_PutContextualLinkOnlyIcon (ActChgVisResMchUsr,NULL,
Mch_PutParamsEdit,Games,
"eye.svg",Ico_GREEN,
Act_GetActionText (ActChgVisResMchUsr));
"eye.svg",Ico_GREEN);
else
Lay_PutContextualLinkOnlyIcon (ActChgVisResMchUsr,NULL,
Mch_PutParamsEdit,Games,
"eye-slash.svg",Ico_RED,
Act_GetActionText (ActChgVisResMchUsr));
"eye-slash.svg",Ico_RED);
}
else
{

View File

@ -1709,8 +1709,7 @@ static void Msg_PutIconsListMsgs (void *Messages)
case Msg_SENT:
Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL,
Msg_PutHiddenParamsMsgsFilters,Messages,
"marker.svg",Ico_BLACK,
Act_GetActionText (ActReqMsgUsr));
"marker.svg",Ico_BLACK);
break;
default:
break;
@ -1723,8 +1722,7 @@ static void Msg_PutIconsListMsgs (void *Messages)
case Msg_SENT:
Lay_PutContextualLinkOnlyIcon (ActSeeRcvMsg,NULL,
Msg_PutHiddenParamsMsgsFilters,Messages,
"inbox.svg",Ico_BLACK,
Act_GetActionText (ActSeeRcvMsg));
"inbox.svg",Ico_BLACK);
break;
default:
break;
@ -1737,8 +1735,7 @@ static void Msg_PutIconsListMsgs (void *Messages)
case Msg_RECEIVED:
Lay_PutContextualLinkOnlyIcon (ActSeeSntMsg,NULL,
Msg_PutHiddenParamsMsgsFilters,Messages,
"share.svg",Ico_BLACK,
Act_GetActionText (ActSeeSntMsg));
"share.svg",Ico_BLACK);
break;
default:
break;

View File

@ -635,8 +635,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
HTM_DIV_Begin ("class=\"CM\"");
Lay_PutContextualLinkOnlyIcon (ActSeeOneNot,Anchor,
Not_PutParams,&NotCod,
"ellipsis-h.svg",Ico_BLACK,
Act_GetActionText (ActSeeOneNot));
"ellipsis-h.svg",Ico_BLACK);
HTM_DIV_End ();
}
else

View File

@ -189,15 +189,13 @@ void Pho_PutIconToChangeUsrPhoto (void)
{
Lay_PutContextualLinkOnlyIcon (ActReqMyPho,NULL,
NULL,NULL,
"camera.svg",Ico_BLACK,
Act_GetActionText (ActReqMyPho));
"camera.svg",Ico_BLACK);
}
else // Not me
if (Pho_ICanChangeOtherUsrPhoto (Gbl.Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"camera.svg",Ico_BLACK,
Act_GetActionText (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs]));
"camera.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -209,8 +207,7 @@ static void Pho_PutIconToRequestRemoveMyPhoto (__attribute__((unused)) void *Arg
if (Gbl.Usrs.Me.MyPhotoExists)
Lay_PutContextualLinkOnlyIcon (ActReqRemMyPho,NULL,
NULL,NULL,
"trash.svg",Ico_RED,
Act_GetActionText (ActReqRemMyPho));
"trash.svg",Ico_RED);
}
/*****************************************************************************/
@ -240,8 +237,7 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (__attribute__((unused)) voi
if (PhotoExists)
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs],NULL,
Usr_PutParamOtherUsrCodEncrypted,Gbl.Usrs.Other.UsrDat.EnUsrCod,
"trash.svg",Ico_RED,
Act_GetActionText (NextAction[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs]));
"trash.svg",Ico_RED);
}
/*****************************************************************************/

View File

@ -338,8 +338,7 @@ void Plc_PutIconToViewPlaces (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeePlc,NULL,
Ins_PutParamCurrentInsCod,&Gbl.Hierarchy.Ins.InsCod,
"map-marker-alt.svg",Ico_BLACK,
Act_GetActionText (ActSeePlc));
"map-marker-alt.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -770,8 +770,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
if (Prg_CheckIfMoveUpIsAllowed (NumItem))
Lay_PutContextualLinkOnlyIcon (ActUp_PrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-up.svg",Ico_BLACK,
Act_GetActionText (ActUp_PrgItm));
"arrow-up.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-up.svg",Ico_BLACK,Txt_Movement_not_allowed);
@ -779,8 +778,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
if (Prg_CheckIfMoveDownIsAllowed (NumItem))
Lay_PutContextualLinkOnlyIcon (ActDwnPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-down.svg",Ico_BLACK,
Act_GetActionText (ActDwnPrgItm));
"arrow-down.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-down.svg",Ico_BLACK,Txt_Movement_not_allowed);
@ -788,8 +786,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
if (Prg_CheckIfMoveLeftIsAllowed (NumItem))
Lay_PutContextualLinkOnlyIcon (ActLftPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-left.svg",Ico_BLACK,
Act_GetActionText (ActLftPrgItm));
"arrow-left.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-left.svg",Ico_BLACK,Txt_Movement_not_allowed);
@ -797,8 +794,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
if (Prg_CheckIfMoveRightIsAllowed (NumItem))
Lay_PutContextualLinkOnlyIcon (ActRgtPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-right.svg",Ico_BLACK,
Act_GetActionText (ActRgtPrgItm));
"arrow-right.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-right.svg",Ico_BLACK,Txt_Movement_not_allowed);
break;

View File

@ -1135,8 +1135,7 @@ static void Prj_PutIconToShowAllData (struct Prj_Projects *Projects)
{
Lay_PutContextualLinkOnlyIcon (ActSeeTblAllPrj,NULL,
Prj_PutCurrentParams,Projects,
"table.svg",Ico_BLACK,
Act_GetActionText (ActSeeTblAllPrj));
"table.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -2151,8 +2150,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
HTM_TD_Begin ("class=\"PRJ_MEMBER_ICO\"");
Lay_PutContextualLinkOnlyIcon (ActionReqRemUsr[RoleInPrj],NULL,
Prj_PutCurrentParams,Projects,
"trash.svg",Ico_RED,
Act_GetActionText (ActionReqRemUsr[RoleInPrj]));
"trash.svg",Ico_RED);
HTM_TD_End ();
}
@ -3838,14 +3836,12 @@ static void Prj_PutIconsToLockUnlockAllProjects (struct Prj_Projects *Projects)
/***** Put icon to lock all projects *****/
Lay_PutContextualLinkOnlyIcon (ActReqLckAllPrj,NULL,
Prj_PutCurrentParams,Projects,
"lock.svg",Ico_RED,
Act_GetActionText (ActReqLckAllPrj));
"lock.svg",Ico_RED);
/***** Put icon to unlock all projects *****/
Lay_PutContextualLinkOnlyIcon (ActReqUnlAllPrj,NULL,
Prj_PutCurrentParams,Projects,
"unlock.svg",Ico_GREEN,
Act_GetActionText (ActReqUnlAllPrj));
"unlock.svg",Ico_GREEN);
}
/*****************************************************************************/

View File

@ -78,8 +78,7 @@ void QstImp_PutIconToExportQuestions (struct Qst_Questions *Questions)
{
Lay_PutContextualLinkOnlyIcon (ActLstTstQst,NULL,
QstImp_PutParamsExportQsts,Questions,
"file-import.svg",Ico_BLACK,
Act_GetActionText (ActLstTstQst));
"file-import.svg",Ico_BLACK);
}
/*****************************************************************************/
@ -119,8 +118,7 @@ void QstImp_PutIconToImportQuestions (void)
{
Lay_PutContextualLinkOnlyIcon (ActReqImpTstQst,NULL,
NULL,NULL,
"file-export.svg",Ico_BLACK,
Act_GetActionText (ActReqImpTstQst));
"file-export.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -2337,39 +2337,33 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
/***** Button to edit my record card *****/
Lay_PutContextualLinkOnlyIcon (ActReqEdiRecSha,NULL,
NULL,NULL,
"pen.svg",Ico_BLACK,
Act_GetActionText (ActReqEdiRecSha));
"pen.svg",Ico_BLACK);
if (ICanViewUsrProfile)
/***** Button to view user's profile *****/
Lay_PutContextualLinkOnlyIcon (ActSeeOthPubPrf,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"user.svg",Ico_BLACK,
Act_GetActionText (ActSeeOthPubPrf));
"user.svg",Ico_BLACK);
/***** Button to view user's record card *****/
if (Usr_CheckIfICanViewRecordStd (Gbl.Record.UsrDat))
/* View student's records: common record card and course record card */
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneStd,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"address-card.svg",Ico_BLACK,
Act_GetActionText (ActSeeRecOneStd));
"address-card.svg",Ico_BLACK);
else if (Usr_CheckIfICanViewRecordTch (Gbl.Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeRecOneTch,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"address-card.svg",Ico_BLACK,
Act_GetActionText (ActSeeRecOneTch));
"address-card.svg",Ico_BLACK);
/***** Button to view user's agenda *****/
if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActSeeMyAgd,NULL,
NULL,NULL,
"calendar.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyAgd));
"calendar.svg",Ico_BLACK);
else if (Usr_CheckIfICanViewUsrAgenda (Gbl.Record.UsrDat))
Lay_PutContextualLinkOnlyIcon (ActSeeUsrAgd,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"calendar.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrAgd));
"calendar.svg",Ico_BLACK);
/***** Button to admin user *****/
if (ItsMe ||
@ -2380,8 +2374,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
Lay_PutContextualLinkOnlyIcon (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs],NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"user-cog.svg",Ico_BLACK,
Act_GetActionText (NextAction[Gbl.Record.UsrDat->Roles.InCurrentCrs]));
"user-cog.svg",Ico_BLACK);
if (Gbl.Hierarchy.Level == HieLvl_CRS) // Course selected
{
@ -2395,36 +2388,30 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
/* My test results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeMyTstResCrs,NULL,
Rec_PutParamsMyTsts,NULL,
"check.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyTstResCrs));
"check.svg",Ico_BLACK);
/* My exam results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeMyExaResCrs,NULL,
Rec_PutParamsMyTsts,NULL,
"file-signature.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyExaResCrs));
"file-signature.svg",Ico_BLACK);
/* My match results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeMyMchResCrs,NULL,
Rec_PutParamsMyTsts,NULL,
"gamepad.svg",Ico_BLACK,
Act_GetActionText (ActSeeMyMchResCrs));
"gamepad.svg",Ico_BLACK);
}
else // Not me
{
/* User's test results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeUsrTstResCrs,NULL,
Rec_PutParamsStdTsts,NULL,
"check.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrTstResCrs));
"check.svg",Ico_BLACK);
/* User's exam results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeUsrExaResCrs,NULL,
Rec_PutParamsStdTsts,NULL,
"file-signature.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrExaResCrs));
"file-signature.svg",Ico_BLACK);
/* User's match results in course */
Lay_PutContextualLinkOnlyIcon (ActSeeUsrMchResCrs,NULL,
Rec_PutParamsStdTsts,NULL,
"gamepad.svg",Ico_BLACK,
Act_GetActionText (ActSeeUsrMchResCrs));
"gamepad.svg",Ico_BLACK);
}
}
@ -2434,13 +2421,11 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActAdmAsgWrkUsr,NULL,
NULL,NULL,
"folder-open.svg",Ico_BLACK,
Act_GetActionText (ActAdmAsgWrkUsr));
"folder-open.svg",Ico_BLACK);
else // Not me, I am not a student in current course
Lay_PutContextualLinkOnlyIcon (ActAdmAsgWrkCrs,NULL,
Rec_PutParamsWorks,NULL,
"folder-open.svg",Ico_BLACK,
Act_GetActionText (ActAdmAsgWrkCrs));
"folder-open.svg",Ico_BLACK);
}
/***** Button to view student's attendance *****/
@ -2449,13 +2434,11 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
if (ItsMe)
Lay_PutContextualLinkOnlyIcon (ActSeeLstMyAtt,NULL,
NULL,NULL,
"calendar-check.svg",Ico_BLACK,
Act_GetActionText (ActSeeLstMyAtt));
"calendar-check.svg",Ico_BLACK);
else // Not me
Lay_PutContextualLinkOnlyIcon (ActSeeLstUsrAtt,NULL,
Rec_PutParamsStudent,NULL,
"calendar-check.svg",Ico_BLACK,
Act_GetActionText (ActSeeLstUsrAtt));
"calendar-check.svg",Ico_BLACK);
}
}
}
@ -2470,8 +2453,7 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
if (!RecipientHasBannedMe)
Lay_PutContextualLinkOnlyIcon (ActReqMsgUsr,NULL,
Rec_PutParamsMsgUsr,NULL,
"envelope.svg",Ico_BLACK,
Act_GetActionText (ActReqMsgUsr));
"envelope.svg",Ico_BLACK);
/***** Button to follow / unfollow *****/
if (!ItsMe) // Not me
@ -2481,13 +2463,11 @@ static void Rec_PutIconsCommands (__attribute__((unused)) void *Args)
// I follow user
Lay_PutContextualLinkOnlyIcon (ActUnfUsr,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"user-check.svg",Ico_BLACK,
Act_GetActionText (ActUnfUsr)); // Put button to unfollow, even if I can not view user's profile
"user-check.svg",Ico_BLACK); // Put button to unfollow, even if I can not view user's profile
else if (ICanViewUsrProfile)
Lay_PutContextualLinkOnlyIcon (ActFolUsr,NULL,
Rec_PutParamUsrCodEncrypted,NULL,
"user-plus.svg",Ico_BLACK,
Act_GetActionText (ActFolUsr)); // Put button to follow
"user-plus.svg",Ico_BLACK); // Put button to follow
}
/***** Button to change user's photo *****/

View File

@ -477,8 +477,7 @@ void Roo_PutIconToViewRooms (void)
{
Lay_PutContextualLinkOnlyIcon (ActSeeRoo,NULL,
NULL,NULL,
"chalkboard-teacher.svg",Ico_BLACK,
Act_GetActionText (ActSeeRoo));
"chalkboard-teacher.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -881,8 +881,7 @@ static void Svy_PutFormsToRemEditOneSvy (struct Svy_Surveys *Surveys,
/***** Put form to reset survey *****/
Lay_PutContextualLinkOnlyIcon (ActReqRstSvy,NULL,
Svy_PutParams,Surveys,
"recycle.svg",Ico_RED,
Act_GetActionText (ActReqRstSvy));
"recycle.svg",Ico_RED);
/***** Put form to hide/show survey *****/
if (Svy->Status.Visible)

View File

@ -649,9 +649,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
ActUp_IteSylPra,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-up.svg",Ico_BLACK,
Act_GetActionText (Gbl.Crs.Info.Type == Inf_LECTURES ? ActUp_IteSylLec :
ActUp_IteSylPra));
"arrow-up.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-up.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -665,9 +663,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
ActDwnIteSylPra,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-down.svg",Ico_BLACK,
Act_GetActionText (Gbl.Crs.Info.Type == Inf_LECTURES ? ActDwnIteSylLec :
ActDwnIteSylPra));
"arrow-down.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-down.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -680,9 +676,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
ActRgtIteSylPra,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-left.svg",Ico_BLACK,
Act_GetActionText (Gbl.Crs.Info.Type == Inf_LECTURES ? ActRgtIteSylLec :
ActRgtIteSylPra));
"arrow-left.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-left.svg",Ico_BLACK,
Txt_Movement_not_allowed);
@ -696,9 +690,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
ActLftIteSylPra,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-right.svg",Ico_BLACK,
Act_GetActionText (Gbl.Crs.Info.Type == Inf_LECTURES ? ActLftIteSylLec :
ActLftIteSylPra));
"arrow-right.svg",Ico_BLACK);
else
Ico_PutIconOff ("arrow-right.svg",Ico_BLACK,
Txt_Movement_not_allowed);

View File

@ -96,8 +96,7 @@ void Tag_PutIconToEditTags (void)
{
Lay_PutContextualLinkOnlyIcon (ActEdiTag,NULL,
NULL,NULL,
"tag.svg",Ico_BLACK,
Act_GetActionText (ActEdiTag));
"tag.svg",Ico_BLACK);
}
/*****************************************************************************/

View File

@ -12841,29 +12841,6 @@ const char *Txt_Event_X_is_now_visible_to_users_of_your_courses = // Warning: it
" to users of your courses."; // Çeviri lazim!
#endif
const char *Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses =
#if L==1 // ca
"Esdeveniment privat; feu clic per fer-lo visible pels usuaris de les seves assignatures";
#elif L==2 // de
"Ereignis privat; klicken Sie, um es f&uuml;r die Nutzer Ihrer Kurse sichtbar zu machen";
#elif L==3 // en
"Event private, click to make it visible to the users of your courses";
#elif L==4 // es
"Evento privado; pulse para hacerlo visible por los usuarios de sus asignaturas";
#elif L==5 // fr
"&Eacute;v&eacute;nement privat, cliquez pour le rendre visible aux utilisateurs de vos mati&egrave;res";
#elif L==6 // gn
"Evento privado; pulse para hacerlo visible por los usuarios de sus asignaturas"; // Okoteve traducción
#elif L==7 // it
"Evento privato, fare clic per renderlo visibile agli utenti dei corsi";
#elif L==8 // pl
"Event privat, kliknij aby by&lstrok; on widoczny dla u&zdot;ytkownik&oacute;w swoich kursach";
#elif L==9 // pt
"Evento privat, clique para torn&aacute;-lo vis&iacute;vel para os usu&aacute;rios de as suas disciplinas";
#elif L==10 // tr
"Event private, click to make it visible to the users of your courses"; // Çeviri lazim!
#endif
const char *Txt_Event_X_removed = // Warning: it is very important to include %s in the following sentences
#if L==1 // ca
"Esdeveniment <strong>%s</strong> eliminat.";
@ -12887,29 +12864,6 @@ const char *Txt_Event_X_removed = // Warning: it is very important to include %s
"Event <strong>%s</strong> removed."; // Çeviri lazim!
#endif
const char *Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private =
#if L==1 // ca
"Esdeveniment visible pels usuaris de les seves assignatures; feu clic per fer-lo privat";
#elif L==2 // de
"Ereignis Nutzer Ihrer Kurse sichtbar zu machen; klicken Sie, um es f&uuml;r die privat";
#elif L==3 // en
"Event visible to the users of your courses, click to make it private";
#elif L==4 // es
"Evento visible por los usuarios de sus asignaturas; pulse para hacerlo privado";
#elif L==5 // fr
"Event visible aux utilisateurs de vos mati&egrave;res, cliquez pour le rendre privat";
#elif L==6 // gn
"Evento visible por los usuarios de sus asignaturas; pulse para hacerlo privado"; // Okoteve traducción
#elif L==7 // it
"Evento visibile agli utenti dei corsi, fare clic per renderlo privato";
#elif L==8 // pl
"Event widoczny dla u&zdot;ytkownik&oacute;w swoich kurs&oacute;w, kliknij, aby prywatne";
#elif L==9 // pt
"Evento vis&iacute;vel para os usu&aacute;rios de as suas disciplinas, clique para torn&aacute;-lo privat";
#elif L==10 // tr
"Event visible to the users of your courses, click to make it private"; // Çeviri lazim!
#endif
const char *Txt_Events =
#if L==1 // ca
"Esdeveniments";

View File

@ -2095,8 +2095,7 @@ static void Usr_PutLinkToLogOut (__attribute__((unused)) void *Args)
{
Lay_PutContextualLinkOnlyIcon (ActLogOut,NULL,
NULL,NULL,
"sign-out-alt.svg",Ico_RED,
Act_GetActionText (ActLogOut));
"sign-out-alt.svg",Ico_RED);
}
/*****************************************************************************/
@ -5890,24 +5889,21 @@ static void Usr_PutIconToShowGstsAllData (void)
{
Lay_PutContextualLinkOnlyIcon (ActLstGstAll,NULL,
Usr_ShowGstsAllDataParams,NULL,
"table.svg",Ico_BLACK,
Act_GetActionText (ActLstGstAll));
"table.svg",Ico_BLACK);
}
static void Usr_PutIconToShowStdsAllData (void)
{
Lay_PutContextualLinkOnlyIcon (ActLstStdAll,NULL,
Usr_ShowStdsAllDataParams,NULL,
"table.svg",Ico_BLACK,
Act_GetActionText (ActLstStdAll));
"table.svg",Ico_BLACK);
}
static void Usr_PutIconToShowTchsAllData (void)
{
Lay_PutContextualLinkOnlyIcon (ActLstTchAll,NULL,
Usr_ShowTchsAllDataParams,NULL,
"table.svg",Ico_BLACK,
Act_GetActionText (ActLstTchAll));
"table.svg",Ico_BLACK);
}
static void Usr_ShowGstsAllDataParams (__attribute__((unused)) void *Args)