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

Version 16.167.1

This commit is contained in:
Antonio Cañas Vargas 2017-03-25 20:46:14 +01:00
parent fccc0592ce
commit 2372da1a37
8 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon/calendar64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
icon/holiday64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
icon/iconset/awesome/action64x64/calendar64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
icon/iconset/nuvola/action64x64/calendar64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

14
swad_action.c
View File

@ -1524,7 +1524,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeLnk */{ 748, 6,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Lnk_SeeLinks ,"link64x64.gif" },
/* ActLstPlg */{ 777, 7,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plg_ListPlugins ,"blocks64x64.gif" },
/* ActSetUp */{ 840, 8,TabSys,ActSetUp , 0, 0, 0, 0, 0, 0,0x100,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Set_Setup ,"lightning64x64.gif" },
/* ActSeeCalSys */{1622, 9,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarSys ,"date64x64.gif" },
/* ActSeeCalSys */{1622, 9,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarSys ,"calendar64x64.png" },
// Actions not in menu:
/* ActSysSch */{ 628,-1,TabUnk,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_SysSearch ,NULL},
@ -1578,7 +1578,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sch_ReqCtySearch ,"search64x64.gif" },
/* ActSeeCtyInf */{1155, 1,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cty_ShowConfiguration ,"info64x64.gif" },
/* ActSeeIns */{ 696, 2,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ins_ShowInssOfCurrentCty ,"institution64x64.gif" },
/* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCty ,"date64x64.gif" },
/* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCty ,"calendar64x64.png" },
// Actions not in menu:
/* ActCtySch */{1181,-1,TabUnk,ActCtyReqSch , 0, 0, 0, 0, 0,0x1FF, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_CtySearch ,NULL},
@ -1605,7 +1605,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ctr_ShowCtrsOfCurrentIns ,"house64x64.gif" },
/* ActSeeDpt */{ 675, 3,TabIns,ActSeeDpt , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_SeeDepts ,"houseteachers64x64.gif"},
/* ActSeePlc */{ 703, 4,TabIns,ActSeePlc , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_SeePlaces ,"mapmarker64x64.png" },
/* ActSeeCalIns */{1628, 6,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarIns ,"date64x64.gif" },
/* ActSeeCalIns */{1628, 6,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" },
// Actions not in menu:
/* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_InsSearch ,NULL},
@ -1661,7 +1661,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sch_ReqCtrSearch ,"search64x64.gif" },
/* ActSeeCtrInf */{1151, 1,TabCtr,ActSeeCtrInf , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ctr_ShowConfiguration ,"info64x64.gif" },
/* ActSeeDeg */{1011, 2,TabCtr,ActSeeDeg , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Deg_ShowDegsOfCurrentCtr ,"deg64x64.gif" },
/* ActSeeCalCtr */{1631, 3,TabCtr,ActSeeCalCtr , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCtr ,"date64x64.gif" },
/* ActSeeCalCtr */{1631, 3,TabCtr,ActSeeCalCtr , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCtr ,"calendar64x64.png" },
// Actions not in menu:
/* ActCtrSch */{1183,-1,TabUnk,ActCtrReqSch , 0, 0, 0,0x1FF, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_CtrSearch ,NULL},
@ -1696,7 +1696,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sch_ReqDegSearch ,"search64x64.gif" },
/* ActSeeDegInf */{1149, 1,TabDeg,ActSeeDegInf , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Deg_ShowConfiguration ,"info64x64.gif" },
/* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ShowCrssOfCurrentDeg ,"coursesdegree64x64.gif"},
/* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarDeg ,"date64x64.gif" },
/* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarDeg ,"calendar64x64.png" },
// Actions not in menu:
/* ActDegSch */{1184,-1,TabUnk,ActDegReqSch , 0, 0,0x1FF, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_DegSearch ,NULL},
@ -1733,7 +1733,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActSeeFAQ */{ 54, 5,TabCrs,ActSeeFAQ ,0x118,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Inf_ShowInfo ,"faq64x64.gif" },
/* ActSeeCrsLnk */{ 9, 6,TabCrs,ActSeeCrsLnk ,0x118,0x100, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Inf_ShowInfo ,"link64x64.gif" },
/* ActSeeCrsTT */{ 25, 7,TabCrs,ActSeeCrsTT ,0x1FF,0x1FF, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActSeeCalCrs */{ 16, 8,TabCrs,ActSeeCalCrs ,0x1FF,0x1FF, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCrs ,"date64x64.gif" },
/* ActSeeCalCrs */{ 16, 8,TabCrs,ActSeeCalCrs ,0x1FF,0x1FF, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarCrs ,"calendar64x64.png" },
// Actions not in menu:
/* ActCrsSch */{1185,-1,TabUnk,ActCrsReqSch ,0x1FF,0x1FF, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL},
@ -2870,7 +2870,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActFrmRolSes */{ 843, 1,TabPrf,ActFrmRolSes ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Usr_WriteFormLogout ,"keyuser64x64.gif" },
/* ActMyCrs */{ 987, 2,TabPrf,ActMyCrs ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Crs_ReqSelectOneOfMyCourses ,"hierarchy64x64.png" },
/* ActSeeMyTT */{ 408, 3,TabPrf,ActSeeMyTT ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,TT_ShowClassTimeTable ,"clock64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"date64x64.gif" },
/* ActSeeMyAgd */{1602, 4,TabPrf,ActSeeMyAgd ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Agd_ShowMyAgenda ,"calendar64x64.png" },
/* ActFrmMyAcc */{ 36, 5,TabPrf,ActFrmMyAcc ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Acc_ShowFormMyAccount ,"arroba64x64.gif" },
/* ActReqEdiRecCom */{ 285, 6,TabPrf,ActReqEdiRecCom ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rec_ShowFormMySharedRecord ,"card64x64.gif" },
/* ActEdiPrf */{ 673, 7,TabPrf,ActEdiPrf ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pre_EditPrefs ,"heart64x64.gif" },

11
swad_changelog.h
View File

@ -209,13 +209,20 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167 (2017-03-24)"
#define Log_PLATFORM_VERSION "SWAD 16.167.1 (2017-03-24)"
#define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.167.1: Mar 25, 2017 Changes in icons related to calendar and holidays. (217595 lines)
Copy the following icons to icon public directory:
sudo cp -a icon/iconset/awesome/action64x64/calendar64x64.png /var/www/html/swad/icon/iconset/awesome/action64x64/
sudo cp -a icon/iconset/nuvola/action64x64/calendar64x64.png /var/www/html/swad/icon/iconset/nuvola/action64x64/
sudo cp -a icon/calendar64x64.png /var/www/html/swad/icon/
sudo cp -a icon/holiday64x64.png /var/www/html/swad/icon/
Version 16.167: Mar 25, 2017 Holidays removed from main manu. (217589 lines)
Version 16.166.2: Mar 25, 2017 Contextual link to edit holidays in calendar. (217628 lines)
Version 16.166.1: Mar 25, 2017 Contextual link to holidays in calendar. (217630 lines)
@ -858,7 +865,7 @@ INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1611','es','N','Ver
Version 16.81.5: Dec 01, 2016 Link in teacher's record card to show agenda. (209313 lines)
Copy the following icon to icon public directory:
sudo cp icon/date64x64.gif /var/www/html/swad/icon/
sudo cp icon/calendar64x64.png /var/www/html/swad/icon/
Version 16.81.4: Dec 01, 2016 Changes in texts related to agenda. (209268 lines)
Version 16.81.3: Dec 01, 2016 Icon view replaced by lock in agenda.

2
swad_holiday.c
View File

@ -81,7 +81,7 @@ void Hld_PutLinkToHolidays (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActSeeHld,NULL,
"date64x64.gif",
"holiday64x64.png",
Txt_Holidays,Txt_Holidays,
NULL);
fprintf (Gbl.F.Out,"</div>");

4
swad_record.c
View File

@ -2421,13 +2421,13 @@ static void Rec_PutIconsCommands (void)
if (ItsMe)
Lay_PutContextualLink (ActSeeMyAgd,
NULL,
"date64x64.gif",
"calendar64x64.png",
Txt_Show_agenda,NULL,
NULL);
else if (Usr_CheckIfICanViewUsrAgenda (Gbl.Record.UsrDat))
Lay_PutContextualLink (ActSeeUsrAgd,
Rec_PutParamUsrCodEncrypted,
"date64x64.gif",
"calendar64x64.png",
Txt_Show_agenda,NULL,
NULL);