diff --git a/css/swad15.198.css b/css/swad15.198.css index 53d508eee..f2e39f2ed 100644 --- a/css/swad15.198.css +++ b/css/swad15.198.css @@ -1693,8 +1693,8 @@ a:hover img.CENTRE_PHOTO_SHOW width:180px; margin:0 auto; } -.REC_DAT {color:#808080; font-size:11pt; line-height:110%;} -.REC_DAT_BOLD {color:black; font-size:11pt; line-height:110%;} +.REC_DAT {color:#808080; font-size:13pt; line-height:110%;} +.REC_DAT_BOLD {color:black; font-size:13pt; line-height:110%;} /*****************************************************************************/ .MSJ_AVISO {color:#632921; font-size:12pt;} diff --git a/swad_changelog.h b/swad_changelog.h index 169ba97e9..786d50c96 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -137,13 +137,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.201.6 (2016-04-22)" +#define Log_PLATFORM_VERSION "SWAD 15.201.7 (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.7: Apr 22, 2016 Code refactoring in record card. + Fixed bugs in record cards. (200862 lines) 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) diff --git a/swad_record.c b/swad_record.c index 94b3370af..1feffbb9b 100644 --- a/swad_record.c +++ b/swad_record.c @@ -94,6 +94,10 @@ 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_ShowEmail (struct UsrData *UsrDat, + Rec_RecordViewType_t TypeOfView, + bool DataForm, + const char *ClassForm); static void Rec_WriteLinkToDataProtectionClause (void); @@ -1958,7 +1962,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, extern const char *Usr_StringsSexDB[Usr_NUM_SEXS]; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_ID; - extern const char *Txt_Email; extern const char *Txt_Sex; extern const char *Txt_Role; extern const char *Txt_SEX_SINGULAR_Abc[Usr_NUM_SEXS]; @@ -1997,18 +2000,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, (TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR && Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM)); bool PutFormLinks; // Put links (forms) inside record card - bool ShowEmail = (ItsMe || - Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM || - DataForm || - TypeOfView == Rec_FORM_MY_COMMON_RECORD || - TypeOfView == Rec_MY_COMMON_RECORD_CHECK || - TypeOfView == Rec_FORM_MY_COURSE_RECORD_AS_STUDENT || - TypeOfView == Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT || - (UsrDat->Accepted && - (TypeOfView == Rec_CHECK_OTHER_USR_COMMON_RECORD || - ((TypeOfView == Rec_RECORD_LIST || - TypeOfView == Rec_RECORD_PRINT) && - (IAmLoggedAsTeacher || Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_TEACHERS))))); bool ShowID = (ItsMe || Gbl.Usrs.Me.LoggedRole >= Rol_DEG_ADM || DataForm || @@ -2135,30 +2126,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, if (ShowIDRows) { /***** User's e-mail *****/ - fprintf (Gbl.F.Out,"" - "" - "%s:" - "" - "", - ClassForm,Rec_C1_BOTTOM,Txt_Email, - Rec_C2_BOTTOM); - if (UsrDat->Email[0]) - { - if (ShowEmail) - { - fprintf (Gbl.F.Out,"Email); - Str_LimitLengthHTMLStr (UsrDat->Email,36); - fprintf (Gbl.F.Out," class=\"REC_DAT_BOLD\">%s", - UsrDat->Email); - } - else - fprintf (Gbl.F.Out,"********"); - } - fprintf (Gbl.F.Out,"" - ""); + Rec_ShowEmail (UsrDat,TypeOfView,DataForm,ClassForm); /***** User's ID *****/ fprintf (Gbl.F.Out,"" @@ -3233,6 +3201,59 @@ static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat, fprintf (Gbl.F.Out,""); } +/*****************************************************************************/ +/***************************** Show user's e-mail ****************************/ +/*****************************************************************************/ + +static void Rec_ShowEmail (struct UsrData *UsrDat, + Rec_RecordViewType_t TypeOfView, + bool DataForm, + const char *ClassForm) + { + extern const char *Txt_Email; + bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod); + bool ShowEmail = (ItsMe || + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM || + DataForm || + TypeOfView == Rec_FORM_MY_COMMON_RECORD || + TypeOfView == Rec_MY_COMMON_RECORD_CHECK || + TypeOfView == Rec_FORM_MY_COURSE_RECORD_AS_STUDENT || + TypeOfView == Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT || + (UsrDat->Accepted && + (TypeOfView == Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR || + TypeOfView == Rec_CHECK_OTHER_USR_COMMON_RECORD || + ((TypeOfView == Rec_RECORD_LIST || + TypeOfView == Rec_RECORD_PRINT) && + (Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER || + (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT && + Gbl.Usrs.Listing.RecsUsrs == Rec_RECORD_USERS_TEACHERS)))))); + + fprintf (Gbl.F.Out,"" + "" + "%s:" + "" + "", + ClassForm,Rec_C1_BOTTOM,Txt_Email, + Rec_C2_BOTTOM); + if (UsrDat->Email[0]) + { + if (ShowEmail) + { + fprintf (Gbl.F.Out,"Email); + Str_LimitLengthHTMLStr (UsrDat->Email,36); + fprintf (Gbl.F.Out," class=\"REC_DAT_BOLD\">%s", + UsrDat->Email); + } + else + fprintf (Gbl.F.Out,"********"); + } + fprintf (Gbl.F.Out,"" + ""); + } + /*****************************************************************************/ /*********************** Write a link to netiquette rules ********************/ /*****************************************************************************/