mirror of https://github.com/acanas/swad-core.git
Version 15.250.1
This commit is contained in:
parent
a70a508841
commit
6ee0ba9c1d
|
@ -135,13 +135,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.250 (2016-09-09)"
|
#define Log_PLATFORM_VERSION "SWAD 15.250.1 (2016-09-09)"
|
||||||
#define CSS_FILE "swad15.229.css"
|
#define CSS_FILE "swad15.229.css"
|
||||||
#define JS_FILE "swad15.238.1.js"
|
#define JS_FILE "swad15.238.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 15.250.1: Sep 09, 2016 Changes in layout of user's usage report. (204056 lines)
|
||||||
Version 15.250: Sep 09, 2016 New option to print user's usage report. (204053 lines)
|
Version 15.250: Sep 09, 2016 New option to print user's usage report. (204053 lines)
|
||||||
Version 15.249.5: Sep 08, 2016 Changes in layout of user's usage report. (204019 lines)
|
Version 15.249.5: Sep 08, 2016 Changes in layout of user's usage report. (204019 lines)
|
||||||
Version 15.249.4: Sep 08, 2016 List of courses in user's usage report. (203993 lines)
|
Version 15.249.4: Sep 08, 2016 List of courses in user's usage report. (203993 lines)
|
||||||
|
|
|
@ -1125,14 +1125,13 @@ void Cty_WriteCountryName (long CtyCod,const char *Class)
|
||||||
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
|
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
|
||||||
char CtyName[Cty_MAX_BYTES_COUNTRY_NAME+1];
|
char CtyName[Cty_MAX_BYTES_COUNTRY_NAME+1];
|
||||||
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
|
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
|
||||||
|
bool PutForm = !Gbl.Form.Inside && // Only if not inside another form
|
||||||
|
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_MAIN_WINDOW; // Only in main window
|
||||||
|
|
||||||
/***** Get country name *****/
|
/***** Get country name *****/
|
||||||
Cty_GetCountryName (CtyCod,CtyName);
|
Cty_GetCountryName (CtyCod,CtyName);
|
||||||
|
|
||||||
if (Gbl.Form.Inside) // If we are writing another form
|
if (PutForm)
|
||||||
/***** Write country name without link *****/
|
|
||||||
fprintf (Gbl.F.Out,"%s",CtyName);
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
/***** Write country name with link to country information *****/
|
/***** Write country name with link to country information *****/
|
||||||
Act_FormStart (ActSeeCtyInf);
|
Act_FormStart (ActSeeCtyInf);
|
||||||
|
@ -1142,6 +1141,9 @@ void Cty_WriteCountryName (long CtyCod,const char *Class)
|
||||||
fprintf (Gbl.F.Out,"%s</a>",CtyName);
|
fprintf (Gbl.F.Out,"%s</a>",CtyName);
|
||||||
Act_FormEnd ();
|
Act_FormEnd ();
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
/***** Write country name without link *****/
|
||||||
|
fprintf (Gbl.F.Out,"%s",CtyName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue