\n");
fprintf (FileRSS,"%s/swad112x32.png \n",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
fprintf (FileRSS,"%s: %s \n",
Cfg_PLATFORM_SHORT_NAME,Crs->ShrtName);
fprintf (FileRSS," %s/?crs=%ld\n",
diff --git a/swad_account.c b/swad_account.c
index fd61b80e..e7f9da47 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -98,7 +98,7 @@ void Acc_PutLinkToCreateAccount (void)
extern const char *Txt_Create_account;
Lay_PutContextualLink (ActFrmMyAcc,NULL,NULL,
- "arroba64x64.gif",
+ "at.svg",
Txt_Create_account,Txt_Create_account,
NULL);
}
@@ -1214,7 +1214,7 @@ void Acc_PutIconToChangeUsrAccount (void)
/***** Link for changing the account *****/
if (ItsMe)
Lay_PutContextualLink (ActFrmMyAcc,NULL,NULL,
- "arroba64x64.gif",
+ "at.svg",
Txt_Change_account,NULL,
NULL);
else // Not me
@@ -1234,7 +1234,7 @@ void Acc_PutIconToChangeUsrAccount (void)
break;
}
Lay_PutContextualLink (NextAction,NULL,Rec_PutParamUsrCodEncrypted,
- "arroba64x64.gif",
+ "at.svg",
Txt_Change_account,NULL,
NULL);
}
diff --git a/swad_action.c b/swad_action.c
index 81a4d486..7bfe60a0 100644
--- a/swad_action.c
+++ b/swad_action.c
@@ -1630,13 +1630,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabSys ******************************************************************
// Actions in menu:
- /* ActSysReqSch */{ 627, 0,TabSys,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search.svg" },
- /* ActSeeCty */{ 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cty_ListCountries1 ,Cty_ListCountries2 ,"earth64x64.gif" },
- /* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hie_SeePending ,"hierarchy64x64.png" },
- /* ActSeeLnk */{ 748, 3,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Lnk_SeeLinks ,"link64x64.gif" },
- /* ActLstPlg */{ 777, 4,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ListPlugins ,"blocks64x64.gif" },
- /* ActSetUp */{ 840, 5,TabSys,ActSetUp , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Set_Setup ,"lightning64x64.gif" },
- /* ActSeeCalSys */{1622, 6,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar64x64.png" },
+ /* ActSysReqSch */{ 627, 0,TabSys,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search" },
+ /* ActSeeCty */{ 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cty_ListCountries1 ,Cty_ListCountries2 ,"globe" },
+ /* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hie_SeePending ,"sitemap" },
+ /* ActSeeLnk */{ 748, 3,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Lnk_SeeLinks ,"link64x64" },
+ /* ActLstPlg */{ 777, 4,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ListPlugins ,"blocks64x64" },
+ /* ActSetUp */{ 840, 5,TabSys,ActSetUp , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Set_Setup ,"lightning64x64" },
+ /* ActSeeCalSys */{1622, 6,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar" },
// Actions not in menu:
/* ActSysSch */{ 628,-1,TabUnk,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_SysSearch ,NULL},
@@ -1684,10 +1684,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabCty ******************************************************************
// Actions in menu:
- /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search.svg" },
- /* ActSeeCtyInf */{1155, 1,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info64x64.gif" },
- /* ActSeeIns */{ 696, 2,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty ,"institution64x64.gif" },
- /* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar64x64.png" },
+ /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search" },
+ /* ActSeeCtyInf */{1155, 1,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info64x64" },
+ /* ActSeeIns */{ 696, 2,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty ,"university" },
+ /* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar" },
// Actions not in menu:
/* ActCtySch */{1181,-1,TabUnk,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtySearch ,NULL},
@@ -1709,12 +1709,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabIns ******************************************************************
// Actions in menu:
- /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search.svg" },
- /* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info64x64.gif" },
- /* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"house64x64.gif" },
- /* ActSeePlc */{ 703, 3,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"mapmarker64x64.png" },
- /* ActSeeDpt */{ 675, 4,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"houseteachers64x64.gif"},
- /* ActSeeCalIns */{1628, 5,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" },
+ /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search" },
+ /* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info64x64" },
+ /* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"building" },
+ /* ActSeePlc */{ 703, 3,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"mapmarker64x64" },
+ /* ActSeeDpt */{ 675, 4,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"houseteachers64x64" },
+ /* ActSeeCalIns */{1628, 5,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar" },
// Actions not in menu:
/* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL},
@@ -1767,11 +1767,11 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabCtr ******************************************************************
// Actions in menu:
- /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search.svg" },
- /* ActSeeCtrInf */{1151, 1,TabCtr,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowConfiguration ,"info64x64.gif" },
- /* ActSeeDeg */{1011, 2,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr ,"deg64x64.gif" },
- /* ActSeeCla */{1744, 3,TabCtr,ActSeeCla , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_SeeClassrooms ,"classroom.svg" },
- /* ActSeeCalCtr */{1631, 4,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar64x64.png" },
+ /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search" },
+ /* ActSeeCtrInf */{1151, 1,TabCtr,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowConfiguration ,"info64x64" },
+ /* ActSeeDeg */{1011, 2,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr ,"graduation-cap" },
+ /* ActSeeCla */{1744, 3,TabCtr,ActSeeCla , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_SeeClassrooms ,"classroom" },
+ /* ActSeeCalCtr */{1631, 4,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar" },
// Actions not in menu:
/* ActCtrSch */{1183,-1,TabUnk,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtrSearch ,NULL},
@@ -1818,10 +1818,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabDeg ******************************************************************
// Actions in menu:
- /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search.svg" },
- /* ActSeeDegInf */{1149, 1,TabDeg,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowConfiguration ,"info64x64.gif" },
- /* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"crs64x64.gif" },
- /* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar64x64.png" },
+ /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search" },
+ /* ActSeeDegInf */{1149, 1,TabDeg,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowConfiguration ,"info64x64" },
+ /* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"list-ol" },
+ /* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar" },
// Actions not in menu:
/* ActDegSch */{1184,-1,TabUnk,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_DegSearch ,NULL},
@@ -1850,15 +1850,15 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabCrs ******************************************************************
// Actions in menu:
- /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search.svg" },
- /* ActSeeCrsInf */{ 847, 1,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info64x64.gif" },
- /* ActSeeTchGui */{ 784, 2,TabCrs,ActSeeTchGui ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"guide64x64.png" },
- /* ActSeeSyl */{1242, 3,TabCrs,ActSeeSyl ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"presentation64x64.gif"},
- /* ActSeeBib */{ 32, 4,TabCrs,ActSeeBib ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"books64x64.gif" },
- /* ActSeeFAQ */{ 54, 5,TabCrs,ActSeeFAQ ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"faq64x64.gif" },
- /* ActSeeCrsLnk */{ 9, 6,TabCrs,ActSeeCrsLnk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"link64x64.gif" },
- /* ActSeeCrsTT */{ 25, 7,TabCrs,ActSeeCrsTT ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
- /* ActSeeCalCrs */{ 16, 8,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar64x64.png" },
+ /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search" },
+ /* ActSeeCrsInf */{ 847, 1,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info64x64" },
+ /* ActSeeTchGui */{ 784, 2,TabCrs,ActSeeTchGui ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"guide64x64" },
+ /* ActSeeSyl */{1242, 3,TabCrs,ActSeeSyl ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"list-ol" },
+ /* ActSeeBib */{ 32, 4,TabCrs,ActSeeBib ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"books64x64" },
+ /* ActSeeFAQ */{ 54, 5,TabCrs,ActSeeFAQ ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"faq64x64" },
+ /* ActSeeCrsLnk */{ 9, 6,TabCrs,ActSeeCrsLnk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"link64x64" },
+ /* ActSeeCrsTT */{ 25, 7,TabCrs,ActSeeCrsTT ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64" },
+ /* ActSeeCalCrs */{ 16, 8,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar" },
// Actions not in menu:
/* ActCrsSch */{1185,-1,TabUnk,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL},
@@ -1986,13 +1986,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabAss ******************************************************************
// Actions in menu:
- /* ActSeeAss */{ 15, 0,TabAss,ActSeeAss ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"infogrades64x64.gif" },
- /* ActSeeAsg */{ 801, 1,TabAss,ActSeeAsg ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_SeeAssignments ,"desk64x64.gif" },
- /* ActSeePrj */{1674, 2,TabAss,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_SeeProjects ,"project64x64.png" },
- /* ActReqTst */{ 103, 3,TabAss,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowFormAskTst ,"test64x64.gif" },
- /* ActSeeAllGam */{1649, 4,TabAss,ActSeeAllGam ,0x200,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_SeeAllGames ,"remote64x64.png" },
- /* ActSeeAllSvy */{ 966, 5,TabAss,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_SeeAllSurveys ,"survey64x64.gif" },
- /* ActSeeAllExaAnn */{ 85, 6,TabAss,ActSeeAllExaAnn ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Exa_ListExamAnnouncementsSee ,"announce64x64.gif" },
+ /* ActSeeAss */{ 15, 0,TabAss,ActSeeAss ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"infogrades64x64" },
+ /* ActSeeAsg */{ 801, 1,TabAss,ActSeeAsg ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Asg_SeeAssignments ,"desk64x64" },
+ /* ActSeePrj */{1674, 2,TabAss,ActSeePrj ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prj_SeeProjects ,"project64x64" },
+ /* ActReqTst */{ 103, 3,TabAss,ActReqTst ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Tst_ShowFormAskTst ,"test64x64" },
+ /* ActSeeAllGam */{1649, 4,TabAss,ActSeeAllGam ,0x200,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Gam_SeeAllGames ,"remote64x64" },
+ /* ActSeeAllSvy */{ 966, 5,TabAss,ActSeeAllSvy ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Svy_SeeAllSurveys ,"survey64x64" },
+ /* ActSeeAllExaAnn */{ 85, 6,TabAss,ActSeeAllExaAnn ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Exa_ListExamAnnouncementsSee ,"announce64x64" },
// Actions not in menu:
/* ActEdiAss */{ 69,-1,TabUnk,ActSeeAss ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_FormsToSelSendInfo ,NULL},
@@ -2159,19 +2159,19 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabFil ******************************************************************
// Actions in menu:
- /* ActSeeAdmDocIns */{1249, 0,TabFil,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" },
- /* ActAdmShaIns */{1382, 1,TabFil,ActAdmShaIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64.gif" },
- /* ActSeeAdmDocCtr */{1248, 2,TabFil,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" },
- /* ActAdmShaCtr */{1363, 3,TabFil,ActAdmShaCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64.gif" },
- /* ActSeeAdmDocDeg */{1247, 4,TabFil,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" },
- /* ActAdmShaDeg */{1344, 5,TabFil,ActAdmShaDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64.gif" },
- /* ActSeeAdmDocCrsGrp*/{ 0, 6,TabFil,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" },
- /* ActAdmTchCrsGrp */{1525, 7,TabFil,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64.gif" },
- /* ActAdmShaCrsGrp */{ 461, 8,TabFil,ActAdmShaCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64.gif" },
- /* ActAdmAsgWrkUsr */{ 792, 9,TabFil,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"editfolderuser64x64.gif"},
- /* ActReqAsgWrkCrs */{ 899,10,TabFil,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_AskEditWorksCrs ,"folderusers64x64.gif" },
- /* ActSeeAdmMrk */{ 17,11,TabFil,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"grades64x64.gif" },
- /* ActAdmBrf */{ 23,12,TabFil,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"pendrive64x64.gif" },
+ /* ActSeeAdmDocIns */{1249, 0,TabFil,ActSeeAdmDocIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64" },
+ /* ActAdmShaIns */{1382, 1,TabFil,ActAdmShaIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64" },
+ /* ActSeeAdmDocCtr */{1248, 2,TabFil,ActSeeAdmDocCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64" },
+ /* ActAdmShaCtr */{1363, 3,TabFil,ActAdmShaCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64" },
+ /* ActSeeAdmDocDeg */{1247, 4,TabFil,ActSeeAdmDocDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64" },
+ /* ActAdmShaDeg */{1344, 5,TabFil,ActAdmShaDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64" },
+ /* ActSeeAdmDocCrsGrp*/{ 0, 6,TabFil,ActSeeAdmDocCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64" },
+ /* ActAdmTchCrsGrp */{1525, 7,TabFil,ActAdmTchCrsGrp ,0x3F0,0x3C0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folder64x64" },
+ /* ActAdmShaCrsGrp */{ 461, 8,TabFil,ActAdmShaCrsGrp ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"folderusers64x64" },
+ /* ActAdmAsgWrkUsr */{ 792, 9,TabFil,ActAdmAsgWrkUsr ,0x008, 0, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"editfolderuser64x64" },
+ /* ActReqAsgWrkCrs */{ 899,10,TabFil,ActReqAsgWrkCrs ,0x230,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_AskEditWorksCrs ,"folderusers64x64" },
+ /* ActSeeAdmMrk */{ 17,11,TabFil,ActSeeAdmMrk ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"grades64x64" },
+ /* ActAdmBrf */{ 23,12,TabFil,ActAdmBrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,"pendrive64x64" },
// Actions not in menu:
/* ActChgToSeeDocIns */{1308,-1,TabUnk,ActSeeAdmDocIns , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Brw_ShowFileBrowserOrWorks ,NULL},
@@ -2639,14 +2639,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabUsr ******************************************************************
// Actions in menu:
- /* ActReqSelGrp */{ 116, 0,TabUsr,ActReqSelGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Grp_ReqRegisterInGrps ,"hierarchy64x64.png" },
- /* ActLstStd */{ 678, 1,TabUsr,ActLstStd ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_SeeStudents ,"usrs64x64.gif" },
- /* ActLstTch */{ 679, 2,TabUsr,ActLstTch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_SeeTeachers ,"tch64x64.gif" },
- /* ActLstOth */{1186, 3,TabUsr,ActLstOth ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_ListDataAdms ,"adm64x64.gif" },
- /* ActSeeAtt */{ 861, 4,TabUsr,ActSeeAtt ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Att_SeeAttEvents ,"rollcall64x64.png" },
- /* ActReqSignUp */{1054, 5,TabUsr,ActReqSignUp , 0,0x006, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest64x64.gif"},
- /* ActSeeSignUpReq */{1057, 6,TabUsr,ActSeeSignUpReq ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Enr_ShowEnrolmentRequests ,"enrollmentrequest64x64.gif"},
- /* ActLstCon */{ 995, 7,TabUsr,ActLstCon ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Con_ShowConnectedUsrs ,"userplugged64x64.gif" },
+ /* ActReqSelGrp */{ 116, 0,TabUsr,ActReqSelGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Grp_ReqRegisterInGrps ,"sitemap" },
+ /* ActLstStd */{ 678, 1,TabUsr,ActLstStd ,0x3F8,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_SeeStudents ,"usrs64x64" },
+ /* ActLstTch */{ 679, 2,TabUsr,ActLstTch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_SeeTeachers ,"tch64x64" },
+ /* ActLstOth */{1186, 3,TabUsr,ActLstOth ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_ListDataAdms ,"adm64x64" },
+ /* ActSeeAtt */{ 861, 4,TabUsr,ActSeeAtt ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Att_SeeAttEvents ,"rollcall64x64" },
+ /* ActReqSignUp */{1054, 5,TabUsr,ActReqSignUp , 0,0x006, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Enr_ReqSignUpInCrs ,"enrollmentrequest64x64"},
+ /* ActSeeSignUpReq */{1057, 6,TabUsr,ActSeeSignUpReq ,0x3E0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Enr_ShowEnrolmentRequests ,"enrollmentrequest64x64"},
+ /* ActLstCon */{ 995, 7,TabUsr,ActLstCon ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Con_ShowConnectedUsrs ,"userplugged64x64" },
// Actions not in menu:
/* ActChgGrp */{ 118,-1,TabUnk,ActReqSelGrp ,0x238,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Grp_ChangeMyGrpsAndShowChanges ,NULL},
@@ -2816,9 +2816,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActNewID_Std */{1454,-1,TabUnk,ActLstStd ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ID_NewOtherUsrID ,NULL},
/* ActNewID_Tch */{1455,-1,TabUnk,ActLstTch ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,ID_NewOtherUsrID ,NULL},
- /* ActChgPwdOth */{1467,-1,TabUnk,ActLstOth ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
- /* ActChgPwdStd */{1468,-1,TabUnk,ActLstStd ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
- /* ActChgPwdTch */{1469,-1,TabUnk,ActLstTch ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
+ /* ActChgPwdOth */{1467,-1,TabUnk,ActLstOth ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
+ /* ActChgPwdStd */{1468,-1,TabUnk,ActLstStd ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
+ /* ActChgPwdTch */{1469,-1,TabUnk,ActLstTch ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,Pwd_UpdateOtherUsrPwd ,Acc_ShowFormChgOtherUsrAccount ,NULL},
/* ActRemMaiOth */{1478,-1,TabUnk,ActLstOth ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_RemoveOtherUsrEmail ,NULL},
/* ActRemMaiStd */{1479,-1,TabUnk,ActLstStd ,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_RemoveOtherUsrEmail ,NULL},
@@ -2846,10 +2846,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActLstClk */{ 989,-1,TabUnk,ActLstCon ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Con_ShowLastClicks ,NULL},
// TabSoc ******************************************************************
- /* ActSeeSocTmlGbl */{1490, 0,TabSoc,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShowTimelineGbl2 ,"soc64x64.png" },
- /* ActSeeSocPrf */{1520, 1,TabSoc,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_SeeSocialProfiles ,"prf64x64.gif" },
- /* ActSeeFor */{ 95, 2,TabSoc,ActSeeFor ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,For_ShowForumTheads ,"forum64x64.gif" },
- /* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" },
+ /* ActSeeSocTmlGbl */{1490, 0,TabSoc,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShowTimelineGbl2 ,"soc64x64" },
+ /* ActSeeSocPrf */{1520, 1,TabSoc,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_SeeSocialProfiles ,"prf64x64" },
+ /* ActSeeFor */{ 95, 2,TabSoc,ActSeeFor ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,For_ShowForumTheads ,"forum64x64" },
+ /* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x3F8,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,0x3C4,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cht_ShowChatRooms ,"chat64x64" },
/* ActRcvSocPstGbl */{1492,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActRcvSocComGbl */{1503,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ReceiveCommentGbl ,NULL},
@@ -3038,13 +3038,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabMsg ******************************************************************
// Actions in menu:
- /* ActSeeNtf */{ 990, 0,TabMsg,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell.svg" },
- /* ActSeeAnn */{1235, 1,TabMsg,ActSeeAnn ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ann_ShowAllAnnouncements ,"announcement64x64.png"},
- /* ActSeeAllNot */{ 762, 2,TabMsg,ActSeeAllNot ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Not_ListFullNotices ,"notice64x64.png" },
- /* ActReqMsgUsr */{ 26, 3,TabMsg,ActReqMsgUsr ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_FormMsgUsrs ,"editnewmsg64x64.gif" },
- /* ActSeeRcvMsg */{ 3, 4,TabMsg,ActSeeRcvMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowRecMsgs ,"recmsg64x64.gif" },
- /* ActSeeSntMsg */{ 70, 5,TabMsg,ActSeeSntMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowSntMsgs ,"sntmsg64x64.gif" },
- /* ActMaiStd */{ 100, 6,TabMsg,ActMaiStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_ListEmails ,"email64x64.gif" },
+ /* ActSeeNtf */{ 990, 0,TabMsg,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" },
+ /* ActSeeAnn */{1235, 1,TabMsg,ActSeeAnn ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ann_ShowAllAnnouncements ,"announcement64x64" },
+ /* ActSeeAllNot */{ 762, 2,TabMsg,ActSeeAllNot ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Not_ListFullNotices ,"notice64x64" },
+ /* ActReqMsgUsr */{ 26, 3,TabMsg,ActReqMsgUsr ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_FormMsgUsrs ,"editnewmsg64x64" },
+ /* ActSeeRcvMsg */{ 3, 4,TabMsg,ActSeeRcvMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowRecMsgs ,"recmsg64x64" },
+ /* ActSeeSntMsg */{ 70, 5,TabMsg,ActSeeSntMsg ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Msg_ShowSntMsgs ,"sntmsg64x64" },
+ /* ActMaiStd */{ 100, 6,TabMsg,ActMaiStd ,0x220,0x200, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Mai_ListEmails ,"email64x64" },
// Actions not in menu:
/* ActWriAnn */{1237,-1,TabUnk,ActSeeAnn ,0x200,0x200,0x200,0x200,0x200,0x200,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ann_ShowFormAnnouncement ,NULL},
@@ -3090,12 +3090,12 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabAna ******************************************************************
// Actions in menu:
- /* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" },
- /* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" },
- /* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" },
- /* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" },
- /* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" },
- /* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" },
+ /* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_ReqShowFigures ,"pie64x64" },
+ /* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64" },
+ /* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64" },
+ /* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64" },
+ /* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rep_ReqMyUsageReport ,"report64x64" },
+ /* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,MFU_ShowMyMFUActions ,"star64x64" },
// Actions not in menu:
/* ActSeeUseGbl */{ 84,-1,TabUnk,ActReqUseGbl ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sta_ShowFigures ,NULL},
@@ -3110,14 +3110,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
// TabPrf ******************************************************************
// Actions in menu:
- /* ActFrmLogIn */{1521, 0,TabPrf,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteLandingPage ,"keyuser64x64.gif" },
- /* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
- /* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ReqSelectOneOfMyCourses ,"hierarchy64x64.png" },
- /* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
- /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Agd_ShowMyAgenda ,"calendar64x64.png" },
- /* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
- /* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore ,"card64x64.gif" },
- /* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pre_EditPrefs ,"heart64x64.gif" },
+ /* ActFrmLogIn */{1521, 0,TabPrf,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteLandingPage ,"keyuser64x64" },
+ /* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteFormLogout ,"keyuser64x64" },
+ /* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ReqSelectOneOfMyCourses ,"sitemap" },
+ /* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TT_ShowClassTimeTable ,"clock64x64" },
+ /* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Agd_ShowMyAgenda ,"calendar" },
+ /* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Acc_ShowFormMyAccount ,"at" },
+ /* ActReqEdiRecSha */{ 285, 6,TabPrf,ActReqEdiRecSha ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Rec_ShowMySharedRecordAndMore ,"card" },
+ /* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pre_EditPrefs ,"heart64x64" },
// Actions not in menu:
/* ActReqSndNewPwd */{ 665,-1,TabUnk,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pwd_ShowFormSendNewPwd ,NULL},
@@ -5106,7 +5106,7 @@ const char *Act_GetIcon (Act_Action_t Action)
if (Action < 0 || Action >= Act_NUM_ACTIONS)
return NULL;
- return Act_Actions[Action].Icon;
+ return Ico_GetIcon (Act_Actions[Action].Icon);
}
/*****************************************************************************/
diff --git a/swad_agenda.c b/swad_agenda.c
index d9093090..cf09f099 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -203,7 +203,7 @@ static void Agd_ShowFormToSelPast__FutureEvents (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Image[PstFut],
Txt_AGENDA_PAST___FUTURE_EVENTS[PstFut],
Txt_AGENDA_PAST___FUTURE_EVENTS[PstFut]);
@@ -245,7 +245,7 @@ static void Agd_ShowFormToSelPrivatPublicEvents (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Image[PrvPub],
Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[PrvPub],
Txt_AGENDA_PRIVAT_PUBLIC_EVENTS[PrvPub]);
@@ -287,7 +287,7 @@ static void Agd_ShowFormToSelHiddenVisiblEvents (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Image[HidVis],
Txt_AGENDA_HIDDEN_VISIBL_EVENTS[HidVis],
Txt_AGENDA_HIDDEN_VISIBL_EVENTS[HidVis]);
@@ -689,7 +689,7 @@ static void Agd_PutIconsOtherPublicAgenda (void)
&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLink (ActSeeOthPubPrf,NULL,
Usr_PutParamOtherUsrCodEncrypted,
- "usr64x64.png",
+ "user.svg",
Txt_Another_user_s_profile,NULL,
NULL);
@@ -698,13 +698,13 @@ static void Agd_PutIconsOtherPublicAgenda (void)
/* View student's records: common record card and course record card */
Lay_PutContextualLink (ActSeeRecOneStd,NULL,
Usr_PutParamOtherUsrCodEncrypted,
- "card64x64.gif",
+ "card.svg",
Txt_View_record_for_this_course,NULL,
NULL);
else if (Usr_CheckIfICanViewRecordTch (&Gbl.Usrs.Other.UsrDat))
Lay_PutContextualLink (ActSeeRecOneTch,NULL,
Usr_PutParamOtherUsrCodEncrypted,
- "card64x64.gif",
+ "card.svg",
Txt_View_record_and_office_hours,NULL,
NULL);
}
diff --git a/swad_alert.c b/swad_alert.c
index 2a009ea0..d07b29a4 100644
--- a/swad_alert.c
+++ b/swad_alert.c
@@ -154,14 +154,14 @@ void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *Txt)
""
"",
IdAlert,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Close,Txt_Close);
/***** Write message *****/
fprintf (Gbl.F.Out,"");
if (Txt)
fprintf (Gbl.F.Out,"%s",Txt);
diff --git a/swad_assignment.c b/swad_assignment.c
index 53690b61..adba6029 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -433,7 +433,7 @@ static void Asg_ShowOneAssignment (long AsgCod,bool PrintView)
" alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
"
%s"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
(Asg.SendWork == Asg_SEND_WORK) ? "file_on" :
"file_off",
Txt_ASSIGNMENT_TYPES[Asg.SendWork],
@@ -529,7 +529,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
fprintf (Gbl.F.Out,"
",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -537,7 +537,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg,bool PrintView)
else // I can't send files to this assignment folder
fprintf (Gbl.F.Out,"
",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
ICanSendFiles ? "folder-open16x16.gif" :
"folder-closed16x16.gif",
Txt_Folder,Txt_Folder);
diff --git a/swad_attendance.c b/swad_attendance.c
index 9d166be6..ba038857 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -2099,7 +2099,7 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,
""
"",
Gbl.RowEvenOdd,NumStd,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Present ? "check" :
"check-empty",
Present ? Txt_Present :
@@ -3500,7 +3500,7 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr
" alt=\"%s\" title=\"%s\" class=\"ICO20x20\" />"
"",
Gbl.RowEvenOdd,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Present ? "check" :
"check-empty",
Present ? Txt_Present :
@@ -3671,7 +3671,7 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat)
Gbl.RowEvenOdd,
NumAttEvent + 1,
Gbl.RowEvenOdd,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Present ? "check" :
"check-empty",
Present ? Txt_Present :
diff --git a/swad_banner.c b/swad_banner.c
index 289dcfad..e5dd968f 100644
--- a/swad_banner.c
+++ b/swad_banner.c
@@ -417,7 +417,7 @@ static void Ban_ListBannersForEdition (void)
Ban_PutParamBanCod (Ban->BanCod);
fprintf (Gbl.F.Out,"
",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Ban->Hidden ? "eye-slash-on64x64.png" :
"eye-on64x64.png",
Ban->Hidden ? Txt_Show :
diff --git a/swad_box.c b/swad_box.c
index 87cfe432..1215ec51 100644
--- a/swad_box.c
+++ b/swad_box.c
@@ -150,13 +150,13 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
if (HelpLink) // Link to help
fprintf (Gbl.F.Out,"
"
""
- "
"
+ " class=\"ICO16x16\" />"
"
"
" ",
Hlp_WIKI,HelpLink,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Help,Txt_Help);
if (Closable == Box_CLOSABLE) // Icon to close the box
@@ -169,7 +169,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
"
"
"",
IdFrame,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Close,Txt_Close);
fprintf (Gbl.F.Out,"");
diff --git a/swad_calendar.c b/swad_calendar.c
index a2dcadff..f3e883fa 100644
--- a/swad_calendar.c
+++ b/swad_calendar.c
@@ -130,7 +130,7 @@ void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,void (*FuncParams) (),
FuncParams ();
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
FirstDayOfWeek,
Txt_DAYS_SMALL[FirstDayOfWeek],
Txt_First_day_of_the_week,Txt_DAYS_SMALL[FirstDayOfWeek],
diff --git a/swad_centre.c b/swad_centre.c
index f9e76cfc..987c46b3 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -723,7 +723,7 @@ static void Ctr_PutIconToChangePhoto (void)
(unsigned) Gbl.CurrentCtr.Ctr.CtrCod);
PhotoExists = Fil_CheckIfPathExists (PathPhoto);
Lay_PutContextualLink (ActReqCtrPho,NULL,NULL,
- "photo64x64.gif",
+ "camera.svg",
PhotoExists ? Txt_Change_photo :
Txt_Upload_photo,NULL,
NULL);
@@ -1035,7 +1035,7 @@ void Ctr_PutIconToViewCentres (void)
extern const char *Txt_Centres;
Lay_PutContextualLink (ActSeeCtr,NULL,NULL,
- "ctr64x64.gif",
+ "building.svg",
Txt_Centres,NULL,
NULL);
}
diff --git a/swad_changelog.h b/swad_changelog.h
index 1b78c32e..78670a59 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -365,11 +365,60 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
-#define Log_PLATFORM_VERSION "SWAD 18.29 (2019-01-07)"
-#define CSS_FILE "swad18.29.css"
+#define Log_PLATFORM_VERSION "SWAD 18.30 (2019-01-09)"
+#define CSS_FILE "swad18.30.css"
#define JS_FILE "swad17.17.1.js"
/*
- Version 18.29: Jan 07, 2019 Some new SVG icons. (239251 lines)
+ Version 18.30: Jan 09, 2019 Some new SVG icons. (239341 lines)
+ Copy the following icons to icon public directory:
+sudo cp icon/question.svg /var/www/html/swad/icon/
+sudo cp icon/pen.svg /var/www/html/swad/icon/
+sudo cp icon/user.svg /var/www/html/swad/icon/
+sudo cp icon/card.svg /var/www/html/swad/icon/
+sudo cp icon/calendar.svg /var/www/html/swad/icon/
+sudo cp icon/user-cog.svg /var/www/html/swad/icon/
+sudo cp icon/users-cog.svg /var/www/html/swad/icon/
+sudo cp icon/qrcode.svg /var/www/html/swad/icon/
+sudo cp icon/envelope.svg /var/www/html/swad/icon/
+sudo cp icon/camera.svg /var/www/html/swad/icon/
+sudo cp icon/at.svg /var/www/html/swad/icon/
+sudo cp icon/university.svg /var/www/html/swad/icon/
+sudo cp icon/sitemap.svg /var/www/html/swad/icon/
+sudo cp icon/theme/blue/sitemap.svg /var/www/html/swad/icon/theme/blue/
+sudo cp icon/theme/grey/sitemap.svg /var/www/html/swad/icon/theme/grey/
+sudo cp icon/theme/white/sitemap.svg /var/www/html/swad/icon/theme/white/
+sudo cp icon/theme/yellow/sitemap.svg /var/www/html/swad/icon/theme/yellow/
+sudo cp icon/mysitemap.png /var/www/html/swad/icon/
+sudo cp icon/globe.svg /var/www/html/swad/icon/
+sudo cp icon/building.svg /var/www/html/swad/icon/
+sudo cp icon/graduation-cap.svg /var/www/html/swad/icon/
+sudo cp icon/list-ol.svg /var/www/html/swad/icon/
+
+sudo cp icon/iconset/awesome/user.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/card.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/calendar.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/envelope.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/at.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/university.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/sitemap.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/globe.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/building.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/graduation-cap.svg /var/www/html/swad/icon/iconset/awesome/
+sudo cp icon/iconset/awesome/list-ol.svg /var/www/html/swad/icon/iconset/awesome/
+
+sudo cp icon/iconset/nuvola/user.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/card.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/calendar.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/envelope.png /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/at.png /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/university.png /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/sitemap.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/globe.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/building.svg /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/graduation-cap.png /var/www/html/swad/icon/iconset/nuvola/
+sudo cp icon/iconset/nuvola/list-ol.png /var/www/html/swad/icon/iconset/nuvola/
+
+ Version 18.29: Jan 08, 2019 Some new SVG icons. (239251 lines)
Copy the following icons to icon public directory:
sudo cp icon/trash.svg /var/www/html/swad/icon/
sudo cp icon/copy.svg /var/www/html/swad/icon/
diff --git a/swad_chat.c b/swad_chat.c
index dbd04024..4779128e 100644
--- a/swad_chat.c
+++ b/swad_chat.c
@@ -138,7 +138,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
" class=\"ICO20x20\" />"
" %s"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Chat_rooms,
Txt_Chat_rooms,
Txt_Chat_rooms);
@@ -153,7 +153,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
ThisRoomFullName,
ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_USR",ThisRoomFullName);
@@ -169,7 +169,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_STD",ThisRoomFullName);
break;
@@ -182,7 +182,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 ("GBL_TCH",ThisRoomFullName);
break;
@@ -245,7 +245,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
ThisRoomFullName,ThisRoomFullName);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
}
diff --git a/swad_connected.c b/swad_connected.c
index f8d856f7..508dabb5 100644
--- a/swad_connected.c
+++ b/swad_connected.c
@@ -626,7 +626,7 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro
fprintf (Gbl.F.Out," "
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Connected_users,Txt_Connected_users);
Frm_EndForm ();
fprintf (Gbl.F.Out,""
diff --git a/swad_country.c b/swad_country.c
index 4a6fa7ae..808ba017 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -842,12 +842,12 @@ void Cty_DrawCountryMap (struct Country *Cty,const char *Class)
fprintf (Gbl.F.Out," Alpha2,
Cty->Alpha2);
else
fprintf (Gbl.F.Out,"%s/tr16x16.gif", // TODO: Change for a 1x1 image or a generic image
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
fprintf (Gbl.F.Out,"\" alt=\"%s\" title=\"%s\" class=\"%s\" />",
Cty->Alpha2,
Cty->Name[Gbl.Prefs.Language],
@@ -1002,7 +1002,7 @@ static void Cty_PutIconToViewCountries (void)
extern const char *Txt_Countries;
Lay_PutContextualLink (ActSeeCty,NULL,NULL,
- "cty64x64.gif",
+ "globe.svg",
Txt_Countries,NULL,
NULL);
}
diff --git a/swad_course.c b/swad_course.c
index 1a3a5c74..38202a5a 100644
--- a/swad_course.c
+++ b/swad_course.c
@@ -461,7 +461,7 @@ static void Crs_Configuration (bool PrintView)
" ",
Gbl.Title,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
(Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green16x16.gif" :
"warning64x64.png",
Gbl.Title);
@@ -569,10 +569,10 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_LinkFormSubmit (Txt_System,
Highlight ? ClassHighlight :
ClassNormal,NULL);
- fprintf (Gbl.F.Out," %s",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_System,
Txt_System,
Txt_System);
@@ -610,7 +610,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
fprintf (Gbl.F.Out," %s",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_COUNTRIES,
Cty.Alpha2,
Cty.Alpha2,
Cty.Alpha2,
@@ -753,7 +753,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
" class=\"ICO20x20\" />"
" %s"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Crs.ShrtName,
Crs.FullName,
Crs.FullName);
@@ -1264,7 +1264,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
" class=\"ICO20x20\" />"
"",
BgColor,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Crs->NumUsrs[Rol_UNK] ? "ok_green" :
"tr",
Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users :
@@ -1394,7 +1394,7 @@ static void Crs_PutIconToViewCourses (void)
extern const char *Txt_Courses;
Lay_PutContextualLink (ActSeeCrs,NULL,NULL,
- "crs64x64.gif",
+ "list-ol.svg",
Txt_Courses,NULL,
NULL);
}
@@ -3005,11 +3005,11 @@ void Crs_PutIconToSelectMyCoursesInBreadcrumb (void)
/***** Put icon with link *****/
Frm_LinkFormSubmit (Txt_My_courses,NULL,NULL);
- fprintf (Gbl.F.Out," "
"",
- Gbl.Prefs.PathTheme,
+ Gbl.Prefs.URLTheme,
Txt_My_courses,Txt_My_courses);
/***** End form *****/
@@ -3028,7 +3028,7 @@ void Crs_PutIconToSelectMyCourses (void)
/***** Put form to search / select courses *****/
Lay_PutContextualLink (ActMyCrs,NULL,NULL,
- "hierarchy64x64.gif",
+ "sitemap.svg",
Txt_My_courses,NULL,
NULL);
}
diff --git a/swad_degree.c b/swad_degree.c
index 558c5674..1bc9e8bf 100644
--- a/swad_degree.c
+++ b/swad_degree.c
@@ -1298,7 +1298,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
" class=\"ICO20x20\" />"
"",
BgColor,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumCrss ? "ok_green" :
"tr",
NumCrss ? Txt_DEGREE_With_courses :
@@ -1424,7 +1424,7 @@ void Deg_PutIconToViewDegrees (void)
extern const char *Txt_Degrees;
Lay_PutContextualLink (ActSeeDeg,NULL,NULL,
- "deg64x64.gif",
+ "graduation-cap.svg",
Txt_Degrees,NULL,
NULL);
}
@@ -2500,7 +2500,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
" alt=\"\" title=\"\""
" class=\"ICO25x25\" />"
"",
- Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
+ Gbl.RowEvenOdd,Gbl.Prefs.URLIcons,
NumRow == NumRows ? "subend" :
"submid");
@@ -2520,7 +2520,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" %s",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_all_degrees,
Txt_all_degrees,
Txt_all_degrees);
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 9197ffae..ee810c58 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -289,7 +289,7 @@ void DT_PutIconToViewDegreeTypes (void)
extern const char *Txt_Types_of_degree;
Lay_PutContextualLink (ActSeeDegTyp,NULL,NULL,
- "hierarchy64x64.png",
+ "sitemap.svg",
Txt_Types_of_degree,NULL,
NULL);
}
diff --git a/swad_enrolment.c b/swad_enrolment.c
index c0df03c4..41cd3023 100644
--- a/swad_enrolment.c
+++ b/swad_enrolment.c
@@ -3089,7 +3089,7 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction)
Txt_Administer_me;
Lay_PutContextualLink (NextAction,NULL,NULL,
- "config64x64.gif",
+ "user-cog.svg",
TitleText,TitleText,
NULL);
}
@@ -3126,7 +3126,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role)
Lay_ShowErrorAndExit ("Wrong role.");
}
Lay_PutContextualLink (NextAction,NULL,NULL,
- "config64x64.gif",
+ "users-cog.svg",
TitleText,TitleText,
NULL);
}
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 5bc616a9..1e5b3c74 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -3383,7 +3383,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
(IsGroupZone &&
GrpDat.GrpCod == Gbl.CurrentCrs.Grps.GrpCod) ? "BROWSER_TITLE" :
"BROWSER_TITLE_LIGHT",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumGrp < LstMyGrps.NumGrps - 1 ? "submid" :
"subend",
GrpDat.GrpCod);
@@ -5880,7 +5880,7 @@ static void Brw_PutIconRemoveFile (const char PathInTree[PATH_MAX + 1],
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -5915,7 +5915,7 @@ static void Brw_PutIconRemoveDir (const char PathInTree[PATH_MAX + 1],
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -5948,7 +5948,7 @@ static void Brw_PutIconCopy (const char PathInTree[PATH_MAX + 1],
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -5978,7 +5978,7 @@ static void Brw_PutIconPasteOn (const char PathInTree[PATH_MAX + 1],
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -5998,7 +5998,7 @@ static void Brw_PutIconPasteOff (void)
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_OPT ICO_HIDDEN ICO16x16\" />"
"",
- Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
+ Gbl.RowEvenOdd,Gbl.Prefs.URLIcons,
Txt_Copy_not_allowed,
Txt_Copy_not_allowed);
}
@@ -6027,7 +6027,7 @@ static void Brw_IndentAndWriteIconExpandContract (unsigned Level,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
break;
case Brw_ICON_TREE_EXPAND:
/***** Visible icon to expand folder *****/
@@ -6075,7 +6075,7 @@ static void Brw_IndentDependingOnLevel (unsigned Level)
" alt=\"\" title=\"\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
}
/*****************************************************************************/
@@ -6114,7 +6114,7 @@ static void Brw_PutIconToExpandFolder (const char *FileBrowserId,const char *Row
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -6159,7 +6159,7 @@ static void Brw_PutIconToContractFolder (const char *FileBrowserId,const char *R
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -6187,7 +6187,7 @@ static void Brw_PutIconShow (unsigned Level,const char *PathInTree,const char *F
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
"on",
Gbl.Title,
@@ -6215,7 +6215,7 @@ static void Brw_PutIconHide (unsigned Level,const char *PathInTree,const char *F
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Brw_CheckIfAnyUpperLevelIsHidden (Level) ? "off" :
"on",
Gbl.Title,
@@ -6344,7 +6344,7 @@ static void Brw_PutIconFolderWithoutPlus (const char *FileBrowserId,const char *
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Open ? "open" :
"closed",
Txt_Folder,
@@ -6387,7 +6387,7 @@ static void Brw_PutIconFolderWithPlus (const char *FileBrowserId,const char *Row
" src=\"%s/folder-%s-plus16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Open ? "open" :
"closed",
Gbl.Title,
@@ -6412,7 +6412,7 @@ static void Brw_PutIconNewFileOrFolder (void)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.RowEvenOdd,Gbl.Prefs.IconsURL,
+ Gbl.RowEvenOdd,Gbl.Prefs.URLIcons,
Txt_New_FILE_OR_FOLDER,
Txt_New_FILE_OR_FOLDER);
}
@@ -6465,7 +6465,7 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
/***** Icon depending on the file extension *****/
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Public_open_educational_resource_OER_for_everyone,
Txt_Public_open_educational_resource_OER_for_everyone);
@@ -6684,7 +6684,7 @@ static void Brw_WriteDatesAssignment (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.FileBrowser.Asg.Open ? "green" :
"red");
@@ -6783,7 +6783,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,unsigned long UsrCod)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Unknown_or_without_photo,
Txt_Unknown_or_without_photo);
@@ -8740,7 +8740,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
" background:url('%s/upload320x320.gif') no-repeat center;\">",
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
Par_PutHiddenParamLong ("act",Act_GetActCod (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type]));
Par_PutHiddenParamString ("ses",Gbl.Session.Id);
Brw_PutParamsFileBrowser (Brw_ActUploadFileDropzone[Gbl.FileBrowser.Type],
@@ -10453,7 +10453,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />"
"",
- FileNameToShow,Gbl.Prefs.IconsURL,
+ FileNameToShow,Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
Frm_EndForm ();
}
@@ -10472,7 +10472,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
" class=\"ICO40x40\" />"
"",
FileNameToShow,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Download,Txt_Download);
}
}
@@ -12557,7 +12557,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Folder,Txt_Folder);
else
/* Icon with file type or link */
diff --git a/swad_follow.c b/swad_follow.c
index 250b3c7d..7e49ec87 100644
--- a/swad_follow.c
+++ b/swad_follow.c
@@ -544,7 +544,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
" class=\"ICO40x40\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Unfollow,Txt_Following_unfollow);
Frm_EndForm ();
}
@@ -560,7 +560,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
" class=\"ICO40x40\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Follow,Txt_Follow);
Frm_EndForm ();
}
@@ -947,11 +947,11 @@ static void Fol_PutInactiveIconToFollowUnfollow (void)
{
/***** Inactive icon to follow/unfollow *****/
fprintf (Gbl.F.Out,""
- "
"
+ " class=\"ICO16x16\" />"
"
",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
}
/*****************************************************************************/
@@ -972,7 +972,7 @@ static void Fol_PutIconToFollow (struct UsrData *UsrDat)
" class=\"ICO20x20\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Follow,Txt_Follow);
Frm_EndForm ();
}
@@ -995,7 +995,7 @@ static void Fol_PutIconToUnfollow (struct UsrData *UsrDat)
" class=\"ICO20x20\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Unfollow,Txt_Unfollow);
Frm_EndForm ();
}
diff --git a/swad_forum.c b/swad_forum.c
index dca794da..dc568691 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -1189,7 +1189,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod,
"",
NewPst ? "MSG_TIT_BG_NEW" :
"MSG_TIT_BG",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NewPst ? "msg-unread" :
"msg-open",
NewPst ? Txt_MSG_New :
@@ -1243,7 +1243,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Enabled ? "eye" :
"eye-slash",
Gbl.Title,
@@ -1262,7 +1262,7 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod,
" class=\"ICO20x20\" />"
"",
Gbl.Title,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Enabled ? "eye" :
"eye-slash",
Gbl.Title,
@@ -2071,7 +2071,7 @@ static void For_WriteLinkToForum (struct Forum *Forum,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Copy_not_allowed,Txt_Copy_not_allowed);
else
{
@@ -2087,7 +2087,7 @@ static void For_WriteLinkToForum (struct Forum *Forum,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Paste_thread,
Txt_Paste_thread);
Frm_EndForm ();
@@ -2114,14 +2114,14 @@ static void For_WriteLinkToForum (struct Forum *Forum,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,ForumName,ForumName);
+ Gbl.Prefs.URLIcons,ForumName,ForumName);
break;
case For_FORUM__SWAD__USRS:
case For_FORUM__SWAD__TCHS:
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,ForumName,ForumName);
+ Gbl.Prefs.URLIcons,ForumName,ForumName);
break;
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
@@ -2140,7 +2140,7 @@ static void For_WriteLinkToForum (struct Forum *Forum,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,ForumName,ForumName);
+ Gbl.Prefs.URLIcons,ForumName,ForumName);
break;
default:
break;
@@ -3429,7 +3429,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
Gbl.Usrs.Me.PhotoURL);
else
fprintf (Gbl.F.Out,"%s/usr_bl.jpg",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
fprintf (Gbl.F.Out,"\" alt=\"%s\" title=\"",
Txt_Thread_with_posts_from_you);
if (Thr.NumMyPosts == 1)
@@ -3447,7 +3447,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
BgColor,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Thr.NumUnreadPosts ? "msg-unread" :
"msg-open",
Thr.NumUnreadPosts ? Txt_There_are_new_posts :
@@ -3489,7 +3489,7 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Move_thread,
Txt_Move_thread);
Frm_EndForm ();
diff --git a/swad_game.c b/swad_game.c
index ac1436c6..a38d1466 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -3205,7 +3205,7 @@ static void Gam_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
" class=\"LEFT_TOP\""
" style=\"width:%upx; height:20px;\" />"
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title,
BarWidth);
@@ -3515,7 +3515,7 @@ static void Gam_PutBigButtonToStartGame (long GamCod)
Frm_LinkFormSubmit (Txt_Play,NULL,NULL);
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,Txt_Play,Txt_Play);
+ Gbl.Prefs.URLIcons,Txt_Play,Txt_Play);
fprintf (Gbl.F.Out,"");
/***** End form *****/
@@ -3664,7 +3664,7 @@ static void Gam_PutBigButtonToContinue (Act_Action_t NextAction,
" alt=\"%s\" title=\"%s\" class=\"ICO64x64\" />"
" "
"%s",
- Gbl.Prefs.IconsURL,Txt_Continue,Txt_Continue,
+ Gbl.Prefs.URLIcons,Txt_Continue,Txt_Continue,
Txt_Continue);
fprintf (Gbl.F.Out,"");
diff --git a/swad_global.c b/swad_global.c
index 0c15bf06..714e4335 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -136,15 +136,15 @@ void Gbl_InitializeGlobals (void)
Gbl.Prefs.Menu = Mnu_MENU_DEFAULT; // Default menu
Gbl.Prefs.Theme = The_THEME_DEFAULT; // Default theme
Gbl.Prefs.IconSet = Ico_ICON_SET_DEFAULT; // Default icon set
- snprintf (Gbl.Prefs.IconsURL,sizeof (Gbl.Prefs.IconsURL),
+ snprintf (Gbl.Prefs.URLIcons,sizeof (Gbl.Prefs.URLIcons),
"%s/%s",
Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_ICON);
- snprintf (Gbl.Prefs.PathTheme,sizeof (Gbl.Prefs.PathTheme),
+ snprintf (Gbl.Prefs.URLTheme,sizeof (Gbl.Prefs.URLTheme),
"%s/%s/%s/%s",
Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_ICON,
Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Gbl.Prefs.Theme]);
- snprintf (Gbl.Prefs.PathIconSet,sizeof (Gbl.Prefs.PathIconSet),
+ snprintf (Gbl.Prefs.URLIconSet,sizeof (Gbl.Prefs.URLIconSet),
"%s/%s/%s/%s",
Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_ICON,
Cfg_ICON_FOLDER_ICON_SETS,
diff --git a/swad_global.h b/swad_global.h
index b30122b9..f0e60f9b 100644
--- a/swad_global.h
+++ b/swad_global.h
@@ -164,10 +164,10 @@ struct Globals
Mnu_Menu_t Menu;
unsigned SideCols;
The_Theme_t Theme;
- char PathTheme[PATH_MAX + 1];
Ico_IconSet_t IconSet;
- char PathIconSet[PATH_MAX + 1];
- char IconsURL[PATH_MAX + 1];
+ char URLIcons[PATH_MAX + 1];
+ char URLTheme[PATH_MAX + 1];
+ char URLIconSet[PATH_MAX + 1];
} Prefs;
struct
diff --git a/swad_group.c b/swad_group.c
index bad6eebd..4d6d0974 100644
--- a/swad_group.c
+++ b/swad_group.c
@@ -1390,7 +1390,7 @@ static void Grp_ListGroupTypesForEdition (void)
" class=\"ICO20x20\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? "time" :
"time-off",
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].MustBeOpened ? Txt_The_groups_will_automatically_open :
@@ -1552,7 +1552,7 @@ static void Grp_ListGroupsForEdition (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Grp->Open ? "unlock" :
"lock",
Gbl.Title,
@@ -1573,7 +1573,7 @@ static void Grp_ListGroupsForEdition (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Grp->FileZones ? "folder-yes" :
"folder-no",
Gbl.Title,
@@ -2476,7 +2476,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Grp->Open ? "unlock" :
"lock",
Gbl.Title,Gbl.Title);
@@ -2622,7 +2622,7 @@ static void Grp_PutFormToCreateGroupType (void)
" class=\"ICO20x20\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? "time" :
"time-off",
Gbl.CurrentCrs.Grps.GrpTyp.MustBeOpened ? Txt_The_groups_will_automatically_open :
@@ -2696,10 +2696,10 @@ static void Grp_PutFormToCreateGroup (void)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Group_closed,
Txt_Group_closed,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_File_zones_disabled,
Txt_File_zones_disabled);
@@ -5102,9 +5102,9 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) ())
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
- WhichGrps == Grp_ONLY_MY_GROUPS ? "myhierarchy64x64.png" :
- "hierarchy64x64.png",
+ Gbl.Prefs.URLIcons,
+ WhichGrps == Grp_ONLY_MY_GROUPS ? "mysitemap.png" :
+ "sitemap.svg",
Txt_GROUP_WHICH_GROUPS[WhichGrps],
Txt_GROUP_WHICH_GROUPS[WhichGrps]);
Frm_EndForm ();
diff --git a/swad_hierarchy.c b/swad_hierarchy.c
index 85683683..c79ec3d1 100644
--- a/swad_hierarchy.c
+++ b/swad_hierarchy.c
@@ -407,7 +407,7 @@ void Hie_WriteBigNameCtyInsCtrDegCrs (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME);
/***** Text *****/
diff --git a/swad_icon.c b/swad_icon.c
index 0606485d..e01ba622 100644
--- a/swad_icon.c
+++ b/swad_icon.c
@@ -69,6 +69,43 @@ const char *Ico_IconSetNames[Ico_NUM_ICON_SETS] =
static void Ico_PutIconsIconSet (void);
+/*****************************************************************************/
+/*********** Get icon with extension from icon without extension *************/
+/*****************************************************************************/
+
+#define Ico_NUM_ICON_EXTENSIONS 3
+
+const char *Ico_GetIcon (const char *IconWithoutExtension)
+ {
+ static const char *Ico_IconExtensions[Ico_NUM_ICON_EXTENSIONS] =
+ { // In order of preference
+ "svg",
+ "png",
+ "gif",
+ };
+ static char IconWithExtension[NAME_MAX + 1];
+ char PathIcon[PATH_MAX + 1];
+ unsigned NumExt;
+
+ for (NumExt = 0;
+ NumExt < Ico_NUM_ICON_EXTENSIONS;
+ NumExt++)
+ {
+ snprintf (IconWithExtension,sizeof (IconWithExtension),
+ "%s.%s",
+ IconWithoutExtension,Ico_IconExtensions[NumExt]);
+ snprintf (PathIcon,sizeof (PathIcon),
+ "%s/%s/%s/%s/%s",
+ Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_ICON,
+ Cfg_ICON_FOLDER_ICON_SETS,Ico_IconSetId[Gbl.Prefs.IconSet],
+ IconWithExtension);
+ if (Fil_CheckIfPathExists (PathIcon))
+ return IconWithExtension;
+ }
+
+ return "default.svg";
+ }
+
/*****************************************************************************/
/************************ Put icons to select a IconSet **********************/
/*****************************************************************************/
@@ -93,7 +130,7 @@ void Ico_PutIconsToSelectIconSet (void)
Par_PutHiddenParamString ("IconSet",Ico_IconSetId[IconSet]);
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[IconSet],
Ico_IconSetNames[IconSet],
@@ -124,7 +161,7 @@ void Ico_ChangeIconSet (void)
{
/***** Get param with icon set *****/
Gbl.Prefs.IconSet = Ico_GetParamIconSet ();
- snprintf (Gbl.Prefs.PathIconSet,sizeof (Gbl.Prefs.PathIconSet),
+ snprintf (Gbl.Prefs.URLIconSet,sizeof (Gbl.Prefs.URLIconSet),
"%s/%s/%s/%s",
Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_PUBLIC_ICON,
Cfg_ICON_FOLDER_ICON_SETS,
@@ -196,7 +233,7 @@ void Ico_PutContextualIconToEdit (Act_Action_t NextAction,void (*FuncParams) ())
extern const char *Txt_Edit;
Lay_PutContextualLink (NextAction,NULL,FuncParams,
- "edit64x64.png",
+ "pen.svg",
Txt_Edit,NULL,
NULL);
}
@@ -264,7 +301,7 @@ void Ico_PutIconLink (const char *Icon,const char *Title,const char *Text,
else
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,Icon,Title,Title);
+ Gbl.Prefs.URLIcons,Icon,Title,Title);
fprintf (Gbl.F.Out,"");
}
@@ -276,7 +313,7 @@ void Ico_PutIconOff (const char *Icon,const char *Alt)
{
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,Icon,Alt,Alt);
+ Gbl.Prefs.URLIcons,Icon,Alt,Alt);
}
/*****************************************************************************/
@@ -289,7 +326,7 @@ void Ico_PutIconWithText (const char *Icon,const char *Alt,const char *Text)
fprintf (Gbl.F.Out,""
"
",
- Gbl.Prefs.IconsURL,Icon,Alt,Text ? Text :
+ Gbl.Prefs.URLIcons,Icon,Alt,Text ? Text :
Alt);
if (Text)
if (Text[0])
@@ -313,8 +350,8 @@ void Ico_PutCalculateIcon (const char *Alt)
" class=\"ICO20x20\" style=\"display:none;\" />" // Animated icon hidden
"
"
"",
- Gbl.Form.Num,Gbl.Prefs.IconsURL,Alt,Alt,
- Gbl.Form.Num,Gbl.Prefs.IconsURL,Alt,Alt);
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Alt);
}
/*****************************************************************************/
@@ -335,8 +372,8 @@ void Ico_PutCalculateIconWithText (const char *Alt,const char *Text)
" %s"
""
"",
- Gbl.Form.Num,Gbl.Prefs.IconsURL,Alt,Text,
- Gbl.Form.Num,Gbl.Prefs.IconsURL,Alt,Text,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text,
+ Gbl.Form.Num,Gbl.Prefs.URLIcons,Alt,Text,
Text);
}
@@ -362,7 +399,7 @@ void Ico_PutIconRemove (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Remove,
Txt_Remove);
}
diff --git a/swad_icon.h b/swad_icon.h
index a973f136..20c22808 100644
--- a/swad_icon.h
+++ b/swad_icon.h
@@ -48,6 +48,8 @@ typedef enum
/***************************** Public prototypes *****************************/
/*****************************************************************************/
+const char *Ico_GetIcon (const char *IconWithoutExtension);
+
void Ico_PutIconsToSelectIconSet (void);
void Ico_ChangeIconSet (void);
Ico_IconSet_t Ico_GetParamIconSet (void);
diff --git a/swad_image.c b/swad_image.c
index 096a1997..d0e213ef 100644
--- a/swad_image.c
+++ b/swad_image.c
@@ -214,7 +214,7 @@ void Img_PutImageUploader (int NumImgInForm,const char *ClassImgTitURL)
/***** Image file *****/
fprintf (Gbl.F.Out,""
- " "
" "
""
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Image,Txt_Image,Txt_optional,
ParamUploadImg.File,
Id,Id);
diff --git a/swad_institution.c b/swad_institution.c
index 57390788..365c0b81 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -983,7 +983,7 @@ static void Ins_PutIconToViewInstitutions (void)
extern const char *Txt_Institutions;
Lay_PutContextualLink (ActSeeIns,NULL,NULL,
- "ins64x64.gif",
+ "university.svg",
Txt_Institutions,NULL,
NULL);
}
diff --git a/swad_language.c b/swad_language.c
index 0cf9f66e..67769c70 100644
--- a/swad_language.c
+++ b/swad_language.c
@@ -78,7 +78,7 @@ static void Lan_PutParamLanguage (void);
void Lan_PutLinkToChangeLanguage (void)
{
Lay_PutContextualLink (ActEdiPrf,NULL,NULL,
- "cty64x64.gif",
+ "globe.svg",
"Change language","Change language",
NULL);
}
diff --git a/swad_layout.c b/swad_layout.c
index 30e0abdd..12ba4667 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -190,8 +190,8 @@ void Lay_WriteStartOfPage (void)
/* Favicon */
fprintf (Gbl.F.Out," \n"
" \n",
- Gbl.Prefs.IconsURL,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons,
+ Gbl.Prefs.URLIcons);
/* Style sheet for SWAD */
fprintf (Gbl.F.Out," \n",
@@ -261,7 +261,7 @@ void Lay_WriteStartOfPage (void)
""
"
"
"",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
else
{
fprintf (Gbl.F.Out,"\n");
@@ -872,7 +872,7 @@ static void Lay_WritePageTopHeading (void)
" class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />"
"", // head_row_1_logo_small
- Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
+ Gbl.Prefs.URLIcons,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
fprintf (Gbl.F.Out,""
@@ -882,7 +882,7 @@ static void Lay_WritePageTopHeading (void)
" class=\"CENTER_MIDDLE\""
" style=\"width:%upx; height:%upx;\" />"
"", // head_row_1_logo_big
- Gbl.Prefs.IconsURL,Cfg_PLATFORM_LOGO_BIG_FILENAME,
+ Gbl.Prefs.URLIcons,Cfg_PLATFORM_LOGO_BIG_FILENAME,
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
fprintf (Gbl.F.Out,""
@@ -976,7 +976,7 @@ static void Lay_WriteTitleAction (void)
/***** Container start *****/
fprintf (Gbl.F.Out,"",
- Gbl.Prefs.PathIconSet,
+ Gbl.Prefs.URLIconSet,
Act_GetIcon (Act_GetSuperAction (Gbl.Action.Act)));
/***** Title *****/
@@ -1082,7 +1082,7 @@ static void Lay_ShowRightColumn (void)
""
"
",
Txt_If_you_have_an_Android_device_try_SWADroid,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
}
/*****************************************************************************/
@@ -1314,7 +1314,7 @@ static void Lay_WriteAboutZone (void)
"%s
"
"",
Cfg_ABOUT_URL,
- Gbl.Prefs.IconsURL,Cfg_ABOUT_LOGO,
+ Gbl.Prefs.URLIcons,Cfg_ABOUT_LOGO,
Cfg_ABOUT_NAME,Cfg_ABOUT_NAME,
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT,
Cfg_ABOUT_NAME);
@@ -1557,7 +1557,7 @@ void Lay_AdvertisementMobile (void)
""
"",
Txt_Stay_connected_with_SWADroid,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Stay_connected_with_SWADroid);
/***** End table and box *****/
@@ -1583,7 +1583,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
IsLastItemInLevel[i] ? "tr" :
"subleft");
@@ -1592,7 +1592,7 @@ void Lay_IndentDependingOnLevel (unsigned Level,bool IsLastItemInLevel[])
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
IsLastItemInLevel[Level] ? "subend" :
"submid");
}
diff --git a/swad_logo.c b/swad_logo.c
index dc5ea1bb..f22e5bee 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -69,13 +69,13 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
{
static const char *Icon[Sco_NUM_SCOPES] =
{
- NULL, // Sco_SCOPE_UNK
- NULL, // Sco_SCOPE_SYS
- NULL, // Sco_SCOPE_CTY
- Cfg_FOLDER_INS, // Sco_SCOPE_INS
- Cfg_FOLDER_CTR, // Sco_SCOPE_CTR
- Cfg_FOLDER_DEG, // Sco_SCOPE_DEG
- NULL, // Sco_SCOPE_CRS
+ NULL, // Sco_SCOPE_UNK
+ NULL, // Sco_SCOPE_SYS
+ NULL, // Sco_SCOPE_CTY
+ "university.svg", // Sco_SCOPE_INS
+ "building.svg", // Sco_SCOPE_CTR
+ "graduation-cap.svg", // Sco_SCOPE_DEG
+ NULL, // Sco_SCOPE_CRS
};
const char *Folder = NULL; // To avoid warning
char PathLogo[PATH_MAX + 1];
@@ -156,8 +156,8 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
(unsigned) Cod,
(unsigned) Cod);
else if (Icon[Scope])
- fprintf (Gbl.F.Out,"%s/%s64x64.gif",
- Gbl.Prefs.IconsURL,Icon[Scope]);
+ fprintf (Gbl.F.Out,"%s/%s",
+ Gbl.Prefs.URLIcons,Icon[Scope]);
fprintf (Gbl.F.Out,"\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO%ux%u",
diff --git a/swad_mail.c b/swad_mail.c
index 4af1542c..8aefdde1 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -1329,7 +1329,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
}
diff --git a/swad_menu.c b/swad_menu.c
index 3d6f2c42..72f574cb 100644
--- a/swad_menu.c
+++ b/swad_menu.c
@@ -374,7 +374,7 @@ void Mnu_WriteMenuThisTab (void)
/***** Icon *****/
fprintf (Gbl.F.Out,"",
URL,Title,
- Gbl.Prefs.IconsURL,Icon,
+ Gbl.Prefs.URLIcons,Icon,
Title,Title);
}
@@ -332,7 +332,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
""
"",
(unsigned) NumURL,The_ClassForm[Gbl.Prefs.Theme],
- Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksIcons[NumURL],
+ Gbl.Prefs.URLIcons,Net_WebsAndSocialNetworksIcons[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL]);
@@ -592,7 +592,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
"%.2f%%"
" "
"",
- Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksIcons[Web],
+ Gbl.Prefs.URLIcons,Net_WebsAndSocialNetworksIcons[Web],
Net_WebsAndSocialNetworksTitle[Web],
Net_WebsAndSocialNetworksTitle[Web],
Net_WebsAndSocialNetworksTitle[Web],
diff --git a/swad_notice.c b/swad_notice.c
index 16506a3f..cca943c6 100644
--- a/swad_notice.c
+++ b/swad_notice.c
@@ -466,7 +466,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
" class=\"ICO20x20\" />"
""
"",
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
break;
case Not_LIST_FULL_NOTICES:
/***** Button to add new notice *****/
@@ -679,7 +679,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
" class=\"ICO20x20\" />"
"",
Txt_NOTICE_Active_SINGULAR,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_NOTICE_Active_SINGULAR,
Txt_NOTICE_Active_SINGULAR);
break;
@@ -690,7 +690,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
" class=\"ICO20x20\" />"
"",
Txt_NOTICE_Obsolete_SINGULAR,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_NOTICE_Obsolete_SINGULAR,
Txt_NOTICE_Obsolete_SINGULAR);
break;
diff --git a/swad_notification.c b/swad_notification.c
index 98d13050..edd230a5 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -252,14 +252,14 @@ static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] =
"soc64x64.png", // Ntf_EVENT_TIMELINE_COMMENT
"fav64x64.png", // Ntf_EVENT_TIMELINE_FAV
"share64x64.png", // Ntf_EVENT_TIMELINE_SHARE
- "arroba64x64.gif", // Ntf_EVENT_TIMELINE_MENTION
+ "at.svg", // Ntf_EVENT_TIMELINE_MENTION
"follow64x64.png", // Ntf_EVENT_FOLLOWER
"forum64x64.gif", // Ntf_EVENT_FORUM_POST_COURSE
"forum64x64.gif", // Ntf_EVENT_FORUM_REPLY
/* Messages tab */
"notice64x64.png", // Ntf_EVENT_NOTICE
- "msg64x64.gif", // Ntf_EVENT_MESSAGE
+ "envelope.svg", // Ntf_EVENT_MESSAGE
/* Statistics tab */
@@ -385,7 +385,7 @@ void Ntf_ShowMyNotifications (void)
/* Put form to view allowed mail domains */
Lay_PutContextualLink (ActSeeMai,NULL,NULL,
- "msg64x64.gif",
+ "envelope.svg",
Txt_Email_domains_allowed_for_notifications,Txt_Domains,
NULL);
@@ -512,7 +512,7 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Ntf_Icons[NotifyEvent],
Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
@@ -522,7 +522,7 @@ void Ntf_ShowMyNotifications (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Ntf_Icons[NotifyEvent],
Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
@@ -2097,7 +2097,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" %u %s ",
- Gbl.Prefs.PathTheme,
+ Gbl.Prefs.URLTheme,
Txt_Notifications,
Txt_Notifications,
NumNewNtfs,
diff --git a/swad_parameter.c b/swad_parameter.c
index a5fd226a..767b49c6 100644
--- a/swad_parameter.c
+++ b/swad_parameter.c
@@ -798,16 +798,16 @@ void Par_GetMainParameters (void)
/***** Set path of theme *****/
snprintf (Path,sizeof (Path),
"%s/%s/%s",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Gbl.Prefs.Theme]);
- Str_Copy (Gbl.Prefs.PathTheme,Path,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Gbl.Prefs.Theme]);
+ Str_Copy (Gbl.Prefs.URLTheme,Path,
PATH_MAX);
/***** Set path of icon set *****/
snprintf (Path,sizeof (Path),
"%s/%s/%s",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_ICON_SETS,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[Gbl.Prefs.IconSet]);
- Str_Copy (Gbl.Prefs.PathIconSet,Path,
+ Str_Copy (Gbl.Prefs.URLIconSet,Path,
PATH_MAX);
}
diff --git a/swad_photo.c b/swad_photo.c
index 4fbe9356..45662ed6 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -183,7 +183,7 @@ void Pho_PutIconToChangeUsrPhoto (void)
TitleText = Gbl.Usrs.Me.MyPhotoExists ? Txt_Change_photo :
Txt_Upload_photo;
Lay_PutContextualLink (ActReqMyPho,NULL,NULL,
- "photo64x64.gif",
+ "camera.svg",
TitleText,NULL,
NULL);
}
@@ -207,7 +207,7 @@ void Pho_PutIconToChangeUsrPhoto (void)
break;
}
Lay_PutContextualLink (NextAction,NULL,Rec_PutParamUsrCodEncrypted,
- "photo64x64.gif",
+ "camera.svg",
TitleText,NULL,
NULL);
}
@@ -1290,7 +1290,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
if (PhotoExists)
fprintf (Gbl.F.Out,"%s",PhotoURL);
else
- fprintf (Gbl.F.Out,"%s/usr_bl.jpg",Gbl.Prefs.IconsURL);
+ fprintf (Gbl.F.Out,"%s/usr_bl.jpg",Gbl.Prefs.URLIcons);
fprintf (Gbl.F.Out,"\" alt=\"%s\" title=\"%s\""
" class=\"%s\"",
UsrDat->FullName,UsrDat->FullName,
@@ -1303,7 +1303,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
if (PhotoExists)
fprintf (Gbl.F.Out,"%s",PhotoURL);
else
- fprintf (Gbl.F.Out,"%s/usr_bl.jpg",Gbl.Prefs.IconsURL);
+ fprintf (Gbl.F.Out,"%s/usr_bl.jpg",Gbl.Prefs.URLIcons);
fprintf (Gbl.F.Out,"','%s');\" onmouseout=\"noZoom();\"",
IdCaption);
}
@@ -2522,7 +2522,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
PhotoURL,IdCaption);
}
else
- fprintf (Gbl.F.Out,"%s/usr_bl.jpg\"",Gbl.Prefs.IconsURL);
+ fprintf (Gbl.F.Out,"%s/usr_bl.jpg\"",Gbl.Prefs.URLIcons);
fprintf (Gbl.F.Out," alt=\"%s\""
" style=\"width:%upx; height:%upx;\" />",
Deg->ShrtName,
diff --git a/swad_plugin.c b/swad_plugin.c
index 8e9b2988..df1c4695 100644
--- a/swad_plugin.c
+++ b/swad_plugin.c
@@ -137,7 +137,7 @@ void Plg_ListPlugins (void)
""
"",
URL,Plg->Name,
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS,Gbl.Plugins.Lst[NumPlg].Logo,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_PLUGINS,Gbl.Plugins.Lst[NumPlg].Logo,
Plg->Name,Plg->Name,
URL,Plg->Name,
Plg->Name);
@@ -383,7 +383,7 @@ static void Plg_ListPluginsForEdition (void)
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />"
"",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_PLUGINS,
Gbl.Plugins.Lst[NumPlg].Logo,
Gbl.Plugins.Lst[NumPlg].Name,
Gbl.Plugins.Lst[NumPlg].Name);
diff --git a/swad_preference.c b/swad_preference.c
index 006355a7..725e568f 100644
--- a/swad_preference.c
+++ b/swad_preference.c
@@ -247,7 +247,7 @@ static void Pre_PutIconsToSelectSideCols (void)
Par_PutHiddenParamUnsigned ("SideCols",SideCols);
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
SideCols >> 1,SideCols & 1,
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols]);
diff --git a/swad_profile.c b/swad_profile.c
index 53cdfba3..3d71734d 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -137,7 +137,7 @@ void Prf_PutLinkMyPublicProfile (void)
extern const char *Txt_My_public_profile;
Lay_PutContextualLink (ActSeeOthPubPrf,NULL,Usr_PutParamMyUsrCodEncrypted,
- "usr64x64.png",
+ "user.svg",
Txt_My_public_profile,Txt_My_public_profile,
NULL);
}
@@ -151,7 +151,7 @@ void Prf_PutLinkRequestAnotherUserProfile (void)
extern const char *Txt_Another_user_s_profile;
Lay_PutContextualLink (ActReqOthPubPrf,NULL,NULL,
- "usr64x64.png",
+ "user.svg",
Txt_Another_user_s_profile,Txt_Another_user_s_profile,
NULL);
}
@@ -396,7 +396,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
" style=\"background-image:url('%s/tch64x64.gif');\">"
"%u %s",
Txt_ROLES_SINGUL_Abc[Rol_TCH][UsrDat->Sex],
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumCrssUsrIsTeacher,
Txt_courses_ABBREVIATION);
if (NumCrssUsrIsTeacher)
@@ -413,7 +413,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
" style=\"background-image:url('%s/std64x64.gif');\">"
"%u %s",
Txt_ROLES_SINGUL_Abc[Rol_STD][UsrDat->Sex],
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumCrssUsrIsStudent,
Txt_courses_ABBREVIATION);
if (NumCrssUsrIsStudent)
@@ -434,7 +434,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
"%u %s (%u %s)"
"",
Txt_Files_uploaded,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumFiles,
(NumFiles == 1) ? Txt_file :
Txt_files,
@@ -447,7 +447,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out,"",
Txt_TIME_Since,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
if (UsrFigures.FirstClickTimeUTC)
{
/* Create unique id for new comment */
@@ -486,7 +486,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out," ",
Txt_Clicks,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
if (UsrFigures.NumClicks >= 0)
{
@@ -515,7 +515,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out," ",
Txt_Downloads,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
if (UsrFigures.NumFileViews >= 0)
{
fprintf (Gbl.F.Out,"%ld %s ",
@@ -542,7 +542,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
fprintf (Gbl.F.Out," ",
Txt_Forums,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
if (UsrFigures.NumForPst >= 0)
{
fprintf (Gbl.F.Out,"%ld %s ",
@@ -568,9 +568,9 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Number of messages sent *****/
fprintf (Gbl.F.Out," ",
+ " style=\"background-image:url('%s/envelope.svg');\">",
Txt_Messages,
- Gbl.Prefs.IconsURL);
+ Gbl.Prefs.URLIcons);
if (UsrFigures.NumMsgSnt >= 0)
{
fprintf (Gbl.F.Out,"%ld %s ",
diff --git a/swad_project.c b/swad_project.c
index 90ad5849..edcd3935 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -359,8 +359,8 @@ static void Prj_ShowFormToFilterByMy_All (void)
Prj_WhoseProjects_t My_All;
static const char *WhoseProjectsImage[Prj_NUM_WHOSE_PROJECTS] =
{
- "myhierarchy64x64.png", // Prj_MY__PROJECTS
- "hierarchy64x64.png", // Prj_ALL_PROJECTS
+ "mysitemap.png", // Prj_MY__PROJECTS
+ "sitemap.svg", // Prj_ALL_PROJECTS
};
fprintf (Gbl.F.Out,"");
@@ -383,7 +383,7 @@ static void Prj_ShowFormToFilterByMy_All (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,WhoseProjectsImage[My_All],
+ Gbl.Prefs.URLIcons,WhoseProjectsImage[My_All],
Txt_PROJECT_MY_ALL_PROJECTS[My_All],
Txt_PROJECT_MY_ALL_PROJECTS[My_All]);
Frm_EndForm ();
@@ -422,7 +422,7 @@ static void Prj_ShowFormToFilterByPreassignedNonPreassig (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,PreassignedNonpreassigImage[PreNon],
+ Gbl.Prefs.URLIcons,PreassignedNonpreassigImage[PreNon],
Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_PLURAL[PreNon],
Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_PLURAL[PreNon]);
Frm_EndForm ();
@@ -466,7 +466,7 @@ static void Prj_ShowFormToFilterByHidden (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
HiddenVisiblImage[HidVis],
Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[HidVis],
Txt_PROJECT_HIDDEN_VISIBL_PROJECTS[HidVis]);
@@ -1070,7 +1070,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
"DAT",
(Prj->Preassigned == Prj_PREASSIGNED) ? Txt_Yes :
Txt_No,
- Gbl.Prefs.IconsURL,PreassignedNonpreassigImage[Prj->Preassigned],
+ Gbl.Prefs.URLIcons,PreassignedNonpreassigImage[Prj->Preassigned],
Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_SINGUL[Prj->Preassigned],
Txt_PROJECT_PREASSIGNED_NONPREASSIGNED_SINGUL[Prj->Preassigned]);
diff --git a/swad_record.c b/swad_record.c
index e9ddf152..66e4d3f9 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -996,7 +996,7 @@ void Rec_PutLinkToEditRecordFields (void)
/***** Link to edit record fields *****/
Lay_PutContextualLink (ActEdiRecFie,NULL,NULL,
- "edit64x64.png",
+ "pen.svg",
Txt_Edit_record_fields,Txt_Edit_record_fields,
NULL);
}
@@ -2550,14 +2550,14 @@ static void Rec_PutIconsCommands (void)
if (ItsMe)
/***** Button to edit my record card *****/
Lay_PutContextualLink (ActReqEdiRecSha,NULL,NULL,
- "edit64x64.png",
+ "pen.svg",
Txt_Edit_my_personal_data,NULL,
NULL);
if (ICanViewUsrProfile)
/***** Button to view user's profile *****/
Lay_PutContextualLink (ActSeeOthPubPrf,NULL,
Rec_PutParamUsrCodEncrypted,
- "usr64x64.png",
+ "user.svg",
ItsMe ? Txt_My_public_profile :
Txt_Another_user_s_profile,NULL,
NULL);
@@ -2567,25 +2567,25 @@ static void Rec_PutIconsCommands (void)
/* View student's records: common record card and course record card */
Lay_PutContextualLink (ActSeeRecOneStd,NULL,
Rec_PutParamUsrCodEncrypted,
- "card64x64.gif",
+ "card.svg",
Txt_View_record_for_this_course,NULL,
NULL);
else if (Usr_CheckIfICanViewRecordTch (Gbl.Record.UsrDat))
Lay_PutContextualLink (ActSeeRecOneTch,NULL,
Rec_PutParamUsrCodEncrypted,
- "card64x64.gif",
+ "card.svg",
Txt_View_record_and_office_hours,NULL,
NULL);
/***** Button to view user's agenda *****/
if (ItsMe)
Lay_PutContextualLink (ActSeeMyAgd,NULL,NULL,
- "calendar64x64.png",
+ "calendar.svg",
Txt_Show_agenda,NULL,
NULL);
else if (Usr_CheckIfICanViewUsrAgenda (Gbl.Record.UsrDat))
Lay_PutContextualLink (ActSeeUsrAgd,NULL,Rec_PutParamUsrCodEncrypted,
- "calendar64x64.png",
+ "calendar.svg",
Txt_Show_agenda,NULL,
NULL);
@@ -2614,7 +2614,7 @@ static void Rec_PutIconsCommands (void)
}
Lay_PutContextualLink (NextAction,NULL,
Rec_PutParamUsrCodEncrypted,
- "config64x64.gif",
+ "user-cog.svg",
Txt_Administer_user,NULL,
NULL);
}
@@ -2675,7 +2675,7 @@ static void Rec_PutIconsCommands (void)
/***** Button to send a message *****/
Lay_PutContextualLink (ActReqMsgUsr,NULL,Rec_PutParamsMsgUsr,
- "msg64x64.gif",
+ "envelope.svg",
Txt_Write_a_message,NULL,
NULL);
diff --git a/swad_report.c b/swad_report.c
index 19598fbf..eda795e1 100644
--- a/swad_report.c
+++ b/swad_report.c
@@ -283,7 +283,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
"
",
Report->Permalink,
Txt_Report,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Report,
Report->FilenameReport);
fprintf (Gbl.F.Out,"%s
",
diff --git a/swad_search.c b/swad_search.c
index c2bbfadc..baf95593 100644
--- a/swad_search.c
+++ b/swad_search.c
@@ -336,7 +336,7 @@ void Sch_PutMagnifyingGlassButton (const char *Icon)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Icon,
Txt_Search,
Txt_Search);
diff --git a/swad_social.c b/swad_social.c
index 6b7ff1da..7fb92c2e 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -1256,8 +1256,8 @@ static void Soc_PutLinkToViewOldPublishings (void)
""
"",
The_ClassFormBold[Gbl.Prefs.Theme],
- Gbl.Prefs.IconsURL,Txt_See_more,Txt_See_more,
- Gbl.Prefs.IconsURL,Txt_See_more,Txt_See_more,
+ Gbl.Prefs.URLIcons,Txt_See_more,Txt_See_more,
+ Gbl.Prefs.URLIcons,Txt_See_more,Txt_See_more,
Txt_See_more);
}
@@ -1882,7 +1882,7 @@ static void Soc_PutFormGoToAction (const struct SocialNote *SocNot)
" class=\"ICO20x20\" />"
" %s"
"",
- Gbl.Prefs.IconsURL,Soc_Icons[SocNot->NoteType],
+ Gbl.Prefs.URLIcons,Soc_Icons[SocNot->NoteType],
Txt_SOCIAL_NOTE[SocNot->NoteType],
Txt_SOCIAL_NOTE[SocNot->NoteType],
Txt_SOCIAL_NOTE[SocNot->NoteType]);
@@ -2364,7 +2364,7 @@ static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Frm_MAX_BY
""
"",
UniqueId,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Comment,Txt_Comment);
}
@@ -2382,7 +2382,7 @@ static void Soc_PutIconCommentDisabled (void)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Comment,Txt_Comment);
}
@@ -2678,7 +2678,7 @@ static void Soc_PutFormToRemoveComment (long PubCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Remove,
Txt_Remove);
Frm_EndForm ();
@@ -2702,7 +2702,7 @@ static void Soc_PutFormToFavSocialComment (long PubCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Mark_as_favourite,Txt_Mark_as_favourite);
Frm_EndForm ();
}
@@ -2730,7 +2730,7 @@ static void Soc_PutDisabledIconShare (unsigned NumShared)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
}
@@ -2757,7 +2757,7 @@ static void Soc_PutDisabledIconFav (unsigned NumFavs)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
}
@@ -2779,7 +2779,7 @@ static void Soc_PutFormToShareSocialNote (long NotCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Share,Txt_Share);
Frm_EndForm ();
}
@@ -2802,7 +2802,7 @@ static void Soc_PutFormToFavSocialNote (long NotCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Mark_as_favourite,Txt_Mark_as_favourite);
Frm_EndForm ();
}
@@ -2825,7 +2825,7 @@ static void Soc_PutFormToUnshareSocialNote (long NotCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_SOCIAL_NOTE_Shared,Txt_SOCIAL_NOTE_Shared);
Frm_EndForm ();
}
@@ -2848,7 +2848,7 @@ static void Soc_PutFormToUnfavSocialNote (long NotCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_SOCIAL_NOTE_Favourite,Txt_SOCIAL_NOTE_Favourite);
Frm_EndForm ();
}
@@ -2871,7 +2871,7 @@ static void Soc_PutFormToUnfavSocialComment (long PubCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_SOCIAL_NOTE_Favourite,Txt_SOCIAL_NOTE_Favourite);
Frm_EndForm ();
}
@@ -2894,7 +2894,7 @@ static void Soc_PutFormToRemoveSocialPublishing (long NotCod)
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Remove,
Txt_Remove);
Frm_EndForm ();
@@ -4508,7 +4508,7 @@ static void Soc_ShowSharersOrFavers (MYSQL_RES **mysql_res,
" alt=\"%u\" title=\"%u\""
" class=\"ICO20x20\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
NumUsrs - NumUsrsShown,
NumUsrs - NumUsrsShown);
}
diff --git a/swad_statistic.c b/swad_statistic.c
index 0cfbc015..3924d0de 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1987,7 +1987,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
" class=\"LEFT_TOP\""
" style=\"width:%upx; height:10px; padding-top:4px;\" />"
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
UsrDat.Roles.InCurrentCrs.Role == Rol_STD ? 'o' : // Student
'r', // Non-editing teacher or teacher
BarWidth);
@@ -2478,7 +2478,7 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float HitsMax)
" "
"",
- R,G,B,Gbl.Prefs.IconsURL);
+ R,G,B,Gbl.Prefs.URLIcons);
}
fprintf (Gbl.F.Out,"");
Tbl_EndTable ();
@@ -2976,7 +2976,7 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,BarHeight);
+ Gbl.Prefs.URLIcons,BarHeight);
}
else
fprintf (Gbl.F.Out,"0%% 0");
@@ -3078,7 +3078,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" alt=\"\" title=\"\""
" style=\"display:block; width:%upx; height:1px;\" />"
"",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/* All the intermediate divisions */
for (i = 0;
@@ -3090,7 +3090,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" style=\"display:block;"
" width:%upx; height:1px;\" />"
"",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/* Last division (right) */
fprintf (Gbl.F.Out,""
@@ -3099,7 +3099,7 @@ static void Sta_ShowAverageAccessesPerMinute (unsigned long NumRows,MYSQL_RES *m
" style=\"display:block; width:%upx; height:1px;\" />"
" "
"",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons,
Sta_WIDTH_SEMIDIVISION_GRAPHIC);
/***** Write again the labels of the X axis *****/
@@ -3155,7 +3155,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" background-repeat:repeat;\">"
"00h"
"",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons);
else if (Minute == (Sta_NUM_MINUTES_PER_DAY - 30))
// If 23:30
fprintf (Gbl.F.Out,""
"24h"
" ",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL);
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons);
else if (!(Minute % 30) && (Minute % 60))
// If minute is multiple of 30 but not of 60 (i.e.: 30, 90, 150...)
fprintf (Gbl.F.Out,""
"%02uh"
" ",
- Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.IconsURL,(Minute + 30) / 60);
+ Sta_WIDTH_SEMIDIVISION_GRAPHIC,Gbl.Prefs.URLIcons,(Minute + 30) / 60);
/***** Start cell for the graphic *****/
fprintf (Gbl.F.Out,"",
- Sta_NUM_DIVISIONS_X * 2,Sta_WIDTH_GRAPHIC,Gbl.Prefs.IconsURL,
+ Sta_NUM_DIVISIONS_X * 2,Sta_WIDTH_GRAPHIC,Gbl.Prefs.URLIcons,
(Minute % 60) == 0 ? 'v' :
'h');
@@ -3194,7 +3194,7 @@ static void Sta_WriteAccessMinute (unsigned Minute,float HitsNum,float MaxX)
" alt=\"\" title=\"\""
" style=\"display:block;"
" width:%upx; height:1px;\" />",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
(Minute % 60) == 0 ? 'r' : // red background
'o', // orange background
BarWidth);
@@ -3995,7 +3995,7 @@ static void Sta_DrawBarNumHits (char Color,
" class=\"LEFT_MIDDLE\""
" style=\"width:%upx; height:10px;\" />"
" ",
- Gbl.Prefs.IconsURL,Color,BarWidth);
+ Gbl.Prefs.URLIcons,Color,BarWidth);
/***** Write the number of hits *****/
Str_WriteFloatNum (Gbl.F.Out,HitsNum);
@@ -4573,9 +4573,9 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
/***** Write number of countries *****/
fprintf (Gbl.F.Out," "
""
- " "
+ " class=\"ICO16x16\" />"
" %s:"
" "
""
@@ -4603,7 +4603,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
"%u"
" "
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Countries,
Txt_Countries,
Txt_Countries,
@@ -4709,9 +4709,9 @@ static void Sta_GetAndShowNumInssInSWAD (void)
/***** Write number of institutions *****/
fprintf (Gbl.F.Out,""
""
- " "
+ " class=\"ICO16x16\" />"
" %s:"
" "
""
@@ -4737,7 +4737,7 @@ static void Sta_GetAndShowNumInssInSWAD (void)
"%u"
" "
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Institutions,
Txt_Institutions,
Txt_Institutions,
@@ -4835,9 +4835,9 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
/***** Write number of centres *****/
fprintf (Gbl.F.Out,""
""
- " "
+ " class=\"ICO16x16\" />"
" %s:"
" "
""
@@ -4861,7 +4861,7 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
"%u"
" "
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Centres,
Txt_Centres,
Txt_Centres,
@@ -4951,9 +4951,9 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
/***** Write number of degrees *****/
fprintf (Gbl.F.Out,""
""
- " "
+ " class=\"ICO16x16\" />"
" %s:"
" "
""
@@ -4975,7 +4975,7 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
"%u"
" "
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Degrees,
Txt_Degrees,
Txt_Degrees,
@@ -5057,9 +5057,9 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
/***** Write number of courses *****/
fprintf (Gbl.F.Out,""
""
- " "
+ " class=\"ICO16x16\" />"
" %s:"
" "
""
@@ -5079,7 +5079,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
"%u"
" "
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Courses,
Txt_Courses,
Txt_Courses,
@@ -7967,7 +7967,7 @@ static void Sta_GetAndShowForumStats (void)
"%s"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Scope,
Txt_Scope,
Txt_Forums,
@@ -8084,42 +8084,42 @@ static void Sta_ShowStatOfAForumType (For_ForumType_t ForumType,
break;
case For_FORUM_INSTIT_USRS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "ins64x64.gif",StatsForum,
+ "university.svg",StatsForum,
Txt_Institutions,"");
break;
case For_FORUM_INSTIT_TCHS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "ins64x64.gif",StatsForum,
+ "university.svg",StatsForum,
Txt_Institutions,Txt_only_teachers);
break;
case For_FORUM_CENTRE_USRS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "ctr64x64.gif",StatsForum,
+ "building.svg",StatsForum,
Txt_Centres,"");
break;
case For_FORUM_CENTRE_TCHS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "ctr64x64.gif",StatsForum,
+ "building.svg",StatsForum,
Txt_Centres,Txt_only_teachers);
break;
case For_FORUM_DEGREE_USRS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "deg64x64.gif",StatsForum,
+ "graduation-cap.svg",StatsForum,
Txt_Degrees,"");
break;
case For_FORUM_DEGREE_TCHS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "deg64x64.gif",StatsForum,
+ "graduation-cap.svg",StatsForum,
Txt_Degrees,Txt_only_teachers);
break;
case For_FORUM_COURSE_USRS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "crs64x64.gif",StatsForum,
+ "list-ol.svg",StatsForum,
Txt_Courses,"");
break;
case For_FORUM_COURSE_TCHS:
Sta_WriteForumTitleAndStats (ForumType,CtyCod,InsCod,CtrCod,DegCod,CrsCod,
- "crs64x64.gif",StatsForum,
+ "list-ol.svg",StatsForum,
Txt_Courses,Txt_only_teachers);
break;
default:
@@ -8195,7 +8195,7 @@ static void Sta_WriteForumTitleAndStats (For_ForumType_t ForumType,
"%.2f"
""
"",
- Gbl.Prefs.IconsURL,Icon,
+ Gbl.Prefs.URLIcons,Icon,
ForumName1,ForumName2,
ForumName1,ForumName2,
ForumName1,ForumName2,
@@ -9015,7 +9015,7 @@ static void Sta_GetAndShowNumUsrsPerFirstDayOfWeek (void)
"%5.2f%%"
""
"",
- Gbl.Prefs.IconsURL,FirstDayOfWeek,
+ Gbl.Prefs.URLIcons,FirstDayOfWeek,
Txt_DAYS_SMALL[FirstDayOfWeek],
Txt_First_day_of_the_week,Txt_DAYS_SMALL[FirstDayOfWeek],
NumUsrs[FirstDayOfWeek],
@@ -9177,7 +9177,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
"%5.2f%%"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[IconSet],
Ico_IconSetNames[IconSet],
@@ -9262,7 +9262,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
"%5.2f%%"
""
"",
- Gbl.Prefs.IconsURL,Mnu_MenuIcons[Menu],
+ Gbl.Prefs.URLIcons,Mnu_MenuIcons[Menu],
Txt_MENU_NAMES[Menu],
Txt_MENU_NAMES[Menu],
NumUsrs[Menu],
@@ -9345,7 +9345,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
"%5.2f%%"
""
"",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme],
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_THEMES,The_ThemeId[Theme],
The_ThemeNames[Theme],
The_ThemeNames[Theme],
NumUsrs[Theme],
@@ -9427,7 +9427,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
"%5.2f%%"
""
"",
- Gbl.Prefs.IconsURL,SideCols >> 1,SideCols & 1,
+ Gbl.Prefs.URLIcons,SideCols >> 1,SideCols & 1,
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
Txt_LAYOUT_SIDE_COLUMNS[SideCols],
NumUsrs[SideCols],
diff --git a/swad_survey.c b/swad_survey.c
index 7ae7ce04..a3b9ab57 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -3513,7 +3513,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
" class=\"LEFT_TOP\""
" style=\"width:%upx; height:20px;\" />"
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title,
BarWidth);
diff --git a/swad_tab.c b/swad_tab.c
index 6d211dc8..ae3d695d 100644
--- a/swad_tab.c
+++ b/swad_tab.c
@@ -43,19 +43,19 @@ extern struct Globals Gbl;
const char *Tab_TabIcons[Tab_NUM_TABS] =
{
/* TabUnk */ NULL,
- /* TabSys */ "sys64x64.gif",
- /* TabCty */ "cty64x64.gif",
- /* TabIns */ "ins64x64.gif",
- /* TabCtr */ "ctr64x64.gif",
- /* TabDeg */ "deg64x64.gif",
- /* TabCrs */ "crs64x64.gif",
- /* TabAss */ "ass64x64.gif",
- /* TabFil */ "fil64x64.gif",
- /* TabUsr */ "usr64x64.gif",
- /* TabSoc */ "soc64x64.png",
- /* TabMsg */ "msg64x64.gif",
- /* TabAna */ "ana64x64.gif",
- /* TabPrf */ "prf64x64.gif",
+ /* TabSys */ "sitemap",
+ /* TabCty */ "globe",
+ /* TabIns */ "university",
+ /* TabCtr */ "building",
+ /* TabDeg */ "graduation-cap",
+ /* TabCrs */ "list-ol",
+ /* TabAss */ "ass64x64",
+ /* TabFil */ "fil64x64",
+ /* TabUsr */ "usr64x64",
+ /* TabSoc */ "soc64x64",
+ /* TabMsg */ "envelope",
+ /* TabAna */ "ana64x64",
+ /* TabPrf */ "user",
};
/*****************************************************************************/
@@ -71,6 +71,7 @@ const char *Tab_TabIcons[Tab_NUM_TABS] =
/*****************************************************************************/
static bool Tab_CheckIfICanViewTab (Tab_Tab_t Tab);
+static const char *Tab_GetIcon (Tab_Tab_t Tab);
static void Tab_WriteBreadcrumbHome (void);
static void Tab_WriteBreadcrumbTab (void);
@@ -141,8 +142,8 @@ void Tab_DrawTabs (void)
" class=\"TAB_ICO\" />"
"%s
"
"",
- Gbl.Prefs.PathIconSet,
- Tab_TabIcons[NumTab],
+ Gbl.Prefs.URLIconSet,
+ Tab_GetIcon (NumTab),
Txt_TABS_TXT[NumTab],
Txt_TABS_TXT[NumTab],
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
@@ -198,6 +199,17 @@ static bool Tab_CheckIfICanViewTab (Tab_Tab_t Tab)
}
}
+/*****************************************************************************/
+/********************** Get icon associated to an action *********************/
+/*****************************************************************************/
+
+static const char *Tab_GetIcon (Tab_Tab_t NumTab)
+ {
+ if (NumTab < (Tab_Tab_t) 1 || NumTab >= Tab_NUM_TABS)
+ return NULL;
+
+ return Ico_GetIcon (Tab_TabIcons[NumTab]);
+ }
/*****************************************************************************/
/********************* Draw breadcrumb with tab and action *******************/
diff --git a/swad_test.c b/swad_test.c
index 0212e7a3..d3c279cb 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -1776,7 +1776,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
TagHidden = (row[2][0] == 'Y');
fprintf (Gbl.F.Out,""
" ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -1917,7 +1917,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Gbl.Title,
Gbl.Title);
Frm_EndForm ();
@@ -3456,7 +3456,7 @@ static void Tst_WriteAnswersEdit (long QstCod)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_TST_Answer_given_by_the_teachers,
Txt_TST_Answer_given_by_the_teachers);
fprintf (Gbl.F.Out," ");
@@ -5300,7 +5300,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
" "
"",
- NumOpt,Gbl.Prefs.IconsURL,
+ NumOpt,Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
/* Icon to contract (hide the answer) */
@@ -5314,7 +5314,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
" "
"",
- NumOpt,Gbl.Prefs.IconsURL,
+ NumOpt,Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
fprintf (Gbl.F.Out,"");
@@ -7971,7 +7971,7 @@ static void Tst_ShowTestResults (struct UsrData *UsrDat)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_View_test,
Txt_View_test);
Frm_EndForm ();
diff --git a/swad_test_import.c b/swad_test_import.c
index 749f5128..2dc3e45c 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -1032,7 +1032,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
" class=\"ICO20x20\" />"
"",
Gbl.RowEvenOdd,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
QuestionExists ? "tr" :
"ok_green",
QuestionExists ? Txt_Existing_question :
@@ -1092,7 +1092,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
QuestionExists ? "ok_off" :
"ok_on",
Txt_TST_Answer_given_by_the_teachers,
@@ -1161,7 +1161,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
QuestionExists ? "ok_off" :
"ok_on",
Txt_TST_Answer_given_by_the_teachers,
diff --git a/swad_theme.c b/swad_theme.c
index 202d4b17..ec7eeed4 100644
--- a/swad_theme.c
+++ b/swad_theme.c
@@ -249,7 +249,7 @@ void The_PutIconsToSelectTheme (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Theme],
The_ThemeNames[Theme],
@@ -286,10 +286,10 @@ void The_ChangeTheme (void)
Gbl.Prefs.Theme = The_GetParamTheme ();
snprintf (Path,sizeof (Path),
"%s/%s/%s",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Gbl.Prefs.Theme]);
- Str_Copy (Gbl.Prefs.PathTheme,Path,
+ Str_Copy (Gbl.Prefs.URLTheme,Path,
PATH_MAX);
/***** Store theme in database *****/
diff --git a/swad_user.c b/swad_user.c
index 37c7b79b..ea79034a 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -2469,7 +2469,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
" autofocus=\"autofocus\" required=\"required\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_User[Usr_SEX_UNKNOWN],
Txt_User[Usr_SEX_UNKNOWN],
Cns_MAX_CHARS_EMAIL_ADDRESS,
@@ -2485,7 +2485,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />"
""
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Password,
Txt_Password,
Pwd_MAX_CHARS_PLAIN_PASSWORD,
@@ -2533,7 +2533,7 @@ void Usr_WelcomeUsr (void)
fprintf (Gbl.F.Out," ",
- Gbl.Prefs.PathIconSet,Cfg_ICON_128x128,
+ Gbl.Prefs.URLIconSet,Cfg_ICON_128x128,
Txt_Happy_birthday,
Txt_Happy_birthday);
snprintf (Gbl.Alert.Txt,sizeof (Gbl.Alert.Txt),
@@ -2658,7 +2658,7 @@ void Usr_PutFormLogIn (void)
" class=\"ICO20x20\" />"
" %s "
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Log_in,
Txt_Log_in,
Txt_Log_in);
@@ -2727,7 +2727,7 @@ void Usr_PutFormLogOut (void)
" class=\"ICO20x20\" />"
" %s "
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Log_out,
Txt_Log_out,
Txt_Log_out);
@@ -3298,17 +3298,17 @@ static void Usr_SetMyPrefsAndRoles (void)
Gbl.Prefs.Theme = Gbl.Usrs.Me.UsrDat.Prefs.Theme;
snprintf (Path,sizeof (Path),
"%s/%s/%s",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_THEMES,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_THEMES,
The_ThemeId[Gbl.Prefs.Theme]);
- Str_Copy (Gbl.Prefs.PathTheme,Path,
+ Str_Copy (Gbl.Prefs.URLTheme,Path,
PATH_MAX);
Gbl.Prefs.IconSet = Gbl.Usrs.Me.UsrDat.Prefs.IconSet;
snprintf (Path,sizeof (Path),
"%s/%s/%s",
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_ICON_SETS,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_ICON_SETS,
Ico_IconSetId[Gbl.Prefs.IconSet]);
- Str_Copy (Gbl.Prefs.PathIconSet,Path,
+ Str_Copy (Gbl.Prefs.URLIconSet,Path,
PATH_MAX);
/***** Construct the path to my directory *****/
@@ -5984,7 +5984,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" %s",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Usr_IconsClassPhotoOrList[ListType],
Txt_USR_LIST_TYPES[ListType],
Txt_USR_LIST_TYPES[ListType],
diff --git a/swad_zip.c b/swad_zip.c
index 036ffcad..92b95d14 100644
--- a/swad_zip.c
+++ b/swad_zip.c
@@ -387,7 +387,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"",
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Create_ZIP_file,
Txt_Create_ZIP_file);
Frm_EndForm ();
@@ -652,11 +652,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
""
"",
URL,FileName,
- Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_FILEXT,
+ Gbl.Prefs.URLIcons,Cfg_ICON_FOLDER_FILEXT,
Txt_ZIP_file,
Txt_ZIP_file,
FileName,
- Gbl.Prefs.IconsURL,
+ Gbl.Prefs.URLIcons,
Txt_Download,
Txt_Download);