Version 21.78.1: Dec 30, 2021 Working on design of dark theme.

This commit is contained in:
acanas 2021-12-30 17:26:40 +01:00
parent 231116c404
commit c65a03029b
3 changed files with 22 additions and 26 deletions

View File

@ -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. 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 CSS_FILE "swad21.77.1.css"
#define JS_FILE "swad21.67.4.js" #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.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.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) Version 21.77.2: Dec 29, 2021 Changing Str_BuildString for asprintf. (322199 lines)

View File

@ -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) void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text)
{ {
char *Class;
/***** Print icon and optional text *****/ /***** Print icon and optional text *****/
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\""); HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
Ico_PutIcon (Icon,Color,Text,"CONTEXT_ICO_x16");
if (asprintf (&Class,"CONTEXT_ICO_x16 %s",
Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
Ico_PutIcon (Icon,Color,Text,Class);
free (Class);
HTM_TxtF ("&nbsp;%s",Text); HTM_TxtF ("&nbsp;%s",Text);
HTM_DIV_End (); 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) 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");
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -6475,7 +6475,17 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
void Usr_PutWhoIcon (Usr_Who_t Who) 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]; 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) switch (Who)
{ {
@ -6490,23 +6500,17 @@ void Usr_PutWhoIcon (Usr_Who_t Who)
"ICO_HIGHLIGHT PHOTOR15x20"); "ICO_HIGHLIGHT PHOTOR15x20");
break; break;
case Usr_WHO_SELECTED: case Usr_WHO_SELECTED:
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"search.svg",
Txt_WHO[Who],
"ICO_HIGHLIGHT ICOx20");
break;
case Usr_WHO_FOLLOWED: 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: case Usr_WHO_ALL:
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"users.svg", if (asprintf (&Class,"ICO_HIGHLIGHT ICOx20 %s",
Txt_WHO[Who], Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]) < 0)
"ICO_HIGHLIGHT ICOx20"); Err_NotEnoughMemoryExit ();
break; HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon[Who],Txt_WHO[Who],Class);
free (Class);
break;
default: default:
Err_WrongWhoExit (); Err_WrongWhoExit ();
break; break;
} }
} }