From 367dca39143e6de9cfeb23f0291391da06c39505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 13 Nov 2016 16:19:18 +0100 Subject: [PATCH] Version 16.54.18 --- css/swad16.51.css | 5 ++--- swad_centre.c | 2 +- swad_changelog.h | 4 +++- swad_country.c | 19 ++++++++++++------- swad_course.c | 2 +- swad_degree.c | 2 +- swad_help.c | 1 + swad_institution.c | 2 +- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/css/swad16.51.css b/css/swad16.51.css index 62b0d8c5d..2ba4cccca 100644 --- a/css/swad16.51.css +++ b/css/swad16.51.css @@ -1398,10 +1398,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} /********** Title of country,institution,centre,degree,course ************/ .TITLE_LOCATION { - font-size:25pt; - font-weight:bold; color:#808080; - text-align:center; + font-size:20pt; + font-weight:bold; } /******************************* Map of country ******************************/ diff --git a/swad_centre.c b/swad_centre.c index 193f2c207..4d67f971f 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -299,7 +299,7 @@ static void Ctr_Configuration (bool PrintView) NULL); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", diff --git a/swad_changelog.h b/swad_changelog.h index 91243d13e..be51eedb1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.54.17 (2016-11-13)" +#define Log_PLATFORM_VERSION "SWAD 16.54.18 (2016-11-13)" #define CSS_FILE "swad16.51.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.54.18: Nov 13, 2016 Contextual help on country information. + Fixed bug in country information. (206811 lines) Version 16.54.17: Nov 13, 2016 Code refactoring in contextual help links. (206804 lines) Version 16.54.16: Nov 13, 2016 Contextual help on courses. (206829 lines) Version 16.54.15: Nov 13, 2016 Contextual help on degrees. (206823 lines) diff --git a/swad_country.c b/swad_country.c index 2b8414d6e..c2560ed48 100644 --- a/swad_country.c +++ b/swad_country.c @@ -208,6 +208,7 @@ void Cty_PrintConfiguration (void) static void Cty_Configuration (bool PrintView) { + extern const char *Hlp_COUNTRY_Information; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Country; extern const char *Txt_Shortcut; @@ -226,12 +227,14 @@ static void Cty_Configuration (bool PrintView) if (Gbl.CurrentCty.Cty.CtyCod > 0) { /***** Start frame *****/ - Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : - Cty_PutIconToPrint, - NULL); + Lay_StartRoundFrame (NULL,NULL, + PrintView ? NULL : + Cty_PutIconToPrint, + PrintView ? NULL : + Hlp_COUNTRY_Information); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", @@ -1230,10 +1233,11 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD switch (GetExtraData) { case Cty_GET_BASIC_DATA: - sprintf (Query,"SELECT Alpha2,Name_%s" + sprintf (Query,"SELECT Alpha2,Name_%s,WWW_%s" " FROM countries" " WHERE CtyCod='%03ld'", Txt_STR_LANG_ID[Gbl.Prefs.Language], + Txt_STR_LANG_ID[Gbl.Prefs.Language], Cty->CtyCod); break; case Cty_GET_EXTRA_DATA: @@ -1287,11 +1291,12 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD switch (GetExtraData) { case Cty_GET_BASIC_DATA: - /* Get the name of the country in current language */ + /* Get name and WWW of the country in current language */ strcpy (Cty->Name[Gbl.Prefs.Language],row[1]); + strcpy (Cty->WWW [Gbl.Prefs.Language],row[2]); break; case Cty_GET_EXTRA_DATA: - /* Get the name of the country in several languages */ + /* Get name and WWW of the country in several languages */ for (Lan = (Txt_Language_t) 1; Lan <= Txt_NUM_LANGUAGES; Lan++) diff --git a/swad_course.c b/swad_course.c index 5cbef0782..645164831 100644 --- a/swad_course.c +++ b/swad_course.c @@ -193,7 +193,7 @@ static void Crs_Configuration (bool PrintView) NULL); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", diff --git a/swad_degree.c b/swad_degree.c index 0ae335bba..dd49437f1 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -313,7 +313,7 @@ static void Deg_Configuration (bool PrintView) NULL); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"", diff --git a/swad_help.c b/swad_help.c index 54209570f..0fb033aa7 100644 --- a/swad_help.c +++ b/swad_help.c @@ -45,6 +45,7 @@ const char *Hlp_SYSTEM_Countries = WIKI "SYSTEM.Countries"; /***** COUNTRY tab *****/ +const char *Hlp_COUNTRY_Information = WIKI "COUNTRY.Information"; const char *Hlp_COUNTRY_Institutions = WIKI "COUNTRY.Institutions"; /***** INSTITUTION tab *****/ diff --git a/swad_institution.c b/swad_institution.c index 07dbeec37..33381be5e 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -297,7 +297,7 @@ static void Ins_Configuration (bool PrintView) NULL); /***** Title *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); if (PutLink) fprintf (Gbl.F.Out,"",