Version 15.151.3

This commit is contained in:
Antonio Cañas Vargas 2016-03-19 00:40:20 +01:00
parent 30296f008e
commit 34cf3d085a
3 changed files with 15 additions and 17 deletions

View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.151.2 (2016-03-19)" #define Log_PLATFORM_VERSION "SWAD 15.151.3 (2016-03-19)"
#define CSS_FILE "swad15.150.2.css" #define CSS_FILE "swad15.150.2.css"
#define JS_FILE "swad15.131.3.js" #define JS_FILE "swad15.131.3.js"
// 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 15.151.3: Mar 19, 2016 Icon to edit mail domains integrated in frame. (195934 lines)
Version 15.151.2: Mar 19, 2016 Changes in layout of groups. (195935 lines) Version 15.151.2: Mar 19, 2016 Changes in layout of groups. (195935 lines)
Version 15.151.1: Mar 18, 2016 Changes in layout of groups. (195929 lines) Version 15.151.1: Mar 18, 2016 Changes in layout of groups. (195929 lines)
Version 15.151: Mar 18, 2016 Changes in layout of header class photo. (195930 lines) Version 15.151: Mar 18, 2016 Changes in layout of header class photo. (195930 lines)

View File

@ -1153,7 +1153,7 @@ static void Grp_ListGroupTypesForEdition (void)
Act_FormStart (ActRenGrpTyp); Act_FormStart (ActRenGrpTyp);
Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"GrpTypName\"" fprintf (Gbl.F.Out,"<input type=\"text\" name=\"GrpTypName\""
" size=\"20\" maxlength=\"%u\" value=\"%s\"" " size=\"12\" maxlength=\"%u\" value=\"%s\""
" onchange=\"document.getElementById('%s').submit();\" />", " onchange=\"document.getElementById('%s').submit();\" />",
MAX_LENGTH_GROUP_TYPE_NAME, MAX_LENGTH_GROUP_TYPE_NAME,
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName, Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName,
@ -2079,7 +2079,7 @@ static void Grp_PutFormToCreateGroupType (void)
/***** Name of group type *****/ /***** Name of group type *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">" fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<input type=\"text\" name=\"GrpTypName\"" "<input type=\"text\" name=\"GrpTypName\""
" size=\"20\" maxlength=\"%u\" value=\"%s\" />" " size=\"12\" maxlength=\"%u\" value=\"%s\" />"
"</td>", "</td>",
MAX_LENGTH_GROUP_TYPE_NAME,Gbl.CurrentCrs.Grps.GrpTyp.GrpTypName); MAX_LENGTH_GROUP_TYPE_NAME,Gbl.CurrentCrs.Grps.GrpTyp.GrpTypName);

View File

@ -65,7 +65,7 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
/*****************************************************************************/ /*****************************************************************************/
static void Mai_GetParamMaiOrderType (void); static void Mai_GetParamMaiOrderType (void);
static void Mai_PutFormToEditMailDomains (void); static void Mai_PutIconToEditMailDomains (void);
static void Mai_GetListMailDomainsAllowedForNotif (void); static void Mai_GetListMailDomainsAllowedForNotif (void);
static void Mai_ListMailDomainsForEdition (void); static void Mai_ListMailDomainsForEdition (void);
static void Mai_PutParamMaiCod (long MaiCod); static void Mai_PutParamMaiCod (long MaiCod);
@ -98,13 +98,12 @@ void Mai_SeeMailDomains (void)
/***** Get list of mail domains *****/ /***** Get list of mail domains *****/
Mai_GetListMailDomainsAllowedForNotif (); Mai_GetListMailDomainsAllowedForNotif ();
/***** Put link (form) to edit mail domains *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Mai_PutFormToEditMailDomains ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,2,Txt_Mail_domains_allowed_for_notifications); Lay_StartRoundFrame (NULL,Txt_Mail_domains_allowed_for_notifications,
fprintf (Gbl.F.Out,"<tr>"); Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains :
NULL);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Mai_ORDER_BY_DOMAIN; for (Order = Mai_ORDER_BY_DOMAIN;
Order <= Mai_ORDER_BY_USERS; Order <= Mai_ORDER_BY_USERS;
Order++) Order++)
@ -145,7 +144,8 @@ void Mai_SeeMailDomains (void)
Gbl.Mails.Lst[NumMai].NumUsrs); Gbl.Mails.Lst[NumMai].NumUsrs);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable (); fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrame ();
/***** Free list of mail domains *****/ /***** Free list of mail domains *****/
Mai_FreeListMailDomains (); Mai_FreeListMailDomains ();
@ -168,17 +168,14 @@ static void Mai_GetParamMaiOrderType (void)
} }
/*****************************************************************************/ /*****************************************************************************/
/******************** Put a mail (form) to edit mail domains *****************/ /************************ Put icon to edit mail domains **********************/
/*****************************************************************************/ /*****************************************************************************/
static void Mai_PutFormToEditMailDomains (void) static void Mai_PutIconToEditMailDomains (void)
{ {
extern const char *Txt_Edit; extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">"); Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",Txt_Edit,NULL);
Lay_PutContextualLink (ActEdiMai,NULL,"edit64x64.png",
Txt_Edit,Txt_Edit);
fprintf (Gbl.F.Out,"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/