mirror of
https://github.com/acanas/swad-core.git
synced 2024-09-20 00:02:42 +02:00
Version 14.110.8
This commit is contained in:
parent
ee90973cc9
commit
95dea395c4
|
@ -103,11 +103,13 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** 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:
|
// 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 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.
|
Version 14.110.7: Apr 11, 2015 Help on writing messages.
|
||||||
Changes in layout of edition of a new message. (184719 lines)
|
Changes in layout of edition of a new message. (184719 lines)
|
||||||
Version 14.110.6: Apr 11, 2015 Help on edition of test questions.
|
Version 14.110.6: Apr 11, 2015 Help on edition of test questions.
|
||||||
|
|
52
swad_forum.c
52
swad_forum.c
|
@ -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_GetNumOfThreadsInForumNewerThan (For_ForumType_t ForumType,const char *Time);
|
||||||
static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr);
|
static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr);
|
||||||
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
|
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_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumUsrsToBeNotifiedByEMail);
|
||||||
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
|
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
|
||||||
static void For_WriteNumThrsAndPsts (unsigned NumThrs,unsigned NumThrsWithNewPosts,unsigned NumPosts);
|
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)
|
static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
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];
|
bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS];
|
||||||
struct ForumThread Thr;
|
struct ForumThread Thr;
|
||||||
char Query[1024];
|
char Query[1024];
|
||||||
|
@ -894,7 +898,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
|
||||||
For_GetThrReadTime (ThrCod,ReadTime);
|
For_GetThrReadTime (ThrCod,ReadTime);
|
||||||
|
|
||||||
/* Table start */
|
/* Table start */
|
||||||
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forums);
|
Lay_StartRoundFrameTable10 (NULL,0,Txt_Thread);
|
||||||
|
|
||||||
/* Put a form to select which forums */
|
/* Put a form to select which forums */
|
||||||
For_PutFormWhichForums ();
|
For_PutFormWhichForums ();
|
||||||
|
@ -982,7 +986,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
|
||||||
Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination);
|
Pag_WriteLinksToPagesCentered (Pag_POSTS_FORUM,ThrCod,&Pagination);
|
||||||
|
|
||||||
/***** Show posts from this page, the author and the date of last reply *****/
|
/***** 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>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td style=\"width:100%%; text-align:center;\">"
|
"<td style=\"width:100%%; text-align:center;\">"
|
||||||
"<table class=\"CELLS_PAD_2\" style=\"width:100%%;\">");
|
"<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)
|
void For_ShowForumThrs (void)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassFormul[The_NUM_THEMES];
|
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_MSG_Subject;
|
||||||
extern const char *Txt_FORUM_THREAD_HELP_ORDER[2];
|
extern const char *Txt_FORUM_THREAD_HELP_ORDER[2];
|
||||||
extern const char *Txt_FORUM_THREAD_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 *****/
|
/***** Header whith the name of this forum, the number of threads, and the total number of posts *****/
|
||||||
/* Table start */
|
/* Table start */
|
||||||
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forums);
|
Lay_StartRoundFrameTable10 (NULL,0,Txt_Forum);
|
||||||
|
|
||||||
/* Put a form to select which forums */
|
/* Put a form to select which forums */
|
||||||
For_PutFormWhichForums ();
|
For_PutFormWhichForums ();
|
||||||
|
@ -2496,7 +2501,7 @@ void For_ShowForumThrs (void)
|
||||||
Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs);
|
Pag_WriteLinksToPagesCentered (Pag_THREADS_FORUM,0,&PaginationThrs);
|
||||||
|
|
||||||
/***** Start table *****/
|
/***** Start table *****/
|
||||||
Lay_StartRoundFrameTable10 (NULL,2,NULL);
|
Lay_StartRoundFrameTable10 (NULL,2,Txt_Threads);
|
||||||
|
|
||||||
/***** Heading row *****/
|
/***** Heading row *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
|
@ -3691,12 +3696,11 @@ void For_ShowForumLevel2 (long ThrCod)
|
||||||
/********************** Show an area to write a message **********************/
|
/********************** 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 *The_ClassFormul[The_NUM_THEMES];
|
||||||
extern const char *Txt_New_message;
|
extern const char *Txt_New_message;
|
||||||
extern const char *Txt_New_thread;
|
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_Subject;
|
||||||
extern const char *Txt_MSG_Message;
|
extern const char *Txt_MSG_Message;
|
||||||
extern const char *Txt_Send_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]);
|
Act_FormStart (For_ActionsRecThrFor[Gbl.Forum.ForumType]);
|
||||||
For_PutAllHiddenParamsForum ();
|
For_PutAllHiddenParamsForum ();
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
|
/***** Start frame *****/
|
||||||
"<tr>"
|
Lay_StartRoundFrameTable10 (NULL,2,IsReply ? Txt_New_message :
|
||||||
"<td></td>"
|
Txt_New_thread);
|
||||||
"<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);
|
|
||||||
|
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td class=\"%s\""
|
"<td class=\"%s\""
|
||||||
" style=\"text-align:right; vertical-align:top;\">"
|
" style=\"text-align:right; vertical-align:top;\">"
|
||||||
"%s: "
|
"%s: "
|
||||||
"</td>"
|
"</td>"
|
||||||
"<td style=\"text-align:left;\">"
|
"<td style=\"text-align:left;\">"
|
||||||
"<textarea name=\"Subject\" cols=\"75\" rows=\"2\">",
|
"<textarea name=\"Subject\" cols=\"72\" rows=\"2\">",
|
||||||
The_ClassFormul[Gbl.Prefs.Theme],
|
The_ClassFormul[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
|
||||||
|
@ -3742,15 +3738,25 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
|
||||||
"%s: "
|
"%s: "
|
||||||
"</td>"
|
"</td>"
|
||||||
"<td style=\"text-align:left;\">"
|
"<td style=\"text-align:left;\">"
|
||||||
"<textarea name=\"Content\" cols=\"75\" rows=\"15\">"
|
"<textarea name=\"Content\" cols=\"72\" rows=\"15\">"
|
||||||
"</textarea>"
|
"</textarea>"
|
||||||
"</td>"
|
"</td>"
|
||||||
"</tr>"
|
"</tr>",
|
||||||
"</table>",
|
|
||||||
The_ClassFormul[Gbl.Prefs.Theme],
|
The_ClassFormul[Gbl.Prefs.Theme],
|
||||||
Txt_MSG_Message);
|
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);
|
Lay_PutCreateButton (Txt_Send_message);
|
||||||
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
|
"</tr>");
|
||||||
|
|
||||||
|
/***** End frame *****/
|
||||||
|
Lay_EndRoundFrameTable10 ();
|
||||||
|
|
||||||
|
/***** End form *****/
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -144,7 +144,6 @@ void For_ShowThrPsts (void);
|
||||||
void For_GetParamsForum (void);
|
void For_GetParamsForum (void);
|
||||||
void For_PutHiddenParamThrCod (long ThrCod);
|
void For_PutHiddenParamThrCod (long ThrCod);
|
||||||
void For_ShowForumLevel2 (long ThrCod);
|
void For_ShowForumLevel2 (long ThrCod);
|
||||||
void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject);
|
|
||||||
void For_RecForumPst (void);
|
void For_RecForumPst (void);
|
||||||
void For_DelPst (void);
|
void For_DelPst (void);
|
||||||
void For_ReqDelThr (void);
|
void For_ReqDelThr (void);
|
||||||
|
|
|
@ -342,9 +342,10 @@ static void Msg_PutFormMsgUsrs (const char *Content)
|
||||||
/***** Subject and content *****/
|
/***** Subject and content *****/
|
||||||
Msg_WriteFormSubjectAndContentMsgToUsrs (Content);
|
Msg_WriteFormSubjectAndContentMsgToUsrs (Content);
|
||||||
|
|
||||||
/***** Send button *****/
|
/***** Help for text editor and send button *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td colspan=\"2\">");
|
"<td colspan=\"2\">");
|
||||||
|
Lay_HelpPlainEditor ();
|
||||||
Lay_PutCreateButton (Txt_Send_message);
|
Lay_PutCreateButton (Txt_Send_message);
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
"</tr>");
|
"</tr>");
|
||||||
|
@ -509,13 +510,6 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
|
||||||
fprintf (Gbl.F.Out,"</textarea>"
|
fprintf (Gbl.F.Out,"</textarea>"
|
||||||
"</td>"
|
"</td>"
|
||||||
"</tr>");
|
"</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
42
swad_text.c
|
@ -13514,27 +13514,6 @@ const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_ =
|
||||||
" você receberá um e-mail com uma nova senha.";
|
" você receberá um e-mail com uma nova senha.";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const char *Txt_If_you_send_this_message_you_will_appear_as_its_author =
|
|
||||||
#if L==0
|
|
||||||
"si envía este mensaje, usted aparecerá 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ía este mensaje, usted aparecerá como autor";
|
|
||||||
#elif L==4
|
|
||||||
"si vous envoyez ce message, vous apparaîtrez comme son auteur";
|
|
||||||
#elif L==5
|
|
||||||
"si envía este mensaje, usted aparecerá 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ê enviar esta mensagem, você vai aparecer como o seu autor";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Txt_Image =
|
const char *Txt_Image =
|
||||||
#if L==0
|
#if L==0
|
||||||
"Imatge";
|
"Imatge";
|
||||||
|
@ -44554,6 +44533,27 @@ const char *Txt_This_survey_has_no_questions =
|
||||||
"Este inquérito não tem perguntas";
|
"Este inquérito não tem perguntas";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
const char *Txt_Thread =
|
||||||
|
#if L==0
|
||||||
|
"Discussió";
|
||||||
|
#elif L==1
|
||||||
|
"Thread";
|
||||||
|
#elif L==2
|
||||||
|
"Thread";
|
||||||
|
#elif L==3
|
||||||
|
"Discusión";
|
||||||
|
#elif L==4
|
||||||
|
"Fil";
|
||||||
|
#elif L==5
|
||||||
|
"Discusión"; // Okoteve traducción
|
||||||
|
#elif L==6
|
||||||
|
"Discussione";
|
||||||
|
#elif L==7
|
||||||
|
"Wątek";
|
||||||
|
#elif L==8
|
||||||
|
"Thread";
|
||||||
|
#endif
|
||||||
|
|
||||||
const char *Txt_thread =
|
const char *Txt_thread =
|
||||||
#if L==0
|
#if L==0
|
||||||
"discussió";
|
"discussió";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user