diff --git a/swad_changelog.h b/swad_changelog.h index 01a66c0d2..ab90747c4 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -134,13 +134,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.202.16 (2016-04-23)" +#define Log_PLATFORM_VERSION "SWAD 15.202.17 (2016-04-23)" #define CSS_FILE "swad15.202.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.202.17:Apr 23, 2016 Code refactoring in record card. (201081 lines) Version 15.202.16:Apr 23, 2016 Code refactoring in record card. (201070 lines) Version 15.202.15:Apr 23, 2016 Code refactoring in record card. (201059 lines) Version 15.202.14:Apr 23, 2016 Code refactoring in record card. (201048 lines) diff --git a/swad_record.c b/swad_record.c index 24d323096..0ceda9a63 100644 --- a/swad_record.c +++ b/swad_record.c @@ -142,6 +142,8 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat, bool ShowData,const char *ClassForm); static void Rec_ShowOffice (struct UsrData *UsrDat, bool ShowData,const char *ClassForm); +static void Rec_ShowOfficePhone (struct UsrData *UsrDat, + bool ShowData,const char *ClassForm); static void Rec_WriteLinkToDataProtectionClause (void); @@ -2004,7 +2006,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, struct UsrData *UsrDat) { extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_Phone; extern const char *Txt_Save_changes; extern const char *Txt_Register; extern const char *Txt_Confirm; @@ -2182,20 +2183,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, /***** Office *****/ Rec_ShowOffice (UsrDat,ShowData,ClassForm); - /* Phone */ - fprintf (Gbl.F.Out,"" - "" - "%s:" - "" - "", - ClassForm,Rec_C1_BOTTOM,Txt_Phone, - Rec_C2_BOTTOM); - if (ShowData) - fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone); - fprintf (Gbl.F.Out,"" - ""); + /***** Office phone *****/ + Rec_ShowOfficePhone (UsrDat,ShowData,ClassForm); } fprintf (Gbl.F.Out,""); @@ -3459,6 +3448,30 @@ static void Rec_ShowOffice (struct UsrData *UsrDat, ""); } +/*****************************************************************************/ +/*************************** Show user's office phone ******************************/ +/*****************************************************************************/ + +static void Rec_ShowOfficePhone (struct UsrData *UsrDat, + bool ShowData,const char *ClassForm) + { + extern const char *Txt_Phone; + + fprintf (Gbl.F.Out,"" + "" + "%s:" + "" + "", + ClassForm,Rec_C1_BOTTOM,Txt_Phone, + Rec_C2_BOTTOM); + if (ShowData) + fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone); + fprintf (Gbl.F.Out,"" + ""); + } + /*****************************************************************************/ /*********************** Write a link to netiquette rules ********************/ /*****************************************************************************/