diff --git a/swad_changelog.h b/swad_changelog.h index f7581564d..11fc99869 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.56.6 (2016-11-13)" +#define Log_PLATFORM_VERSION "SWAD 16.56.7 (2016-11-13)" #define CSS_FILE "swad16.51.css" #define JS_FILE "swad16.46.1.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 +// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* + Version 16.56.7: Nov 13, 2016 Contextual help on forums. (206996 lines) Version 16.56.6: Nov 13, 2016 Contextual help on who to follow. (206968 lines) Version 16.56.5: Nov 13, 2016 Contextual help on view public profile. (206963 lines) Version 16.56.4: Nov 13, 2016 Contextual help on public activity. (206960 lines) diff --git a/swad_forum.c b/swad_forum.c index 6bd4b744a..c6e36f182 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -936,10 +936,11 @@ void For_RemoveUsrFromReadThrs (long UsrCod) static void For_ShowThreadPosts (long ThrCod,char *LastSubject) { + extern const char *Hlp_SOCIAL_Forums; extern const char *Txt_Thread; extern const char *Txt_There_are_new_posts; extern const char *Txt_No_new_posts; - extern const char *Txt_Messages; + extern const char *Txt_Posts; bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]; struct ForumThread Thr; char Query[1024]; @@ -972,7 +973,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) ReadTimeUTC = For_GetThrReadTime (ThrCod); /* Table start */ - Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums,NULL); + Lay_StartRoundFrame (NULL,Txt_Thread,For_PutIconsForums,Hlp_SOCIAL_Forums); /* Put a form to select which forums */ For_PutFormWhichForums (); @@ -1059,7 +1060,8 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject) Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination); /***** Show posts from this page, the author and the date of last reply *****/ - Lay_StartRoundFrameTable (NULL,2,Txt_Messages); + Lay_StartRoundFrame (NULL,Txt_Posts,NULL,Hlp_SOCIAL_Forums); + fprintf (Gbl.F.Out,""); mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible - 1)); for (NumRow = Pagination.FirstItemVisible; @@ -1714,6 +1716,7 @@ void For_SetForumTypeAndRestrictAccess (void) void For_ShowForumList (void) { + extern const char *Hlp_SOCIAL_Forums; extern const char *Txt_Forums; bool ICanMoveThreads = (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); // If I have permission to move threads... bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]; @@ -1740,7 +1743,7 @@ void For_ShowForumList (void) Usr_GetMyInstits (); /***** Table start *****/ - Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums,NULL); + Lay_StartRoundFrame (NULL,Txt_Forums,For_PutIconsForums,Hlp_SOCIAL_Forums); /***** Put a form to select which forums *****/ For_PutFormWhichForums (); @@ -2485,6 +2488,7 @@ static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time) void For_ShowForumThrs (void) { + extern const char *Hlp_SOCIAL_Forums; extern const char *Txt_Forum; extern const char *Txt_Threads; extern const char *Txt_MSG_Subject; @@ -2591,7 +2595,7 @@ void For_ShowForumThrs (void) /***** Header whith the name of this forum, the number of threads, and the total number of posts *****/ /* Table start */ - Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums,NULL); + Lay_StartRoundFrame (NULL,Txt_Forum,For_PutIconsForums,Hlp_SOCIAL_Forums); /* Put a form to select which forums */ For_PutFormWhichForums (); @@ -2619,7 +2623,8 @@ void For_ShowForumThrs (void) Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs); /***** Start table *****/ - Lay_StartRoundFrameTable (NULL,2,Txt_Threads); + Lay_StartRoundFrame (NULL,Txt_Threads,NULL,Hlp_SOCIAL_Forums); + fprintf (Gbl.F.Out,"
"); /***** Heading row *****/ fprintf (Gbl.F.Out,"" @@ -3796,6 +3801,7 @@ void For_ShowForumLevel2 (long ThrCod) static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) { + extern const char *Hlp_SOCIAL_Forums; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_message; extern const char *Txt_New_thread; @@ -3807,7 +3813,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) Lay_StartRoundFrame (NULL, IsReply ? Txt_New_message : Txt_New_thread, - NULL,NULL); + NULL,Hlp_SOCIAL_Forums); /***** Start form *****/ if (IsReply) // Form to write a reply to a message of an existing thread diff --git a/swad_help.c b/swad_help.c index 01a46b67b..2621b6f48 100644 --- a/swad_help.c +++ b/swad_help.c @@ -102,6 +102,8 @@ const char *Hlp_SOCIAL_Activity = WIKI "SOCIAL.Activity"; const char *Hlp_SOCIAL_Profiles_view_public_profile = WIKI "SOCIAL.Profiles#view-public-profile"; const char *Hlp_SOCIAL_Profiles_who_to_follow = WIKI "SOCIAL.Profiles#who-to-follow"; +const char *Hlp_SOCIAL_Forums = WIKI "SOCIAL.Forums"; + /***** STATS tab *****/ const char *Hlp_STATS_Surveys = WIKI "STATS.Surveys"; diff --git a/swad_text.c b/swad_text.c index 05012f56f..2c66e05a3 100644 --- a/swad_text.c +++ b/swad_text.c @@ -29231,6 +29231,27 @@ const char *Txt_post = "post"; #endif +const char *Txt_Posts = +#if L==1 + "Missatges"; +#elif L==2 + "Nachrichten"; +#elif L==3 + "Posts"; +#elif L==4 + "Mensajes"; +#elif L==5 + "Messages"; +#elif L==6 + "Marandu"; +#elif L==7 + "Post"; +#elif L==8 + "Posty"; +#elif L==9 + "Posts"; +#endif + const char *Txt_posts = #if L==1 "missatges";