From 64df3bd60c2e7f3cf686a90ec23cd64309edfcc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 23 Dec 2015 11:05:32 +0100 Subject: [PATCH] Version 15.72.2 --- icon/usrs64x64.gif | Bin 0 -> 578 bytes swad_changelog.h | 5 ++++- swad_enrollment.c | 4 ++-- swad_message.c | 30 ++++++++++++++++++++++++++++-- swad_test.c | 2 +- swad_user.c | 2 +- 6 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 icon/usrs64x64.gif diff --git a/icon/usrs64x64.gif b/icon/usrs64x64.gif new file mode 100644 index 0000000000000000000000000000000000000000..e6f962072a3032b0712d96c560bc8a57d7bf2a9d GIT binary patch literal 578 zcmV-I0=@l5Nk%w1VL$*t0J8u9KtMoBN=i~vQe0eIWMpJ(Yio3Lbb5Mvf`WpJi;I(! zlboEKq@<*(s;aiOw*UYCA^8LW000jFEC2ui06+jh000F3@X1N5y*TU5yZ>M)j$~%PSf8or8m3@9+u=ZA1_6=rh%rI1jXEn%+7~E8r)3YPp$!c2yva z$(%FGd>*9F1dF1e0tgHYi`uY0eKb+ zH?A10w8$9_fi{;FM*;{94h{?{n9BfV4+9C}wmff>vW!}dr_hzB8Rf*5ZM=!0Y zdXQzz%$Q8>De~m2B?X653P9^uiJ*i9BwJDFG{vQbomTE$Z~*j(g^WUMJz!8kOhuZ4 z0NF7>(4Y{b!K&J75YI*cqYLPy!b5@Mjhkj!Fa&|M$Dd|U(3-FdrGQ`w43Y}bfm4Wp z0tXDpJ#*7U&3uSnU{)iQMBmL*4u7Z$8VWTLrR|lNm|9DT&#jM$=8!k`k-b1{gJh$- zFz?<+Oojjs#VH8lOe!BoF2wi;=0ZG%sEr)=2dK~im{8pNw1~FEosUr2ov{RAtqE8+ Q&%V9;_weJ(FA)I%JHCbZrT_o{ literal 0 HcmV?d00001 diff --git a/swad_changelog.h b/swad_changelog.h index 7bd748c1f..675ba7b2a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -112,17 +112,20 @@ // TODO: Reply to all // TODO: Reply icons should appear without text // TODO: Link to remove messages is too wide. For example: "Remove these X messages". +// TODO: Remove message to teachers to verify indicators /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.72.1 (2015-12-22)" +#define Log_PLATFORM_VERSION "SWAD 15.72.2 (2015-12-23)" #define CSS_FILE "swad15.65.1.css" // 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 15.72.2: Dec 23, 2015 Write message only to one recipient. Not finished. + Some small icons changed. (187750 lines) Version 15.72.1: Dec 22, 2015 Write message only to one recipient. Not finished. (187724 lines) Version 15.72: Dec 22, 2015 Reply message only to sender, suggested by Francisco Ocaņa Lara. Not finished. (187705 lines) Version 15.71.3: Dec 22, 2015 Changes in birthday range of years. (187669 lines) diff --git a/swad_enrollment.c b/swad_enrollment.c index 3880aa926..cd9059b6b 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -2888,7 +2888,7 @@ void Enr_PutLinkToAdminOneUsr (Act_Action_t NextAction) extern const char *Txt_Admin_me; extern const char *Txt_Admin_one_user; - Lay_PutContextualLink (NextAction,NULL,"configtest16x16.gif", + Lay_PutContextualLink (NextAction,NULL,"config64x64.gif", Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user : Txt_Admin_me, Enr_CheckIfICanAdminOtherUsrs () ? Txt_Admin_one_user : @@ -2906,7 +2906,7 @@ void Enr_PutLinkToAdminSeveralUsrs (Rol_Role_t Role) Lay_PutContextualLink (Role == Rol_STUDENT ? ActReqEnrSevStd : ActReqEnrSevTch, - NULL,"configtest16x16.gif", + NULL,"config64x64.gif", Role == Rol_STUDENT ? Txt_Admin_several_students : Txt_Admin_several_teachers, Role == Rol_STUDENT ? Txt_Admin_several_students : diff --git a/swad_message.c b/swad_message.c index 7e29c2b7d..427292f8d 100644 --- a/swad_message.c +++ b/swad_message.c @@ -80,6 +80,7 @@ static void Msg_ShowASentOrReceivedMessage (Msg_TypeOfMessages_t TypeOfMessages, static void Msg_GetStatusOfSentMsg (long MsgCod,bool *Expanded); static void Msg_GetStatusOfReceivedMsg (long MsgCod,bool *Open,bool *Replied,bool *Expanded); static long Msg_GetParamMsgCod (void); +static void Msg_PutParamsShowMorePotentialRecipients (void); static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void); static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content); static void Msg_ShowNumMsgsDeleted (unsigned NumMsgs); @@ -290,8 +291,9 @@ static void Msg_PutFormMsgUsrs (const char *Content) Usr_GetListMsgRecipientsWrittenExplicitelyBySender (false); /***** Get list of users belonging to the current course *****/ - if (Gbl.Usrs.Me.IBelongToCurrentCrs || // If there is a course selected and I belong to it - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) + if (!Gbl.Msg.ShowOnlyOneRecipient && // Show list of potential recipients + (Gbl.Usrs.Me.IBelongToCurrentCrs || // If there is a course selected and I belong to it + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)) { /***** Get and update type of list, number of columns in class photo @@ -323,6 +325,16 @@ static void Msg_PutFormMsgUsrs (const char *Content) Gbl.Usrs.LstStds.NumUsrs) Usr_ShowFormsToSelectUsrListType (ActReqMsgUsr); + /***** Form to show several potential recipients *****/ + if (Gbl.Msg.ShowOnlyOneRecipient) + { + fprintf (Gbl.F.Out,"
"); + Lay_PutContextualLink (ActReqMsgUsr,Msg_PutParamsShowMorePotentialRecipients, + "usrs64x64.gif", + "Ver más destinatarios","Ver más destinatarios"); // Need translation!!!! + fprintf (Gbl.F.Out,"
"); + } + /***** Start form to select recipients and write the message *****/ Act_FormStart (ActRcvMsgUsr); if (Gbl.Msg.Reply.IsReply) @@ -411,6 +423,20 @@ static void Msg_PutFormMsgUsrs (const char *Content) Grp_FreeListCodSelectedGrps (); } +/*****************************************************************************/ +/************ Put parameters to show more potential recipients ***************/ +/*****************************************************************************/ + +static void Msg_PutParamsShowMorePotentialRecipients (void) + { + if (Gbl.Msg.Reply.IsReply) + { + Par_PutHiddenParamChar ("IsReply",'Y'); + Msg_PutHiddenParamMsgCod (Gbl.Msg.Reply.OriginalMsgCod); + Usr_PutParamOtherUsrCodEncrypted (); + } + } + /*****************************************************************************/ /************** Nicknames of recipients of a message to users ****************/ /*****************************************************************************/ diff --git a/swad_test.c b/swad_test.c index 43d986f28..8ddfe022e 100644 --- a/swad_test.c +++ b/swad_test.c @@ -344,7 +344,7 @@ static void Tst_PutFormToConfigure (void) { extern const char *Txt_Configure; - Lay_PutContextualLink (ActCfgTst,NULL,"configtest16x16.gif", + Lay_PutContextualLink (ActCfgTst,NULL,"config64x64.gif", Txt_Configure,Txt_Configure); } diff --git a/swad_user.c b/swad_user.c index d14ce3f4e..0213ce884 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6534,7 +6534,7 @@ static void Usr_PutLinkToSeeGuests (void) extern const char *Txt_See_guests; /***** Put form to list guests *****/ - Lay_PutContextualLink (ActLstGst,NULL,"usrs16x16.gif", + Lay_PutContextualLink (ActLstGst,NULL,"usrs64x64.gif", Txt_See_guests,Txt_See_guests); }