From 3bfe7b7f8c4ff96aa14bb266a6f0fd2bf1bde6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 6 Feb 2016 13:45:33 +0100 Subject: [PATCH] Version 15.136.7 --- swad_action.c | 52 ++++++++++++++++++++++++------------------------ swad_action.h | 2 +- swad_changelog.h | 3 ++- swad_follow.c | 4 ++-- swad_menu.c | 2 +- swad_profile.c | 12 +++++++++++ swad_profile.h | 2 ++ swad_text.c | 4 ++-- 8 files changed, 48 insertions(+), 33 deletions(-) diff --git a/swad_action.c b/swad_action.c index 71a94b36..2f722b4f 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. ActWhoFol Suggest list of users to follow + 838. ActSeeSocPrf Suggest list of users to follow 839. ActSeeFor Show the level superior of the forums 840. ActSeeChtRms Show the chat rooms @@ -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" }, - /* ActWhoFol */{1520, 1,TabSoc,ActWhoFol ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_SuggestWhoToFollow ,"prf64x64.gif" }, + /* ActSeeSocPrf */{1520, 1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_SeeSocialProfiles ,"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,32 +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}, - /* ActReqPubPrf */{1401,-1,TabSoc,ActWhoFol ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,NULL}, + /* ActReqPubPrf */{1401,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,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}, + /* ActRcvSocPstUsr */{1498,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL}, + /* ActRcvSocComUsr */{1504,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentUsr ,NULL}, + /* ActShaSocNotUsr */{1499,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL}, + /* ActUnsSocNotUsr */{1500,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialNoteUsr ,NULL}, + /* ActFavSocNotUsr */{1514,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialNoteUsr ,NULL}, + /* ActUnfSocNotUsr */{1515,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialNoteUsr ,NULL}, + /* ActFavSocComUsr */{1518,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialCommentUsr ,NULL}, + /* ActUnfSocComUsr */{1519,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialCommentUsr ,NULL}, + /* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteUsr ,NULL}, + /* ActRemSocPubUsr */{1502,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteUsr ,NULL}, + /* ActReqRemSocComGbl*/{1506,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComUsr ,NULL}, + /* ActRemSocComGbl */{1508,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComUsr ,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}, + /* ActSeePubPrf */{1402,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL}, + /* ActCal1stClkTim */{1405,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL}, + /* ActCalNumClk */{1406,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumClicks ,NULL}, + /* ActCalNumFilVie */{1409,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumFileViews ,NULL}, + /* ActCalNumForPst */{1408,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateNumForPst ,NULL}, + /* ActCalNumMsgSnt */{1407,-1,TabSoc,ActSeeSocPrf ,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}, + /* ActFolUsr */{1410,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_FollowUsr ,NULL}, + /* ActUnfUsr */{1411,-1,TabSoc,ActSeeSocPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_UnfollowUsr ,NULL}, + /* ActSeeFlg */{1412,-1,TabSoc,ActSeeSocPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Fol_ListFollowing ,NULL}, + /* ActSeeFlr */{1413,-1,TabSoc,ActSeeSocPrf ,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}, @@ -4236,7 +4236,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq ActUnfSocComGbl, // #1517 ActFavSocComUsr, // #1518 ActUnfSocComUsr, // #1519 - ActWhoFol, // #1520 + ActSeeSocPrf, // #1520 }; /*****************************************************************************/ diff --git a/swad_action.h b/swad_action.h index 5dc4dafb..c8d37ff8 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 ActWhoFol (ActLstClk+ 2) +#define ActSeeSocPrf (ActLstClk+ 2) #define ActSeeFor (ActLstClk+ 3) #define ActSeeChtRms (ActLstClk+ 4) // Secondary actions diff --git a/swad_changelog.h b/swad_changelog.h index 16b87c28..d1655d4d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -121,13 +121,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.136.6 (2016-02-06)" +#define Log_PLATFORM_VERSION "SWAD 15.136.7 (2016-02-06)" #define CSS_FILE "swad15.136.5.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.136.7: Feb 06, 2016 Fixed bug in social tab when not logged. (195715 lines) Version 15.136.6: Feb 06, 2016 Change in graphic with number of users per country. (195703 lines) Version 15.136.5: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195702 lines) Version 15.136.4: Feb 04, 2016 Change in layout of main title (country/institution/centre/degree/course). (195687 lines) diff --git a/swad_follow.c b/swad_follow.c index f2be39ef..7fc9dcb5 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -81,7 +81,7 @@ void Fol_PutLinkWhoToFollow (void) extern const char *Txt_Who_to_follow; fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActWhoFol,NULL, + Lay_PutContextualLink (ActSeeSocPrf,NULL, "follow64x64.png", Txt_Who_to_follow,Txt_Who_to_follow); fprintf (Gbl.F.Out,"
"); @@ -213,7 +213,7 @@ void Fol_SuggestWhoToFollow (void) /***** Put form to update connected users *****/ fprintf (Gbl.F.Out,"
"); - Act_FormStart (ActWhoFol); + Act_FormStart (ActSeeSocPrf); Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Update,Txt_Update); Act_FormEnd (); diff --git a/swad_menu.c b/swad_menu.c index 246b6897..027bed2f 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, - ActWhoFol, + ActSeeSocPrf, ActSeeFor, ActSeeChtRms, }, diff --git a/swad_profile.c b/swad_profile.c index cfb1536f..7d6c581c 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -104,6 +104,18 @@ static bool Prf_CheckIfUsrFiguresExists (long UsrCod); static void Prf_GetAndShowRankingFigure (const char *FieldName); +/*****************************************************************************/ +/************* Suggest who to follow or request user's profile ***************/ +/*****************************************************************************/ + +void Prf_SeeSocialProfiles (void) + { + if (Gbl.Usrs.Me.Logged) + Fol_SuggestWhoToFollow (); + else + Prf_RequestUserProfile (); + } + /*****************************************************************************/ /************************** Get public profile URL ***************************/ /*****************************************************************************/ diff --git a/swad_profile.h b/swad_profile.h index bfdab988..9ae1b1a8 100644 --- a/swad_profile.h +++ b/swad_profile.h @@ -39,6 +39,8 @@ /****************************** Public prototypes ****************************/ /*****************************************************************************/ +void Prf_SeeSocialProfiles (void); + char *Prf_GetURLPublicProfile (char *URL,const char *NicknameWithoutArroba); void Prf_PutLinkRequestUserProfile (void); void Prf_RequestUserProfile (void); diff --git a/swad_text.c b/swad_text.c index 71877c9e..fc503146 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18122,7 +18122,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Atividade" #endif , - // ActWhoFol + // ActSeeSocPrf #if L==1 "Perfils" #elif L==2 @@ -20078,7 +20078,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 , - // ActWhoFol + // ActSeeSocPrf #if L==1 "Perfils públics" #elif L==2