diff --git a/css/swad15.113.8.css b/css/swad15.113.8.css index 1a774840a..9db1f8e65 100644 --- a/css/swad15.113.8.css +++ b/css/swad15.113.8.css @@ -1677,7 +1677,7 @@ a:hover img.CENTRE_PHOTO_SHOW text-align:center; vertical-align:middle; } -#just_now_timeline_list,#new_timeline_list +#just_now_timeline_list,#new_timeline_list,#old_timeline_list { display:none; margin:0; diff --git a/swad_changelog.h b/swad_changelog.h index 1581c6bc2..ce196d232 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -119,18 +119,20 @@ // TODO: Increment one second after each refresh in social timeline? // TODO: Add a new type of visibility of profile "unknown". Keep the same for photos? +// TODO: Check if number of old publishings got is correct or it is better to get one more publishing /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.113.16 (2016-01-16)" +#define Log_PLATFORM_VERSION "SWAD 15.113.17 (2016-01-16)" #define CSS_FILE "swad15.113.8.css" #define JS_FILE "swad15.113.8.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.113.17:Jan 16, 2016 Fixed bug in user's timeline. (192763 lines) Version 15.113.16:Jan 16, 2016 Removed unused code and messages. (192743 lines) Version 15.113.15:Jan 16, 2016 Changes in feedback on request to remove a social note. (192871 lines) Version 15.113.14:Jan 16, 2016 Changes in feedback when a social comment is published. (192850 lines) diff --git a/swad_layout.c b/swad_layout.c index 341bd2598..9deb4b4a0 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -641,26 +641,44 @@ static void Lay_WriteScriptParamsAJAX (void) Act_Actions[ActRefLstClk].ActCod); /***** Parameters related with refreshing of social timeline *****/ - if (Act_Actions[Gbl.CurrentAct].SuperAction == ActSeePubPrf) - { - // In all the actions children of ActSeePubPrf ==> put parameters used by AJAX - if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0) - Usr_GetParamOtherUsrCodEncrypted (); - if (!Gbl.Usrs.Other.UsrDat.Nickname[0]) - Nck_GetNicknameFromUsrCod (Gbl.Usrs.Other.UsrDat.UsrCod, - Gbl.Usrs.Other.UsrDat.Nickname); - fprintf (Gbl.F.Out,"var RefreshParamNxtActOldPub = \"act=%ld\";\n" - "var RefreshParamUsr = \"usr=@%s\";\n", - Act_Actions[ActRefOldSocPubUsr].ActCod, - Gbl.Usrs.Other.UsrDat.Nickname); - } - else if (Act_Actions[Gbl.CurrentAct].SuperAction == ActSeeSocTmlGbl) - // In all the actions children of ActSeeSocTmlGbl ==> put parameters used by AJAX + if (Gbl.CurrentAct == ActSeeSocTmlGbl || + Gbl.CurrentAct == ActRcvSocPstGbl || + Gbl.CurrentAct == ActRcvSocComUsr || + Gbl.CurrentAct == ActShaSocNotGbl || + Gbl.CurrentAct == ActUnsSocPubGbl || + Gbl.CurrentAct == ActReqRemSocPubGbl || + Gbl.CurrentAct == ActRemSocPubGbl || + Gbl.CurrentAct == ActReqRemSocComGbl || + Gbl.CurrentAct == ActRemSocComGbl) + /* In all the actions related to view or editing global timeline ==> + put parameters used by AJAX */ fprintf (Gbl.F.Out,"var RefreshParamNxtActNewPub = \"act=%ld\";\n" "var RefreshParamNxtActOldPub = \"act=%ld\";\n" "var RefreshParamUsr = \"\";\n", // No user specified Act_Actions[ActRefNewSocPubGbl].ActCod, Act_Actions[ActRefOldSocPubGbl].ActCod); + else if (Gbl.CurrentAct == ActSeePubPrf || + Gbl.CurrentAct == ActRcvSocPstGbl || + Gbl.CurrentAct == ActRcvSocComUsr || + Gbl.CurrentAct == ActShaSocNotGbl || + Gbl.CurrentAct == ActUnsSocPubGbl || + Gbl.CurrentAct == ActReqRemSocPubGbl || + Gbl.CurrentAct == ActRemSocPubGbl || + Gbl.CurrentAct == ActReqRemSocComGbl || + Gbl.CurrentAct == ActRemSocComGbl) + { + /* In all the actions related to view or editing user's timeline ==> + put parameters used by AJAX */ + if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0) + Usr_GetParamOtherUsrCodEncrypted (); + if (!Gbl.Usrs.Other.UsrDat.Nickname[0]) + Nck_GetNicknameFromUsrCod (Gbl.Usrs.Other.UsrDat.UsrCod, + Gbl.Usrs.Other.UsrDat.Nickname); + fprintf (Gbl.F.Out,"var RefreshParamNxtActOldPub = \"act=%ld\";\n" + "var RefreshParamUsr = \"usr=@%s\";\n", + Act_Actions[ActRefOldSocPubUsr].ActCod, + Gbl.Usrs.Other.UsrDat.Nickname); + } /***** Parameters with code of session and current course code *****/ fprintf (Gbl.F.Out,"var RefreshParamIdSes = \"ses=%s\";\n"