diff --git a/swad_changelog.h b/swad_changelog.h index 5f0118971..868a21bdf 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.110.6 (2015/04/11)" +#define Log_PLATFORM_VERSION "SWAD 14.110.7 (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.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. Changes in layout of edition of test questions. (184702 lines) Version 14.110.5: Apr 11, 2015 Fixed bug in tests. (184685 lines) diff --git a/swad_message.c b/swad_message.c index f39fcec0a..1b595d820 100644 --- a/swad_message.c +++ b/swad_message.c @@ -256,6 +256,7 @@ void Msg_FormMsgUsrs (void) static void Msg_PutFormMsgUsrs (const char *Content) { extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *Txt_New_message; extern const char *Txt_MSG_To; extern const char *Txt_Send_message; char YN[1+1]; @@ -302,7 +303,7 @@ static void Msg_PutFormMsgUsrs (const char *Content) if (Usr_GetIfShowBigList (Gbl.Usrs.LstTchs.NumUsrs + Gbl.Usrs.LstStds.NumUsrs)) { - /***** Form to select destinatary users and write the message *****/ + /***** Start form to select recipients and write the message *****/ Act_FormStart (ActRcvMsgUsr); if (Gbl.Msg.IsReply) { @@ -311,36 +312,47 @@ static void Msg_PutFormMsgUsrs (const char *Content) Usr_PutParamOtherUsrCodEncrypted (); } - /* Start table */ - fprintf (Gbl.F.Out,"" - "" + /***** Start frame *****/ + Lay_StartRoundFrameTable10 (NULL,2,Txt_New_message); + + /***** Draw lists of users with the recipients *****/ + fprintf (Gbl.F.Out,"" "" - "" ""); /***** Subject and content *****/ Msg_WriteFormSubjectAndContentMsgToUsrs (Content); - fprintf (Gbl.F.Out,"
" "%s:" "", + "" + "", The_ClassFormul[Gbl.Prefs.Theme],Txt_MSG_To); - Lay_StartRoundFrameTable10 (NULL,0,NULL); - /* Draw two lists of users with the recipients: one with the teachers of the course and another one with the students */ + /* Teachers */ Usr_ListUsersToSelect (Rol_TEACHER); + + /* Students */ Usr_ListUsersToSelect (Rol_STUDENT); /* Other users (nicknames) */ Msg_WriteFormUsrsIDsOrNicksOtherRecipients (Gbl.Msg.IsReply); /* End of table */ - Lay_EndRoundFrameTable10 (); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"
" + "
"); - - /***** Send and undo buttons *****/ + /***** Send button *****/ + fprintf (Gbl.F.Out,"" + ""); Lay_PutCreateButton (Txt_Send_message); + fprintf (Gbl.F.Out,"" + ""); + + /***** End frame *****/ + Lay_EndRoundFrameTable10 (); + + /***** End form *****/ Act_FormEnd (); } @@ -430,7 +442,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content) "%s: " "" "" - "" "" ""); + + /***** Help for text editor *****/ + fprintf (Gbl.F.Out,"" + ""); + Lay_HelpPlainEditor (); + fprintf (Gbl.F.Out,"" + ""); } /*****************************************************************************/