diff --git a/swad_action.c b/swad_action.c index 65f5ee9d1..65b161e2c 100644 --- a/swad_action.c +++ b/swad_action.c @@ -997,11 +997,11 @@ Users: 834. ActLstClk List last clicks in real time Social: - xxx. ActReqSocPst Write a public social post to be displayed in the timeline xxx. ActSeeSocAct Show social activity (timeline) 699. ActReqPubPrf Request @nickname to show a public user's profile 845. ActSeeChtRms Show the chat rooms + xxx. ActReqSocPst Write a public social post to be displayed in the timeline xxx. ActRcvSocPst Receive a public social post to be displayed in the timeline 835. ActSeePubPrf Show a public user's profile 836. ActCal1stClkTim Calculate first click time from log and store into user's figures @@ -2305,12 +2305,12 @@ 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 ****************************************************************** - /* ActReqSocPst */{1491, 0,TabSoc,ActReqSocPst ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPost ,"editnewmsg64x64.gif" }, - /* ActSeeSocAct */{1490, 1,TabSoc,ActSeeSocAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShowFollowingTimeline ,"soc64x64.png" }, - /* ActReqPubPrf */{1401, 2,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,"prf64x64.gif" }, - /* ActSeeChtRms */{ 51, 3,TabSoc,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" }, + /* ActSeeSocAct */{1490, 0,TabSoc,ActSeeSocAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShowFollowingTimeline ,"soc64x64.png" }, + /* ActReqPubPrf */{1401, 1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_RequestUserProfile ,"prf64x64.gif" }, + /* ActSeeChtRms */{ 51, 2,TabSoc,ActSeeChtRms ,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Cht_ShowChatRooms ,"chat64x64.gif" }, - /* ActRcvSocPst */{1492,-1,TabSoc,ActReqSocPst ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPost ,NULL}, + /* ActReqSocPst */{1491,-1,TabSoc,ActSeeSocAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPost ,NULL}, + /* ActRcvSocPst */{1492,-1,TabSoc,ActSeeSocAct ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPost ,NULL}, /* ActSeePubPrf */{1402,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrCodAndShowUserProfile,NULL}, /* ActCal1stClkTim */{1405,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL}, diff --git a/swad_action.h b/swad_action.h index 4db3ec9e1..f996a0078 100644 --- a/swad_action.h +++ b/swad_action.h @@ -1036,11 +1036,11 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica /******************************** Social tab *********************************/ /*****************************************************************************/ // Actions in menu -#define ActReqSocPst (ActLstClk+ 1) -#define ActSeeSocAct (ActLstClk+ 2) -#define ActReqPubPrf (ActLstClk+ 3) -#define ActSeeChtRms (ActLstClk+ 4) +#define ActSeeSocAct (ActLstClk+ 1) +#define ActReqPubPrf (ActLstClk+ 2) +#define ActSeeChtRms (ActLstClk+ 3) // Secondary actions +#define ActReqSocPst (ActLstClk+ 4) #define ActRcvSocPst (ActLstClk+ 5) #define ActSeePubPrf (ActLstClk+ 6) diff --git a/swad_changelog.h b/swad_changelog.h index e23b79f84..505ab04b0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -116,13 +116,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.82.3 (2015-12-30)" +#define Log_PLATFORM_VERSION "SWAD 15.82.4 (2015-12-30)" #define CSS_FILE "swad15.80.css" #define JS_FILE "swad15.77.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.82.4: Dec 30, 2015 Action to write a new social post is removed form menu. (189159 lines) Version 15.82.3: Dec 30, 2015 Contextual link to write a new social post. (189199 lines) Version 15.82.2: Dec 30, 2015 Current timeline is displayed below the form to write a new social post. (189183 lines) Version 15.82.1: Dec 29, 2015 Public social posts are displayed in timeline. (189176 lines) diff --git a/swad_menu.c b/swad_menu.c index e71f68f9d..e1dd75216 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -155,7 +155,6 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB }, // TabSoc ********** { - ActReqSocPst, ActSeeSocAct, ActReqPubPrf, ActSeeChtRms, diff --git a/swad_social.c b/swad_social.c index 028f33e14..6d3450efc 100644 --- a/swad_social.c +++ b/swad_social.c @@ -148,7 +148,7 @@ void Soc_FormSocialPost (void) Act_FormStart (ActRcvSocPst); /* Content of new post */ - fprintf (Gbl.F.Out,""); /* Send button */ @@ -177,7 +177,7 @@ void Soc_ReceiveSocialPost (void) /***** Get and store new post *****/ /* Get the content of the post */ Par_GetParAndChangeFormat ("Content",Content,Cns_MAX_BYTES_LONG_TEXT, - Str_TO_RIGOROUS_HTML,false); + Str_TO_RIGOROUS_HTML,true); /* Insert post content in the database */ sprintf (Query,"INSERT INTO social_post (Content) VALUES ('%s')", diff --git a/swad_text.c b/swad_text.c index 549e61c87..7b3675cac 100644 --- a/swad_text.c +++ b/swad_text.c @@ -17880,27 +17880,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabSoc ***************************************************** - // ActReqSocPst -#if L==1 - "Redactar" -#elif L==2 - "Schreiben" -#elif L==3 - "Write" -#elif L==4 - "Redactar" -#elif L==5 - "Ecrire" -#elif L==6 - "Redactar" // Okoteve traducción -#elif L==7 - "Scrivi" -#elif L==8 - "Napisz" -#elif L==9 - "Escrever" -#endif - , // ActSeeSocAct #if L==1 "Activitat" @@ -17980,6 +17959,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabMsg ***************************************************** @@ -19856,27 +19836,6 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = }, { // TabSoc ***************************************************** - // ActReqSocPst -#if L==1 - "Nou comentari públic" -#elif L==2 - "Neue öffentlichen Kommentar" -#elif L==3 - "New public comment" -#elif L==4 - "Nuevo comentario público" -#elif L==5 - "Nouvelle commentaire public" -#elif L==6 - "Nuevo comentario público" // Okoteve traducción -#elif L==7 - "Nuovo commento pubblico" -#elif L==8 - "Nowy komentarz publicznego" -#elif L==9 - "Novo comentário público" -#endif - , // ActSeeSocAct #if L==1 "Activitat social (línia de temps)" @@ -19956,6 +19915,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, NULL, NULL, + NULL, }, { // TabMsg *****************************************************