diff --git a/swad_changelog.h b/swad_changelog.h index 637468b14..4fde026ca 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,10 +602,11 @@ 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.78 (2021-12-30)" +#define Log_PLATFORM_VERSION "SWAD 21.78.1 (2021-12-30)" #define CSS_FILE "swad21.77.1.css" #define JS_FILE "swad21.67.4.js" /* + Version 21.78.1: Dec 30, 2021 Working on design of dark theme. (322358 lines) Version 21.78: Dec 30, 2021 Changing Str_BuildString for asprintf. (322358 lines) Version 21.77.3: Dec 29, 2021 Changing Str_BuildString for asprintf. (322287 lines) Version 21.77.2: Dec 29, 2021 Changing Str_BuildString for asprintf. (322199 lines) diff --git a/swad_icon.c b/swad_icon.c index b92d780e2..c356c0f89 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -468,19 +468,10 @@ void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title) void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text) { - char *Class; - /***** Print icon and optional text *****/ HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\""); - - if (asprintf (&Class,"CONTEXT_ICO_x16 %s", - Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0) - Err_NotEnoughMemoryExit (); - Ico_PutIcon (Icon,Color,Text,Class); - free (Class); - + Ico_PutIcon (Icon,Color,Text,"CONTEXT_ICO_x16"); HTM_TxtF (" %s",Text); - HTM_DIV_End (); } @@ -510,7 +501,7 @@ void Ico_PutIconOn (const char *Icon,Ico_Color_t Color,const char *Title) void Ico_PutIconOff (const char *Icon,Ico_Color_t Color,const char *Title) { - Ico_PutIcon (Icon,Color,Title,"CONTEXT_OPT ICO_HIDDEN CONTEXT_ICO_16x16"); + Ico_PutIcon (Icon,Color,Title,"CONTEXT_OPT CONTEXT_ICO_16x16 ICO_HIDDEN"); } /*****************************************************************************/ diff --git a/swad_user.c b/swad_user.c index 43ccea6fb..3fefbcba1 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6475,7 +6475,17 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows) void Usr_PutWhoIcon (Usr_Who_t Who) { + extern const char *Ico_ClassColor[Ico_NUM_COLORS][The_NUM_THEMES]; extern const char *Txt_WHO[Usr_NUM_WHO]; + static char *Icon[Usr_NUM_WHO] = + { + [Usr_WHO_UNKNOWN ] = NULL, + [Usr_WHO_ME ] = NULL, + [Usr_WHO_SELECTED] = "search.svg", + [Usr_WHO_FOLLOWED] = "user-check.svg", + [Usr_WHO_ALL ] = "users.svg", + }; + char *Class; switch (Who) { @@ -6490,23 +6500,17 @@ void Usr_PutWhoIcon (Usr_Who_t Who) "ICO_HIGHLIGHT PHOTOR15x20"); break; case Usr_WHO_SELECTED: - HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"search.svg", - Txt_WHO[Who], - "ICO_HIGHLIGHT ICOx20"); - break; case Usr_WHO_FOLLOWED: - HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg", - Txt_WHO[Who], - "ICO_HIGHLIGHT ICOx20"); - break; case Usr_WHO_ALL: - HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"users.svg", - Txt_WHO[Who], - "ICO_HIGHLIGHT ICOx20"); - break; + if (asprintf (&Class,"ICO_HIGHLIGHT ICOx20 %s", + Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]) < 0) + Err_NotEnoughMemoryExit (); + HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon[Who],Txt_WHO[Who],Class); + free (Class); + break; default: - Err_WrongWhoExit (); - break; + Err_WrongWhoExit (); + break; } }