Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.54.18

This commit is contained in:
Antonio Cañas Vargas 2016-11-13 16:19:18 +01:00
parent f6228aef90
commit 367dca3914
8 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
css/swad16.51.css
View File

@ -1398,10 +1398,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
/********** Title of country,institution,centre,degree,course ************/ /********** Title of country,institution,centre,degree,course ************/
.TITLE_LOCATION .TITLE_LOCATION
{ {
font-size:25pt;
font-weight:bold;
color:#808080; color:#808080;
text-align:center; font-size:20pt;
font-weight:bold;
} }
/******************************* Map of country ******************************/ /******************************* Map of country ******************************/

2
swad_centre.c
View File

@ -299,7 +299,7 @@ static void Ctr_Configuration (bool PrintView)
NULL); NULL);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",

4
swad_changelog.h
View File

@ -156,13 +156,15 @@
/****************************** Public constants *****************************/ /****************************** 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 CSS_FILE "swad16.51.css"
#define JS_FILE "swad16.46.1.js" #define JS_FILE "swad16.46.1.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 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.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.16: Nov 13, 2016 Contextual help on courses. (206829 lines)
Version 16.54.15: Nov 13, 2016 Contextual help on degrees. (206823 lines) Version 16.54.15: Nov 13, 2016 Contextual help on degrees. (206823 lines)

19
swad_country.c
View File

@ -208,6 +208,7 @@ void Cty_PrintConfiguration (void)
static void Cty_Configuration (bool PrintView) static void Cty_Configuration (bool PrintView)
{ {
extern const char *Hlp_COUNTRY_Information;
extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Country; extern const char *Txt_Country;
extern const char *Txt_Shortcut; extern const char *Txt_Shortcut;
@ -226,12 +227,14 @@ static void Cty_Configuration (bool PrintView)
if (Gbl.CurrentCty.Cty.CtyCod > 0) if (Gbl.CurrentCty.Cty.CtyCod > 0)
{ {
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : Lay_StartRoundFrame (NULL,NULL,
Cty_PutIconToPrint, PrintView ? NULL :
NULL); Cty_PutIconToPrint,
PrintView ? NULL :
Hlp_COUNTRY_Information);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",
@ -1230,10 +1233,11 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD
switch (GetExtraData) switch (GetExtraData)
{ {
case Cty_GET_BASIC_DATA: case Cty_GET_BASIC_DATA:
sprintf (Query,"SELECT Alpha2,Name_%s" sprintf (Query,"SELECT Alpha2,Name_%s,WWW_%s"
" FROM countries" " FROM countries"
" WHERE CtyCod='%03ld'", " WHERE CtyCod='%03ld'",
Txt_STR_LANG_ID[Gbl.Prefs.Language], Txt_STR_LANG_ID[Gbl.Prefs.Language],
Txt_STR_LANG_ID[Gbl.Prefs.Language],
Cty->CtyCod); Cty->CtyCod);
break; break;
case Cty_GET_EXTRA_DATA: case Cty_GET_EXTRA_DATA:
@ -1287,11 +1291,12 @@ bool Cty_GetDataOfCountryByCod (struct Country *Cty,Cty_GetExtraData_t GetExtraD
switch (GetExtraData) switch (GetExtraData)
{ {
case Cty_GET_BASIC_DATA: 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->Name[Gbl.Prefs.Language],row[1]);
strcpy (Cty->WWW [Gbl.Prefs.Language],row[2]);
break; break;
case Cty_GET_EXTRA_DATA: 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; for (Lan = (Txt_Language_t) 1;
Lan <= Txt_NUM_LANGUAGES; Lan <= Txt_NUM_LANGUAGES;
Lan++) Lan++)

2
swad_course.c
View File

@ -193,7 +193,7 @@ static void Crs_Configuration (bool PrintView)
NULL); NULL);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",

2
swad_degree.c
View File

@ -313,7 +313,7 @@ static void Deg_Configuration (bool PrintView)
NULL); NULL);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",

1
swad_help.c
View File

@ -45,6 +45,7 @@ const char *Hlp_SYSTEM_Countries = WIKI "SYSTEM.Countries";
/***** COUNTRY tab *****/ /***** COUNTRY tab *****/
const char *Hlp_COUNTRY_Information = WIKI "COUNTRY.Information";
const char *Hlp_COUNTRY_Institutions = WIKI "COUNTRY.Institutions"; const char *Hlp_COUNTRY_Institutions = WIKI "COUNTRY.Institutions";
/***** INSTITUTION tab *****/ /***** INSTITUTION tab *****/

2
swad_institution.c
View File

@ -297,7 +297,7 @@ static void Ins_Configuration (bool PrintView)
NULL); NULL);
/***** Title *****/ /***** Title *****/
fprintf (Gbl.F.Out,"<div class=\"TITLE_LOCATION\">"); fprintf (Gbl.F.Out,"<div class=\"FRAME_TABLE_TITLE CENTER_MIDDLE\">");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",