Version 15.72.2

This commit is contained in:
Antonio Cañas Vargas 2015-12-23 11:05:32 +01:00
parent 3814579155
commit 64df3bd60c
6 changed files with 36 additions and 7 deletions

BIN
icon/usrs64x64.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 578 B

View File

@ -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)

View File

@ -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 :

View File

@ -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,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActReqMsgUsr,Msg_PutParamsShowMorePotentialRecipients,
"usrs64x64.gif",
"Ver m&aacute;s destinatarios","Ver m&aacute;s destinatarios"); // Need translation!!!!
fprintf (Gbl.F.Out,"</div>");
}
/***** 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 ****************/
/*****************************************************************************/

View File

@ -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);
}

View File

@ -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);
}