Version 15.81

2015-12-29 21:21:51 +01:00 · 2015-12-29 21:21:51 +01:00 · e2a97bf3f6
parent 747ef60c26
commit e2a97bf3f6
7 changed files with 95 additions and 31 deletions
--- a/swad_action.c
+++ b/swad_action.c
@ -997,8 +997,11 @@ Users:

        834. ActLstClk			List last clicks in real time
 Social:
-        xxx. ActSeeSocAct		Show social activity (timeline).
+	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
+
 	835. ActSeePubPrf		Show a public user's profile
 	836. ActCal1stClkTim		Calculate first click time from log and store into user's figures
 	837. ActCalNumClk		Calculate number of clicks from log and store into user's figures
@ -1011,13 +1014,13 @@ Social:
 	843. ActSeeFlg			Show following
 	844. ActSeeFlr			Show followers

-	845. ActSeeChtRms		Show the chat rooms
+       1015. ActCht			Enter in a chat room to chat
 Messages:
 	846. ActSeeNtf			Show my recent notifications
 	847. ActSeeAnn			Show global announcements
 	848. ActSeeNot			Show notices
 	849. ActSeeFor			Show the level superior of the forums
-	850. ActReqMsgUsr		Write message a varios users
+	850. ActReqMsgUsr		Write message to several users
 	851. ActSeeRcvMsg		Show the messages received from other users (link in menu)
 	852. ActSeeSntMsg		Show the messages sent to other users
 	853. ActMaiStd			Send an e-mail to students
@ -1182,7 +1185,6 @@ Messages:
       1012. ActBanUsrMsg		Ban the sender of a message when showing received messages
       1013. ActUnbUsrMsg		Unban the sender of a message when showing received messages
       1014. ActUnbUsrLst		Unban a user when listing banned users
-       1015. ActCht			Enter in a chat room to chat
 Statistics:
       1016. ActSeeAllSvy		List all surveys in pages
       1017. ActReqUseGbl		Request showing use of the platform
@ -2302,9 +2304,10 @@ 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 ******************************************************************
-   /* 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"	},
+   /* 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"	},

   /* 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},
@ -2326,10 +2329,10 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
   /* ActSeeAnn		*/{1235, 1,TabMsg,ActSeeAnn		,0x1FF,0x1FF,0x1FF,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Ann_ShowAllAnnouncements	,"note64x64.gif"	},
   /* ActSeeNot		*/{ 762, 2,TabMsg,ActSeeNot		,0x1FF,0x1FF,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Not_ListFullNotices		,"note64x64.gif"	},
   /* ActSeeFor		*/{  95, 3,TabMsg,ActSeeFor		,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,For_ShowForumList		,"forum64x64.gif"	},
-   /* ActReqMsgUsr	*/{  26, 5,TabMsg,ActReqMsgUsr		,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_FormMsgUsrs		,"editnewmsg64x64.gif"	},
-   /* ActSeeRcvMsg	*/{   3, 6,TabMsg,ActSeeRcvMsg		,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ShowRecMsgs		,"recmsg64x64.gif"	},
-   /* ActSeeSntMsg	*/{  70, 7,TabMsg,ActSeeSntMsg		,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ShowSntMsgs		,"sntmsg64x64.gif"	},
-   /* ActMaiStd		*/{ 100, 8,TabMsg,ActMaiStd		,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ListEMails			,"email64x64.gif"	},
+   /* ActReqMsgUsr	*/{  26, 4,TabMsg,ActReqMsgUsr		,0x1FC,0x1FC,0x1FC,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_FormMsgUsrs		,"editnewmsg64x64.gif"	},
+   /* ActSeeRcvMsg	*/{   3, 5,TabMsg,ActSeeRcvMsg		,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ShowRecMsgs		,"recmsg64x64.gif"	},
+   /* ActSeeSntMsg	*/{  70, 6,TabMsg,ActSeeSntMsg		,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ShowSntMsgs		,"sntmsg64x64.gif"	},
+   /* ActMaiStd		*/{ 100, 7,TabMsg,ActMaiStd		,0x110,0x100,0x000,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Msg_ListEMails			,"email64x64.gif"	},

   // Actions not in menu:
   /* ActWriAnn		*/{1237,-1,TabMsg,ActSeeAnn		,0x100,0x100,0x100,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL			,Ann_ShowFormAnnouncement	,NULL},
@ -4144,6 +4147,7 @@ Act_Action_t Act_FromActCodToAction[1+Act_MAX_ACTION_COD] =	// Do not reuse uniq
 	ActAskRemOldBrf,	// #1488
 	ActRemOldBrf,		// #1489
 	ActSeeSocAct,		// #1490
+	ActReqSocPst,		// #1491
 	};

 /*****************************************************************************/
--- a/swad_action.h
+++ b/swad_action.h
@ -71,9 +71,9 @@ typedef enum

 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+14+169+27+82)
+#define Act_NUM_ACTIONS	(7+52+15+90+72+67+205+183+143+15+169+27+82)

-#define Act_MAX_ACTION_COD 1490
+#define Act_MAX_ACTION_COD 1491

 #define Act_MAX_OPTIONS_IN_MENU_PER_TAB 20

@ -1036,23 +1036,24 @@ typedef int Act_Action_t;	// Must be a signed type, because -1 is used to indica
 /******************************** Social tab *********************************/
 /*****************************************************************************/
 // Actions in menu
-#define ActSeeSocAct		(ActLstClk+  1)
-#define ActReqPubPrf		(ActLstClk+  2)
-#define ActSeeChtRms		(ActLstClk+  3)
+#define ActReqSocPst		(ActLstClk+  1)
+#define ActSeeSocAct		(ActLstClk+  2)
+#define ActReqPubPrf		(ActLstClk+  3)
+#define ActSeeChtRms		(ActLstClk+  4)
 // Secondary actions
-#define ActSeePubPrf		(ActLstClk+  4)
-#define ActCal1stClkTim		(ActLstClk+  5)
-#define ActCalNumClk		(ActLstClk+  6)
-#define ActCalNumFilVie		(ActLstClk+  7)
-#define ActCalNumForPst		(ActLstClk+  8)
-#define ActCalNumMsgSnt		(ActLstClk+  9)
+#define ActSeePubPrf		(ActLstClk+  5)
+#define ActCal1stClkTim		(ActLstClk+  6)
+#define ActCalNumClk		(ActLstClk+  7)
+#define ActCalNumFilVie		(ActLstClk+  8)
+#define ActCalNumForPst		(ActLstClk+  9)
+#define ActCalNumMsgSnt		(ActLstClk+ 10)

-#define ActFolUsr		(ActLstClk+ 10)
-#define ActUnfUsr		(ActLstClk+ 11)
-#define ActSeeFlg		(ActLstClk+ 12)
-#define ActSeeFlr		(ActLstClk+ 13)
+#define ActFolUsr		(ActLstClk+ 11)
+#define ActUnfUsr		(ActLstClk+ 12)
+#define ActSeeFlg		(ActLstClk+ 13)
+#define ActSeeFlr		(ActLstClk+ 14)

-#define ActCht			(ActLstClk+ 14)
+#define ActCht			(ActLstClk+ 15)

 /*****************************************************************************/
 /******************************* Messages tab ********************************/
--- a/swad_changelog.h
+++ b/swad_changelog.h
@ -116,13 +116,17 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/

-#define Log_PLATFORM_VERSION	"SWAD 15.80.2 (2015-12-29)"
+#define Log_PLATFORM_VERSION	"SWAD 15.81 (2015-12-29)"
 #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.81:    Dec 29, 2015	New option to write a public social post. Not finished. (189030 lines)
+					1 change necessary in database:
+INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1491','es','N','Redactar comentario social');
+
        Version 15.80.2:  Dec 29, 2015	Change in layout of social events (timeline). (188972 lines)
        Version 15.80.1:  Dec 29, 2015	Message translated. (188967 lines)
        Version 15.80:    Dec 29, 2015	Changes in layout of user's profile. (188944 lines)
--- a/swad_menu.c
+++ b/swad_menu.c
@ -155,6 +155,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
 		},
 		// TabSoc **********
 		{
+		ActReqSocPst,
 		ActSeeSocAct,
 		ActReqPubPrf,
 		ActSeeChtRms,
--- a/swad_social.c
+++ b/swad_social.c
@ -74,7 +74,7 @@ static const Act_Action_t Soc_DefaultActions[Soc_NUM_SOCIAL_EVENTS] =
   /* Users tab */

   /* Social tab */
-   ActUnk,		// Soc_EVENT_SOCIAL_POST
+   ActSeeSocAct,	// Soc_EVENT_SOCIAL_POST (action not used)

   /* Messages tab */
   ActShoNot,		// Soc_EVENT_NOTICE
@ -112,6 +112,16 @@ static void Soc_StartFormGoToAction (Soc_SocialEvent_t SocialEvent,
 static void Soc_GetEventSummary (Soc_SocialEvent_t SocialEvent,long Cod,
                                 char *SummaryStr,unsigned MaxChars);

+
+/*****************************************************************************/
+/****************** Form to write a new public comment ***********************/
+/*****************************************************************************/
+
+void Soc_FormSocialPost (void)
+  {
+   Lay_ShowAlert (Lay_INFO,"Not implemented...");
+  }
+
 /*****************************************************************************/
 /*********** Show social activity (timeline) of a selected user **************/
 /*****************************************************************************/
--- a/swad_social.h
+++ b/swad_social.h
@ -81,6 +81,8 @@ typedef enum
 /****************************** Public prototypes ****************************/
 /*****************************************************************************/

+void Soc_FormSocialPost (void);
+
 void Soc_ShowUsrTimeline (long UsrCod);
 void Soc_ShowFollowingTimeline (void);

--- a/swad_text.c
+++ b/swad_text.c
@ -17880,6 +17880,27 @@ 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"
@ -17959,7 +17980,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
 	NULL,
 	NULL,
 	NULL,
-	NULL,
 	},
 	{
 	// TabMsg *****************************************************
@ -19836,7 +19856,28 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
 	},
 	{
 	// TabSoc *****************************************************
-	 // ActSeeSocAct
+	// ActReqSocPst
+#if   L==1
+	"Nou comentari p&uacute;blic"
+#elif L==2
+	"Neue &ouml;ffentlichen Kommentar"
+#elif L==3
+	"New public comment"
+#elif L==4
+	"Nuevo comentario p&uacute;blico"
+#elif L==5
+	"Nouvelle commentaire public"
+#elif L==6
+	"Nuevo comentario p&uacute;blico"	// Okoteve traducción
+#elif L==7
+	"Nuovo commento pubblico"
+#elif L==8
+	"Nowy komentarz publicznego"
+#elif L==9
+	"Novo coment&aacute;rio p&uacute;blico"
+#endif
+	,
+	// ActSeeSocAct
 #if   L==1
 	 "Activitat social (l&iacute;nia de temps)"
 #elif L==2
@ -19914,6 +19955,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
 	NULL,
 	NULL,
 	NULL,
+	NULL,
 	},
 	{
 	// TabMsg *****************************************************