From 0532da51774414cdb4d68f3a8f57079fcdc5ea35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 23 Nov 2016 21:06:37 +0100 Subject: [PATCH] Version 16.68.9 --- swad_changelog.h | 3 ++- swad_message.c | 46 +++++++++++++++++++++------------------------- swad_text.c | 42 +++++++++++++++++++++--------------------- 3 files changed, 44 insertions(+), 47 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 6eae55db9..709d997c0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,13 +172,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.68.8 (2016-11-23)" +#define Log_PLATFORM_VERSION "SWAD 16.68.9 (2016-11-23)" #define CSS_FILE "swad16.68.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.68.9: Nov 23, 2016 Changes in layout of messages received / sent. (207458 lines) Version 16.68.8: Nov 23, 2016 Changes in layout of messages received / sent. (207462 lines) Version 16.68.7: Nov 23, 2016 Changes in layout of messages received / sent. (207463 lines) Version 16.68.6: Nov 23, 2016 Contextual help on messages. (207455 lines) diff --git a/swad_message.c b/swad_message.c index c56bbb652..c0e0c7a78 100644 --- a/swad_message.c +++ b/swad_message.c @@ -1717,9 +1717,12 @@ static void Msg_ShowSentOrReceivedMessages (void) /* Form to see messages again */ Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]); + + fprintf (Gbl.F.Out,"
"); Msg_ShowFormSelectCourseSentOrRecMsgs (); if (Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED) Msg_ShowFormToShowOnlyUnreadMessages (); + fprintf (Gbl.F.Out,"
"); Msg_ShowFormToFilterMsgs (); fprintf (Gbl.F.Out,"
"); @@ -2506,7 +2509,6 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void) }; /***** Course selection *****/ - fprintf (Gbl.F.Out,"
"); fprintf (Gbl.F.Out,"%s " "" - "
"); + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ @@ -2547,42 +2548,36 @@ void Msg_ShowFormToFilterMsgs (void) }; /***** Table start *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"
" + ""); /***** Authors/recipients of the message *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "", + " size=\"15\" maxlength=\"%u\" value=\"%s\" />" + "", The_ClassForm[Gbl.Prefs.Theme], TxtFromTo[Gbl.Msg.TypeOfMessages], Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3,Gbl.Msg.FilterFromTo); /***** Authors/recipients of the message *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "", + " size=\"15\" maxlength=\"%u\" value=\"%s\" />" + "", The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Message, Msg_MAX_LENGTH_FILTER_CONTENT,Gbl.Msg.FilterContent); /***** End table *****/ - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"" "" - "" "" - "
" + fprintf (Gbl.F.Out,"" "" - "" "" - "
"); + fprintf (Gbl.F.Out,"" + ""); } /*****************************************************************************/ @@ -2592,16 +2587,17 @@ void Msg_ShowFormToFilterMsgs (void) static void Msg_ShowFormToShowOnlyUnreadMessages (void) { extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_Show_only_unread_messages; + extern const char *Txt_only_unread_messages; /***** Put checkbox to select whether to show only unread (received) messages *****/ - fprintf (Gbl.F.Out,"
" - " %s
", - Txt_Show_only_unread_messages); + fprintf (Gbl.F.Out," />" + "%s", + The_ClassForm[Gbl.Prefs.Theme], + Txt_only_unread_messages); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index cf7491e4a..44cb8585a 100644 --- a/swad_text.c +++ b/swad_text.c @@ -27193,6 +27193,27 @@ const char *Txt_only_teachers = ", professores"; #endif +const char *Txt_only_unread_messages = +#if L==1 + "només els missatges no llegits"; +#elif L==2 + "nur ungelesene Nachrichten"; +#elif L==3 + "only unread messages"; +#elif L==4 + "únicamente los mensajes no leídos"; +#elif L==5 + "uniquement les messages non lus"; +#elif L==6 + "únicamente los mensajes no leídos"; // Okoteve traducción +#elif L==7 + "solo i messaggi non letti"; +#elif L==8 + "only unread messages"; // Potrzebujesz tlumaczenie +#elif L==9 + "apenas mensagens não lidas"; +#endif + const char *Txt_open_document = #if L==1 "document obert"; @@ -36736,27 +36757,6 @@ const char *Txt_Show_office_hours = "Mostrar horários tutor"; #endif -const char *Txt_Show_only_unread_messages = -#if L==1 - "Mostrar només els missatges no llegits"; -#elif L==2 - "Zeige nur ungelesene Nachrichten"; -#elif L==3 - "Show only unread messages"; -#elif L==4 - "Mostrar únicamente los mensajes no leídos"; -#elif L==5 - "Afficher uniquement les messages non lus"; -#elif L==6 - "Mostrar únicamente los mensajes no leídos"; // Okoteve traducción -#elif L==7 - "Mostra solo i messaggi non letti"; -#elif L==8 - "Show only unread messages"; // Potrzebujesz tlumaczenie -#elif L==9 - "Mostrar apenas mensagens não lidas"; -#endif - const char *Txt_Show_previous_X_clicks = // Warning: it is very important to include %lu in the following sentences #if L==1 "Mostrar %lu clics anteriores"; // Necessita traduccio