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 15.201.5

This commit is contained in:
Antonio Cañas Vargas 2016-04-22 19:55:41 +02:00
parent 88aa61a15d
commit c3473d1215
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -137,13 +137,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.201.4 (2016-04-22)"
#define Log_PLATFORM_VERSION "SWAD 15.201.5 (2016-04-22)"
#define CSS_FILE "swad15.198.css"
#define JS_FILE "swad15.197.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 15.201.5: Apr 22, 2016 Code refactoring in record card. (200832 lines)
Version 15.201.4: Apr 22, 2016 Code refactoring in record card. (200822 lines)
Version 15.201.3: Apr 22, 2016 Code refactoring in record card. (200812 lines)
Version 15.201.2: Apr 22, 2016 Code refactoring in record card. (200806 lines)

27
swad_record.c
View File

@ -91,6 +91,7 @@ static void Rec_ShowCommands (struct UsrData *UsrDat,
bool PutFormLinks);
static void Rec_ShowFullName (struct UsrData *UsrDat);
static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks);
static void Rec_ShowCountry (struct UsrData *UsrDat,bool ShowData);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -2094,13 +2095,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Rec_ShowNickname (UsrDat,PutFormLinks);
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"REC_DAT_BOLD LEFT_TOP\" style=\"width:%upx;\">",
Rec_C2_TOP);
if (ShowData && UsrDat->CtyCod > 0)
/* Link to see country information */
Cty_WriteCountryName (UsrDat->CtyCod,"REC_DAT_BOLD");
fprintf (Gbl.F.Out,"</td>");
fprintf (Gbl.F.Out,"<tr>");
Rec_ShowCountry (UsrDat,ShowData);
/***** User's web and social networks *****/
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:%upx;\">",
@ -3176,7 +3172,7 @@ static void Rec_ShowFullName (struct UsrData *UsrDat)
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*************************** Show user's nickname ****************************/
/*****************************************************************************/
static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
@ -3212,6 +3208,21 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
"</tr>");
}
/*****************************************************************************/
/**************************** Show user's country ****************************/
/*****************************************************************************/
static void Rec_ShowCountry (struct UsrData *UsrDat,bool ShowData)
{
fprintf (Gbl.F.Out,"<td class=\"REC_DAT_BOLD LEFT_TOP\""
" style=\"width:%upx;\">",
Rec_C2_TOP);
if (ShowData && UsrDat->CtyCod > 0)
/* Link to see country information */
Cty_WriteCountryName (UsrDat->CtyCod,"REC_DAT_BOLD");
fprintf (Gbl.F.Out,"</td>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/