From 8869a969b1b4f7cfaa30f21834d85854d3766452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 15 Feb 2019 09:44:30 +0100 Subject: [PATCH] Version 18.44.1 --- swad_action.c | 51 +++++++----- swad_action.h | 202 +++++++++++++++++++++++------------------------ swad_calendar.c | 26 +----- swad_calendar.h | 1 - swad_changelog.h | 8 +- swad_date.c | 2 +- swad_menu.c | 6 +- swad_text.c | 92 ++++++++++----------- 8 files changed, 192 insertions(+), 196 deletions(-) diff --git a/swad_action.c b/swad_action.c index 2aeed38ea..faf0557e5 100644 --- a/swad_action.c +++ b/swad_action.c @@ -104,6 +104,7 @@ Start: 10. ActSysReqSch Request search in system tab 1057. ActSeeSocTmlGbl Show social timeline (global) 1058. ActSeeSocPrf Suggest list of users to follow + 16. ActSeeCalSys Show the academic calendar 1228. ActSeeNtf Show my recent notifications 1293. ActReqSndNewPwd Show form to send a new password via email @@ -151,13 +152,24 @@ Start: 1093. ActSeeFlg Show following 1094. ActSeeFlr Show followers + 56. ActPrnSysCrs Show print view of the academic calendar + 57. ActChgSysCrs1stDay Change first day of week and show academic calendar + + 1247. ActSeeNewNtf Show my recent notifications (link in top heading) + 1248. ActMrkNtfSee Mark all my notifications as seen + 1249. ActSeeMai See mail domains + 1250. ActEdiMai Edit mail domains + 1251. ActNewMai Request the creation of a mail domain + 1252. ActRemMai Request the removal of a mail domain + 1253. ActRenMaiSho Request the change of a mail domain + 1254. ActRenMaiFul Request the change of the info of a mail domain + System: 11. ActSeeCty List countries 12. ActSeePen List pending institutions, centres, degrees and courses in hierarchy 13. ActSeeLnk See institutional links 14. ActLstPlg List plugins 15. ActSetUp Initial set up - 16. ActSeeCalSys Show the academic calendar 18. ActEdiCty Edit countries 19. ActNewCty Request the creation of a country @@ -202,9 +214,6 @@ System: 54. ActChgPlgURL Change the URL of a plugin 55. ActChgPlgIP Change the IP address of a plugin - 56. ActPrnSysCrs Show print view of the academic calendar - 57. ActChgSysCrs1stDay Change first day of week and show academic calendar - Country: 59. ActSeeCtyInf Show information on the current country 60. ActSeeIns List institutions @@ -1312,15 +1321,6 @@ Messages: 1245. ActReqRemNot Request removal of a notice 1246. ActRemNot Remove a notice - 1247. ActSeeNewNtf Show my recent notifications (link in top heading) - 1248. ActMrkNtfSee Mark all my notifications as seen - 1249. ActSeeMai See mail domains - 1250. ActEdiMai Edit mail domains - 1251. ActNewMai Request the creation of a mail domain - 1252. ActRemMai Request the removal of a mail domain - 1253. ActRenMaiSho Request the change of a mail domain - 1254. ActRenMaiFul Request the change of the info of a mail domain - 1095. ActSeeForCrsUsr Show top level of forum of users of the course 1096. ActSeeForCrsTch Show top level of forum of teachers of the course 1097. ActSeeForDegUsr Show top level of forum of users of the degree @@ -1618,7 +1618,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSysReqSch */{ 627, 1,TabSta,ActSysReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search" }, /* ActSeeSocTmlGbl */{1490, 2,TabSta,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShowTimelineGbl2 ,"comment-dots" }, /* ActSeeSocPrf */{1520, 3,TabSta,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_SeeSocialProfiles ,"user-check" }, - /* ActSeeNtf */{ 990, 4,TabSta,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" }, + /* ActSeeCalSys */{1622, 4,TabSta,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar" }, +// /* ActSeeCalCty */{1625, 2,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar" }, +// /* ActSeeCalIns */{1628, 4,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar" }, +// /* ActSeeCalCtr */{1631, 3,TabCtr,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCtr ,"calendar" }, +// /* ActSeeCalDeg */{1634, 2,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar" }, +// /* ActSeeCalCrs */{ 16, 7,TabCrs,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCrs ,"calendar" }, + /* ActSeeNtf */{ 990, 5,TabSta,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" }, /* ActReqSndNewPwd */{ 665,-1,TabUnk,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pwd_ShowFormSendNewPwd ,NULL}, /* ActSndNewPwd */{ 633,-1,TabUnk,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pwd_ChkIdLoginAndSendNewPwd ,NULL}, @@ -1666,6 +1672,19 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeFlg */{1412,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Fol_ListFollowing ,NULL}, /* ActSeeFlr */{1413,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Fol_ListFollowers ,NULL}, + /* ActPrnCalSys */{1623,-1,TabUnk,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, +// /* ActPrnCalCty */{1626,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, +// /* ActPrnCalIns */{1629,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, +// /* ActPrnCalCtr */{1632,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, +// /* ActPrnCalDeg */{1635,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, +// /* ActPrnCalCrs */{ 71,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, + /* ActChgCalSys1stDay*/{1624,-1,TabUnk,ActSeeCalSys ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarSys ,NULL}, +// /* ActChgCalCty1stDay*/{1627,-1,TabUnk,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCty ,NULL}, +// /* ActChgCalIns1stDay*/{1630,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarIns ,NULL}, +// /* ActChgCalCtr1stDay*/{1633,-1,TabUnk,ActSeeCalCtr , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCtr ,NULL}, +// /* ActChgCalDeg1stDay*/{1636,-1,TabUnk,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarDeg ,NULL}, +// /* ActChgCalCrs1stDay*/{1485,-1,TabUnk,ActSeeCalCrs ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarCrs ,NULL}, + /* ActSeeNewNtf */{ 991,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,NULL}, /* ActMrkNtfSee */{1146,-1,TabUnk,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_MarkAllNotifAsSeen ,NULL}, @@ -1683,7 +1702,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeLnk */{ 748, 2,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Lnk_SeeLinks ,"link" }, /* ActLstPlg */{ 777, 3,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ListPlugins ,"puzzle-piece" }, /* ActSetUp */{ 840, 4,TabSys,ActSetUp , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Set_Setup ,"bolt" }, - /* ActSeeCalSys */{1622, 5,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar" }, // Actions not in menu: /* ActEdiCty */{ 863,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_EditCountries ,NULL}, @@ -1724,9 +1742,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActChgPlgURL */{ 783,-1,TabUnk,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ChangePlgURL ,NULL}, /* ActChgPlgIP */{ 780,-1,TabUnk,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ChangePlgIP ,NULL}, - /* ActPrnCalSys */{1623,-1,TabUnk,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_NEW_TAB,NULL ,Cal_PrintCalendar ,NULL}, - /* ActChgCalSys1stDay*/{1624,-1,TabUnk,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarSys ,NULL}, - // TabCty ****************************************************************** // Actions in menu: /* ActSeeCtyInf */{1155, 0,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info" }, diff --git a/swad_action.h b/swad_action.h index 672b1478f..3d788303b 100644 --- a/swad_action.h +++ b/swad_action.h @@ -61,7 +61,7 @@ typedef enum typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action -#define Act_NUM_ACTIONS (1 + 9 + 52 + 41 + 15 + 45 + 39 + 22 + 113 + 157 + 437 + 165 + 168 + 15 + 72) +#define Act_NUM_ACTIONS (1 + 9 + 55 + 38 + 15 + 45 + 39 + 22 + 113 + 157 + 437 + 165 + 168 + 15 + 72) #define Act_MAX_ACTION_COD 1752 @@ -93,63 +93,67 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActSysReqSch (ActWebSvc + 2) #define ActSeeSocTmlGbl (ActWebSvc + 3) #define ActSeeSocPrf (ActWebSvc + 4) -#define ActSeeNtf (ActWebSvc + 5) +#define ActSeeCalSys (ActWebSvc + 5) +#define ActSeeNtf (ActWebSvc + 6) // Secondary actions -#define ActReqSndNewPwd (ActWebSvc + 6) -#define ActSndNewPwd (ActWebSvc + 7) -#define ActLogOut (ActWebSvc + 8) +#define ActReqSndNewPwd (ActWebSvc + 7) +#define ActSndNewPwd (ActWebSvc + 8) +#define ActLogOut (ActWebSvc + 9) -#define ActSysSch (ActWebSvc + 9) +#define ActSysSch (ActWebSvc + 10) -#define ActRcvSocPstGbl (ActWebSvc + 10) -#define ActRcvSocComGbl (ActWebSvc + 11) -#define ActShaSocNotGbl (ActWebSvc + 12) -#define ActUnsSocNotGbl (ActWebSvc + 13) -#define ActFavSocNotGbl (ActWebSvc + 14) -#define ActUnfSocNotGbl (ActWebSvc + 15) -#define ActFavSocComGbl (ActWebSvc + 16) -#define ActUnfSocComGbl (ActWebSvc + 17) -#define ActReqRemSocPubGbl (ActWebSvc + 18) -#define ActRemSocPubGbl (ActWebSvc + 19) -#define ActReqRemSocComGbl (ActWebSvc + 20) -#define ActRemSocComGbl (ActWebSvc + 21) +#define ActRcvSocPstGbl (ActWebSvc + 11) +#define ActRcvSocComGbl (ActWebSvc + 12) +#define ActShaSocNotGbl (ActWebSvc + 13) +#define ActUnsSocNotGbl (ActWebSvc + 14) +#define ActFavSocNotGbl (ActWebSvc + 15) +#define ActUnfSocNotGbl (ActWebSvc + 16) +#define ActFavSocComGbl (ActWebSvc + 17) +#define ActUnfSocComGbl (ActWebSvc + 18) +#define ActReqRemSocPubGbl (ActWebSvc + 19) +#define ActRemSocPubGbl (ActWebSvc + 20) +#define ActReqRemSocComGbl (ActWebSvc + 21) +#define ActRemSocComGbl (ActWebSvc + 22) -#define ActReqOthPubPrf (ActWebSvc + 22) +#define ActReqOthPubPrf (ActWebSvc + 23) -#define ActRcvSocPstUsr (ActWebSvc + 23) -#define ActRcvSocComUsr (ActWebSvc + 24) -#define ActShaSocNotUsr (ActWebSvc + 25) -#define ActUnsSocNotUsr (ActWebSvc + 26) -#define ActFavSocNotUsr (ActWebSvc + 27) -#define ActUnfSocNotUsr (ActWebSvc + 28) -#define ActFavSocComUsr (ActWebSvc + 29) -#define ActUnfSocComUsr (ActWebSvc + 30) -#define ActReqRemSocPubUsr (ActWebSvc + 31) -#define ActRemSocPubUsr (ActWebSvc + 32) -#define ActReqRemSocComUsr (ActWebSvc + 33) -#define ActRemSocComUsr (ActWebSvc + 34) +#define ActRcvSocPstUsr (ActWebSvc + 24) +#define ActRcvSocComUsr (ActWebSvc + 25) +#define ActShaSocNotUsr (ActWebSvc + 26) +#define ActUnsSocNotUsr (ActWebSvc + 27) +#define ActFavSocNotUsr (ActWebSvc + 28) +#define ActUnfSocNotUsr (ActWebSvc + 29) +#define ActFavSocComUsr (ActWebSvc + 30) +#define ActUnfSocComUsr (ActWebSvc + 31) +#define ActReqRemSocPubUsr (ActWebSvc + 32) +#define ActRemSocPubUsr (ActWebSvc + 33) +#define ActReqRemSocComUsr (ActWebSvc + 34) +#define ActRemSocComUsr (ActWebSvc + 35) -#define ActSeeOthPubPrf (ActWebSvc + 35) -#define ActCal1stClkTim (ActWebSvc + 36) -#define ActCalNumClk (ActWebSvc + 37) -#define ActCalNumFilVie (ActWebSvc + 38) -#define ActCalNumForPst (ActWebSvc + 39) -#define ActCalNumMsgSnt (ActWebSvc + 40) +#define ActSeeOthPubPrf (ActWebSvc + 36) +#define ActCal1stClkTim (ActWebSvc + 37) +#define ActCalNumClk (ActWebSvc + 38) +#define ActCalNumFilVie (ActWebSvc + 39) +#define ActCalNumForPst (ActWebSvc + 40) +#define ActCalNumMsgSnt (ActWebSvc + 41) -#define ActFolUsr (ActWebSvc + 41) -#define ActUnfUsr (ActWebSvc + 42) -#define ActSeeFlg (ActWebSvc + 43) -#define ActSeeFlr (ActWebSvc + 44) +#define ActFolUsr (ActWebSvc + 42) +#define ActUnfUsr (ActWebSvc + 43) +#define ActSeeFlg (ActWebSvc + 44) +#define ActSeeFlr (ActWebSvc + 45) -#define ActSeeNewNtf (ActWebSvc + 45) -#define ActMrkNtfSee (ActWebSvc + 46) -#define ActSeeMai (ActWebSvc + 47) -#define ActEdiMai (ActWebSvc + 48) -#define ActNewMai (ActWebSvc + 49) -#define ActRemMai (ActWebSvc + 50) -#define ActRenMaiSho (ActWebSvc + 51) -#define ActRenMaiFul (ActWebSvc + 52) +#define ActPrnCalSys (ActWebSvc + 46) +#define ActChgCalSys1stDay (ActWebSvc + 47) + +#define ActSeeNewNtf (ActWebSvc + 48) +#define ActMrkNtfSee (ActWebSvc + 49) +#define ActSeeMai (ActWebSvc + 50) +#define ActEdiMai (ActWebSvc + 51) +#define ActNewMai (ActWebSvc + 52) +#define ActRemMai (ActWebSvc + 53) +#define ActRenMaiSho (ActWebSvc + 54) +#define ActRenMaiFul (ActWebSvc + 55) /*****************************************************************************/ /******************************** System tab *********************************/ @@ -160,73 +164,69 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActSeeLnk (ActRenMaiFul + 3) #define ActLstPlg (ActRenMaiFul + 4) #define ActSetUp (ActRenMaiFul + 5) -#define ActSeeCalSys (ActRenMaiFul + 6) // Secondary actions -#define ActEdiCty (ActRenMaiFul + 7) -#define ActNewCty (ActRenMaiFul + 8) -#define ActRemCty (ActRenMaiFul + 9) -#define ActRenCty (ActRenMaiFul + 10) -#define ActChgCtyWWW (ActRenMaiFul + 11) +#define ActEdiCty (ActRenMaiFul + 6) +#define ActNewCty (ActRenMaiFul + 7) +#define ActRemCty (ActRenMaiFul + 8) +#define ActRenCty (ActRenMaiFul + 9) +#define ActChgCtyWWW (ActRenMaiFul + 10) -#define ActReqRemOldCrs (ActRenMaiFul + 12) -#define ActRemOldCrs (ActRenMaiFul + 13) +#define ActReqRemOldCrs (ActRenMaiFul + 11) +#define ActRemOldCrs (ActRenMaiFul + 12) -#define ActSeeBan (ActRenMaiFul + 14) -#define ActEdiBan (ActRenMaiFul + 15) -#define ActNewBan (ActRenMaiFul + 16) -#define ActRemBan (ActRenMaiFul + 17) -#define ActShoBan (ActRenMaiFul + 18) -#define ActHidBan (ActRenMaiFul + 19) -#define ActRenBanSho (ActRenMaiFul + 20) -#define ActRenBanFul (ActRenMaiFul + 21) -#define ActChgBanImg (ActRenMaiFul + 22) -#define ActChgBanWWW (ActRenMaiFul + 23) -#define ActClkBan (ActRenMaiFul + 24) +#define ActSeeBan (ActRenMaiFul + 13) +#define ActEdiBan (ActRenMaiFul + 14) +#define ActNewBan (ActRenMaiFul + 15) +#define ActRemBan (ActRenMaiFul + 16) +#define ActShoBan (ActRenMaiFul + 17) +#define ActHidBan (ActRenMaiFul + 18) +#define ActRenBanSho (ActRenMaiFul + 19) +#define ActRenBanFul (ActRenMaiFul + 20) +#define ActChgBanImg (ActRenMaiFul + 21) +#define ActChgBanWWW (ActRenMaiFul + 22) +#define ActClkBan (ActRenMaiFul + 23) -#define ActEdiLnk (ActRenMaiFul + 25) -#define ActNewLnk (ActRenMaiFul + 26) -#define ActRemLnk (ActRenMaiFul + 27) -#define ActRenLnkSho (ActRenMaiFul + 28) -#define ActRenLnkFul (ActRenMaiFul + 29) -#define ActChgLnkWWW (ActRenMaiFul + 30) +#define ActEdiLnk (ActRenMaiFul + 24) +#define ActNewLnk (ActRenMaiFul + 25) +#define ActRemLnk (ActRenMaiFul + 26) +#define ActRenLnkSho (ActRenMaiFul + 27) +#define ActRenLnkFul (ActRenMaiFul + 28) +#define ActChgLnkWWW (ActRenMaiFul + 29) -#define ActEdiPlg (ActRenMaiFul + 31) -#define ActNewPlg (ActRenMaiFul + 32) -#define ActRemPlg (ActRenMaiFul + 33) -#define ActRenPlg (ActRenMaiFul + 34) -#define ActChgPlgDes (ActRenMaiFul + 35) -#define ActChgPlgLog (ActRenMaiFul + 36) -#define ActChgPlgAppKey (ActRenMaiFul + 37) -#define ActChgPlgURL (ActRenMaiFul + 38) -#define ActChgPlgIP (ActRenMaiFul + 39) - -#define ActPrnCalSys (ActRenMaiFul + 40) -#define ActChgCalSys1stDay (ActRenMaiFul + 41) +#define ActEdiPlg (ActRenMaiFul + 30) +#define ActNewPlg (ActRenMaiFul + 31) +#define ActRemPlg (ActRenMaiFul + 32) +#define ActRenPlg (ActRenMaiFul + 33) +#define ActChgPlgDes (ActRenMaiFul + 34) +#define ActChgPlgLog (ActRenMaiFul + 35) +#define ActChgPlgAppKey (ActRenMaiFul + 36) +#define ActChgPlgURL (ActRenMaiFul + 37) +#define ActChgPlgIP (ActRenMaiFul + 38) /*****************************************************************************/ /******************************** Country tab ********************************/ /*****************************************************************************/ // Actions in menu -#define ActSeeCtyInf (ActChgCalSys1stDay + 1) -#define ActSeeIns (ActChgCalSys1stDay + 2) -#define ActSeeCalCty (ActChgCalSys1stDay + 3) +#define ActSeeCtyInf (ActChgPlgIP + 1) +#define ActSeeIns (ActChgPlgIP + 2) +#define ActSeeCalCty (ActChgPlgIP + 3) // Secondary actions -#define ActPrnCtyInf (ActChgCalSys1stDay + 4) -#define ActChgCtyMapAtt (ActChgCalSys1stDay + 5) +#define ActPrnCtyInf (ActChgPlgIP + 4) +#define ActChgCtyMapAtt (ActChgPlgIP + 5) -#define ActEdiIns (ActChgCalSys1stDay + 6) -#define ActReqIns (ActChgCalSys1stDay + 7) -#define ActNewIns (ActChgCalSys1stDay + 8) -#define ActRemIns (ActChgCalSys1stDay + 9) -#define ActRenInsSho (ActChgCalSys1stDay + 10) -#define ActRenInsFul (ActChgCalSys1stDay + 11) -#define ActChgInsWWW (ActChgCalSys1stDay + 12) -#define ActChgInsSta (ActChgCalSys1stDay + 13) +#define ActEdiIns (ActChgPlgIP + 6) +#define ActReqIns (ActChgPlgIP + 7) +#define ActNewIns (ActChgPlgIP + 8) +#define ActRemIns (ActChgPlgIP + 9) +#define ActRenInsSho (ActChgPlgIP + 10) +#define ActRenInsFul (ActChgPlgIP + 11) +#define ActChgInsWWW (ActChgPlgIP + 12) +#define ActChgInsSta (ActChgPlgIP + 13) -#define ActPrnCalCty (ActChgCalSys1stDay + 14) -#define ActChgCalCty1stDay (ActChgCalSys1stDay + 15) +#define ActPrnCalCty (ActChgPlgIP + 14) +#define ActChgCalCty1stDay (ActChgPlgIP + 15) /*****************************************************************************/ /****************************** Institution tab ******************************/ diff --git a/swad_calendar.c b/swad_calendar.c index 36e1645ec..869c1219a 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -226,37 +226,13 @@ void Cal_DrawCurrentMonth (void) Gbl.CurrentCtr.Ctr.PlcCod, Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language]); - Frm_SetParamsForm (ParamsStr,Cal_GetActionToSeeCalendar (),true); + Frm_SetParamsForm (ParamsStr,ActSeeCalSys,true); fprintf (Gbl.F.Out,"'%s',",ParamsStr); Frm_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); fprintf (Gbl.F.Out,"'%s');" "",ParamsStr); } -/*****************************************************************************/ -/********** Get action to see calendar depending on current scope ************/ -/*****************************************************************************/ - -Act_Action_t Cal_GetActionToSeeCalendar () - { - if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected - return ActSeeCalCrs; - - if (Gbl.CurrentDeg.Deg.DegCod > 0) // Degree selected - return ActSeeCalDeg; - - if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // Centre selected - return ActSeeCalCtr; - - if (Gbl.CurrentIns.Ins.InsCod > 0) // Institution selected - return ActSeeCalIns; - - if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected - return ActSeeCalCty; - - return ActSeeCalSys; - } - /*****************************************************************************/ /************************ Draw an academic calendar **************************/ /*****************************************************************************/ diff --git a/swad_calendar.h b/swad_calendar.h index 1f527fd05..133c81c3f 100644 --- a/swad_calendar.h +++ b/swad_calendar.h @@ -49,7 +49,6 @@ void Cal_ChangeFirstDayOfWeek (void); unsigned Cal_GetFirstDayOfWeekFromStr (const char *Str); void Cal_DrawCurrentMonth (void); -Act_Action_t Cal_GetActionToSeeCalendar (); void Cal_DrawCalendarSys (void); void Cal_DrawCalendarCty (void); diff --git a/swad_changelog.h b/swad_changelog.h index 758476d63..8f47f597e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -386,10 +386,16 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.44 (2019-02-15)" +#define Log_PLATFORM_VERSION "SWAD 18.44.1 (2019-02-15)" #define CSS_FILE "swad18.41.1.css" #define JS_FILE "swad18.32.1.js" /* + Version 18.44.1: Feb 15, 2019 Option system calendar is moved to start tab. (238654 lines) + 3 changes necessary in database: +UPDATE actions SET Txt='Ver calendario' WHERE ActCod='1622' AND Language='es'; +UPDATE actions SET Txt='Imprimir calendario' WHERE ActCod='1623' AND Language='es'; +UPDATE actions SET Txt='Cambiar 1er. día calendario' WHERE ActCod='1624' AND Language='es'; + Version 18.44: Feb 15, 2019 Removed options to search from country, institution, centre, degree and course. (238652 lines) 10 changes necessary in database: UPDATE actions SET Obsolete='Y' WHERE ActCod='1176'; diff --git a/swad_date.c b/swad_date.c index 2bbe35269..cd759532b 100644 --- a/swad_date.c +++ b/swad_date.c @@ -315,7 +315,7 @@ void Dat_ShowClientLocalTime (void) /* Month with link to calendar */ fprintf (Gbl.F.Out,"
"); - Frm_StartForm (Cal_GetActionToSeeCalendar ()); + Frm_StartForm (ActSeeCalSys); Frm_LinkFormSubmit (Txt_Show_calendar,"CURRENT_MONTH",NULL); fprintf (Gbl.F.Out,"" // JavaScript will write HTML here "" diff --git a/swad_menu.c b/swad_menu.c index 84242bf6f..c5e6c5256 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -93,8 +93,8 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSysReqSch, // 1 ActSeeSocTmlGbl, // 2 ActSeeSocPrf, // 3 - ActSeeNtf, // 4 - 0, // 5 + ActSeeCalSys, // 4 + ActSeeNtf, // 5 0, // 6 0, // 7 0, // 8 @@ -110,7 +110,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeLnk, // 2 ActLstPlg, // 3 ActSetUp, // 4 - ActSeeCalSys, // 5 + 0, // 5 0, // 6 0, // 7 0, // 8 diff --git a/swad_text.c b/swad_text.c index 66ebfe71a..13a11c4bd 100644 --- a/swad_text.c +++ b/swad_text.c @@ -17764,7 +17764,28 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Perfiles" #endif , - // 4: ActSeeNtf + // 4: ActSeeCalSys +#if L==1 // ca + "Calendari" +#elif L==2 // de + "Kalender" +#elif L==3 // en + "Calendar" +#elif L==4 // es + "Calendario" +#elif L==5 // fr + "Calendrier" +#elif L==6 // gn + "Arapapaha" +#elif L==7 // it + "Calendario" +#elif L==8 // pl + "Kalendarz" +#elif L==9 // pt + "Calendário" +#endif + , + // 5: ActSeeNtf #if L==1 // ca "Notificacions" #elif L==2 // de @@ -17785,7 +17806,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Notificações" #endif , - NULL, // 5 NULL, // 6 NULL, // 7 NULL, // 8 @@ -17901,27 +17921,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instalar" #endif , - // 5: ActSeeCalSys -#if L==1 // ca - "Calendari" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Calendar" -#elif L==4 // es - "Calendario" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Arapapaha" -#elif L==7 // it - "Calendario" -#elif L==8 // pl - "Kalendarz" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 5 NULL, // 6 NULL, // 7 NULL, // 8 @@ -19651,7 +19651,28 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Perfis públicos" #endif , - // 4: ActSeeNtf + // 4: ActSeeCalSys +#if L==1 // ca + "Calendari acadèmic" +#elif L==2 // de + "Kalender" +#elif L==3 // en + "Academic calendar" +#elif L==4 // es + "Calendario académico" +#elif L==5 // fr + "Calendrier" +#elif L==6 // gn + "Calendario académico"// Okoteve traducción +#elif L==7 // it + "Calendario del corso" +#elif L==8 // pl + "Kalendarz akademicki" +#elif L==9 // pt + "Calendário" +#endif + , + // 5: ActSeeNtf #if L==1 // ca "Esdeveniments recents que han estat o seran notificats" #elif L==2 // de @@ -19672,7 +19693,6 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Os recentes acontecimentos que foram ou serão notificados" #endif , - NULL, // 5 NULL, // 6 NULL, // 7 NULL, // 8 @@ -19788,27 +19808,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instalar" #endif , - // 5: ActSeeCalSys -#if L==1 // ca - "Calendari acadèmic" -#elif L==2 // de - "Kalender" -#elif L==3 // en - "Academic calendar" -#elif L==4 // es - "Calendario académico" -#elif L==5 // fr - "Calendrier" -#elif L==6 // gn - "Calendario académico"// Okoteve traducción -#elif L==7 // it - "Calendario del corso" -#elif L==8 // pl - "Kalendarz akademicki" -#elif L==9 // pt - "Calendário" -#endif - , + NULL, // 5 NULL, // 6 NULL, // 7 NULL, // 8