diff --git a/swad_action.c b/swad_action.c index 805182394..bdadf3cda 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1619,32 +1619,32 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSch */{ 628,-1,TabUnk,ActReqSch ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_SysSearch ,NULL}, - /* ActRcvSocPstGbl */{1492,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_ReceivePostGbl ,NULL}, + /* ActRcvSocPstGbl */{1492,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_ReceivePostGbl ,NULL}, /* ActRcvSocComGbl */{1503,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_ReceiveCommentGbl ,NULL}, /* ActShaSocNotGbl */{1495,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_ShareNoteGbl ,NULL}, - /* ActUnsSocNotGbl */{1496,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnshareNoteGbl ,NULL}, - /* ActFavSocNotGbl */{1512,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavNoteGbl ,NULL}, + /* ActUnsSocNotGbl */{1496,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnshareNoteGbl ,NULL}, + /* ActFavSocNotGbl */{1512,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavNoteGbl ,NULL}, /* ActUnfSocNotGbl */{1513,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavNoteGbl ,NULL}, - /* ActFavSocComGbl */{1516,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavCommentGbl ,NULL}, - /* ActUnfSocComGbl */{1517,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavCommentGbl ,NULL}, - /* ActReqRemSocPubGbl*/{1494,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RequestRemNoteGbl ,NULL}, - /* ActRemSocPubGbl */{1493,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RemoveNoteGbl ,NULL}, - /* ActReqRemSocComGbl*/{1505,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RequestRemComGbl ,NULL}, + /* ActFavSocComGbl */{1516,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavCommentGbl ,NULL}, + /* ActUnfSocComGbl */{1517,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavCommentGbl ,NULL}, + /* ActReqRemSocPubGbl*/{1494,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RequestRemNoteGbl ,NULL}, + /* ActRemSocPubGbl */{1493,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RemoveNoteGbl ,NULL}, + /* ActReqRemSocComGbl*/{1505,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RequestRemComGbl ,NULL}, /* ActRemSocComGbl */{1507,-1,TabUnk,ActSeeSocTmlGbl ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,TL_ShowTimelineGbl1 ,TL_RemoveComGbl ,NULL}, /* ActReqOthPubPrf */{1401,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_RequestUserProfile ,NULL}, - /* ActRcvSocPstUsr */{1498,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,TL_ReceivePostUsr ,NULL}, + /* ActRcvSocPstUsr */{1498,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,TL_ReceivePostUsr ,NULL}, /* ActRcvSocComUsr */{1504,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,TL_ReceiveCommentUsr ,NULL}, /* ActShaSocNotUsr */{1499,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_ShareNoteUsr ,NULL}, - /* ActUnsSocNotUsr */{1500,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnshareNoteUsr ,NULL}, - /* ActFavSocNotUsr */{1514,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavNoteUsr ,NULL}, + /* ActUnsSocNotUsr */{1500,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnshareNoteUsr ,NULL}, + /* ActFavSocNotUsr */{1514,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavNoteUsr ,NULL}, /* ActUnfSocNotUsr */{1515,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavNoteUsr ,NULL}, - /* ActFavSocComUsr */{1518,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavCommentUsr ,NULL}, - /* ActUnfSocComUsr */{1519,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavCommentUsr ,NULL}, - /* ActReqRemSocPubUsr*/{1501,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RequestRemNoteUsr ,NULL}, - /* ActRemSocPubUsr */{1502,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RemoveNoteUsr ,NULL}, - /* ActReqRemSocComGbl*/{1506,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RequestRemComUsr ,NULL}, + /* ActFavSocComUsr */{1518,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_FavCommentUsr ,NULL}, + /* ActUnfSocComUsr */{1519,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_UnfavCommentUsr ,NULL}, + /* ActReqRemSocPubUsr*/{1501,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RequestRemNoteUsr ,NULL}, + /* ActRemSocPubUsr */{1502,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RemoveNoteUsr ,NULL}, + /* ActReqRemSocComGbl*/{1506,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RequestRemComUsr ,NULL}, /* ActRemSocComGbl */{1508,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,TL_RemoveComUsr ,NULL}, /* ActSeeOthPubPrf */{1402,-1,TabUnk,ActSeeSocPrf ,0x3F8,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Prf_GetUsrDatAndShowUserProfile,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index d64e11a50..ed75e83d9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -452,11 +452,12 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.75 (2019-03-13)" +#define Log_PLATFORM_VERSION "SWAD 18.75.1 (2019-03-13)" #define CSS_FILE "swad18.68.3.css" #define JS_FILE "swad18.75.js" /* - Version 18.75: Mar 13, 2019 Timeline refresh rate is increased on each refresh. (239633 lines) + Version 18.75.1: Mar 13, 2019 Timeline note is not shown apart on top of timeline when commenting. (239630 lines) + Version 18.75: Mar 13, 2019 Timeline refresh rate start with 2 s and is increased 1 s on each refresh. (239633 lines) Version 18.74.4: Mar 13, 2019 Fixed bug in JavaScript related to timeline. (239628 lines) Version 18.74.3: Mar 13, 2019 Fixed bug in JavaScript related to timeline. (239628 lines) Version 18.74.2: Mar 13, 2019 Fixed bug in JavaScript related to timeline. (239628 lines) diff --git a/swad_config.h b/swad_config.h index cffa7dac1..6e55b39b7 100644 --- a/swad_config.h +++ b/swad_config.h @@ -455,7 +455,7 @@ #define Cfg_TIME_TO_REFRESH_LAST_CLICKS ((time_t)( 1UL * 1000UL)) // Refresh period of last clicks in miliseconds -#define Cfg_TIME_TO_REFRESH_TIMELINE ((time_t)( 1UL * 1000UL)) // Initial refresh period of social timeline in miliseconds +#define Cfg_TIME_TO_REFRESH_TIMELINE ((time_t)( 2UL * 1000UL)) // Initial refresh period of social timeline in miliseconds // This delay is increased 1 second on each refresh #define Cfg_TIME_TO_CHANGE_BANNER ((time_t)( 2UL * 60UL)) // After these seconds, change banner diff --git a/swad_timeline.c b/swad_timeline.c index 003a8b6ba..ee60e090d 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -144,13 +144,13 @@ static void TL_UpdateFirstPubCodIntoSession (long FirstPubCod); static void TL_DropTemporaryTablesUsedToQueryTimeline (void); static void TL_ShowTimeline (char *Query, - const char *Title,long NotCodToHighlight); + const char *Title,long NotCodToHighlight); static void TL_PutIconsTimeline (void); static void TL_FormStart (Act_Action_t ActionGbl,Act_Action_t ActionUsr); static void TL_FormFavSha (Act_Action_t ActionGbl,Act_Action_t ActionUsr, - const char *ParamCod, - const char *Icon,const char *Title); + const char *ParamCod, + const char *Icon,const char *Title); static void TL_PutFormWhichUsrs (void); static void TL_PutParamWhichUsrs (void); @@ -183,7 +183,7 @@ static void TL_PublishNoteInTimeline (struct TL_Publication *SocPub); static void TL_PutFormToWriteNewPost (void); static void TL_PutTextarea (const char *Placeholder, - const char *ClassTextArea,const char *ClassImgTit); + const char *ClassTextArea,const char *ClassImgTit); static long TL_ReceivePost (void); @@ -195,7 +195,7 @@ static unsigned long TL_GetNumCommentsInNote (long NotCod); static void TL_WriteCommentsInNote (const struct TL_Note *SocNot); static void TL_WriteOneCommentInList (MYSQL_RES *mysql_res); static void TL_PutIconToToggleComments (const char *UniqueId, - const char *Icon,const char *Text); + const char *Icon,const char *Text); static void TL_WriteComment (struct TL_Comment *SocCom, TL_TopMessage_t TopMessage,long UsrCod, bool ShowCommentAlone); @@ -225,7 +225,7 @@ static void TL_ShareNote (struct TL_Note *SocNot); static void TL_FavNote (struct TL_Note *SocNot); static void TL_FavComment (struct TL_Comment *SocCom); static void TL_CreateNotifToAuthor (long AuthorCod,long PubCod, - Ntf_NotifyEvent_t NotifyEvent); + Ntf_NotifyEvent_t NotifyEvent); static void TL_UnshareNote (struct TL_Note *SocNot); static void TL_UnfavNote (struct TL_Note *SocNot); @@ -258,7 +258,7 @@ static void TL_ShowUsrsWhoHaveSharedNote (const struct TL_Note *SocNot); static void TL_ShowUsrsWhoHaveMarkedNoteAsFav (const struct TL_Note *SocNot); static void TL_ShowUsrsWhoHaveMarkedCommAsFav (const struct TL_Comment *SocCom); static void TL_ShowSharersOrFavers (MYSQL_RES **mysql_res, - unsigned NumUsrs,unsigned NumFirstUsrs); + unsigned NumUsrs,unsigned NumFirstUsrs); static void TL_GetDataOfNoteByCod (struct TL_Note *SocNot); static void TL_GetDataOfCommByCod (struct TL_Comment *SocCom); @@ -967,7 +967,7 @@ static void TL_DropTemporaryTablesUsedToQueryTimeline (void) \ |_____| */ static void TL_ShowTimeline (char *Query, - const char *Title,long NotCodToHighlight) + const char *Title,long NotCodToHighlight) { extern const char *Hlp_START_Timeline; MYSQL_RES *mysql_res; @@ -1085,8 +1085,8 @@ static void TL_FormStart (Act_Action_t ActionGbl,Act_Action_t ActionUsr) /*****************************************************************************/ static void TL_FormFavSha (Act_Action_t ActionGbl,Act_Action_t ActionUsr, - const char *ParamCod, - const char *Icon,const char *Title) + const char *ParamCod, + const char *Icon,const char *Title) { char *OnSubmit; @@ -2374,7 +2374,7 @@ static void TL_PutFormToWriteNewPost (void) /*****************************************************************************/ static void TL_PutTextarea (const char *Placeholder, - const char *ClassTextArea,const char *ClassImgTit) + const char *ClassTextArea,const char *ClassImgTit) { extern const char *Txt_Post; char IdDivImgButton[Frm_MAX_BYTES_ID + 1]; @@ -2730,7 +2730,7 @@ static void TL_WriteOneCommentInList (MYSQL_RES *mysql_res) /*****************************************************************************/ static void TL_PutIconToToggleComments (const char *UniqueId, - const char *Icon,const char *Text) + const char *Icon,const char *Text) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; @@ -3238,11 +3238,6 @@ static long TL_ReceiveComment (void) /***** Analyze content and store notifications about mentions *****/ Str_AnalyzeTxtAndStoreNotifyEventToMentionedUsrs (SocPub.PubCod,Content); - - /***** Show the note just commented *****/ - TL_WriteNote (&SocNot, - TL_TOP_MESSAGE_COMMENTED,Gbl.Usrs.Me.UsrDat.UsrCod, - true,true); } /***** Free image *****/ @@ -3477,7 +3472,7 @@ static void TL_FavComment (struct TL_Comment *SocCom) /*****************************************************************************/ static void TL_CreateNotifToAuthor (long AuthorCod,long PubCod, - Ntf_NotifyEvent_t NotifyEvent) + Ntf_NotifyEvent_t NotifyEvent) { struct UsrData UsrDat; bool CreateNotif; @@ -4580,7 +4575,7 @@ static void TL_ShowUsrsWhoHaveMarkedCommAsFav (const struct TL_Comment *SocCom) // All forms in this function and nested functions must have unique identifiers static void TL_ShowSharersOrFavers (MYSQL_RES **mysql_res, - unsigned NumUsrs,unsigned NumFirstUsrs) + unsigned NumUsrs,unsigned NumFirstUsrs) { MYSQL_ROW row; unsigned NumUsr;