From 2ceed502a2a00a9bc441b72a64d638ee00d339d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 28 Nov 2016 02:56:39 +0100 Subject: [PATCH] Version 16.73.6 --- swad_changelog.h | 3 ++- swad_help.c | 3 +++ swad_mail.c | 10 +++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b7bf2ce08..9c10b072e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -176,13 +176,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.73.5 (2016-11-28)" +#define Log_PLATFORM_VERSION "SWAD 16.73.6 (2016-11-28)" #define CSS_FILE "swad16.69.css" #define JS_FILE "swad16.46.1.js" // 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 16.73.6: Nov 28, 2016 Contextual help on email domains. (207764 lines) Version 16.73.5: Nov 28, 2016 Contextual help on types of degrees. (207757 lines) Version 16.73.4: Nov 28, 2016 Contextual help on old courses. (207749 lines) Version 16.73.3: Nov 27, 2016 Better contextual help on attendance. (207746 lines) diff --git a/swad_help.c b/swad_help.c index c6ca38fcf..8b37aa689 100644 --- a/swad_help.c +++ b/swad_help.c @@ -52,6 +52,9 @@ const char *Hlp_SYSTEM_Old = WIKI "SYSTEM.Old"; const char *Hlp_SYSTEM_Studies = WIKI "SYSTEM.Studies"; const char *Hlp_SYSTEM_Studies_edit = WIKI "SYSTEM.Studies#edit"; +const char *Hlp_SYSTEM_Domains = WIKI "SYSTEM.Domains"; +const char *Hlp_SYSTEM_Domains_edit = WIKI "SYSTEM.Domains#edit"; + /***** COUNTRY tab *****/ const char *Hlp_COUNTRY_Information = WIKI "COUNTRY.Information"; diff --git a/swad_mail.c b/swad_mail.c index e5ce9e30f..2dd71ebca 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -88,6 +88,7 @@ static void Mai_InsertMailKey (const char *Email,const char MailKey[Mai_LENGTH_E void Mai_SeeMailDomains (void) { + extern const char *Hlp_SYSTEM_Domains; extern const char *Txt_Email_domains_allowed_for_notifications; extern const char *Txt_EMAIL_DOMAIN_HELP_ORDER[3]; extern const char *Txt_EMAIL_DOMAIN_ORDER[3]; @@ -104,7 +105,7 @@ void Mai_SeeMailDomains (void) Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Mai_PutIconToEditMailDomains : NULL, - NULL,2); + Hlp_SYSTEM_Domains,2); fprintf (Gbl.F.Out,""); for (Order = Mai_ORDER_BY_DOMAIN; Order <= Mai_ORDER_BY_USERS; @@ -423,12 +424,13 @@ void Mai_FreeListMailDomains (void) static void Mai_ListMailDomainsForEdition (void) { + extern const char *Hlp_SYSTEM_Domains_edit; extern const char *Txt_Email_domains_allowed_for_notifications; unsigned NumMai; struct Mail *Mai; Lay_StartRoundFrameTable (NULL,Txt_Email_domains_allowed_for_notifications, - NULL,NULL,2); + NULL,Hlp_SYSTEM_Domains_edit,2); /***** Table head *****/ Mai_PutHeadMailDomains (); @@ -671,6 +673,7 @@ static bool Mai_CheckIfMailDomainNameExists (const char *FieldName,const char *N static void Mai_PutFormToCreateMailDomain (void) { + extern const char *Hlp_SYSTEM_Domains_edit; extern const char *Txt_New_email_domain; extern const char *Txt_EMAIL_DOMAIN_ORDER[3]; extern const char *Txt_Create_email_domain; @@ -682,7 +685,8 @@ static void Mai_PutFormToCreateMailDomain (void) Act_FormStart (ActNewMai); /***** Start of frame *****/ - Lay_StartRoundFrameTable (NULL,Txt_New_email_domain,NULL,NULL,2); + Lay_StartRoundFrameTable (NULL,Txt_New_email_domain, + NULL,Hlp_SYSTEM_Domains_edit,2); /***** Write heading *****/ fprintf (Gbl.F.Out,""