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.107.7

This commit is contained in:
Antonio Cañas Vargas 2016-12-27 11:45:06 +01:00
parent 86f6454962
commit 309aa1a72c
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -189,13 +189,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.107.6 (2016-12-27)"
#define Log_PLATFORM_VERSION "SWAD 16.107.7 (2016-12-27)"
#define CSS_FILE "swad16.106.5.css"
#define JS_FILE "swad16.101.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.107.7: Dec 27, 2016 Code refactoring in forums. (211594 lines)
Version 16.107.6: Dec 27, 2016 Changes in behaviour of labels in forms. (211593 lines)
Version 16.107.5: Dec 26, 2016 Changes in behaviour of labels in forms. (211540 lines)
Version 16.107.4: Dec 26, 2016 Code refactoring in announcements. (211532 lines)

66
swad_forum.c
View File

@ -309,6 +309,8 @@ static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject);
static void For_PutSubjectContent (const char *Label,const char *Field,
unsigned NumRows,const char *Content);
static void For_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumUsrsToBeNotifiedByEMail);
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
@ -3827,40 +3829,12 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]);
For_PutAllHiddenParamsForum ();
/***** Start table *****/
/***** Subject and content *****/
// If writing a reply to a message of an existing thread ==> write subject
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">");
/***** Post subject *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\">"
"<label for=\"Subject\" class=\"%s\">%s:&nbsp;</label>"
"</td>"
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Subject\" name=\"Subject\""
" cols=\"72\" rows=\"2\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject);
if (IsReply) // If writing a reply to a message of an existing thread
fprintf (Gbl.F.Out,"%s",Subject);
fprintf (Gbl.F.Out,"</textarea>"
"</td>"
"</tr>");
/***** Post content *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\">"
"<label for=\"Content\" class=\"%s\">%s:&nbsp;</label>"
"</td>"
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Content\" name=\"Content\""
" cols=\"72\" rows=\"15\">"
"</textarea>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message);
/***** End table *****/
For_PutSubjectContent (Txt_MSG_Subject,"Subject", 2,IsReply ? Subject :
NULL);
For_PutSubjectContent (Txt_MSG_Message,"Content",15,NULL);
fprintf (Gbl.F.Out,"</table>");
/***** Help for text editor *****/
@ -3879,6 +3853,32 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/****************** Put form field for subject or content ********************/
/*****************************************************************************/
static void For_PutSubjectContent (const char *Label,const char *Field,
unsigned NumRows,const char *Content)
{
extern const char *The_ClassForm[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\">"
"<label for=\"%s\" class=\"%s\">%s:&nbsp;</label>"
"</td>"
"<td class=\"LEFT_TOP\">"
"<textarea id=\"%s\" name=\"%s\""
" cols=\"72\" rows=\"%u\">",
Field,The_ClassForm[Gbl.Prefs.Theme],Label,
Field,Field,
NumRows);
if (Content)
fprintf (Gbl.F.Out,"%s",Content);
fprintf (Gbl.F.Out,"</textarea>"
"</td>"
"</tr>");
}
/*****************************************************************************/
/************************** Receive message of a forum ***********************/
/*****************************************************************************/