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.6

This commit is contained in:
Antonio Cañas Vargas 2016-04-22 20:00:26 +02:00
parent c3473d1215
commit 6e9ec55edd
2 changed files with 21 additions and 10 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.5 (2016-04-22)"
#define Log_PLATFORM_VERSION "SWAD 15.201.6 (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.6: Apr 22, 2016 Code refactoring in record card. (200842 lines)
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)

28
swad_record.c
View File

@ -92,6 +92,8 @@ static void Rec_ShowCommands (struct UsrData *UsrDat,
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_ShowWebsAndSocialNets (struct UsrData *UsrDat,
Rec_RecordViewType_t TypeOfView);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -2094,17 +2096,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** User's nickname *****/
Rec_ShowNickname (UsrDat,PutFormLinks);
/***** Country *****/
/***** User's country, web and social networks *****/
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;\">",
Rec_C3_TOP);
if (TypeOfView != Rec_RECORD_PRINT)
Net_ShowWebsAndSocialNets (UsrDat);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Rec_ShowWebsAndSocialNets (UsrDat,TypeOfView);
fprintf (Gbl.F.Out,"</tr>");
if (ShowIDRows ||
ShowAddressRows ||
@ -3223,6 +3219,20 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool ShowData)
fprintf (Gbl.F.Out,"</td>");
}
/*****************************************************************************/
/******************* Show user's webs and social networks ********************/
/*****************************************************************************/
static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat,
Rec_RecordViewType_t TypeOfView)
{
fprintf (Gbl.F.Out,"<td class=\"CENTER_TOP\" style=\"width:%upx;\">",
Rec_C3_TOP);
if (TypeOfView != Rec_RECORD_PRINT)
Net_ShowWebsAndSocialNets (UsrDat);
fprintf (Gbl.F.Out,"</td>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/