Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-20 15:35:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.100.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-07 00:42:35 +01:00
parent 7159652e3d
commit 3d7d9cd83b
7 changed files with 293 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/swad15.97.css
View File

@ -1705,20 +1705,27 @@ a:hover img.CENTRE_PHOTO_SHOW
text-align:right; text-align:right;
vertical-align:top; vertical-align:top;
} }
.SOCIAL_ICON .SOCIAL_ICON_COMMENT
{
display:inline-block;
padding-top:10px;
padding-right:20px;
vertical-align:bottom;
}
.SOCIAL_ICON_SHARE
{ {
display:inline-block; display:inline-block;
padding-top:10px; padding-top:10px;
vertical-align:bottom; vertical-align:bottom;
} }
.SOCIAL_ICON_DISABLED .SOCIAL_ICON_SHARE_DISABLED
{ {
display:inline-block; display:inline-block;
padding-top:10px; padding-top:10px;
opacity:0.2; opacity:0.2;
vertical-align:bottom; vertical-align:bottom;
} }
.SOCIAL_ICON_RIGHT .SOCIAL_ICON_REMOVE
{ {
display:inline-block; display:inline-block;
padding-top:10px; padding-top:10px;

10
swad_action.c
View File

@ -1004,6 +1004,7 @@ Social:
839. ActReqSocPstGbl Write a public social post to be displayed in the timeline (global) 839. ActReqSocPstGbl Write a public social post to be displayed in the timeline (global)
840. ActRcvSocPstGbl Receive a public social post to be displayed in the timeline (global) 840. ActRcvSocPstGbl Receive a public social post to be displayed in the timeline (global)
NEW!!!!!!!!. ActComSocNotGbl Comment a social note in the timeline (global)
NEW!!!!!!!!. ActShaSocNotGbl Share a social publishing in the timeline (global) NEW!!!!!!!!. ActShaSocNotGbl Share a social publishing in the timeline (global)
NEW!!!!!!!!. ActUnsSocPubGbl Unshare a previously shared social publishing in the timeline (global) NEW!!!!!!!!. ActUnsSocPubGbl Unshare a previously shared social publishing in the timeline (global)
841. ActReqRemSocPubGbl Request the removal of a social publishing in the timeline (global) 841. ActReqRemSocPubGbl Request the removal of a social publishing in the timeline (global)
@ -1011,6 +1012,7 @@ NEW!!!!!!!!. ActUnsSocPubGbl Unshare a previously shared social publishing in t
NEW!!!!!!!!. ActReqSocPstUsr Write a public social post to be displayed in the timeline (user) NEW!!!!!!!!. ActReqSocPstUsr Write a public social post to be displayed in the timeline (user)
NEW!!!!!!!!. ActRcvSocPstUsr Receive a public social post to be displayed in the timeline (user) NEW!!!!!!!!. ActRcvSocPstUsr Receive a public social post to be displayed in the timeline (user)
NEW!!!!!!!!. ActComSocNotUsr Comment a social note in the timeline (user)
NEW!!!!!!!!. ActShaSocNotUsr Share a social note in the timeline (user) NEW!!!!!!!!. ActShaSocNotUsr Share a social note in the timeline (user)
NEW!!!!!!!!. ActUnsSocPubUsr Unshare a previously shared social note in the timeline (user) NEW!!!!!!!!. ActUnsSocPubUsr Unshare a previously shared social note in the timeline (user)
NEW!!!!!!!!. ActReqRemSocPubUsr Request the removal of a social publishing in the timeline (user) NEW!!!!!!!!. ActReqRemSocPubUsr Request the removal of a social publishing in the timeline (user)
@ -2325,17 +2327,19 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqSocPstGbl */{1491,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostGbl ,NULL}, /* ActReqSocPstGbl */{1491,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostGbl ,NULL},
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL}, /* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActComSocNotUsr */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_CommentSocialNoteGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL}, /* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubGbl ,NULL}, /* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubGbl ,NULL}, /* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubGbl ,NULL},
/* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialPubGbl ,NULL}, /* ActRemSocPubGbl */{1493,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNotGbl ,NULL},
/* ActReqSocPstUsr */{1497,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostUsr ,NULL}, /* ActReqSocPstUsr */{1497,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostUsr ,NULL},
/* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL}, /* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL},
/* ActComSocNotUsr */{1504,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_CommentSocialNoteUsr ,NULL},
/* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL}, /* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL},
/* ActUnsSocPubUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubUsr ,NULL}, /* ActUnsSocPubUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubUsr ,NULL},
/* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubUsr ,NULL}, /* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubUsr ,NULL},
/* ActRemSocPubUsr */{1502,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialPubUsr ,NULL}, /* ActRemSocPubUsr */{1502,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RemoveSocialNotUsr ,NULL},
/* ActSeePubPrf */{1402,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_GetUsrCodAndShowUserProfile,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}, /* ActCal1stClkTim */{1405,-1,TabSoc,ActReqPubPrf ,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Prf_CalculateFirstClickTime ,NULL},
@ -4186,6 +4190,8 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] = // Do not reuse uniq
ActUnsSocPubUsr, // #1500 ActUnsSocPubUsr, // #1500
ActReqRemSocPubUsr, // #1501 ActReqRemSocPubUsr, // #1501
ActRemSocPubUsr, // #1502 ActRemSocPubUsr, // #1502
ActComSocNotGbl, // #1503
ActComSocNotUsr, // #1504
}; };
/*****************************************************************************/ /*****************************************************************************/

312
swad_action.h
View File

@ -71,9 +71,9 @@ typedef enum
typedef int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action typedef int Act_Action_t; // Must be a signed type, because -1 is used to indicate obsolete action
#define Act_NUM_ACTIONS (7+52+15+90+72+67+205+183+143+159+36+27+82) #define Act_NUM_ACTIONS (7+52+15+90+72+67+205+183+143+161+36+27+82)
#define Act_MAX_ACTION_COD 1502 #define Act_MAX_ACTION_COD 1504
#define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20
@ -1043,164 +1043,166 @@ typedef int Act_Action_t; // Must be a signed type, because -1 is used to indica
// Secondary actions // Secondary actions
#define ActReqSocPstGbl (ActLstClk+ 5) #define ActReqSocPstGbl (ActLstClk+ 5)
#define ActRcvSocPstGbl (ActLstClk+ 6) #define ActRcvSocPstGbl (ActLstClk+ 6)
#define ActShaSocNotGbl (ActLstClk+ 7) #define ActComSocNotGbl (ActLstClk+ 7)
#define ActUnsSocPubGbl (ActLstClk+ 8) #define ActShaSocNotGbl (ActLstClk+ 8)
#define ActReqRemSocPubGbl (ActLstClk+ 9) #define ActUnsSocPubGbl (ActLstClk+ 9)
#define ActRemSocPubGbl (ActLstClk+ 10) #define ActReqRemSocPubGbl (ActLstClk+ 10)
#define ActRemSocPubGbl (ActLstClk+ 11)
#define ActReqSocPstUsr (ActLstClk+ 11) #define ActReqSocPstUsr (ActLstClk+ 12)
#define ActRcvSocPstUsr (ActLstClk+ 12) #define ActRcvSocPstUsr (ActLstClk+ 13)
#define ActShaSocNotUsr (ActLstClk+ 13) #define ActComSocNotUsr (ActLstClk+ 14)
#define ActUnsSocPubUsr (ActLstClk+ 14) #define ActShaSocNotUsr (ActLstClk+ 15)
#define ActReqRemSocPubUsr (ActLstClk+ 15) #define ActUnsSocPubUsr (ActLstClk+ 16)
#define ActRemSocPubUsr (ActLstClk+ 16) #define ActReqRemSocPubUsr (ActLstClk+ 17)
#define ActRemSocPubUsr (ActLstClk+ 18)
#define ActSeePubPrf (ActLstClk+ 17) #define ActSeePubPrf (ActLstClk+ 19)
#define ActCal1stClkTim (ActLstClk+ 18) #define ActCal1stClkTim (ActLstClk+ 20)
#define ActCalNumClk (ActLstClk+ 19) #define ActCalNumClk (ActLstClk+ 21)
#define ActCalNumFilVie (ActLstClk+ 20) #define ActCalNumFilVie (ActLstClk+ 22)
#define ActCalNumForPst (ActLstClk+ 21) #define ActCalNumForPst (ActLstClk+ 23)
#define ActCalNumMsgSnt (ActLstClk+ 22) #define ActCalNumMsgSnt (ActLstClk+ 24)
#define ActFolUsr (ActLstClk+ 23) #define ActFolUsr (ActLstClk+ 25)
#define ActUnfUsr (ActLstClk+ 24) #define ActUnfUsr (ActLstClk+ 26)
#define ActSeeFlg (ActLstClk+ 25) #define ActSeeFlg (ActLstClk+ 27)
#define ActSeeFlr (ActLstClk+ 26) #define ActSeeFlr (ActLstClk+ 28)
#define ActSeeForCrsUsr (ActLstClk+ 27) #define ActSeeForCrsUsr (ActLstClk+ 29)
#define ActSeeForCrsTch (ActLstClk+ 28) #define ActSeeForCrsTch (ActLstClk+ 30)
#define ActSeeForDegUsr (ActLstClk+ 29) #define ActSeeForDegUsr (ActLstClk+ 31)
#define ActSeeForDegTch (ActLstClk+ 30) #define ActSeeForDegTch (ActLstClk+ 32)
#define ActSeeForCtrUsr (ActLstClk+ 31) #define ActSeeForCtrUsr (ActLstClk+ 33)
#define ActSeeForCtrTch (ActLstClk+ 32) #define ActSeeForCtrTch (ActLstClk+ 34)
#define ActSeeForInsUsr (ActLstClk+ 33) #define ActSeeForInsUsr (ActLstClk+ 35)
#define ActSeeForInsTch (ActLstClk+ 34) #define ActSeeForInsTch (ActLstClk+ 36)
#define ActSeeForGenUsr (ActLstClk+ 35) #define ActSeeForGenUsr (ActLstClk+ 37)
#define ActSeeForGenTch (ActLstClk+ 36) #define ActSeeForGenTch (ActLstClk+ 38)
#define ActSeeForSWAUsr (ActLstClk+ 37) #define ActSeeForSWAUsr (ActLstClk+ 39)
#define ActSeeForSWATch (ActLstClk+ 38) #define ActSeeForSWATch (ActLstClk+ 40)
#define ActSeePstForCrsUsr (ActLstClk+ 39) #define ActSeePstForCrsUsr (ActLstClk+ 41)
#define ActSeePstForCrsTch (ActLstClk+ 40) #define ActSeePstForCrsTch (ActLstClk+ 42)
#define ActSeePstForDegUsr (ActLstClk+ 41) #define ActSeePstForDegUsr (ActLstClk+ 43)
#define ActSeePstForDegTch (ActLstClk+ 42) #define ActSeePstForDegTch (ActLstClk+ 44)
#define ActSeePstForCtrUsr (ActLstClk+ 43) #define ActSeePstForCtrUsr (ActLstClk+ 45)
#define ActSeePstForCtrTch (ActLstClk+ 44) #define ActSeePstForCtrTch (ActLstClk+ 46)
#define ActSeePstForInsUsr (ActLstClk+ 45) #define ActSeePstForInsUsr (ActLstClk+ 47)
#define ActSeePstForInsTch (ActLstClk+ 46) #define ActSeePstForInsTch (ActLstClk+ 48)
#define ActSeePstForGenUsr (ActLstClk+ 47) #define ActSeePstForGenUsr (ActLstClk+ 49)
#define ActSeePstForGenTch (ActLstClk+ 48) #define ActSeePstForGenTch (ActLstClk+ 50)
#define ActSeePstForSWAUsr (ActLstClk+ 49) #define ActSeePstForSWAUsr (ActLstClk+ 51)
#define ActSeePstForSWATch (ActLstClk+ 50) #define ActSeePstForSWATch (ActLstClk+ 52)
#define ActRcvThrForCrsUsr (ActLstClk+ 51) #define ActRcvThrForCrsUsr (ActLstClk+ 53)
#define ActRcvThrForCrsTch (ActLstClk+ 52) #define ActRcvThrForCrsTch (ActLstClk+ 54)
#define ActRcvThrForDegUsr (ActLstClk+ 53) #define ActRcvThrForDegUsr (ActLstClk+ 55)
#define ActRcvThrForDegTch (ActLstClk+ 54) #define ActRcvThrForDegTch (ActLstClk+ 56)
#define ActRcvThrForCtrUsr (ActLstClk+ 55) #define ActRcvThrForCtrUsr (ActLstClk+ 57)
#define ActRcvThrForCtrTch (ActLstClk+ 56) #define ActRcvThrForCtrTch (ActLstClk+ 58)
#define ActRcvThrForInsUsr (ActLstClk+ 57) #define ActRcvThrForInsUsr (ActLstClk+ 59)
#define ActRcvThrForInsTch (ActLstClk+ 58) #define ActRcvThrForInsTch (ActLstClk+ 60)
#define ActRcvThrForGenUsr (ActLstClk+ 59) #define ActRcvThrForGenUsr (ActLstClk+ 61)
#define ActRcvThrForGenTch (ActLstClk+ 60) #define ActRcvThrForGenTch (ActLstClk+ 62)
#define ActRcvThrForSWAUsr (ActLstClk+ 61) #define ActRcvThrForSWAUsr (ActLstClk+ 63)
#define ActRcvThrForSWATch (ActLstClk+ 62) #define ActRcvThrForSWATch (ActLstClk+ 64)
#define ActRcvRepForCrsUsr (ActLstClk+ 63) #define ActRcvRepForCrsUsr (ActLstClk+ 65)
#define ActRcvRepForCrsTch (ActLstClk+ 64) #define ActRcvRepForCrsTch (ActLstClk+ 66)
#define ActRcvRepForDegUsr (ActLstClk+ 65) #define ActRcvRepForDegUsr (ActLstClk+ 67)
#define ActRcvRepForDegTch (ActLstClk+ 66) #define ActRcvRepForDegTch (ActLstClk+ 68)
#define ActRcvRepForCtrUsr (ActLstClk+ 67) #define ActRcvRepForCtrUsr (ActLstClk+ 69)
#define ActRcvRepForCtrTch (ActLstClk+ 68) #define ActRcvRepForCtrTch (ActLstClk+ 70)
#define ActRcvRepForInsUsr (ActLstClk+ 69) #define ActRcvRepForInsUsr (ActLstClk+ 71)
#define ActRcvRepForInsTch (ActLstClk+ 70) #define ActRcvRepForInsTch (ActLstClk+ 72)
#define ActRcvRepForGenUsr (ActLstClk+ 71) #define ActRcvRepForGenUsr (ActLstClk+ 73)
#define ActRcvRepForGenTch (ActLstClk+ 72) #define ActRcvRepForGenTch (ActLstClk+ 74)
#define ActRcvRepForSWAUsr (ActLstClk+ 73) #define ActRcvRepForSWAUsr (ActLstClk+ 75)
#define ActRcvRepForSWATch (ActLstClk+ 74) #define ActRcvRepForSWATch (ActLstClk+ 76)
#define ActReqDelThrCrsUsr (ActLstClk+ 75) #define ActReqDelThrCrsUsr (ActLstClk+ 77)
#define ActReqDelThrCrsTch (ActLstClk+ 76) #define ActReqDelThrCrsTch (ActLstClk+ 78)
#define ActReqDelThrDegUsr (ActLstClk+ 77) #define ActReqDelThrDegUsr (ActLstClk+ 79)
#define ActReqDelThrDegTch (ActLstClk+ 78) #define ActReqDelThrDegTch (ActLstClk+ 80)
#define ActReqDelThrCtrUsr (ActLstClk+ 79) #define ActReqDelThrCtrUsr (ActLstClk+ 81)
#define ActReqDelThrCtrTch (ActLstClk+ 80) #define ActReqDelThrCtrTch (ActLstClk+ 82)
#define ActReqDelThrInsUsr (ActLstClk+ 81) #define ActReqDelThrInsUsr (ActLstClk+ 83)
#define ActReqDelThrInsTch (ActLstClk+ 82) #define ActReqDelThrInsTch (ActLstClk+ 84)
#define ActReqDelThrGenUsr (ActLstClk+ 83) #define ActReqDelThrGenUsr (ActLstClk+ 85)
#define ActReqDelThrGenTch (ActLstClk+ 84) #define ActReqDelThrGenTch (ActLstClk+ 86)
#define ActReqDelThrSWAUsr (ActLstClk+ 85) #define ActReqDelThrSWAUsr (ActLstClk+ 87)
#define ActReqDelThrSWATch (ActLstClk+ 86) #define ActReqDelThrSWATch (ActLstClk+ 88)
#define ActDelThrForCrsUsr (ActLstClk+ 87) #define ActDelThrForCrsUsr (ActLstClk+ 89)
#define ActDelThrForCrsTch (ActLstClk+ 88) #define ActDelThrForCrsTch (ActLstClk+ 90)
#define ActDelThrForDegUsr (ActLstClk+ 89) #define ActDelThrForDegUsr (ActLstClk+ 91)
#define ActDelThrForDegTch (ActLstClk+ 90) #define ActDelThrForDegTch (ActLstClk+ 92)
#define ActDelThrForCtrUsr (ActLstClk+ 91) #define ActDelThrForCtrUsr (ActLstClk+ 93)
#define ActDelThrForCtrTch (ActLstClk+ 92) #define ActDelThrForCtrTch (ActLstClk+ 94)
#define ActDelThrForInsUsr (ActLstClk+ 93) #define ActDelThrForInsUsr (ActLstClk+ 95)
#define ActDelThrForInsTch (ActLstClk+ 94) #define ActDelThrForInsTch (ActLstClk+ 96)
#define ActDelThrForGenUsr (ActLstClk+ 95) #define ActDelThrForGenUsr (ActLstClk+ 97)
#define ActDelThrForGenTch (ActLstClk+ 96) #define ActDelThrForGenTch (ActLstClk+ 98)
#define ActDelThrForSWAUsr (ActLstClk+ 97) #define ActDelThrForSWAUsr (ActLstClk+ 99)
#define ActDelThrForSWATch (ActLstClk+ 98) #define ActDelThrForSWATch (ActLstClk+100)
#define ActCutThrForCrsUsr (ActLstClk+ 99) #define ActCutThrForCrsUsr (ActLstClk+101)
#define ActCutThrForCrsTch (ActLstClk+100) #define ActCutThrForCrsTch (ActLstClk+102)
#define ActCutThrForDegUsr (ActLstClk+101) #define ActCutThrForDegUsr (ActLstClk+103)
#define ActCutThrForDegTch (ActLstClk+102) #define ActCutThrForDegTch (ActLstClk+104)
#define ActCutThrForCtrUsr (ActLstClk+103) #define ActCutThrForCtrUsr (ActLstClk+105)
#define ActCutThrForCtrTch (ActLstClk+104) #define ActCutThrForCtrTch (ActLstClk+106)
#define ActCutThrForInsUsr (ActLstClk+105) #define ActCutThrForInsUsr (ActLstClk+107)
#define ActCutThrForInsTch (ActLstClk+106) #define ActCutThrForInsTch (ActLstClk+108)
#define ActCutThrForGenUsr (ActLstClk+107) #define ActCutThrForGenUsr (ActLstClk+109)
#define ActCutThrForGenTch (ActLstClk+108) #define ActCutThrForGenTch (ActLstClk+110)
#define ActCutThrForSWAUsr (ActLstClk+109) #define ActCutThrForSWAUsr (ActLstClk+111)
#define ActCutThrForSWATch (ActLstClk+110) #define ActCutThrForSWATch (ActLstClk+112)
#define ActPasThrForCrsUsr (ActLstClk+111) #define ActPasThrForCrsUsr (ActLstClk+113)
#define ActPasThrForCrsTch (ActLstClk+112) #define ActPasThrForCrsTch (ActLstClk+114)
#define ActPasThrForDegUsr (ActLstClk+113) #define ActPasThrForDegUsr (ActLstClk+115)
#define ActPasThrForDegTch (ActLstClk+114) #define ActPasThrForDegTch (ActLstClk+116)
#define ActPasThrForCtrUsr (ActLstClk+115) #define ActPasThrForCtrUsr (ActLstClk+117)
#define ActPasThrForCtrTch (ActLstClk+116) #define ActPasThrForCtrTch (ActLstClk+118)
#define ActPasThrForInsUsr (ActLstClk+117) #define ActPasThrForInsUsr (ActLstClk+119)
#define ActPasThrForInsTch (ActLstClk+118) #define ActPasThrForInsTch (ActLstClk+120)
#define ActPasThrForGenUsr (ActLstClk+119) #define ActPasThrForGenUsr (ActLstClk+121)
#define ActPasThrForGenTch (ActLstClk+120) #define ActPasThrForGenTch (ActLstClk+122)
#define ActPasThrForSWAUsr (ActLstClk+121) #define ActPasThrForSWAUsr (ActLstClk+123)
#define ActPasThrForSWATch (ActLstClk+122) #define ActPasThrForSWATch (ActLstClk+124)
#define ActDelPstForCrsUsr (ActLstClk+123) #define ActDelPstForCrsUsr (ActLstClk+125)
#define ActDelPstForCrsTch (ActLstClk+124) #define ActDelPstForCrsTch (ActLstClk+126)
#define ActDelPstForDegUsr (ActLstClk+125) #define ActDelPstForDegUsr (ActLstClk+127)
#define ActDelPstForDegTch (ActLstClk+126) #define ActDelPstForDegTch (ActLstClk+128)
#define ActDelPstForCtrUsr (ActLstClk+127) #define ActDelPstForCtrUsr (ActLstClk+129)
#define ActDelPstForCtrTch (ActLstClk+128) #define ActDelPstForCtrTch (ActLstClk+130)
#define ActDelPstForInsUsr (ActLstClk+129) #define ActDelPstForInsUsr (ActLstClk+131)
#define ActDelPstForInsTch (ActLstClk+130) #define ActDelPstForInsTch (ActLstClk+132)
#define ActDelPstForGenUsr (ActLstClk+131) #define ActDelPstForGenUsr (ActLstClk+133)
#define ActDelPstForGenTch (ActLstClk+132) #define ActDelPstForGenTch (ActLstClk+134)
#define ActDelPstForSWAUsr (ActLstClk+133) #define ActDelPstForSWAUsr (ActLstClk+135)
#define ActDelPstForSWATch (ActLstClk+134) #define ActDelPstForSWATch (ActLstClk+136)
#define ActEnbPstForCrsUsr (ActLstClk+135) #define ActEnbPstForCrsUsr (ActLstClk+137)
#define ActEnbPstForCrsTch (ActLstClk+136) #define ActEnbPstForCrsTch (ActLstClk+138)
#define ActEnbPstForDegUsr (ActLstClk+137) #define ActEnbPstForDegUsr (ActLstClk+139)
#define ActEnbPstForDegTch (ActLstClk+138) #define ActEnbPstForDegTch (ActLstClk+140)
#define ActEnbPstForCtrUsr (ActLstClk+139) #define ActEnbPstForCtrUsr (ActLstClk+141)
#define ActEnbPstForCtrTch (ActLstClk+140) #define ActEnbPstForCtrTch (ActLstClk+142)
#define ActEnbPstForInsUsr (ActLstClk+141) #define ActEnbPstForInsUsr (ActLstClk+143)
#define ActEnbPstForInsTch (ActLstClk+142) #define ActEnbPstForInsTch (ActLstClk+144)
#define ActEnbPstForGenUsr (ActLstClk+143) #define ActEnbPstForGenUsr (ActLstClk+145)
#define ActEnbPstForGenTch (ActLstClk+144) #define ActEnbPstForGenTch (ActLstClk+146)
#define ActEnbPstForSWAUsr (ActLstClk+145) #define ActEnbPstForSWAUsr (ActLstClk+147)
#define ActEnbPstForSWATch (ActLstClk+146) #define ActEnbPstForSWATch (ActLstClk+148)
#define ActDisPstForCrsUsr (ActLstClk+147) #define ActDisPstForCrsUsr (ActLstClk+149)
#define ActDisPstForCrsTch (ActLstClk+148) #define ActDisPstForCrsTch (ActLstClk+150)
#define ActDisPstForDegUsr (ActLstClk+149) #define ActDisPstForDegUsr (ActLstClk+151)
#define ActDisPstForDegTch (ActLstClk+150) #define ActDisPstForDegTch (ActLstClk+152)
#define ActDisPstForCtrUsr (ActLstClk+151) #define ActDisPstForCtrUsr (ActLstClk+153)
#define ActDisPstForCtrTch (ActLstClk+152) #define ActDisPstForCtrTch (ActLstClk+154)
#define ActDisPstForInsUsr (ActLstClk+153) #define ActDisPstForInsUsr (ActLstClk+155)
#define ActDisPstForInsTch (ActLstClk+154) #define ActDisPstForInsTch (ActLstClk+156)
#define ActDisPstForGenUsr (ActLstClk+155) #define ActDisPstForGenUsr (ActLstClk+157)
#define ActDisPstForGenTch (ActLstClk+156) #define ActDisPstForGenTch (ActLstClk+158)
#define ActDisPstForSWAUsr (ActLstClk+157) #define ActDisPstForSWAUsr (ActLstClk+159)
#define ActDisPstForSWATch (ActLstClk+158) #define ActDisPstForSWATch (ActLstClk+160)
#define ActCht (ActLstClk+159) #define ActCht (ActLstClk+161)
/*****************************************************************************/ /*****************************************************************************/
/******************************* Messages tab ********************************/ /******************************* Messages tab ********************************/

3
swad_changelog.h
View File

@ -124,13 +124,14 @@ En definitiva, se estar
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.100 (2016-01-06)" #define Log_PLATFORM_VERSION "SWAD 15.100.1 (2016-01-07)"
#define CSS_FILE "swad15.97.css" #define CSS_FILE "swad15.97.css"
#define JS_FILE "swad15.77.7.js" #define JS_FILE "swad15.77.7.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.100.1: Jan 07, 2016 New icon in social note to reply. (190937 lines)
Version 15.100: Jan 06, 2016 When an author removes a social note, all the publishings of this note are removed. (190842 lines) Version 15.100: Jan 06, 2016 When an author removes a social note, all the publishings of this note are removed. (190842 lines)
Version 15.99.1: Jan 05, 2016 Change in message in social timeline. (190917 lines) Version 15.99.1: Jan 05, 2016 Change in message in social timeline. (190917 lines)
Version 15.99: Jan 05, 2016 Changes in social timeline. (190892 lines) Version 15.99: Jan 05, 2016 Changes in social timeline. (190892 lines)

109
swad_social.c
View File

@ -149,6 +149,7 @@ static void Soc_PutLinkToWriteANewPost (Act_Action_t Action,void (*FuncParams) (
static void Soc_FormSocialPost (void); static void Soc_FormSocialPost (void);
static void Soc_ReceiveSocialPost (void); static void Soc_ReceiveSocialPost (void);
static void Soc_PutFormToCommentSocialNote (long NotCod);
static void Soc_PutDisabledIconShare (unsigned NumShared); static void Soc_PutDisabledIconShare (unsigned NumShared);
static void Soc_PutFormToShareSocialNote (long NotCod); static void Soc_PutFormToShareSocialNote (long NotCod);
static void Soc_PutFormToUnshareSocialPublishing (long PubCod); static void Soc_PutFormToUnshareSocialPublishing (long PubCod);
@ -158,14 +159,14 @@ static void Soc_PutHiddenParamPubCod (long PubCod);
static long Soc_GetParamNotCod (void); static long Soc_GetParamNotCod (void);
static long Soc_GetParamPubCod (void); static long Soc_GetParamPubCod (void);
static void Soc_CommentSocialNote (void);
static void Soc_ShareSocialNote (void); static void Soc_ShareSocialNote (void);
static void Soc_UnshareSocialPublishing (void); static void Soc_UnshareSocialPublishing (void);
static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot); static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot);
static void Soc_RequestRemovalSocialPublishing (void); static void Soc_RequestRemovalSocialPublishing (void);
static void Soc_RemoveSocialPublishing (void); static void Soc_RemoveSocialNote (void);
static void Soc_RemoveASocialPublishingFromDB (const struct SocialPublishing *SocPub, static void Soc_RemoveASocialPublishingFromDB (struct SocialNote *SocNot);
struct SocialNote *SocNot);
static bool Soc_CheckIfNoteIsPublishedInTimelineByUsr (long NotCod,long UsrCod); static bool Soc_CheckIfNoteIsPublishedInTimelineByUsr (long NotCod,long UsrCod);
static void Soc_UpdateNumTimesANoteHasBeenShared (struct SocialNote *SocNot); static void Soc_UpdateNumTimesANoteHasBeenShared (struct SocialNote *SocNot);
@ -548,6 +549,9 @@ static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
fprintf (Gbl.F.Out,"<div class=\"DAT\">%s</div>",SummaryStr); fprintf (Gbl.F.Out,"<div class=\"DAT\">%s</div>",SummaryStr);
} }
/* Put icon to comment */
Soc_PutFormToCommentSocialNote (SocNot->NotCod);
/* Put icons to share/unshare */ /* Put icons to share/unshare */
if (IAmTheAuthor) // I am the author if (IAmTheAuthor) // I am the author
Soc_PutDisabledIconShare (SocNot->NumShared); Soc_PutDisabledIconShare (SocNot->NumShared);
@ -1137,6 +1141,35 @@ static void Soc_ReceiveSocialPost (void)
Soc_StoreAndPublishSocialNote (Soc_NOTE_SOCIAL_POST,PstCod); Soc_StoreAndPublishSocialNote (Soc_NOTE_SOCIAL_POST,PstCod);
} }
/*****************************************************************************/
/******************* Form to comment a social publishing *********************/
/*****************************************************************************/
static void Soc_PutFormToCommentSocialNote (long NotCod)
{
extern const char *Txt_Comment;
/***** Form to comment a social note *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
Act_FormStartAnchor (ActComSocNotUsr,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
Act_FormStart (ActComSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">"
"<input type=\"image\""
" src=\"%s/write64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON20x20\" />"
"</div>",
Gbl.Prefs.IconsURL,
Txt_Comment,
Txt_Comment);
Act_FormEnd ();
}
/*****************************************************************************/ /*****************************************************************************/
/*********************** Put disabled icon to share **************************/ /*********************** Put disabled icon to share **************************/
/*****************************************************************************/ /*****************************************************************************/
@ -1152,7 +1185,7 @@ static void Soc_PutDisabledIconShare (unsigned NumShared)
strcpy (Gbl.Title,Txt_SOCIAL_PUBLISHING_Not_shared_by_anyone); strcpy (Gbl.Title,Txt_SOCIAL_PUBLISHING_Not_shared_by_anyone);
/***** Disabled icon to share *****/ /***** Disabled icon to share *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_DISABLED\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE_DISABLED\">"
"<img src=\"%s/share64x64.png\"" "<img src=\"%s/share64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICON20x20\" />" " class=\"ICON20x20\" />"
@ -1178,7 +1211,7 @@ static void Soc_PutFormToShareSocialNote (long NotCod)
else else
Act_FormStart (ActShaSocNotGbl); Act_FormStart (ActShaSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod); Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON ICON_HIGHLIGHT\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE ICON_HIGHLIGHT\">"
"<input type=\"image\"" "<input type=\"image\""
" src=\"%s/share64x64.png\"" " src=\"%s/share64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
@ -1207,7 +1240,7 @@ static void Soc_PutFormToUnshareSocialPublishing (long PubCod)
else else
Act_FormStart (ActUnsSocPubGbl); Act_FormStart (ActUnsSocPubGbl);
Soc_PutHiddenParamPubCod (PubCod); Soc_PutHiddenParamPubCod (PubCod);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON ICON_HIGHLIGHT\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_SHARE ICON_HIGHLIGHT\">"
"<input type=\"image\"" "<input type=\"image\""
" src=\"%s/shared64x64.png\"" " src=\"%s/shared64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
@ -1235,7 +1268,7 @@ static void Soc_PutFormToRemoveSocialPublishing (long PubCod)
else else
Act_FormStart (ActReqRemSocPubGbl); Act_FormStart (ActReqRemSocPubGbl);
Soc_PutHiddenParamPubCod (PubCod); Soc_PutHiddenParamPubCod (PubCod);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_RIGHT ICON_HIGHLIGHT\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_REMOVE ICON_HIGHLIGHT\">"
"<input type=\"image\"" "<input type=\"image\""
" src=\"%s/remove-on64x64.png\"" " src=\"%s/remove-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
@ -1299,6 +1332,45 @@ static long Soc_GetParamPubCod (void)
return PubCod; return PubCod;
} }
/*****************************************************************************/
/*************************** Comment a social note ***************************/
/*****************************************************************************/
void Soc_CommentSocialNoteGbl (void)
{
/***** Comment social note *****/
Soc_CommentSocialNote ();
/***** Write updated timeline after commenting (global) *****/
Soc_ShowTimelineGbl ();
}
void Soc_CommentSocialNoteUsr (void)
{
/***** Get user whom profile is displayed *****/
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
/***** Show user's profile *****/
Prf_ShowUserProfile ();
/***** Start section *****/
fprintf (Gbl.F.Out,"<section id=\"timeline\">");
/***** Comment social note *****/
Soc_CommentSocialNote ();
/***** Write updated timeline after commenting (user) *****/
Soc_ShowTimelineUsr ();
/***** End section *****/
fprintf (Gbl.F.Out,"</section>");
}
static void Soc_CommentSocialNote (void)
{
Lay_ShowAlert (Lay_WARNING,"Not implemented.");
}
/*****************************************************************************/ /*****************************************************************************/
/**************************** Share a social note ****************************/ /**************************** Share a social note ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -1549,31 +1621,31 @@ static void Soc_RequestRemovalSocialPublishing (void)
} }
/*****************************************************************************/ /*****************************************************************************/
/************************ Remove a social publishing *************************/ /*************************** Remove a social note ****************************/
/*****************************************************************************/ /*****************************************************************************/
void Soc_RemoveSocialPubGbl (void) void Soc_RemoveSocialNotGbl (void)
{ {
/***** Remove a social publishing *****/ /***** Remove a social note *****/
Soc_RemoveSocialPublishing (); Soc_RemoveSocialNote ();
/***** Write updated timeline after removing (global) *****/ /***** Write updated timeline after removing (global) *****/
Soc_ShowTimelineGbl (); Soc_ShowTimelineGbl ();
} }
void Soc_RemoveSocialPubUsr (void) void Soc_RemoveSocialNotUsr (void)
{ {
/***** Get user whom profile is displayed *****/ /***** Get user whom profile is displayed *****/
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (); Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
/***** Show user's profile *****/ /***** Show user's profile *****/
Prf_ShowUserProfile (); Prf_ShowUserProfile ();
/***** Start section *****/ /***** Start section *****/
fprintf (Gbl.F.Out,"<section id=\"timeline\">"); fprintf (Gbl.F.Out,"<section id=\"timeline\">");
/***** Remove a social publishing *****/ /***** Remove a social note *****/
Soc_RemoveSocialPublishing (); Soc_RemoveSocialNote ();
/***** Write updated timeline after removing (user) *****/ /***** Write updated timeline after removing (user) *****/
Soc_ShowTimelineUsr (); Soc_ShowTimelineUsr ();
@ -1582,7 +1654,7 @@ void Soc_RemoveSocialPubUsr (void)
fprintf (Gbl.F.Out,"</section>"); fprintf (Gbl.F.Out,"</section>");
} }
static void Soc_RemoveSocialPublishing (void) static void Soc_RemoveSocialNote (void)
{ {
extern const char *Txt_SOCIAL_PUBLISHING_Removed; extern const char *Txt_SOCIAL_PUBLISHING_Removed;
struct SocialPublishing SocPub; struct SocialPublishing SocPub;
@ -1606,7 +1678,7 @@ static void Soc_RemoveSocialPublishing (void)
if (ICanRemove) if (ICanRemove)
{ {
/***** Delete social publishing from database *****/ /***** Delete social publishing from database *****/
Soc_RemoveASocialPublishingFromDB (&SocPub,&SocNot); Soc_RemoveASocialPublishingFromDB (&SocNot);
/***** Message of success *****/ /***** Message of success *****/
Lay_ShowAlert (Lay_SUCCESS,Txt_SOCIAL_PUBLISHING_Removed); Lay_ShowAlert (Lay_SUCCESS,Txt_SOCIAL_PUBLISHING_Removed);
@ -1617,8 +1689,7 @@ static void Soc_RemoveSocialPublishing (void)
/**************** Remove a social publishing from database *******************/ /**************** Remove a social publishing from database *******************/
/*****************************************************************************/ /*****************************************************************************/
static void Soc_RemoveASocialPublishingFromDB (const struct SocialPublishing *SocPub, static void Soc_RemoveASocialPublishingFromDB (struct SocialNote *SocNot)
struct SocialNote *SocNot)
{ {
char Query[128]; char Query[128];

7
swad_social.h
View File

@ -95,6 +95,9 @@ void Soc_FormSocialPostUsr (void);
void Soc_ReceiveSocialPostGbl (void); void Soc_ReceiveSocialPostGbl (void);
void Soc_ReceiveSocialPostUsr (void); void Soc_ReceiveSocialPostUsr (void);
void Soc_CommentSocialNoteGbl (void);
void Soc_CommentSocialNoteUsr (void);
void Soc_ShareSocialNoteGbl (void); void Soc_ShareSocialNoteGbl (void);
void Soc_ShareSocialNoteUsr (void); void Soc_ShareSocialNoteUsr (void);
void Soc_UnshareSocialPubGbl (void); void Soc_UnshareSocialPubGbl (void);
@ -102,7 +105,7 @@ void Soc_UnshareSocialPubUsr (void);
void Soc_RequestRemSocialPubGbl (void); void Soc_RequestRemSocialPubGbl (void);
void Soc_RequestRemSocialPubUsr (void); void Soc_RequestRemSocialPubUsr (void);
void Soc_RemoveSocialPubGbl (void); void Soc_RemoveSocialNotGbl (void);
void Soc_RemoveSocialPubUsr (void); void Soc_RemoveSocialNotUsr (void);
#endif #endif

21
swad_text.c
View File

@ -4603,6 +4603,27 @@ const char *Txt_columns =
"colunas"; "colunas";
#endif #endif
const char *Txt_Comment = // As a verb
#if L==1
"Comentar";
#elif L==2
"Kommentieren";
#elif L==3
"Comment";
#elif L==4
"Comentar";
#elif L==5
"Commenter";
#elif L==6
"Comentar"; // Okoteve traducción
#elif L==7
"Commentare";
#elif L==8
"Komentowa&cacute;";
#elif L==9
"Comentar";
#endif
const char *Txt_Comments = const char *Txt_Comments =
#if L==1 #if L==1
"Comentaris"; "Comentaris";