diff --git a/swad_changelog.h b/swad_changelog.h index 0ce8009b5..9eb8db43d 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.96.1 (2015/03/18)" +#define Log_PLATFORM_VERSION "SWAD 14.96.2 (2015/03/18)" // 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 14.96.2: Mar 18, 2015 Changes in record cards. (183011 lines) Version 14.96.1: Mar 18, 2015 Changes in user's profile. (183015 lines) Version 14.96: Mar 18, 2015 New layout in record cards. (183011 lines) Version 14.95.1: Mar 18, 2015 Show user's profile after followin or unfollowing. (182985 lines) diff --git a/swad_record.c b/swad_record.c index 67e7a31d9..b7ea6fd0e 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2039,7 +2039,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, extern const char *Txt_Surname_1; extern const char *Txt_Surname_2; extern const char *Txt_First_name; - extern const char *Txt_Country; + // extern const char *Txt_Country; extern const char *Txt_Another_country; extern const char *Txt_Place_of_origin; extern const char *Txt_Date_of_birth; @@ -2208,10 +2208,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ""); /***** Commands *****/ - CommandsRowspan = 2; // Name + Webs/social networks + CommandsRowspan = 4; // Name + Webs/social networks + Layout row + Country if (ShowIDRows) CommandsRowspan += 6; // Email, ID, Role, Surname1, Surname2, Firstname - CommandsRowspan += 1; // Country if (ShowAddressRows) CommandsRowspan += 7; // Origin place, Date of birth, Local address, Local phone // Family address, Family phone, Common comments for all the courses @@ -2423,13 +2422,62 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, "" ""); - /***** User's web and social networks *****/ + /***** Layout row *****/ fprintf (Gbl.F.Out,"" - "" - "" - "" + "" + "" + "" + "", + C2_WIDTH,C3_WIDTH,C4_WIDTH); + + /***** Country *****/ + fprintf (Gbl.F.Out,"" + "", + ClassData,C2_WIDTH + C3_WIDTH); + if (ShowData) + { + if (DataForm) + { + /* If list of countries is empty, try to get it */ + if (!Gbl.Ctys.Num) + { + Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY; + Cty_GetListCountries (Cty_GET_ONLY_COUNTRIES); + } + + fprintf (Gbl.F.Out,""); + } + else if (UsrDat->CtyCod > 0) + { + Cty_GetCountryName (UsrDat->CtyCod,CtyName); + fprintf (Gbl.F.Out,"%s",CtyName); + } + } + fprintf (Gbl.F.Out,""); + + /***** User's web and social networks *****/ + fprintf (Gbl.F.Out,"" "
", - C2_WIDTH,C3_WIDTH,C4_WIDTH); + C4_WIDTH); Net_ShowWebsAndSocialNets (UsrDat); fprintf (Gbl.F.Out,"
" "" @@ -2640,7 +2688,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, UsrDat->Surname1); else if (UsrDat->Surname1[0]) @@ -2662,7 +2710,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, UsrDat->Surname2); else if (UsrDat->Surname2[0]) @@ -2686,7 +2734,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, UsrDat->FirstName); else if (UsrDat->FirstName[0]) @@ -2695,58 +2743,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, ""); } - /* Country */ - fprintf (Gbl.F.Out,"" - "" - "%s", - ClassForm,C2_WIDTH,Txt_Country); - if (TypeOfView == Rec_FORM_MY_COMMON_RECORD) - fprintf (Gbl.F.Out,"*"); - fprintf (Gbl.F.Out,":" - "", - ClassData,C3_WIDTH + C4_WIDTH); - if (ShowData) - { - if (DataForm) - { - /* If list of countries is empty, try to get it */ - if (!Gbl.Ctys.Num) - { - Gbl.Ctys.SelectedOrderType = Cty_ORDER_BY_COUNTRY; - Cty_GetListCountries (Cty_GET_ONLY_COUNTRIES); - } - - fprintf (Gbl.F.Out,""); - } - else if (UsrDat->CtyCod > 0) - { - Cty_GetCountryName (UsrDat->CtyCod,CtyName); - fprintf (Gbl.F.Out,"%s",CtyName); - } - } - fprintf (Gbl.F.Out,"" - ""); - if (ShowAddressRows) { /* Origin place */ @@ -2764,7 +2760,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Cns_MAX_LENGTH_STRING, UsrDat->OriginPlace); else if (UsrDat->OriginPlace[0]) @@ -2812,7 +2808,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Cns_MAX_LENGTH_STRING, UsrDat->LocalAddress); else if (UsrDat->LocalAddress[0]) @@ -2836,7 +2832,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Usr_MAX_LENGTH_PHONE, UsrDat->LocalPhone); else if (UsrDat->LocalPhone[0]) @@ -2860,7 +2856,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Cns_MAX_LENGTH_STRING, UsrDat->FamilyAddress); else if (UsrDat->FamilyAddress[0]) @@ -2884,7 +2880,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, Usr_MAX_LENGTH_PHONE, UsrDat->FamilyPhone); else if (UsrDat->FamilyPhone[0]) @@ -2908,7 +2904,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (DataForm) fprintf (Gbl.F.Out,"", - C3_WIDTH + C4_WIDTH - 40, + C3_WIDTH + C4_WIDTH - 60, UsrDat->Comments); else if (UsrDat->Comments[0]) {