Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 21.86.3: Mar 25, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-03-25 19:18:01 +01:00
parent daf16e4871
commit 4957c7f814
8 changed files with 152 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia.
*/
#define Log_PLATFORM_VERSION "SWAD 21.86.2 (2022-03-25)"
#define Log_PLATFORM_VERSION "SWAD 21.86.3 (2022-03-25)"
#define CSS_FILE "swad21.85.1.css"
#define JS_FILE "swad21.78.2.js"
/*
Version 21.86.3: Mar 25, 2022 Working on design of dark theme. (323709 lines)
Version 21.86.2: Mar 25, 2022 Working on design of dark theme. (323687 lines)
Version 21.86.1: Mar 25, 2022 Working on design of dark theme. (323687 lines)
Version 21.86: Mar 25, 2022 Working on design of dark theme. (323663 lines)

14
swad_degree_type.c
View File

@ -315,7 +315,7 @@ void DegTyp_PutIconToViewDegreeTypes (void)
static void DegTyp_ListDegreeTypesForSeeing (void)
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
unsigned NumDegTyp;
const char *BgColor;
@ -332,20 +332,20 @@ static void DegTyp_ListDegreeTypesForSeeing (void)
HTM_TR_Begin (NULL);
/* Number of degree type in this list */
HTM_TD_Begin ("class=\"RM %s %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],BgColor);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s %s\"",
The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumDegTyp + 1);
HTM_TD_End ();
/* Name of degree type */
HTM_TD_Begin ("class=\"LM %s %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],BgColor);
HTM_TD_Begin ("class=\"LM DAT_STRONG_%s %s\"",
The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (Gbl.DegTypes.Lst[NumDegTyp].DegTypName);
HTM_TD_End ();
/* Number of degrees of this type */
HTM_TD_Begin ("class=\"RM %s %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],BgColor);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s %s\"",
The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Gbl.DegTypes.Lst[NumDegTyp].NumDegs);
HTM_TD_End ();

91
swad_exam_result.c
View File

@ -1122,21 +1122,21 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
const struct ExaPrn_Score *TotalScore,
double TotalGrade)
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Sessions;
unsigned NumTotalQstsInvalid;
/***** Row title *****/
HTM_TD_Begin ("colspan=\"3\" class=\"RM %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("colspan=\"3\" class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_TxtColonNBSP (Txt_Sessions);
HTM_Unsigned (NumResults);
HTM_TD_End ();
/***** Write total number of questions *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Unsigned (NumTotalQsts->All);
HTM_TD_End ();
@ -1161,8 +1161,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write number of correct questions *****/
HTM_TD_Begin ("class=\"RT %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumTotalQsts->Valid.Correct)
HTM_Unsigned (NumTotalQsts->Valid.Correct);
@ -1171,8 +1171,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write number of wrong questions *****/
HTM_TD_Begin ("class=\"RT %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumTotalQsts->Valid.Wrong.Negative)
HTM_Unsigned (NumTotalQsts->Valid.Wrong.Negative);
@ -1180,8 +1180,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_Light0 ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"RT %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumTotalQsts->Valid.Wrong.Zero)
HTM_Unsigned (NumTotalQsts->Valid.Wrong.Zero);
@ -1189,8 +1189,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_Light0 ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"RT %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumTotalQsts->Valid.Wrong.Positive)
HTM_Unsigned (NumTotalQsts->Valid.Wrong.Positive);
@ -1199,8 +1199,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write number of blank questions *****/
HTM_TD_Begin ("class=\"RT %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumTotalQsts->Valid.Blank)
HTM_Unsigned (NumTotalQsts->Valid.Blank);
@ -1209,8 +1209,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write total valid score *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (TotalScore->Valid);
HTM_Txt ("/");
@ -1218,8 +1218,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write average valid score per valid question *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (NumTotalQsts->Valid.Total ? TotalScore->Valid /
(double) NumTotalQsts->Valid.Total :
@ -1228,15 +1228,15 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults,
/***** Write total grade *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (TotalGrade);
HTM_TD_End ();
/***** Last cell *****/
HTM_TD_Begin ("class=\"%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_TD_End ();
}
@ -1543,8 +1543,7 @@ static void ExaRes_ComputeValidPrintScore (struct ExaPrn_Print *Print)
void ExaRes_ShowExamResultUser (struct UsrData *UsrDat)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
static const char *ClassPhoto[PhoSha_NUM_SHAPES] =
{
@ -1558,12 +1557,12 @@ void ExaRes_ShowExamResultUser (struct UsrData *UsrDat)
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs][UsrDat->Sex]);
HTM_TD_End ();
/***** User's data *****/
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_TxtF (" %s",UsrDat->Surname1);
if (UsrDat->Surname2[0])
@ -1586,8 +1585,7 @@ void ExaRes_ShowExamResultUser (struct UsrData *UsrDat)
static void ExaRes_ShowExamResultTime (struct ExaPrn_Print *Print)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
Dat_StartEndTime_t StartEndTime;
char *Id;
@ -1600,15 +1598,16 @@ static void ExaRes_ShowExamResultTime (struct ExaPrn_Print *Print)
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_START_END_TIME[StartEndTime]);
HTM_TD_End ();
/***** Time *****/
if (asprintf (&Id,"match_%u",(unsigned) StartEndTime) < 0)
Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LB\"",
Id,The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("id=\"%s\" class=\"LB DAT_%s\"",
Id,The_Colors[Gbl.Prefs.Theme]);
Dat_WriteLocalDateHMSFromUTC (Id,Print->TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA,
true,true,true,0x7);
@ -1627,8 +1626,7 @@ static void ExaRes_ShowExamResultTime (struct ExaPrn_Print *Print)
static void ExaRes_ShowExamResultNumQsts (struct ExaPrn_Print *Print,
const struct ExaRes_ICanView *ICanView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Questions;
extern const char *Txt_QUESTIONS_valid;
extern const char *Txt_QUESTIONS_invalid;
@ -1637,12 +1635,12 @@ static void ExaRes_ShowExamResultNumQsts (struct ExaPrn_Print *Print,
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Questions);
HTM_TD_End ();
/***** Number of questions *****/
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanView->Result)
{
HTM_TxtF ("%u",Print->NumQsts.All);
@ -1682,8 +1680,7 @@ static void ExaRes_ShowExamResultNumQsts (struct ExaPrn_Print *Print,
static void ExaRes_ShowExamResultNumAnss (struct ExaPrn_Print *Print,
const struct ExaRes_ICanView *ICanView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Valid_answers;
extern const char *Txt_ANSWERS_correct;
extern const char *Txt_ANSWERS_wrong;
@ -1693,12 +1690,12 @@ static void ExaRes_ShowExamResultNumAnss (struct ExaPrn_Print *Print,
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Valid_answers);
HTM_TD_End ();
/***** Number of answers *****/
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanView->Score)
HTM_TxtF ("%s(<em>p<sub>i</sub></em>=1):&nbsp;%u; "
"%s(-1&le;<em>p<sub>i</sub></em>&lt;0):&nbsp;%u; "
@ -1725,8 +1722,7 @@ static void ExaRes_ShowExamResultNumAnss (struct ExaPrn_Print *Print,
static void ExaRes_ShowExamResultScore (struct ExaPrn_Print *Print,
const struct ExaRes_ICanView *ICanView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Score;
extern const char *Txt_valid_score;
@ -1734,12 +1730,12 @@ static void ExaRes_ShowExamResultScore (struct ExaPrn_Print *Print,
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Score);
HTM_TD_End ();
/***** Score *****/
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanView->Score)
{
/* Score counting all questions */
@ -1779,8 +1775,7 @@ static void ExaRes_ShowExamResultGrade (const struct Exa_Exam *Exam,
struct ExaPrn_Print *Print,
const struct ExaRes_ICanView *ICanView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Grade;
extern const char *Txt_valid_grade;
@ -1788,12 +1783,12 @@ static void ExaRes_ShowExamResultGrade (const struct Exa_Exam *Exam,
HTM_TR_Begin (NULL);
/***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Grade);
HTM_TD_End ();
/***** Grade *****/
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanView->Score)
{
/* Grade counting all questions */

30
swad_forum.c
View File

@ -3444,7 +3444,7 @@ static void For_WriteForumTitleAndStats (For_ForumType_t ForumType,
static void For_WriteForumTotalStats (struct For_FiguresForum *FiguresForum)
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Total;
double NumThrsPerForum;
double NumPostsPerThread;
@ -3464,39 +3464,47 @@ static void For_WriteForumTotalStats (struct For_FiguresForum *FiguresForum)
/***** Write forum name and stats *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LINE_TOP\" style=\"width:20px;\"",
The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"DAT_STRONG_%s LINE_TOP\" style=\"width:20px;\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"LM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Total);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (FiguresForum->NumForums);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (FiguresForum->NumThreads);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (FiguresForum->NumPosts);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP RM\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP RM\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (FiguresForum->NumUsrsToBeNotifiedByEMail);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumThrsPerForum);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumPostsPerThread);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumPostsPerForum);
HTM_TD_End ();

22
swad_hierarchy.c
View File

@ -1008,7 +1008,7 @@ static void Hie_GetAndShowHierarchyWithInss (void)
/***** Write number of elements with institutions *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_institutions,
The_ClassDat[Gbl.Prefs.Theme],
"DAT",
(int) NumCtysWithInss,
-1, // < 0 ==> do not show number
-1, // < 0 ==> do not show number
@ -1050,7 +1050,7 @@ static void Hie_GetAndShowHierarchyWithCtrs (void)
/***** Write number of elements with centers *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_centers,
The_ClassDat[Gbl.Prefs.Theme],
"DAT",
(int) NumCtysWithCtrs,
(int) NumInssWithCtrs,
-1, // < 0 ==> do not show number
@ -1097,7 +1097,7 @@ static void Hie_GetAndShowHierarchyWithDegs (void)
/***** Write number of elements with degrees *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_degrees,
The_ClassDat[Gbl.Prefs.Theme],
"DAT",
(int) NumCtysWithDegs,
(int) NumInssWithDegs,
(int) NumCtrsWithDegs,
@ -1147,7 +1147,7 @@ static void Hie_GetAndShowHierarchyWithCrss (void)
/***** Write number of elements with courses *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_courses,
The_ClassDat[Gbl.Prefs.Theme],
"DAT",
(int) NumCtysWithCrss,
(int) NumInssWithCrss,
(int) NumCtrsWithCrss,
@ -1179,7 +1179,7 @@ static void Hie_GetAndShowHierarchyWithUsrs (Rol_Role_t Role)
/***** Write number of elements with students *****/
Hie_ShowHierarchyRow (Txt_With_,Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN],
The_ClassDat[Gbl.Prefs.Theme],
"DAT",
(int) NumCtysWithUsrs,
(int) NumInssWithUsrs,
(int) NumCtrsWithUsrs,
@ -1193,9 +1193,7 @@ static void Hie_GetAndShowHierarchyWithUsrs (Rol_Role_t Role)
static void Hie_GetAndShowHierarchyTotal (void)
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Total;
char *ClassTxt;
unsigned NumCtysTotal = 1;
unsigned NumInssTotal = 1;
unsigned NumCtrsTotal = 1;
@ -1238,15 +1236,13 @@ static void Hie_GetAndShowHierarchyTotal (void)
}
/***** Write total number of elements *****/
if (asprintf (&ClassTxt,"%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
Hie_ShowHierarchyRow ("",Txt_Total,ClassTxt,
Hie_ShowHierarchyRow ("",Txt_Total,
"LINE_TOP DAT_STRONG",
(int) NumCtysTotal,
(int) NumInssTotal,
(int) NumCtrsTotal,
(int) NumDegsTotal,
(int) NumCrssTotal);
free (ClassTxt);
}
/*****************************************************************************/
@ -1261,11 +1257,13 @@ static void Hie_ShowHierarchyRow (const char *Text1,const char *Text2,
int NumDegs, // < 0 ==> do not show number
int NumCrss) // < 0 ==> do not show number
{
extern const char *The_Colors[The_NUM_THEMES];
/***** Begin row *****/
HTM_TR_Begin (NULL);
/***** Write text *****/
HTM_TD_Begin ("class=\"%s RM\"",ClassTxt);
HTM_TD_Begin ("class=\"RM %s_%s\"",ClassTxt,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Text1);
HTM_Txt (Text2);
HTM_TD_End ();

8
swad_hierarchy_config.c
View File

@ -86,7 +86,7 @@ void HieCfg_Title (bool PutLink,
void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
const char FullName[Cns_HIERARCHY_MAX_BYTES_FULL_NAME + 1])
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
/***** Full name *****/
@ -98,7 +98,7 @@ void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
Label);
/* Data */
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm)
{
/* Form to change full name */
@ -124,7 +124,7 @@ void HieCfg_FullName (bool PutForm,const char *Label,Act_Action_t NextAction,
void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
const char ShrtName[Cns_HIERARCHY_MAX_BYTES_SHRT_NAME + 1])
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Short_name;
@ -137,7 +137,7 @@ void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
Txt_Short_name);
/* Data */
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm)
{
/* Form to change short name */

80
swad_match_result.c
View File

@ -982,47 +982,47 @@ static void MchRes_ShowMchResultsSummaryRow (unsigned NumResults,
double TotalScore,
double TotalGrade)
{
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Matches;
/***** Begin row *****/
HTM_TR_Begin (NULL);
/***** Row title *****/
HTM_TD_Begin ("colspan=\"3\" class=\"RM %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("colspan=\"3\" class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_TxtColonNBSP (Txt_Matches);
HTM_Unsigned (NumResults);
HTM_TD_End ();
/***** Write total number of questions *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumResults)
HTM_Unsigned (NumTotalQsts->All);
HTM_TD_End ();
/***** Write total number of non-blank answers *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumResults)
HTM_Unsigned (NumTotalQsts->NotBlank);
HTM_TD_End ();
/***** Write total number of blank answers *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (NumResults)
HTM_Unsigned (NumTotalQsts->All - NumTotalQsts->NotBlank);
HTM_TD_End ();
/***** Write total score *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (TotalScore);
HTM_Txt ("/");
@ -1030,8 +1030,8 @@ static void MchRes_ShowMchResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write average score per question *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (NumTotalQsts->All ? TotalScore /
(double) NumTotalQsts->All :
@ -1039,15 +1039,15 @@ static void MchRes_ShowMchResultsSummaryRow (unsigned NumResults,
HTM_TD_End ();
/***** Write total grade *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Double2Decimals (TotalGrade);
HTM_TD_End ();
/***** Last cell *****/
HTM_TD_Begin ("class=\"%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_ClassDatStrong[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"DAT_STRONG_%s LINE_TOP LINE_BOTTOM LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_TD_End ();
@ -1062,8 +1062,7 @@ static void MchRes_ShowMchResultsSummaryRow (unsigned NumResults,
void MchRes_ShowOneMchResult (void)
{
extern const char *Hlp_ASSESSMENT_Games_results;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Questions;
@ -1153,11 +1152,13 @@ void MchRes_ShowOneMchResult (void)
/* User */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs][UsrDat->Sex]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_TxtF ("&nbsp;%s",UsrDat->Surname1);
if (UsrDat->Surname2[0])
@ -1179,14 +1180,15 @@ void MchRes_ShowOneMchResult (void)
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_START_END_TIME[StartEndTime]);
HTM_TD_End ();
if (asprintf (&Id,"match_%u",(unsigned) StartEndTime) < 0)
Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LB\"",
Id,The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("id=\"%s\" class=\"LB DAT_%s\"",
Id,The_Colors[Gbl.Prefs.Theme]);
Dat_WriteLocalDateHMSFromUTC (Id,Print.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA,
true,true,true,0x7);
@ -1199,11 +1201,13 @@ void MchRes_ShowOneMchResult (void)
/***** Number of questions *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Questions);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Print.NumQsts.All);
HTM_TD_End ();
@ -1212,11 +1216,13 @@ void MchRes_ShowOneMchResult (void)
/***** Number of answers *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Answers);
HTM_TD_End ();
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Print.NumQsts.NotBlank);
HTM_TD_End ();
@ -1225,11 +1231,13 @@ void MchRes_ShowOneMchResult (void)
/***** Score *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Score);
HTM_TD_End ();
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (ICanView.Score)
{
HTM_STRONG_Begin ();
@ -1247,11 +1255,13 @@ void MchRes_ShowOneMchResult (void)
/***** Grade *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Grade);
HTM_TD_End ();
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (ICanView.Score)
{
HTM_STRONG_Begin ();
@ -1267,11 +1277,13 @@ void MchRes_ShowOneMchResult (void)
/***** Tags present in this result *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Tags);
HTM_TD_End ();
HTM_TD_Begin ("class=\"LB %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
Gam_ShowTstTagsPresentInAGame (Match.GamCod);
HTM_TD_End ();

33
swad_message.c
View File

@ -2987,8 +2987,7 @@ void Msg_ListBannedUsrs (void)
void Msg_GetAndShowMsgsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_messages;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Messages;
extern const char *Txt_MSGS_Not_deleted;
@ -3026,23 +3025,28 @@ void Msg_GetAndShowMsgsStats (void)
/***** Write number of messages *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_MSGS_Sent);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsSentNotDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsSentDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsSentNotDeleted + NumMsgsSentDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Hyphen ();
HTM_TD_End ();
@ -3050,23 +3054,28 @@ void Msg_GetAndShowMsgsStats (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_MSGS_Received);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsReceivedNotDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsReceivedAndDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_STRONG_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsReceivedNotDeleted + NumMsgsReceivedAndDeleted);
HTM_TD_End ();
HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumMsgsReceivedAndNotified);
HTM_TD_End ();