From d3dbccfe530a9412d9fc096626f7c597dd6753a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 24 Nov 2016 00:57:25 +0100 Subject: [PATCH] Version 16.69.1 --- swad_changelog.h | 3 ++- swad_help.c | 8 +++++--- swad_message.c | 10 +++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f868d2bea..76b697286 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,13 +172,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.69 (2016-11-23)" +#define Log_PLATFORM_VERSION "SWAD 16.69.1 (2016-11-24)" #define CSS_FILE "swad16.69.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 /* + Version 16.69.1: Nov 24, 2016 Contextual help on messages. (207484 lines) Version 16.69: Nov 23, 2016 Changes in layout of frame title. (207473 lines) Version 16.68.10: Nov 23, 2016 Changes in layout of messages received / sent. (207459 lines) Version 16.68.9: Nov 23, 2016 Changes in layout of messages received / sent. (207458 lines) diff --git a/swad_help.c b/swad_help.c index afcad26bd..34c364d49 100644 --- a/swad_help.c +++ b/swad_help.c @@ -131,9 +131,11 @@ const char *Hlp_MESSAGES_Notifications = WIKI "MESSAGES.Notifications"; const char *Hlp_MESSAGES_Notices = WIKI "MESSAGES.Notices"; -const char *Hlp_MESSAGES_Write = WIKI "MESSAGES.Write"; -const char *Hlp_MESSAGES_Received = WIKI "MESSAGES.Received"; -const char *Hlp_MESSAGES_Sent = WIKI "MESSAGES.Sent"; +const char *Hlp_MESSAGES_Write = WIKI "MESSAGES.Write"; +const char *Hlp_MESSAGES_Received = WIKI "MESSAGES.Received"; +const char *Hlp_MESSAGES_Received_filter = WIKI "MESSAGES.Received#filter"; +const char *Hlp_MESSAGES_Sent = WIKI "MESSAGES.Sent"; +const char *Hlp_MESSAGES_Sent_filter = WIKI "MESSAGES.Sent#filter"; /***** STATS tab *****/ diff --git a/swad_message.c b/swad_message.c index 84f4e42b8..b5744ff6a 100644 --- a/swad_message.c +++ b/swad_message.c @@ -1648,7 +1648,9 @@ void Msg_ShowRecMsgs (void) static void Msg_ShowSentOrReceivedMessages (void) { extern const char *Hlp_MESSAGES_Received; + extern const char *Hlp_MESSAGES_Received_filter; extern const char *Hlp_MESSAGES_Sent; + extern const char *Hlp_MESSAGES_Sent_filter; extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Filter; extern const char *Txt_Update_messages; @@ -1677,6 +1679,11 @@ static void Msg_ShowSentOrReceivedMessages (void) Hlp_MESSAGES_Received, Hlp_MESSAGES_Sent }; + const char *HelpFilter[Msg_NUM_TYPES_OF_MSGS] = + { + Hlp_MESSAGES_Received_filter, + Hlp_MESSAGES_Sent_filter + }; /***** Get the page number *****/ Pag_GetParamPagNum (WhatPaginate[Gbl.Msg.TypeOfMessages]); @@ -1713,7 +1720,8 @@ static void Msg_ShowSentOrReceivedMessages (void) /***** Filter messages *****/ /* Start frame with filter */ - Lay_StartRoundFrame (NULL,Txt_Filter,NULL,NULL); + Lay_StartRoundFrame (NULL,Txt_Filter, + NULL,HelpFilter[Gbl.Msg.TypeOfMessages]); /* Form to see messages again */ Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]);