Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.68.9

This commit is contained in:
Antonio Cañas Vargas 2016-11-23 21:06:37 +01:00
parent 4aa4482315
commit 0532da5177
3 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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)

46
swad_message.c
View File

@ -1717,9 +1717,12 @@ static void Msg_ShowSentOrReceivedMessages (void)
/* Form to see messages again */
Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]);
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
Msg_ShowFormSelectCourseSentOrRecMsgs ();
if (Gbl.Msg.TypeOfMessages == Msg_MESSAGES_RECEIVED)
Msg_ShowFormToShowOnlyUnreadMessages ();
fprintf (Gbl.F.Out,"</div>");
Msg_ShowFormToFilterMsgs ();
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
@ -2506,7 +2509,6 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
};
/***** Course selection *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">");
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>"
"<select name=\"FilterCrsCod\">"
"<option value=\"\"",
@ -2526,8 +2528,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
fprintf (Gbl.F.Out," selected=\"selected\""); // Select origin course
fprintf (Gbl.F.Out,">%s</option>",Gbl.Msg.Courses[NumOriginCrs].ShrtName);
}
fprintf (Gbl.F.Out,"</select>"
"</div>");
fprintf (Gbl.F.Out,"</select>");
}
/*****************************************************************************/
@ -2547,42 +2548,36 @@ void Msg_ShowFormToFilterMsgs (void)
};
/***** Table start *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">");
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
/***** Authors/recipients of the message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_MIDDLE\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
"%s: "
"</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"FilterFromTo\""
" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
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,"<tr>"
"<td class=\"RIGHT_MIDDLE\">"
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
"%s: "
"</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"FilterContent\""
" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
" size=\"15\" maxlength=\"%u\" value=\"%s\" />"
"</td>",
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message,
Msg_MAX_LENGTH_FILTER_CONTENT,Gbl.Msg.FilterContent);
/***** End table *****/
fprintf (Gbl.F.Out,"</table>");
fprintf (Gbl.F.Out,"</tr>"
"</table>");
}
/*****************************************************************************/
@ -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,"<div class=\"%s CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" name=\"OnlyUnreadMsgs\" value=\"Y\"");
if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," /> %s</div>",
Txt_Show_only_unread_messages);
fprintf (Gbl.F.Out," />"
"<span class=\"%s\">%s</span>",
The_ClassForm[Gbl.Prefs.Theme],
Txt_only_unread_messages);
}
/*****************************************************************************/

42
swad_text.c
View File

@ -27193,6 +27193,27 @@ const char *Txt_only_teachers =
", professores";
#endif
const char *Txt_only_unread_messages =
#if L==1
"nom&eacute;s els missatges no llegits";
#elif L==2
"nur ungelesene Nachrichten";
#elif L==3
"only unread messages";
#elif L==4
"&uacute;nicamente los mensajes no le&iacute;dos";
#elif L==5
"uniquement les messages non lus";
#elif L==6
"&uacute;nicamente los mensajes no le&iacute;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&atilde;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&aacute;rios tutor";
#endif
const char *Txt_Show_only_unread_messages =
#if L==1
"Mostrar nom&eacute;s els missatges no llegits";
#elif L==2
"Zeige nur ungelesene Nachrichten";
#elif L==3
"Show only unread messages";
#elif L==4
"Mostrar &uacute;nicamente los mensajes no le&iacute;dos";
#elif L==5
"Afficher uniquement les messages non lus";
#elif L==6
"Mostrar &uacute;nicamente los mensajes no le&iacute;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&atilde;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