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 14.110.8

This commit is contained in:
Antonio Cañas Vargas 2015-04-11 14:00:23 +02:00
parent ee90973cc9
commit 95dea395c4
5 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_changelog.h
View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.110.7 (2015/04/11)"
#define Log_PLATFORM_VERSION "SWAD 14.110.8 (2015/04/11)"
// 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 14.110.8: Apr 11, 2015 Help on writing forum posts.
Changes in layout of edition of a new forum post. (184718 lines)
Version 14.110.7: Apr 11, 2015 Help on writing messages.
Changes in layout of edition of a new message. (184719 lines)
Version 14.110.6: Apr 11, 2015 Help on edition of test questions.

52
swad_forum.c
View File

@ -260,6 +260,9 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
static unsigned For_GetNumOfThreadsInForumNewerThan (For_ForumType_t ForumType,const char *Time);
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_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumUsrsToBeNotifiedByEMail);
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
static void For_WriteNumThrsAndPsts (unsigned NumThrs,unsigned NumThrsWithNewPosts,unsigned NumPosts);
@ -862,7 +865,8 @@ void For_RemoveUsrFromReadThrs (long UsrCod)
static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Forums;
extern const char *Txt_Thread;
extern const char *Txt_Messages;
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS];
struct ForumThread Thr;
char Query[1024];
@ -894,7 +898,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
For_GetThrReadTime (ThrCod,ReadTime);
/* Table start */
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forums);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Thread);
/* Put a form to select which forums */
For_PutFormWhichForums ();
@ -982,7 +986,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination);
/***** Show posts from this page, the author and the date of last reply *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Messages);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:100%%; text-align:center;\">"
"<table class=\"CELLS_PAD_2\" style=\"width:100%%;\">");
@ -2359,7 +2363,8 @@ static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time)
void For_ShowForumThrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_Forums;
extern const char *Txt_Forum;
extern const char *Txt_Threads;
extern const char *Txt_MSG_Subject;
extern const char *Txt_FORUM_THREAD_HELP_ORDER[2];
extern const char *Txt_FORUM_THREAD_ORDER[2];
@ -2462,7 +2467,7 @@ void For_ShowForumThrs (void)
/***** Header whith the name of this forum, the number of threads, and the total number of posts *****/
/* Table start */
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forums);
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forum);
/* Put a form to select which forums */
For_PutFormWhichForums ();
@ -2496,7 +2501,7 @@ void For_ShowForumThrs (void)
Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs);
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL);
Lay_StartRoundFrameTable10 (NULL,2,Txt_Threads);
/***** Heading row *****/
fprintf (Gbl.F.Out,"<tr>"
@ -3691,12 +3696,11 @@ void For_ShowForumLevel2 (long ThrCod)
/********************** Show an area to write a message **********************/
/*****************************************************************************/
void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_message;
extern const char *Txt_New_thread;
extern const char *Txt_If_you_send_this_message_you_will_appear_as_its_author;
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Message;
extern const char *Txt_Send_message;
@ -3711,24 +3715,16 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]);
For_PutAllHiddenParamsForum ();
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td></td>"
"<td style=\"text-align:left;\">"
"<span class=\"%s\">%s</span>"
"<span class=\"DAT\"> (%s)</span></td>",
The_ClassFormul[Gbl.Prefs.Theme],
IsReply ? Txt_New_message :
Txt_New_thread,
Txt_If_you_send_this_message_you_will_appear_as_its_author);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,IsReply ? Txt_New_message :
Txt_New_thread);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Subject\" cols=\"75\" rows=\"2\">",
"<textarea name=\"Subject\" cols=\"72\" rows=\"2\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Subject);
if (IsReply) // If writing a reply to a message of an existing thread
@ -3742,15 +3738,25 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Content\" cols=\"75\" rows=\"15\">"
"<textarea name=\"Content\" cols=\"72\" rows=\"15\">"
"</textarea>"
"</td>"
"</tr>"
"</table>",
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message);
/***** Help for text editor and send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
Lay_HelpPlainEditor ();
Lay_PutCreateButton (Txt_Send_message);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/
Act_FormEnd ();
}

1
swad_forum.h
View File

@ -144,7 +144,6 @@ void For_ShowThrPsts (void);
void For_GetParamsForum (void);
void For_PutHiddenParamThrCod (long ThrCod);
void For_ShowForumLevel2 (long ThrCod);
void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject);
void For_RecForumPst (void);
void For_DelPst (void);
void For_ReqDelThr (void);

10
swad_message.c
View File

@ -342,9 +342,10 @@ static void Msg_PutFormMsgUsrs (const char *Content)
/***** Subject and content *****/
Msg_WriteFormSubjectAndContentMsgToUsrs (Content);
/***** Send button *****/
/***** Help for text editor and send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
Lay_HelpPlainEditor ();
Lay_PutCreateButton (Txt_Send_message);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -509,13 +510,6 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
fprintf (Gbl.F.Out,"</textarea>"
"</td>"
"</tr>");
/***** Help for text editor *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
Lay_HelpPlainEditor ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/

42
swad_text.c
View File

@ -13514,27 +13514,6 @@ const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_ =
" voc&ecirc; receber&aacute; um e-mail com uma nova senha.";
#endif
const char *Txt_If_you_send_this_message_you_will_appear_as_its_author =
#if L==0
"si env&iacute;a este mensaje, usted aparecer&aacute; como autor"; // Necessita traduccio
#elif L==1
"Wenn Senden diese Nachricht, Sie wird als dessen Urheber";
#elif L==2
"if you send this message, you will appear as its author";
#elif L==3
"si env&iacute;a este mensaje, usted aparecer&aacute; como autor";
#elif L==4
"si vous envoyez ce message, vous appara&icirc;trez comme son auteur";
#elif L==5
"si env&iacute;a este mensaje, usted aparecer&aacute; como autor"; // Okoteve traducción
#elif L==6
"se invii questo messaggio, apparirai come suo autore";
#elif L==7
"jesli wyslesz te wiadomosc, pojawi sie jako jego autor";
#elif L==8
"se voc&ecirc; enviar esta mensagem, voc&ecirc; vai aparecer como o seu autor";
#endif
const char *Txt_Image =
#if L==0
"Imatge";
@ -44554,6 +44533,27 @@ const char *Txt_This_survey_has_no_questions =
"Este inqu&eacute;rito n&atilde;o tem perguntas";
#endif
const char *Txt_Thread =
#if L==0
"Discussi&oacute;";
#elif L==1
"Thread";
#elif L==2
"Thread";
#elif L==3
"Discusi&oacute;n";
#elif L==4
"Fil";
#elif L==5
"Discusi&oacute;n"; // Okoteve traducción
#elif L==6
"Discussione";
#elif L==7
"W&aogon;tek";
#elif L==8
"Thread";
#endif
const char *Txt_thread =
#if L==0
"discussi&oacute;";