diff --git a/css/swad21.65.css b/css/swad21.65.1.css similarity index 98% rename from css/swad21.65.css rename to css/swad21.65.1.css index 8bf2e358..37d76659 100644 --- a/css/swad21.65.css +++ b/css/swad21.65.1.css @@ -2120,15 +2120,15 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} } /******************************* User's photo ********************************/ -.PHOTOC12x16 {width: 12px; height: 16px; clip-path: circle(50% at center); vertical-align:middle; margin-top:-2px;} -.PHOTOC15x20 {width: 15px; height: 20px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC15x20B {width: 15px; height: 20px; clip-path: circle(50% at center); vertical-align:middle; display:block; margin:0 auto;} -.PHOTOC18x24 {width: 18px; height: 24px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC21x28 {width: 21px; height: 28px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC30x40 {width: 30px; height: 40px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC45x60 {width: 45px; height: 60px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC60x80 {width: 60px; height: 80px; clip-path: circle(50% at center); vertical-align:middle;} -.PHOTOC186x248 {width:186px; height:248px; clip-path: circle(50% at center); vertical-align:middle;} +.PHOTOC12x16 {width: 12px; height: 16px; clip-path: circle(40% at center); vertical-align:middle; margin-top:-2px;} +.PHOTOC15x20 {width: 15px; height: 20px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC15x20B {width: 15px; height: 20px; clip-path: circle(40% at center); vertical-align:middle; display:block; margin:0 auto;} +.PHOTOC18x24 {width: 18px; height: 24px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC21x28 {width: 21px; height: 28px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC30x40 {width: 30px; height: 40px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC45x60 {width: 45px; height: 60px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC60x80 {width: 60px; height: 80px; clip-path: circle(40% at center); vertical-align:middle;} +.PHOTOC186x248 {width:186px; height:248px; clip-path: circle(40% at center); margin-top:-24px;} .PHOTOE12x16 {width: 12px; height: 16px; clip-path: ellipse(50% 50% at center); vertical-align:middle; margin-top:-2px;} .PHOTOE15x20 {width: 15px; height: 20px; clip-path: ellipse(50% 50% at center); vertical-align:middle;} @@ -2138,7 +2138,17 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .PHOTOE30x40 {width: 30px; height: 40px; clip-path: ellipse(50% 50% at center); vertical-align:middle;} .PHOTOE45x60 {width: 45px; height: 60px; clip-path: ellipse(50% 50% at center); vertical-align:middle;} .PHOTOE60x80 {width: 60px; height: 80px; clip-path: ellipse(50% 50% at center); vertical-align:middle;} -.PHOTOE186x248 {width:186px; height:248px; clip-path: ellipse(50% 50% at center); vertical-align:middle;} +.PHOTOE186x248 {width:186px; height:248px; clip-path: ellipse(50% 50% at center);} + +.PHOTOO12x16 {width: 12px; height: 16px; border-radius: 6px; vertical-align:middle; margin-top:-2px;} +.PHOTOO15x20 {width: 15px; height: 20px; border-radius: 8px; vertical-align:middle;} +.PHOTOO15x20B {width: 15px; height: 20px; border-radius: 8px; vertical-align:middle; display:block; margin:0 auto;} +.PHOTOO18x24 {width: 18px; height: 24px; border-radius: 9px; vertical-align:middle;} +.PHOTOO21x28 {width: 21px; height: 28px; border-radius:11px; vertical-align:middle;} +.PHOTOO30x40 {width: 30px; height: 40px; border-radius:15px; vertical-align:middle;} +.PHOTOO45x60 {width: 45px; height: 60px; border-radius:23px; vertical-align:middle;} +.PHOTOO60x80 {width: 60px; height: 80px; border-radius:30px; vertical-align:middle;} +.PHOTOO186x248 {width:186px; height:248px; border-radius:92px;} .PHOTOR12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} .PHOTOR15x20 {width: 15px; height: 20px; border-radius:1px; vertical-align:middle;} @@ -2148,7 +2158,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .PHOTOR30x40 {width: 30px; height: 40px; border-radius:2px; vertical-align:middle;} .PHOTOR45x60 {width: 45px; height: 60px; border-radius:3px; vertical-align:middle;} .PHOTOR60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;} -.PHOTOR186x248 {width:186px; height:248px; border-radius:4px; vertical-align:middle;} +.PHOTOR186x248 {width:186px; height:248px; border-radius:4px;} .IMG_USR { diff --git a/swad_attendance.c b/swad_attendance.c index bda3d447..ea9dc6d6 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1684,6 +1684,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; bool Present; @@ -2918,6 +2919,7 @@ static void Att_WriteRowUsrSeveralAttEvents (const struct Att_Events *Events, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; unsigned NumAttEvent; @@ -3078,6 +3080,7 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; unsigned NumAttEvent; diff --git a/swad_autolink.c b/swad_autolink.c index 464c72aa..8a7bbca9 100644 --- a/swad_autolink.c +++ b/swad_autolink.c @@ -465,6 +465,7 @@ static ALn_LinkType_t ALn_CheckNickname (char **PtrSrc,char PrevCh, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC12x16", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE12x16", + [Set_USR_PHOTO_OVAL ] = "PHOTOO12x16", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR12x16", }; char Ch; diff --git a/swad_browser.c b/swad_browser.c index 3809702c..91eb4476 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -3233,6 +3233,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC60x80", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE60x80", + [Set_USR_PHOTO_OVAL ] = "PHOTOO60x80", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR60x80", }; @@ -5456,6 +5457,7 @@ static void Brw_WriteFileOrFolderPublisher (unsigned Level,long UsrCod) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20B", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20B", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20B", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20B", }; bool ShowUsr = false; @@ -7847,6 +7849,7 @@ void Brw_ShowFileMetadata (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20", }; struct FileMetadata FileMetadata; diff --git a/swad_changelog.h b/swad_changelog.h index 41bb032e..f223f5fe 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,13 +602,18 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.65 (2021-12-01)" -#define CSS_FILE "swad21.65.css" +#define Log_PLATFORM_VERSION "SWAD 21.65.1 (2021-12-01)" +#define CSS_FILE "swad21.65.1.css" #define JS_FILE "swad21.59.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 21.65.1: Dec 01, 2021 New shape of user photos. (320833 lines) + 2 changes necessary in database: +UPDATE set_ip_settings SET UsrPhotos=3 WHERE UsrPhotos=2; +UPDATE usr_data SET UsrPhotos=3 WHERE UsrPhotos=2; + Version 21.65: Dec 01, 2021 Selection of shape of user photos. (320755 lines) 4 changes necessary in database: ALTER TABLE set_ip_settings ADD COLUMN UsrPhotos TINYINT NOT NULL DEFAULT 0 AFTER SideCols; diff --git a/swad_connected.c b/swad_connected.c index 60547035..e0ddcc00 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -560,6 +560,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; const char *ClassTxt; @@ -661,6 +662,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; MYSQL_RES *mysql_res; diff --git a/swad_enrolment.c b/swad_enrolment.c index b5e95cc0..ae5ab051 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2078,6 +2078,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; MYSQL_RES *mysql_res; diff --git a/swad_exam_result.c b/swad_exam_result.c index 287a26ab..e76cb24b 100644 --- a/swad_exam_result.c +++ b/swad_exam_result.c @@ -1487,6 +1487,7 @@ void ExaRes_ShowExamResultUser (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; diff --git a/swad_figure.c b/swad_figure.c index 8f07dc12..184a1ec6 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -3986,6 +3986,7 @@ static void Fig_GetAndShowNumUsrsPerUserPhotos (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20B", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20B", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20B", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20B", }; Set_UsrPhotos_t UsrPhotos; @@ -3994,7 +3995,7 @@ static void Fig_GetAndShowNumUsrsPerUserPhotos (void) unsigned NumUsrsTotal = 0; /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_SIDE_COLUMNS], + Box_BoxTableBegin (NULL,Txt_FIGURE_TYPES[Fig_USER_PHOTOS], NULL,NULL, Hlp_ANALYTICS_Figures_columns,Box_NOT_CLOSABLE,2); diff --git a/swad_follow.c b/swad_follow.c index 4062085c..22065cd9 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -616,6 +616,7 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC60x80", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE60x80", + [Set_USR_PHOTO_OVAL ] = "PHOTOO60x80", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR60x80", }; bool Visible = Pri_ShowingIsAllowed (UsrDat->BaPrfVisibility,UsrDat); @@ -674,6 +675,7 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; bool Visible = Pri_ShowingIsAllowed (UsrDat->BaPrfVisibility,UsrDat); diff --git a/swad_forum.c b/swad_forum.c index afd0c748..0b0cb0ee 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2138,6 +2138,7 @@ static void For_ListForumThrs (struct For_Forums *Forums, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20", }; unsigned NumThr; diff --git a/swad_match_result.c b/swad_match_result.c index 9a65fbe5..4e454e56 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -1045,6 +1045,7 @@ void MchRes_ShowOneMchResult (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; struct Gam_Games Games; diff --git a/swad_message.c b/swad_message.c index fd29362f..341d69f7 100644 --- a/swad_message.c +++ b/swad_message.c @@ -483,6 +483,7 @@ static void Msg_ShowOneUniqueRecipient (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; @@ -2294,6 +2295,7 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat,bool Enabled,const char *BgColor { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC30x40", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE30x40", + [Set_USR_PHOTO_OVAL ] = "PHOTOO30x40", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR30x40", }; bool WriteAuthor; @@ -2461,6 +2463,7 @@ static void Msg_WriteMsgFrom (struct Msg_Messages *Messages, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; @@ -2536,6 +2539,7 @@ static void Msg_WriteMsgTo (struct Msg_Messages *Messages,long MsgCod) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; MYSQL_RES *mysql_res; @@ -2879,6 +2883,7 @@ void Msg_ListBannedUsrs (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; MYSQL_RES *mysql_res; diff --git a/swad_photo.c b/swad_photo.c index 2e5b26d1..a2dc46ad 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -423,8 +423,9 @@ void Pho_ReqRemoveMyPhoto (void) extern const char *Txt_The_photo_no_longer_exists; static const char *ClassPhoto[Set_NUM_USR_PHOTOS] = { - [Set_USR_PHOTO_CIRCLE ] = "PHOTOC186x248", - [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE186x248", + [Set_USR_PHOTO_CIRCLE ] = "PHOTOR186x248", + [Set_USR_PHOTO_ELLIPSE ] = "PHOTOR186x248", + [Set_USR_PHOTO_OVAL ] = "PHOTOR186x248", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR186x248", }; @@ -501,6 +502,7 @@ void Pho_ReqRemoveUsrPhoto (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC186x248", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE186x248", + [Set_USR_PHOTO_OVAL ] = "PHOTOO186x248", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR186x248", }; char PhotoURL[PATH_MAX + 1]; diff --git a/swad_profile.c b/swad_profile.c index ceb22d38..470c152b 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -1303,6 +1303,7 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank,bool ItsM { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC30x40", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE30x40", + [Set_USR_PHOTO_OVAL ] = "PHOTOO30x48", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR30x40", }; bool Visible = Pri_ShowingIsAllowed (UsrDat->BaPrfVisibility,UsrDat); diff --git a/swad_project.c b/swad_project.c index 95ab4a19..18ee6dbf 100644 --- a/swad_project.c +++ b/swad_project.c @@ -2032,6 +2032,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; MYSQL_RES *mysql_res; diff --git a/swad_record.c b/swad_record.c index d18908f8..1ec86d81 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2601,8 +2601,9 @@ static void Rec_ShowPhoto (struct UsrData *UsrDat) { static const char *ClassPhoto[Set_NUM_USR_PHOTOS] = { - [Set_USR_PHOTO_CIRCLE ] = "PHOTOC186x248", - [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE186x248", + [Set_USR_PHOTO_CIRCLE ] = "PHOTOR186x248", + [Set_USR_PHOTO_ELLIPSE ] = "PHOTOR186x248", + [Set_USR_PHOTO_OVAL ] = "PHOTOR186x248", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR186x248", }; diff --git a/swad_setting.c b/swad_setting.c index df0ee95f..6e4f7ab7 100644 --- a/swad_setting.c +++ b/swad_setting.c @@ -301,6 +301,7 @@ static void Set_PutIconsToSelectUsrPhotos (void) { [Set_USR_PHOTO_CIRCLE ] = "ICO_HIGHLIGHT PHOTOC15x20B", [Set_USR_PHOTO_ELLIPSE ] = "ICO_HIGHLIGHT PHOTOE15x20B", + [Set_USR_PHOTO_OVAL ] = "ICO_HIGHLIGHT PHOTOO15x20B", [Set_USR_PHOTO_RECTANGLE] = "ICO_HIGHLIGHT PHOTOR15x20B", }; Set_UsrPhotos_t UsrPhotos; diff --git a/swad_setting.h b/swad_setting.h index 9403308f..5320f8d2 100644 --- a/swad_setting.h +++ b/swad_setting.h @@ -34,12 +34,13 @@ /*****************************************************************************/ // Related with user photo shape -#define Set_NUM_USR_PHOTOS 3 +#define Set_NUM_USR_PHOTOS 4 typedef enum { Set_USR_PHOTO_CIRCLE = 0, Set_USR_PHOTO_ELLIPSE = 1, - Set_USR_PHOTO_RECTANGLE = 2, + Set_USR_PHOTO_OVAL = 2, + Set_USR_PHOTO_RECTANGLE = 3, } Set_UsrPhotos_t; #define Set_USR_PHOTOS_DEFAULT Set_USR_PHOTO_CIRCLE diff --git a/swad_statistic.c b/swad_statistic.c index 268a8e28..90d92bc3 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1310,6 +1310,7 @@ static void Sta_ShowNumHitsPerUsr (Sta_CountType_t CountType, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20", }; MYSQL_ROW row; diff --git a/swad_string.c b/swad_string.c index 1bb72285..66986875 100644 --- a/swad_string.c +++ b/swad_string.c @@ -30,6 +30,7 @@ #include // For setlocale #include // For log10, floor, ceil, modf, sqrt... #include // For asprintf +#include // For free #include // For string functions #include "swad_error.h" diff --git a/swad_test_print.c b/swad_test_print.c index 340940d2..83e7bab1 100644 --- a/swad_test_print.c +++ b/swad_test_print.c @@ -2160,6 +2160,7 @@ void TstPrn_ShowOnePrint (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; struct TstPrn_Print Print; diff --git a/swad_text.c b/swad_text.c index 65e4373f..0dc916c4 100644 --- a/swad_text.c +++ b/swad_text.c @@ -55632,7 +55632,7 @@ const char *Txt_USER_PHOTOS[Set_NUM_USR_PHOTOS] = #elif L==5 // fr "Ellipse" #elif L==6 // gn - "Elipse" // Okoteve traducción + "Elipse" // Okoteve traducción #elif L==7 // it "Ellisse" #elif L==8 // pl @@ -55641,6 +55641,26 @@ const char *Txt_USER_PHOTOS[Set_NUM_USR_PHOTOS] = "Elipse" #endif , +#if L==1 // ca + "Oval" +#elif L==2 // de + "Oval" +#elif L==3 // en + "Oval" +#elif L==4 // es + "Óvalo" +#elif L==5 // fr + "Ovale" +#elif L==6 // gn + "Óvalo" // Okoteve traducción +#elif L==7 // it + "Ovale" +#elif L==8 // pl + "Owalny" +#elif L==9 // pt + "Ovalo" +#endif + , #if L==1 // ca "Rectangle" #elif L==2 // de diff --git a/swad_timeline_comment.c b/swad_timeline_comment.c index 2bfdf679..2e20a8a9 100644 --- a/swad_timeline_comment.c +++ b/swad_timeline_comment.c @@ -188,6 +188,7 @@ static void Tml_Com_ShowAuthorPhoto (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC30x40", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE30x40", + [Set_USR_PHOTO_OVAL ] = "PHOTOO30x40", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR30x40", }; diff --git a/swad_timeline_note.c b/swad_timeline_note.c index 7274d9f7..868e216d 100644 --- a/swad_timeline_note.c +++ b/swad_timeline_note.c @@ -293,6 +293,7 @@ void Tml_Not_ShowAuthorPhoto (struct UsrData *UsrDat,bool FormUnique) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; diff --git a/swad_timeline_user.c b/swad_timeline_user.c index df1c9768..d84a6ef0 100644 --- a/swad_timeline_user.c +++ b/swad_timeline_user.c @@ -183,6 +183,7 @@ static void Tml_Usr_ListSharersOrFavers (MYSQL_RES **mysql_res, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC12x16", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE12x16", + [Set_USR_PHOTO_OVAL ] = "PHOTOO12x16", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR12x16", }; unsigned NumUsr; diff --git a/swad_user.c b/swad_user.c index b5134650..dc457671 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1394,6 +1394,7 @@ void Usr_WriteLoggedUsrHead (void) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC18x24", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE18x24", + [Set_USR_PHOTO_OVAL ] = "PHOTOO18x24", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR18x24", }; unsigned NumAvailableRoles = Rol_GetNumAvailableRoles (); @@ -2196,6 +2197,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat, { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; char BgColor[Usr_MAX_BYTES_BG_COLOR + 1]; @@ -2288,6 +2290,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; struct Ins_Instit Ins; @@ -2376,6 +2379,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; unsigned NumGrpTyp,NumField; @@ -2486,6 +2490,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; struct Ins_Instit Ins; @@ -2566,6 +2571,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", }; struct Ins_Instit Ins; @@ -6139,12 +6145,15 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType, { [Usr_CLASS_PHOTO_SEL ][Set_USR_PHOTO_CIRCLE ] = "PHOTOC21x28", [Usr_CLASS_PHOTO_SEL ][Set_USR_PHOTO_ELLIPSE ] = "PHOTOE21x28", + [Usr_CLASS_PHOTO_SEL ][Set_USR_PHOTO_OVAL ] = "PHOTOO21x28", [Usr_CLASS_PHOTO_SEL ][Set_USR_PHOTO_RECTANGLE] = "PHOTOR21x28", [Usr_CLASS_PHOTO_SEL_SEE][Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Usr_CLASS_PHOTO_SEL_SEE][Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Usr_CLASS_PHOTO_SEL_SEE][Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Usr_CLASS_PHOTO_SEL_SEE][Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", [Usr_CLASS_PHOTO_PRN ][Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Usr_CLASS_PHOTO_PRN ][Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Usr_CLASS_PHOTO_PRN ][Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Usr_CLASS_PHOTO_PRN ][Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", }; unsigned NumUsr; @@ -6369,6 +6378,7 @@ void Usr_WriteAuthor1Line (long UsrCod,bool Hidden) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC15x20", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE15x20", + [Set_USR_PHOTO_OVAL ] = "PHOTOO15x20", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR15x20", }; bool ShowPhoto = false; @@ -6416,6 +6426,7 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows) { [Set_USR_PHOTO_CIRCLE ] = "PHOTOC45x60", [Set_USR_PHOTO_ELLIPSE ] = "PHOTOE45x60", + [Set_USR_PHOTO_OVAL ] = "PHOTOO45x60", [Set_USR_PHOTO_RECTANGLE] = "PHOTOR45x60", };