From b4b98524048a785d522d4139036cc389a6fe9499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 15 Feb 2019 00:57:23 +0100 Subject: [PATCH] Version 18.43.7 --- swad_action.c | 40 +++--- swad_action.h | 187 +++++++++++++-------------- swad_changelog.h | 7 +- swad_menu.c | 22 ++-- swad_text.c | 328 +++++++++++++++++++++++------------------------ 5 files changed, 300 insertions(+), 284 deletions(-) diff --git a/swad_action.c b/swad_action.c index 4ea0382b3..4fcfd0efc 100644 --- a/swad_action.c +++ b/swad_action.c @@ -101,6 +101,7 @@ extern struct Globals Gbl; Start: 1285. ActFrmLogIn Show landing page (forms to log in and to create a new account) + 10. ActSysReqSch Request search in system tab 1057. ActSeeSocTmlGbl Show social timeline (global) 1058. ActSeeSocPrf Suggest list of users to follow 1228. ActSeeNtf Show my recent notifications @@ -109,6 +110,8 @@ Start: 1294. ActSndNewPwd Send a new password via email 1295. ActLogOut Close session + 17. ActSysSch Search for courses, teachers, documents... + 1061. ActRcvSocPstGbl Receive a public social post to be displayed in the timeline (global) 1062. ActRcvSocComGbl Comment a social note in the timeline (global) 1063. ActShaSocNotGbl Share a social note in the timeline (global) @@ -149,7 +152,6 @@ Start: 1094. ActSeeFlr Show followers System: - 10. ActSysReqSch Request search in system tab 11. ActSeeCty List countries 12. ActSeePen List pending institutions, centres, degrees and courses in hierarchy 13. ActSeeLnk See institutional links @@ -157,8 +159,6 @@ System: 15. ActSetUp Initial set up 16. ActSeeCalSys Show the academic calendar - 17. ActSysSch Search for courses, teachers, documents... - 18. ActEdiCty Edit countries 19. ActNewCty Request the creation of a country 20. ActRemCty Remove a country @@ -1632,14 +1632,27 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabSta ****************************************************************** /* ActFrmLogIn */{1521, 0,TabSta,ActFrmLogIn , 0,0x001,0x001,0x001,0x001,0x001,0x001,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Usr_WriteLandingPage ,"power-off" }, - /* ActSeeSocTmlGbl */{1490, 1,TabSta,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShowTimelineGbl2 ,"comment-dots" }, - /* ActSeeSocPrf */{1520, 2,TabSta,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_SeeSocialProfiles ,"user-check" }, - /* ActSeeNtf */{ 990, 3,TabSta,ActSeeNtf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ntf_ShowMyNotifications ,"bell" }, + /* ActSysReqSch */{ 627, 1,TabSta,ActSysReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search" }, +// /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search" }, +// /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search" }, +// /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search" }, +// /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search" }, +// /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"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" }, /* 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}, /* ActLogOut */{ 10,-1,TabUnk,ActFrmLogIn ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Ses_CloseSession ,Usr_Logout ,NULL}, + /* ActSysSch */{ 628,-1,TabUnk,ActSysReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_SysSearch ,NULL}, +// /* ActCtySch */{1181,-1,TabUnk,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtySearch ,NULL}, +// /* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL}, +// /* ActCtrSch */{1183,-1,TabUnk,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CtrSearch ,NULL}, +// /* ActDegSch */{1184,-1,TabUnk,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_DegSearch ,NULL}, +// /* ActCrsSch */{1185,-1,TabUnk,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_CrsSearch ,NULL}, + /* 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}, /* ActShaSocNotGbl */{1495,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Soc_ShowTimelineGbl1 ,Soc_ShareSocialNoteGbl ,NULL}, @@ -1692,17 +1705,14 @@ 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" }, - /* 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 ,"link" }, - /* ActLstPlg */{ 777, 4,TabSys,ActLstPlg , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plg_ListPlugins ,"puzzle-piece" }, - /* ActSetUp */{ 840, 5,TabSys,ActSetUp , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Set_Setup ,"bolt" }, - /* ActSeeCalSys */{1622, 6,TabSys,ActSeeCalSys , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarSys ,"calendar" }, + /* ActSeeCty */{ 862, 0,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cty_ListCountries1 ,Cty_ListCountries2 ,"globe" }, + /* ActSeePen */{1060, 1,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hie_SeePending ,"sitemap" }, + /* 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: - /* ActSysSch */{ 628,-1,TabUnk,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_SysSearch ,NULL}, - /* ActEdiCty */{ 863,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_EditCountries ,NULL}, /* ActNewCty */{ 864,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_RecFormNewCountry ,NULL}, /* ActRemCty */{ 893,-1,TabUnk,ActSeeCty , 0, 0, 0, 0, 0, 0,0x200,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_RemoveCountry ,NULL}, diff --git a/swad_action.h b/swad_action.h index 71ec7af28..5cb5e6b35 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 + 50 + 43 + 17 + 47 + 41 + 24 + 115 + 157 + 437 + 165 + 168 + 15 + 72) +#define Act_NUM_ACTIONS (1 + 9 + 52 + 41 + 17 + 47 + 41 + 24 + 115 + 157 + 437 + 165 + 168 + 15 + 72) #define Act_MAX_ACTION_COD 1752 @@ -90,118 +90,119 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to /*****************************************************************************/ // Actions in menu #define ActFrmLogIn (ActWebSvc + 1) -#define ActSeeSocTmlGbl (ActWebSvc + 2) -#define ActSeeSocPrf (ActWebSvc + 3) -#define ActSeeNtf (ActWebSvc + 4) +#define ActSysReqSch (ActWebSvc + 2) +#define ActSeeSocTmlGbl (ActWebSvc + 3) +#define ActSeeSocPrf (ActWebSvc + 4) +#define ActSeeNtf (ActWebSvc + 5) // Secondary actions -#define ActReqSndNewPwd (ActWebSvc + 5) -#define ActSndNewPwd (ActWebSvc + 6) -#define ActLogOut (ActWebSvc + 7) +#define ActReqSndNewPwd (ActWebSvc + 6) +#define ActSndNewPwd (ActWebSvc + 7) +#define ActLogOut (ActWebSvc + 8) -#define ActRcvSocPstGbl (ActWebSvc + 8) -#define ActRcvSocComGbl (ActWebSvc + 9) -#define ActShaSocNotGbl (ActWebSvc + 10) -#define ActUnsSocNotGbl (ActWebSvc + 11) -#define ActFavSocNotGbl (ActWebSvc + 12) -#define ActUnfSocNotGbl (ActWebSvc + 13) -#define ActFavSocComGbl (ActWebSvc + 14) -#define ActUnfSocComGbl (ActWebSvc + 15) -#define ActReqRemSocPubGbl (ActWebSvc + 16) -#define ActRemSocPubGbl (ActWebSvc + 17) -#define ActReqRemSocComGbl (ActWebSvc + 18) -#define ActRemSocComGbl (ActWebSvc + 19) +#define ActSysSch (ActWebSvc + 9) -#define ActReqOthPubPrf (ActWebSvc + 20) +#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 ActRcvSocPstUsr (ActWebSvc + 21) -#define ActRcvSocComUsr (ActWebSvc + 22) -#define ActShaSocNotUsr (ActWebSvc + 23) -#define ActUnsSocNotUsr (ActWebSvc + 24) -#define ActFavSocNotUsr (ActWebSvc + 25) -#define ActUnfSocNotUsr (ActWebSvc + 26) -#define ActFavSocComUsr (ActWebSvc + 27) -#define ActUnfSocComUsr (ActWebSvc + 28) -#define ActReqRemSocPubUsr (ActWebSvc + 29) -#define ActRemSocPubUsr (ActWebSvc + 30) -#define ActReqRemSocComUsr (ActWebSvc + 31) -#define ActRemSocComUsr (ActWebSvc + 32) +#define ActReqOthPubPrf (ActWebSvc + 22) -#define ActSeeOthPubPrf (ActWebSvc + 33) -#define ActCal1stClkTim (ActWebSvc + 34) -#define ActCalNumClk (ActWebSvc + 35) -#define ActCalNumFilVie (ActWebSvc + 36) -#define ActCalNumForPst (ActWebSvc + 37) -#define ActCalNumMsgSnt (ActWebSvc + 38) +#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 ActFolUsr (ActWebSvc + 39) -#define ActUnfUsr (ActWebSvc + 40) -#define ActSeeFlg (ActWebSvc + 41) -#define ActSeeFlr (ActWebSvc + 42) +#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 ActSeeNewNtf (ActWebSvc + 43) -#define ActMrkNtfSee (ActWebSvc + 44) -#define ActSeeMai (ActWebSvc + 45) -#define ActEdiMai (ActWebSvc + 46) -#define ActNewMai (ActWebSvc + 47) -#define ActRemMai (ActWebSvc + 48) -#define ActRenMaiSho (ActWebSvc + 49) -#define ActRenMaiFul (ActWebSvc + 50) +#define ActFolUsr (ActWebSvc + 41) +#define ActUnfUsr (ActWebSvc + 42) +#define ActSeeFlg (ActWebSvc + 43) +#define ActSeeFlr (ActWebSvc + 44) + +#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) /*****************************************************************************/ /******************************** System tab *********************************/ /*****************************************************************************/ // Actions in menu -#define ActSysReqSch (ActRenMaiFul + 1) -#define ActSeeCty (ActRenMaiFul + 2) -#define ActSeePen (ActRenMaiFul + 3) -#define ActSeeLnk (ActRenMaiFul + 4) -#define ActLstPlg (ActRenMaiFul + 5) -#define ActSetUp (ActRenMaiFul + 6) -#define ActSeeCalSys (ActRenMaiFul + 7) +#define ActSeeCty (ActRenMaiFul + 1) +#define ActSeePen (ActRenMaiFul + 2) +#define ActSeeLnk (ActRenMaiFul + 3) +#define ActLstPlg (ActRenMaiFul + 4) +#define ActSetUp (ActRenMaiFul + 5) +#define ActSeeCalSys (ActRenMaiFul + 6) // Secondary actions -#define ActSysSch (ActRenMaiFul + 8) -#define ActEdiCty (ActRenMaiFul + 9) -#define ActNewCty (ActRenMaiFul + 10) -#define ActRemCty (ActRenMaiFul + 11) -#define ActRenCty (ActRenMaiFul + 12) -#define ActChgCtyWWW (ActRenMaiFul + 13) +#define ActEdiCty (ActRenMaiFul + 7) +#define ActNewCty (ActRenMaiFul + 8) +#define ActRemCty (ActRenMaiFul + 9) +#define ActRenCty (ActRenMaiFul + 10) +#define ActChgCtyWWW (ActRenMaiFul + 11) -#define ActReqRemOldCrs (ActRenMaiFul + 14) -#define ActRemOldCrs (ActRenMaiFul + 15) +#define ActReqRemOldCrs (ActRenMaiFul + 12) +#define ActRemOldCrs (ActRenMaiFul + 13) -#define ActSeeBan (ActRenMaiFul + 16) -#define ActEdiBan (ActRenMaiFul + 17) -#define ActNewBan (ActRenMaiFul + 18) -#define ActRemBan (ActRenMaiFul + 19) -#define ActShoBan (ActRenMaiFul + 20) -#define ActHidBan (ActRenMaiFul + 21) -#define ActRenBanSho (ActRenMaiFul + 22) -#define ActRenBanFul (ActRenMaiFul + 23) -#define ActChgBanImg (ActRenMaiFul + 24) -#define ActChgBanWWW (ActRenMaiFul + 25) -#define ActClkBan (ActRenMaiFul + 26) +#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 ActEdiLnk (ActRenMaiFul + 27) -#define ActNewLnk (ActRenMaiFul + 28) -#define ActRemLnk (ActRenMaiFul + 29) -#define ActRenLnkSho (ActRenMaiFul + 30) -#define ActRenLnkFul (ActRenMaiFul + 31) -#define ActChgLnkWWW (ActRenMaiFul + 32) +#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 ActEdiPlg (ActRenMaiFul + 33) -#define ActNewPlg (ActRenMaiFul + 34) -#define ActRemPlg (ActRenMaiFul + 35) -#define ActRenPlg (ActRenMaiFul + 36) -#define ActChgPlgDes (ActRenMaiFul + 37) -#define ActChgPlgLog (ActRenMaiFul + 38) -#define ActChgPlgAppKey (ActRenMaiFul + 39) -#define ActChgPlgURL (ActRenMaiFul + 40) -#define ActChgPlgIP (ActRenMaiFul + 41) +#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 + 42) -#define ActChgCalSys1stDay (ActRenMaiFul + 43) +#define ActPrnCalSys (ActRenMaiFul + 40) +#define ActChgCalSys1stDay (ActRenMaiFul + 41) /*****************************************************************************/ /******************************** Country tab ********************************/ diff --git a/swad_changelog.h b/swad_changelog.h index f0db7c12d..641610c34 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -386,10 +386,15 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.43.6 (2019-02-14)" +#define Log_PLATFORM_VERSION "SWAD 18.43.7 (2019-02-14)" #define CSS_FILE "swad18.41.1.css" #define JS_FILE "swad18.32.1.js" /* + Version 18.43.7: Feb 14, 2019 Option system search is moved to start tab. (239027 lines) + 2 changes necessary in database: +UPDATE actions SET Txt='Solicitar búsqueda' WHERE ActCod='627' AND Language='es'; +UPDATE actions SET Txt='Buscar' WHERE ActCod='628' AND Language='es'; + Version 18.43.6: Feb 14, 2019 Forums option is moved to messages tab. (239013 lines) Version 18.43.5: Feb 14, 2019 Contextual link removed in account. (239011 lines) Version 18.43.4: Feb 14, 2019 Notifications are moved to start tab. (239012 lines) diff --git a/swad_menu.c b/swad_menu.c index b6ce0d36e..975340955 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -90,10 +90,10 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB // TabSta ******************* { ActFrmLogIn, // 0 - ActSeeSocTmlGbl, // 1 - ActSeeSocPrf, // 2 - ActSeeNtf, // 3 - 0, // 4 + ActSysReqSch, // 1 + ActSeeSocTmlGbl, // 2 + ActSeeSocPrf, // 3 + ActSeeNtf, // 4 0, // 5 0, // 6 0, // 7 @@ -105,13 +105,13 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabSys ******************* { - ActSysReqSch, // 0 - ActSeeCty, // 1 - ActSeePen, // 2 - ActSeeLnk, // 3 - ActLstPlg, // 4 - ActSetUp, // 5 - ActSeeCalSys, // 6 + ActSeeCty, // 0 + ActSeePen, // 1 + ActSeeLnk, // 2 + ActLstPlg, // 3 + ActSetUp, // 4 + ActSeeCalSys, // 5 + 0, // 6 0, // 7 0, // 8 0, // 9 diff --git a/swad_text.c b/swad_text.c index 2c95057ca..732486439 100644 --- a/swad_text.c +++ b/swad_text.c @@ -17701,82 +17701,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Entrar" #endif , - // 1: ActSeeSocTmlGbl -#if L==1 // ca - "Timeline" -#elif L==2 // de - "Timeline" -#elif L==3 // en - "Timeline" -#elif L==4 // es - "Timeline" -#elif L==5 // fr - "Chronologie" -#elif L==6 // gn - "Timeline" // Okoteve traducción -#elif L==7 // it - "Timeline" -#elif L==8 // pl - "Timeline" -#elif L==9 // pt - "Timeline" -#endif - , - // 2: ActSeeSocPrf -#if L==1 // ca - "Perfils" -#elif L==2 // de - "Profiles" -#elif L==3 // en - "Profiles" -#elif L==4 // es - "Perfiles" -#elif L==5 // fr - "Profils" -#elif L==6 // gn - "Che" -#elif L==7 // it - "Profili" -#elif L==8 // pl - "Profile" -#elif L==9 // pt - "Perfiles" -#endif - , - // 3: ActSeeNtf -#if L==1 // ca - "Notificacions" -#elif L==2 // de - "Anmeldungen" -#elif L==3 // en - "Notifications" -#elif L==4 // es - "Notificaciones" -#elif L==5 // fr - "Notifications" -#elif L==6 // gn - "Momarandu" -#elif L==7 // it - "Notifiche" -#elif L==8 // pl - "Powiadomienia" -#elif L==9 // pt - "Notificações" -#endif - , - NULL, // 4 - NULL, // 5 - NULL, // 6 - NULL, // 7 - NULL, // 8 - NULL, // 9 - NULL, // 10 - NULL, // 11 - NULL, // 12 - }, - { - // TabSys ***************************************************** - // 0: ActSysReqSch + // 1: ActSysReqSch #if L==1 // ca "Cercar" #elif L==2 // de @@ -17797,7 +17722,81 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Procurar" #endif , - // 1: ActSeeCty + // 2: ActSeeSocTmlGbl +#if L==1 // ca + "Timeline" +#elif L==2 // de + "Timeline" +#elif L==3 // en + "Timeline" +#elif L==4 // es + "Timeline" +#elif L==5 // fr + "Chronologie" +#elif L==6 // gn + "Timeline" // Okoteve traducción +#elif L==7 // it + "Timeline" +#elif L==8 // pl + "Timeline" +#elif L==9 // pt + "Timeline" +#endif + , + // 3: ActSeeSocPrf +#if L==1 // ca + "Perfils" +#elif L==2 // de + "Profiles" +#elif L==3 // en + "Profiles" +#elif L==4 // es + "Perfiles" +#elif L==5 // fr + "Profils" +#elif L==6 // gn + "Che" +#elif L==7 // it + "Profili" +#elif L==8 // pl + "Profile" +#elif L==9 // pt + "Perfiles" +#endif + , + // 4: ActSeeNtf +#if L==1 // ca + "Notificacions" +#elif L==2 // de + "Anmeldungen" +#elif L==3 // en + "Notifications" +#elif L==4 // es + "Notificaciones" +#elif L==5 // fr + "Notifications" +#elif L==6 // gn + "Momarandu" +#elif L==7 // it + "Notifiche" +#elif L==8 // pl + "Powiadomienia" +#elif L==9 // pt + "Notificações" +#endif + , + NULL, // 5 + NULL, // 6 + NULL, // 7 + NULL, // 8 + NULL, // 9 + NULL, // 10 + NULL, // 11 + NULL, // 12 + }, + { + // TabSys ***************************************************** + // 0: ActSeeCty #if L==1 // ca "Països" #elif L==2 // de @@ -17818,7 +17817,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Países" #endif , - // 2: ActSeePen + // 1: ActSeePen #if L==1 // ca "Jerarquia" #elif L==2 // de @@ -17839,7 +17838,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Hierarquia" #endif , - // 3: ActSeeLnk + // 2: ActSeeLnk #if L==1 // ca "Enllaços" #elif L==2 // de @@ -17860,7 +17859,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Ligações" #endif , - // 4: ActLstPlg + // 3: ActLstPlg #if L==1 // ca "Complements" #elif L==2 // de @@ -17881,7 +17880,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Plugins" #endif , - // 5: ActSetUp + // 4: ActSetUp #if L==1 // ca "Instal lar" #elif L==2 // de @@ -17902,7 +17901,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instalar" #endif , - // 6: ActSeeCalSys + // 5: ActSeeCalSys #if L==1 // ca "Calendari" #elif L==2 // de @@ -17923,6 +17922,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9 @@ -19688,82 +19688,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Papel nesta sessão" #endif , - // 1: ActSeeSocTmlGbl -#if L==1 // ca - "Timeline dels usuaris que segueixo o de tots els usuaris" -#elif L==2 // de - "Timeline der Benutzer Ich folge oder alle Benutzern" -#elif L==3 // en - "Timeline of users I follow or all users" -#elif L==4 // es - "Timeline de los usuarios que sigo o de todos los usuarios" -#elif L==5 // fr - "Chronologie des utilisateurs que je suis ou de tous les utilisateurs" -#elif L==6 // gn - "Timeline de los usuarios que sigo o de todos los usuarios" // Okoteve traducción -#elif L==7 // it - "Timeline degli utenti che seguo o tutti gli utenti" -#elif L==8 // pl - "Timeline użytkowników śledzę lub wszystkich użytkowników" -#elif L==9 // pt - "Timeline dos usuários que eu sigo ou de todos os usuários" -#endif - , - // 2: ActSeeSocPrf -#if L==1 // ca - "Perfils públics" -#elif L==2 // de - "Öffentliche Profile" -#elif L==3 // en - "Public profiles" -#elif L==4 // es - "Perfiles públicos de usuarios" -#elif L==5 // fr - "Profils publics" -#elif L==6 // gn - "Perfiles públicos de usuarios" // Okoteve traducción -#elif L==7 // it - "Profili pubblici" -#elif L==8 // pl - "Profile publiczne" -#elif L==9 // pt - "Perfis públicos" -#endif - , - // 3: ActSeeNtf -#if L==1 // ca - "Esdeveniments recents que han estat o seran notificats" -#elif L==2 // de - "Die jüngsten Ereignisse wurden oder werden benachrichtigt" -#elif L==3 // en - "Recent events that have been or will be notified" -#elif L==4 // es - "Eventos recientes que han sido o serán notificados" -#elif L==5 // fr - "Les événements récents qui ont été ou seront avisés" -#elif L==6 // gn - "Eventos recientes que han sido o serán notificados"// Okoteve traducción -#elif L==7 // it - "Recenti eventi che sono stati o saranno notificati" -#elif L==8 // pl - "Ostatnie wydarzenia, które zostaly lub zostana powiadomieni" -#elif L==9 // pt - "Os recentes acontecimentos que foram ou serão notificados" -#endif - , - NULL, // 4 - NULL, // 5 - NULL, // 6 - NULL, // 7 - NULL, // 8 - NULL, // 9 - NULL, // 10 - NULL, // 11 - NULL, // 12 - }, - { - // TabSys ***************************************************** - // 0: ActSysReqSch + // 1: ActSysReqSch #if L==1 // ca "Cerca d'assignatures, professors i documents" #elif L==2 // de @@ -19784,7 +19709,81 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Procurar disciplinas, professores e documentos" #endif , - // 1: ActSeeCty + // 2: ActSeeSocTmlGbl +#if L==1 // ca + "Timeline dels usuaris que segueixo o de tots els usuaris" +#elif L==2 // de + "Timeline der Benutzer Ich folge oder alle Benutzern" +#elif L==3 // en + "Timeline of users I follow or all users" +#elif L==4 // es + "Timeline de los usuarios que sigo o de todos los usuarios" +#elif L==5 // fr + "Chronologie des utilisateurs que je suis ou de tous les utilisateurs" +#elif L==6 // gn + "Timeline de los usuarios que sigo o de todos los usuarios" // Okoteve traducción +#elif L==7 // it + "Timeline degli utenti che seguo o tutti gli utenti" +#elif L==8 // pl + "Timeline użytkowników śledzę lub wszystkich użytkowników" +#elif L==9 // pt + "Timeline dos usuários que eu sigo ou de todos os usuários" +#endif + , + // 3: ActSeeSocPrf +#if L==1 // ca + "Perfils públics" +#elif L==2 // de + "Öffentliche Profile" +#elif L==3 // en + "Public profiles" +#elif L==4 // es + "Perfiles públicos de usuarios" +#elif L==5 // fr + "Profils publics" +#elif L==6 // gn + "Perfiles públicos de usuarios" // Okoteve traducción +#elif L==7 // it + "Profili pubblici" +#elif L==8 // pl + "Profile publiczne" +#elif L==9 // pt + "Perfis públicos" +#endif + , + // 4: ActSeeNtf +#if L==1 // ca + "Esdeveniments recents que han estat o seran notificats" +#elif L==2 // de + "Die jüngsten Ereignisse wurden oder werden benachrichtigt" +#elif L==3 // en + "Recent events that have been or will be notified" +#elif L==4 // es + "Eventos recientes que han sido o serán notificados" +#elif L==5 // fr + "Les événements récents qui ont été ou seront avisés" +#elif L==6 // gn + "Eventos recientes que han sido o serán notificados"// Okoteve traducción +#elif L==7 // it + "Recenti eventi che sono stati o saranno notificati" +#elif L==8 // pl + "Ostatnie wydarzenia, które zostaly lub zostana powiadomieni" +#elif L==9 // pt + "Os recentes acontecimentos que foram ou serão notificados" +#endif + , + NULL, // 5 + NULL, // 6 + NULL, // 7 + NULL, // 8 + NULL, // 9 + NULL, // 10 + NULL, // 11 + NULL, // 12 + }, + { + // TabSys ***************************************************** + // 0: ActSeeCty #if L==1 // ca "Llista de països i del nombre d'usuaris de cada país" #elif L==2 // de @@ -19805,7 +19804,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Países" #endif , - // 2: ActSeePen + // 1: ActSeePen #if L==1 // ca "Institutions, centres, titulacions i assignatures pendents d'activar" #elif L==2 // de @@ -19826,7 +19825,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instituções, centros, graus e disciplinas pendentes" #endif , - // 3: ActSeeLnk + // 2: ActSeeLnk #if L==1 // ca "Llista d'enllaços institucionals" #elif L==2 // de @@ -19847,7 +19846,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Ligações institucionais" #endif , - // 4: ActLstPlg + // 3: ActLstPlg #if L==1 // ca "Llista de complements (versió beta)" #elif L==2 // de @@ -19868,7 +19867,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Lista de plugins" #endif , - // 5: ActSetUp + // 4: ActSetUp #if L==1 // ca "Instal lació de la plataforma (en proves)" #elif L==2 // de @@ -19889,7 +19888,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Instalar" #endif , - // 6: ActSeeCalSys + // 5: ActSeeCalSys #if L==1 // ca "Calendari acadèmic" #elif L==2 // de @@ -19910,6 +19909,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9