diff --git a/swad_action.c b/swad_action.c index d4577e4be..c0a5238c4 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1001,7 +1001,7 @@ Users: 836. ActLstClk List last clicks in real time Social: 837. ActSeeSocTmlGbl Show social timeline (global) - 838. ActReqPubPrf Request @nickname to show a public user's profile + 838. ActWhoFol Suggest list of users to follow 839. ActSeeFor Show the level superior of the forums 840. ActSeeChtRms Show the chat rooms @@ -1018,27 +1018,27 @@ Social: 851. ActReqRemSocComGbl Request the removal of a comment in a social note (global) 852. ActRemSocComGbl Remove of a comment in a social note (global) - 853. ActRcvSocPstUsr Receive a public social post to be displayed in the timeline (user) - 854. ActRcvSocComUsr Comment a social note in the timeline (user) - 855. ActShaSocNotUsr Share a social note in the timeline (user) - 856. ActUnsSocNotUsr Unshare a previously shared social note in the timeline (user) - 857. ActFavSocNotUsr Favourite a social note in the timeline (user) - 858. ActUnfSocNotUsr Unfavourite a previously favourited social note in the timeline (user) - 859. ActFavSocComUsr Favourite a social comment in the timeline (user) - 860. ActUnfSocComUsr Unfavourite a previously favourited social comment in the timeline (user) - 861. ActReqRemSocPubUsr Request the removal of a social publishing in the timeline (user) - 862. ActRemSocPubUsr Remove a social publishing in the timeline (user) - 863. ActReqRemSocComUsr Request the removal of a comment in a social note (user) - 864. ActRemSocComUsr Remove of a comment in a social note (user) + 853. ActReqPubPrf Request @nickname to show a public user's profile + + 854. ActRcvSocPstUsr Receive a public social post to be displayed in the timeline (user) + 855. ActRcvSocComUsr Comment a social note in the timeline (user) + 856. ActShaSocNotUsr Share a social note in the timeline (user) + 857. ActUnsSocNotUsr Unshare a previously shared social note in the timeline (user) + 858. ActFavSocNotUsr Favourite a social note in the timeline (user) + 859. ActUnfSocNotUsr Unfavourite a previously favourited social note in the timeline (user) + 860. ActFavSocComUsr Favourite a social comment in the timeline (user) + 861. ActUnfSocComUsr Unfavourite a previously favourited social comment in the timeline (user) + 862. ActReqRemSocPubUsr Request the removal of a social publishing in the timeline (user) + 863. ActRemSocPubUsr Remove a social publishing in the timeline (user) + 864. ActReqRemSocComUsr Request the removal of a comment in a social note (user) + 865. ActRemSocComUsr Remove of a comment in a social note (user) - 865. ActSeePubPrf Show a public user's profile 866. ActCal1stClkTim Calculate first click time from log and store into user's figures 867. ActCalNumClk Calculate number of clicks from log and store into user's figures 868. ActCalNumFileViews Calculate number of file views and store into user's figures 869. ActCalNumForPst Calculate number of forum posts and store into user's figures 870. ActCalNumMsgSnt Calculate number of messages sent from log and store into user's figures -NEW.....871. ActWhoFol Suggest list of users to follow 871. ActFolUsr Follow another user 872. ActUnfUsr Unfollow another user 873. ActSeeFlg Show following @@ -2338,7 +2338,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabSoc ****************************************************************** /* ActSeeSocTmlGbl */{1490, 0,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_ShowTimelineGbl ,"soc64x64.png" }, - /* ActReqPubPrf */{1401, 1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,"prf64x64.gif" }, + /* ActWhoFol */{1520, 1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_SuggestWhoToFollow ,"prf64x64.gif" }, /* ActSeeFor */{ 95, 2,TabSoc,ActSeeFor ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,For_ShowForumList ,"forum64x64.gif" }, /* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" }, @@ -2355,31 +2355,32 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActReqRemSocComGbl*/{1505,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_RequestRemSocialComGbl ,NULL}, /* ActRemSocComGbl */{1507,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_RemoveSocialComGbl ,NULL}, - /* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL}, - /* ActRcvSocComUsr */{1504,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentUsr ,NULL}, - /* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL}, - /* ActUnsSocNotUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialNoteUsr ,NULL}, - /* ActFavSocNotUsr */{1514,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialNoteUsr ,NULL}, - /* ActUnfSocNotUsr */{1515,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialNoteUsr ,NULL}, - /* ActFavSocComUsr */{1518,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialCommentUsr ,NULL}, - /* ActUnfSocComUsr */{1519,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialCommentUsr ,NULL}, - /* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteUsr ,NULL}, - /* ActRemSocPubUsr */{1502,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteUsr ,NULL}, - /* ActReqRemSocComGbl*/{1506,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL}, - /* ActRemSocComGbl */{1508,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComUsr ,NULL}, + /* ActReqPubPrf */{1401,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,NULL}, - /* ActSeePubPrf */{1402,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL}, - /* ActCal1stClkTim */{1405,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL}, - /* ActCalNumClk */{1406,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumClicks ,NULL}, - /* ActCalNumFilVie */{1409,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumFileViews ,NULL}, - /* ActCalNumForPst */{1408,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumForPst ,NULL}, - /* ActCalNumMsgSnt */{1407,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumMsgSnt ,NULL}, + /* ActRcvSocPstUsr */{1498,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL}, + /* ActRcvSocComUsr */{1504,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentUsr ,NULL}, + /* ActShaSocNotUsr */{1499,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL}, + /* ActUnsSocNotUsr */{1500,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialNoteUsr ,NULL}, + /* ActFavSocNotUsr */{1514,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialNoteUsr ,NULL}, + /* ActUnfSocNotUsr */{1515,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialNoteUsr ,NULL}, + /* ActFavSocComUsr */{1518,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialCommentUsr ,NULL}, + /* ActUnfSocComUsr */{1519,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialCommentUsr ,NULL}, + /* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteUsr ,NULL}, + /* ActRemSocPubUsr */{1502,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteUsr ,NULL}, + /* ActReqRemSocComGbl*/{1506,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL}, + /* ActRemSocComGbl */{1508,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComUsr ,NULL}, - /* ActWhoFol */{1520,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_SuggestWhoToFollow ,NULL}, - /* ActFolUsr */{1410,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_FollowUsr ,NULL}, - /* ActUnfUsr */{1411,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_UnfollowUsr ,NULL}, - /* ActSeeFlg */{1412,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_ListFollowing ,NULL}, - /* ActSeeFlr */{1413,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_ListFollowers ,NULL}, + /* ActSeePubPrf */{1402,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL}, + /* ActCal1stClkTim */{1405,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL}, + /* ActCalNumClk */{1406,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumClicks ,NULL}, + /* ActCalNumFilVie */{1409,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumFileViews ,NULL}, + /* ActCalNumForPst */{1408,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumForPst ,NULL}, + /* ActCalNumMsgSnt */{1407,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumMsgSnt ,NULL}, + + /* ActFolUsr */{1410,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_FollowUsr ,NULL}, + /* ActUnfUsr */{1411,-1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_UnfollowUsr ,NULL}, + /* ActSeeFlg */{1412,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_ListFollowing ,NULL}, + /* ActSeeFlr */{1413,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_ListFollowers ,NULL}, /* ActSeeForCrsUsr */{ 345,-1,TabSoc,ActSeeFor ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,For_ShowForumThrs ,NULL}, /* ActSeeForCrsTch */{ 431,-1,TabSoc,ActSeeFor ,0x114,0x114,0x114,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,For_ShowForumThrs ,NULL}, diff --git a/swad_action.h b/swad_action.h index f2e2ddd3c..5dc4dafbe 100644 --- a/swad_action.h +++ b/swad_action.h @@ -1043,7 +1043,7 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica /*****************************************************************************/ // Actions in menu #define ActSeeSocTmlGbl (ActLstClk+ 1) -#define ActReqPubPrf (ActLstClk+ 2) +#define ActWhoFol (ActLstClk+ 2) #define ActSeeFor (ActLstClk+ 3) #define ActSeeChtRms (ActLstClk+ 4) // Secondary actions @@ -1060,27 +1060,28 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica #define ActReqRemSocComGbl (ActLstClk+ 15) #define ActRemSocComGbl (ActLstClk+ 16) -#define ActRcvSocPstUsr (ActLstClk+ 17) -#define ActRcvSocComUsr (ActLstClk+ 18) -#define ActShaSocNotUsr (ActLstClk+ 19) -#define ActUnsSocNotUsr (ActLstClk+ 20) -#define ActFavSocNotUsr (ActLstClk+ 21) -#define ActUnfSocNotUsr (ActLstClk+ 22) -#define ActFavSocComUsr (ActLstClk+ 23) -#define ActUnfSocComUsr (ActLstClk+ 24) -#define ActReqRemSocPubUsr (ActLstClk+ 25) -#define ActRemSocPubUsr (ActLstClk+ 26) -#define ActReqRemSocComUsr (ActLstClk+ 27) -#define ActRemSocComUsr (ActLstClk+ 28) +#define ActReqPubPrf (ActLstClk+ 17) -#define ActSeePubPrf (ActLstClk+ 29) -#define ActCal1stClkTim (ActLstClk+ 30) -#define ActCalNumClk (ActLstClk+ 31) -#define ActCalNumFilVie (ActLstClk+ 32) -#define ActCalNumForPst (ActLstClk+ 33) -#define ActCalNumMsgSnt (ActLstClk+ 34) +#define ActRcvSocPstUsr (ActLstClk+ 18) +#define ActRcvSocComUsr (ActLstClk+ 19) +#define ActShaSocNotUsr (ActLstClk+ 20) +#define ActUnsSocNotUsr (ActLstClk+ 21) +#define ActFavSocNotUsr (ActLstClk+ 22) +#define ActUnfSocNotUsr (ActLstClk+ 23) +#define ActFavSocComUsr (ActLstClk+ 24) +#define ActUnfSocComUsr (ActLstClk+ 25) +#define ActReqRemSocPubUsr (ActLstClk+ 26) +#define ActRemSocPubUsr (ActLstClk+ 27) +#define ActReqRemSocComUsr (ActLstClk+ 28) +#define ActRemSocComUsr (ActLstClk+ 29) + +#define ActSeePubPrf (ActLstClk+ 30) +#define ActCal1stClkTim (ActLstClk+ 31) +#define ActCalNumClk (ActLstClk+ 32) +#define ActCalNumFilVie (ActLstClk+ 33) +#define ActCalNumForPst (ActLstClk+ 34) +#define ActCalNumMsgSnt (ActLstClk+ 35) -#define ActWhoFol (ActLstClk+ 35) #define ActFolUsr (ActLstClk+ 36) #define ActUnfUsr (ActLstClk+ 37) #define ActSeeFlg (ActLstClk+ 38) diff --git a/swad_changelog.h b/swad_changelog.h index 35f69bc88..acf79892f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -121,13 +121,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.133.8 (2016-01-29)" -#define CSS_FILE "swad15.131.2.css" +#define Log_PLATFORM_VERSION "SWAD 15.134 (2016-01-29)" +#define CSS_FILE "swad15.134.css" #define JS_FILE "swad15.131.3.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 15.134: Jan 29, 2016 Change in menu of social tab. (195328 lines) Version 15.133.8: Jan 29, 2016 Link to request a user's profile. (195328 lines) Version 15.133.7: Jan 28, 2016 Changes in layout of followed/followers. (195288 lines) Version 15.133.6: Jan 28, 2016 Changes in layout of "Who to follow". (195287 lines) diff --git a/swad_menu.c b/swad_menu.c index 118472e5f..246b68979 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -156,7 +156,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB // TabSoc ********** { ActSeeSocTmlGbl, - ActReqPubPrf, + ActWhoFol, ActSeeFor, ActSeeChtRms, }, diff --git a/swad_text.c b/swad_text.c index 57760daed..9d1efb33f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18058,7 +18058,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Atividade" #endif , - // ActReqPubPrf + // ActWhoFol #if L==1 "Perfils" #elif L==2 @@ -20014,7 +20014,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Atividade pública dos usuários que eu sigo" #endif , - // ActReqPubPrf + // ActWhoFol #if L==1 "Perfils públics" #elif L==2