Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.129.3

This commit is contained in:
Antonio Cañas Vargas 2016-01-25 23:00:22 +01:00
parent 0ca6406309
commit 84f623c5cc
5 changed files with 64 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
swad_action.c
View File

@ -2336,23 +2336,23 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActLstClk */{ 989,-1,TabUsr,ActLstCon ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Con_ShowLastClicks ,NULL},
// TabSoc ******************************************************************
/* ActSeeSocTmlGbl */{1490, 0,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShowTimelineGbl ,"soc64x64.png" },
/* 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" },
/* 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" },
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActRcvSocComGbl */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocNotGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialNoteGbl ,NULL},
/* ActFavSocNotGbl */{1512,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialNoteGbl ,NULL},
/* ActUnfSocNotGbl */{1513,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialNoteGbl ,NULL},
/* ActFavSocComGbl */{1516,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FavSocialCommentGbl ,NULL},
/* ActUnfSocComGbl */{1517,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnfavSocialCommentGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialNoteGbl ,NULL},
/* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNoteGbl ,NULL},
/* ActReqRemSocComGbl*/{1505,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialComGbl ,NULL},
/* ActRemSocComGbl */{1507,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialComGbl ,NULL},
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActRcvSocComGbl */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocNotGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_UnshareSocialNoteGbl ,NULL},
/* ActFavSocNotGbl */{1512,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_FavSocialNoteGbl ,NULL},
/* ActUnfSocNotGbl */{1513,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_UnfavSocialNoteGbl ,NULL},
/* ActFavSocComGbl */{1516,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_FavSocialCommentGbl ,NULL},
/* ActUnfSocComGbl */{1517,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_UnfavSocialCommentGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_RequestRemSocialNoteGbl ,NULL},
/* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,Soc_MarkMyNotifAsSeen ,Soc_RemoveSocialNoteGbl ,NULL},
/* 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},

3
swad_changelog.h
View File

@ -121,13 +121,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.129.2 (2016-01-25)"
#define Log_PLATFORM_VERSION "SWAD 15.129.3 (2016-01-25)"
#define CSS_FILE "swad15.121.7.css"
#define JS_FILE "swad15.121.7.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.129.3: Jan 25, 2016 Changed text in some messages. (194964 lines)
Version 15.129.2: Jan 25, 2016 Mark timeline notifications as seen when new social activity is shown. (194967 lines)
Version 15.129.1: Jan 25, 2016 Do not show top message in social timeline for original publishings. (194979 lines)
Version 15.129: Jan 25, 2016 Do not notify new social sharings or comments. (194979 lines)

13
swad_social.c
View File

@ -128,8 +128,6 @@ static void Soc_ShowTimelineUsrHighlightingNot (long NotCod);
static void Soc_GetAndShowNewTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl);
static void Soc_GetAndShowOldTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl);
static void Soc_MarkAllMyNotifAboutTimelineAsSeen (void);
static void Soc_BuildQueryToGetTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl,
Soc_WhatToGetFromTimeline_t WhatToGetFromTimeline,
char *Query);
@ -349,9 +347,6 @@ static void Soc_ShowTimelineGblHighlightingNot (long NotCod)
/***** Drop temporary tables *****/
Soc_DropTemporaryTablesUsedToQueryTimeline ();
/***** Mark all my notifications related to timeline as seen *****/
Soc_MarkAllMyNotifAboutTimelineAsSeen ();
}
/*****************************************************************************/
@ -414,7 +409,7 @@ static void Soc_GetAndShowNewTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl)
Soc_DropTemporaryTablesUsedToQueryTimeline ();
/***** Mark all my notifications related to timeline as seen *****/
Soc_MarkAllMyNotifAboutTimelineAsSeen ();
// Soc_MarkMyNotifAsSeen ();
/***** All the output is made, so don't write anymore *****/
Gbl.Layout.DivsEndWritten = Gbl.Layout.HTMLEndWritten = true;
@ -464,7 +459,7 @@ static void Soc_GetAndShowOldTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl)
/************ Mark all my notifications about timeline as seen ***************/
/*****************************************************************************/
static void Soc_MarkAllMyNotifAboutTimelineAsSeen (void)
void Soc_MarkMyNotifAsSeen (void)
{
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_PUBLISH,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_COMMENT,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod);
@ -2857,10 +2852,6 @@ static long Soc_ShareSocialNote (void)
/**** Create notification about shared post
for the author of the post ***/
OriginalPubCod = Soc_GetPubCodOfOriginalSocialNote (SocNot.NotCod);
sprintf (Gbl.Message,"OriginalPubCod = %ld",OriginalPubCod);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
if (OriginalPubCod > 0)
Soc_CreateNotifToAuthor (SocNot.UsrCod,OriginalPubCod,Ntf_EVENT_TIMELINE_SHARE);
}

2
swad_social.h
View File

@ -121,6 +121,8 @@ void Soc_RefreshNewTimelineGbl (void);
void Soc_RefreshOldTimelineGbl (void);
void Soc_RefreshOldTimelineUsr (void);
void Soc_MarkMyNotifAsSeen (void);
void Soc_StoreAndPublishSocialNote (Soc_NoteType_t NoteType,long Cod,struct SocialPublishing *SocPub);
void Soc_MarkSocialNoteAsUnavailableUsingNotCod (long NotCod);
void Soc_MarkSocialNoteAsUnavailableUsingNoteTypeAndCod (Soc_NoteType_t NoteType,long Cod);

90
swad_text.c
View File

@ -25538,103 +25538,103 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] =
#endif
,
#if L==1 // Ntf_EVENT_TIMELINE_PUBLISH
"Novo missatge social"
"Missatge social"
#elif L==2
"Neue soziale Beitrag"
"Soziale Beitrag"
#elif L==3
"New social post"
"Social post"
#elif L==4
"Nuevo mensaje social"
"Mensaje social"
#elif L==5
"Nouveau message social"
"Message social"
#elif L==6
"Nuevo mensaje social" // Okoteve traducción
"Mensaje social" // Okoteve traducción
#elif L==7
"Nuovo post sociale"
"Post sociale"
#elif L==8
"Nowy post społeczna"
"Post społeczna"
#elif L==9
"Novo post sociais"
"Post sociais"
#endif
,
#if L==1 // Ntf_EVENT_TIMELINE_COMMENT
"Nou comentari a un missatge social"
"Comentari a un missatge social"
#elif L==2
"Neue Kommentar zu soziale Beitrag"
"Kommentar zu soziale Beitrag"
#elif L==3
"New comment to social post"
"Comment to social post"
#elif L==4
"Nuevo comentario a un mensaje social"
"Comentario a un mensaje social"
#elif L==5
"Nouveau commentaire à message social"
"Commentaire à message social"
#elif L==6
"Nuevo comentario a un mensaje social" // Okoteve traducción
"Comentario a un mensaje social" // Okoteve traducción
#elif L==7
"Nuovo commento a un post sociale"
"Commento a un post sociale"
#elif L==8
"Nowy komentarz do post społeczna"
"Komentarz do post społeczna"
#elif L==9
"Novo comentário a um post sociais"
"Comentário a um post sociais"
#endif
,
#if L==1 // Ntf_EVENT_TIMELINE_FAV
"Nou favorit a un missatge social"
"Missatge social marcat com favorit"
#elif L==2
"Neue Favorit zu soziale Beitrag"
"Social Beitrag als Favorit markiert"
#elif L==3
"New favourite to social post"
"Social post marked as favourite"
#elif L==4
"Nuevo favorito a un mensaje social"
"Mensaje social marcado como favorito"
#elif L==5
"Nouveau favori à message social"
"Message social marquée comme favori"
#elif L==6
"Nuevo favorito a un mensaje social" // Okoteve traducción
"Mensaje social marcado como favorito" // Okoteve traducción
#elif L==7
"Nuovo preferito a un post sociale"
"Post sociale segnato come preferito"
#elif L==8
"Nowy ulubiony do post społeczna"
"Post społecznej oznaczone jako ulubiony"
#elif L==9
"Novo favorito a um post sociais"
"Post sociais marcado como favorito"
#endif
,
#if L==1 // Ntf_EVENT_TIMELINE_SHARE
"Nova compartició d'un missatge social"
"Missatge social compartit"
#elif L==2
"Neue gemeinsame Nutzung von soziale Beitrag"
"Social Beitrag gemeinsamer"
#elif L==3
"New sharing of social post"
"Social post shared"
#elif L==4
"Nueva compartición de un mensaje social"
"Mensaje social compartido"
#elif L==5
"Nouveau partage à message social"
"Message social partagéé"
#elif L==6
"Nueva compartición de un mensaje social" // Okoteve traducción
"Mensaje social compartido" // Okoteve traducción
#elif L==7
"Nuova condivisione a un post sociale"
"Post sociale condiviso"
#elif L==8
"Nowy podzial post społeczna"
"Post społecznej wspólne"
#elif L==9
"Nova partilha de um post sociais"
"Post sociais compartido"
#endif
,
#if L==1 // Ntf_EVENT_TIMELINE_MENTION
"Nova menció"
"Menció"
#elif L==2
"Neue Erwähnung"
"Erwähnung"
#elif L==3
"New mention"
"Mention"
#elif L==4
"Nueva mención"
"Mención"
#elif L==5
"Nouvelle mention"
"Mention"
#elif L==6
"Nueva mención" // Okoteve traducción
"Mención" // Okoteve traducción
#elif L==7
"Nuova menzione"
"Menzione"
#elif L==8
"Nowa wzmianka"
"Wzmianka"
#elif L==9
"Nova menção"
"Menção"
#endif
,
#if L==1 // Ntf_EVENT_FOLLOWER