From 6e9ec55edd37129c46896fc637a4700071c27f26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 22 Apr 2016 20:00:26 +0200 Subject: [PATCH] Version 15.201.6 --- swad_changelog.h | 3 ++- swad_record.c | 28 +++++++++++++++++++--------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b7ae3c95e..169ba97e9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_record.c b/swad_record.c index df74a1f74..94b3370af 100644 --- a/swad_record.c +++ b/swad_record.c @@ -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,""); Rec_ShowCountry (UsrDat,ShowData); - - /***** User's web and social networks *****/ - fprintf (Gbl.F.Out,"", - Rec_C3_TOP); - if (TypeOfView != Rec_RECORD_PRINT) - Net_ShowWebsAndSocialNets (UsrDat); - fprintf (Gbl.F.Out,"" - ""); + Rec_ShowWebsAndSocialNets (UsrDat,TypeOfView); + fprintf (Gbl.F.Out,""); if (ShowIDRows || ShowAddressRows || @@ -3223,6 +3219,20 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool ShowData) fprintf (Gbl.F.Out,""); } +/*****************************************************************************/ +/******************* Show user's webs and social networks ********************/ +/*****************************************************************************/ + +static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat, + Rec_RecordViewType_t TypeOfView) + { + fprintf (Gbl.F.Out,"", + Rec_C3_TOP); + if (TypeOfView != Rec_RECORD_PRINT) + Net_ShowWebsAndSocialNets (UsrDat); + fprintf (Gbl.F.Out,""); + } + /*****************************************************************************/ /*********************** Write a link to netiquette rules ********************/ /*****************************************************************************/