Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-12 19:54:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.106.10

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-24 14:05:59 +01:00
parent c5992805cf
commit 767ab11590
4 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
swad_announcement.c
View File

@ -419,22 +419,24 @@ void Ann_ShowFormAnnouncement (void)
Lay_StartRoundFrameTable (NULL,Txt_New_announcement, Lay_StartRoundFrameTable (NULL,Txt_New_announcement,
NULL,Hlp_MESSAGES_Announcements,2); NULL,Hlp_MESSAGES_Announcements,2);
/***** Message subject and body *****/ /***** Announcement subject and body *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"Subject\" class=\"%s\">%s:&nbsp;</label>"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<textarea name=\"Subject\" cols=\"75\" rows=\"2\">" "<textarea id=\"Subject\" name=\"Subject\""
" cols=\"75\" rows=\"2\">"
"</textarea>" "</textarea>"
"</td>" "</td>"
"</tr>" "</tr>"
"<tr>" "<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"Content\" class=\"%s\">%s:&nbsp;</label>"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<textarea name=\"Content\" cols=\"75\" rows=\"20\">" "<textarea id=\"Content\" name=\"Content\""
" cols=\"75\" rows=\"20\">"
"</textarea>" "</textarea>"
"</td>" "</td>"
"</tr>", "</tr>",

3
swad_changelog.h
View File

@ -188,13 +188,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.106.9 (2016-12-24)" #define Log_PLATFORM_VERSION "SWAD 16.106.10 (2016-12-24)"
#define CSS_FILE "swad16.106.5.css" #define CSS_FILE "swad16.106.5.css"
#define JS_FILE "swad16.101.js" #define JS_FILE "swad16.101.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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.106.10:Dec 24, 2016 Changes in behaviour of labels in forms. (211412 lines)
Version 16.106.9: Dec 24, 2016 Changes in layout of preferences. (211400 lines) Version 16.106.9: Dec 24, 2016 Changes in layout of preferences. (211400 lines)
Version 16.106.8: Dec 24, 2016 Changes in behaviour of labels in forms. (211404 lines) Version 16.106.8: Dec 24, 2016 Changes in behaviour of labels in forms. (211404 lines)
Version 16.106.7: Dec 24, 2016 Changes in behaviour of labels in forms. (211401 lines) Version 16.106.7: Dec 24, 2016 Changes in behaviour of labels in forms. (211401 lines)

18
swad_forum.c
View File

@ -3830,13 +3830,14 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">");
/***** Subject *****/ /***** Post subject *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"Subject\" class=\"%s\">%s:&nbsp;</label>"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<textarea name=\"Subject\" cols=\"72\" rows=\"2\">", "<textarea id=\"Subject\" name=\"Subject\""
" cols=\"72\" rows=\"2\">",
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject); Txt_MSG_Subject);
if (IsReply) // If writing a reply to a message of an existing thread if (IsReply) // If writing a reply to a message of an existing thread
@ -3845,13 +3846,14 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Post *****/ /***** Post content *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"Content\" class=\"%s\">%s:&nbsp;</label>"
"</td>" "</td>"
"<td class=\"LEFT_TOP\">" "<td class=\"LEFT_TOP\">"
"<textarea name=\"Content\" cols=\"72\" rows=\"15\">" "<textarea id=\"Content\" name=\"Content\""
" cols=\"72\" rows=\"15\">"
"</textarea>" "</textarea>"
"</td>" "</td>"
"</tr>", "</tr>",

53
swad_message.c
View File

@ -484,10 +484,12 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
/***** Get possible code (of original message if it's a reply) *****/ /***** Get possible code (of original message if it's a reply) *****/
MsgCod = Msg_GetParamMsgCod (); MsgCod = Msg_GetParamMsgCod ();
/***** Subject of new message *****/ /***** Message subject *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"MsgSubject\" class=\"%s\">"
"%s:&nbsp;"
"</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">" "<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgSubject\" name=\"Subject\"" "<textarea id=\"MsgSubject\" name=\"Subject\""
@ -495,17 +497,17 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
The_ClassForm[Gbl.Prefs.Theme], The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject); Txt_MSG_Subject);
/***** If message is a reply ==> get original message *****/ /* If message is a reply ==> get original message */
if (MsgCod > 0) // It's a reply if (MsgCod > 0) // It's a reply
{ {
if (!SubjectAndContentComeFromForm) if (!SubjectAndContentComeFromForm)
{ {
/***** Get subject and content of message from database *****/ /* Get subject and content of message from database */
sprintf (Query,"SELECT Subject,Content FROM msg_content" sprintf (Query,"SELECT Subject,Content FROM msg_content"
" WHERE MsgCod='%ld'",MsgCod); " WHERE MsgCod='%ld'",MsgCod);
NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get message content"); NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get message content");
/***** Result should have a unique row *****/ /* Result should have a unique row */
if (NumRows != 1) if (NumRows != 1)
Lay_ShowErrorAndExit ("Error when getting message."); Lay_ShowErrorAndExit ("Error when getting message.");
@ -519,11 +521,11 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
strncpy (Content,row[1],Cns_MAX_BYTES_LONG_TEXT); strncpy (Content,row[1],Cns_MAX_BYTES_LONG_TEXT);
Content[Cns_MAX_BYTES_LONG_TEXT] = '\0'; Content[Cns_MAX_BYTES_LONG_TEXT] = '\0';
/***** Free structure that stores the query result *****/ /* Free structure that stores the query result */
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
} }
/***** Write subject *****/ /* Write subject */
if (!SubjectAndContentComeFromForm) if (!SubjectAndContentComeFromForm)
fprintf (Gbl.F.Out,"Re: "); fprintf (Gbl.F.Out,"Re: ");
fprintf (Gbl.F.Out,"%s" fprintf (Gbl.F.Out,"%s"
@ -532,10 +534,12 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
"</tr>", "</tr>",
Gbl.Msg.Subject); Gbl.Msg.Subject);
/***** Write content *****/ /***** Message content *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"MsgContent\" class=\"%s\">"
"%s:&nbsp;"
"</label>"
"</td>" "</td>"
"<td class=\"LEFT_MIDDLE\">" "<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\"" "<textarea id=\"MsgContent\" name=\"Content\""
@ -556,17 +560,19 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char *Content)
} }
else // It's not a reply else // It's not a reply
{ {
/***** Subject of new message *****/ /* End of message subject */
fprintf (Gbl.F.Out,"%s</textarea>" fprintf (Gbl.F.Out,"%s</textarea>"
"</td>" "</td>"
"</tr>", "</tr>",
Gbl.Msg.Subject); Gbl.Msg.Subject);
/***** Content of new message *****/ /***** Message content *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_TOP\">" "<td class=\"RIGHT_TOP\">"
"%s: " "<label for=\"MsgContent\" class=\"%s\">"
"</td>" "%s:&nbsp;"
"</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">" "<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\"" "<textarea id=\"MsgContent\" name=\"Content\""
" cols=\"72\" rows=\"20\">", " cols=\"72\" rows=\"20\">",
@ -2607,13 +2613,15 @@ static void Msg_ShowFormToShowOnlyUnreadMessages (void)
extern const char *Txt_only_unread_messages; extern const char *Txt_only_unread_messages;
/***** Put checkbox to select whether to show only unread (received) messages *****/ /***** Put checkbox to select whether to show only unread (received) messages *****/
fprintf (Gbl.F.Out,"<input type=\"checkbox\"" fprintf (Gbl.F.Out,"<label class=\"%s\">"
" name=\"OnlyUnreadMsgs\" value=\"Y\""); "<input type=\"checkbox\" name=\"OnlyUnreadMsgs\""
" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Msg.ShowOnlyUnreadMsgs) if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\""); fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />" fprintf (Gbl.F.Out," />"
"<span class=\"%s\">%s</span>", "%s"
The_ClassForm[Gbl.Prefs.Theme], "</label>",
Txt_only_unread_messages); Txt_only_unread_messages);
} }
@ -3605,10 +3613,9 @@ static void Msg_PutFormToUnbanSender (struct UsrData *UsrDat)
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Msg_PutHiddenParamsMsgsFilters (); Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<span class=\"MSG_AUT\">&nbsp;</span>" fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/lock-on64x64.png\""
"<input type=\"image\" src=\"%s/lock-on64x64.png\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO20x20\" style=\"margin-left:12px;\" />",
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_Sender_banned_click_to_unban_him, Txt_Sender_banned_click_to_unban_him,
Txt_Sender_banned_click_to_unban_him); Txt_Sender_banned_click_to_unban_him);