diff --git a/css/swad21.78.2.css b/css/swad21.78.2.css
index a8a12219..ed8d7e7c 100644
--- a/css/swad21.78.2.css
+++ b/css/swad21.78.2.css
@@ -1965,7 +1965,7 @@ a:hover img.CENTER_PHOTO_SHOW
.GREEN_ICO_BLUE {filter: invert(31%) sepia(16%) saturate(3727%) hue-rotate(60deg) brightness(94%) contrast(104%);} /* #246600 */
.GREEN_ICO_YELLOW {filter: invert(31%) sepia(16%) saturate(3727%) hue-rotate(60deg) brightness(94%) contrast(104%);} /* #246600 */
.GREEN_ICO_PINK {filter: invert(31%) sepia(16%) saturate(3727%) hue-rotate(60deg) brightness(94%) contrast(104%);} /* #246600 */
-.GREEN_ICO_DARK {filter: invert(31%) sepia(16%) saturate(3727%) hue-rotate(60deg) brightness(94%) contrast(104%);} /* #246600 */
+.GREEN_ICO_DARK {filter: invert(49%) sepia(97%) saturate(781%) hue-rotate(55deg) brightness(95%) contrast(104%);} /* #50b800 */
.RED_ICO_WHITE {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
.RED_ICO_GREY {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
@@ -1973,7 +1973,7 @@ a:hover img.CENTER_PHOTO_SHOW
.RED_ICO_BLUE {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
.RED_ICO_YELLOW {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
.RED_ICO_PINK {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
-.RED_ICO_DARK {filter: invert(8%) sepia(61%) saturate(5373%) hue-rotate(0deg) brightness(92%) contrast(114%);} /* #660000 */
+.RED_ICO_DARK {filter: invert(51%) sepia(58%) saturate(1457%) hue-rotate(320deg) brightness(126%) contrast(104%);} /* #ff8080 */
.WHITE_ICO_WHITE {filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(194deg) brightness(106%) contrast(105%);} /* #ffffff */
.WHITE_ICO_GREY {filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(194deg) brightness(106%) contrast(105%);} /* #ffffff */
@@ -2504,11 +2504,11 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.LST {color:#202020; font-size:11pt; white-space:nowrap;}
.LST_HID {color:#A0A0A0; font-size:11pt; white-space:nowrap;}
.LST_REC {color:#008000; font-size:11pt; white-space:nowrap;}
-.LST_REC_HID {color:#89BE87; font-size:11pt; white-space:nowrap;}
+.LST_REC_HID {color:#89be87; font-size:11pt; white-space:nowrap;}
.LST_EDIT {width:250px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
.LST_EDIT_HID {width:250px; color:#A0A0A0; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
.LST_EDIT_REC {width:250px; color:#008000; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
-.LST_EDIT_REC_HID {width:250px; color:#89BE87; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
+.LST_EDIT_REC_HID {width:250px; color:#89be87; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
.LST_EDIT_ROWS {width:30px; color:#202020; font-weight:bold; font-size:11pt; height:20px; padding:0; margin:-1px; border-width:1px; border-style:solid; border-color:#ECE9D8;}
.PUBLIC_FILE {max-width:400px;}
@@ -2743,30 +2743,35 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.INS_LNK_DARK, .MFU_DARK, .MONTH_DARK {color:#8cbcce;}
/*****************************************************************************/
-.MSJ_AVISO {color:#632921; font-size:12pt;}
-.TIT_TBL {color:#4d88a1; font-size:12pt; font-weight:bold;}
+.TIT_TBL_WHITE {color:#4d88a1;}
+.TIT_TBL_GREY {color:#4d88a1;}
+.TIT_TBL_PURPLE {color:#4d88a1;}
+.TIT_TBL_BLUE {color:#4d88a1;}
+.TIT_TBL_YELLOW {color:#4d88a1;}
+.TIT_TBL_PINK {color:#4d88a1;}
+.TIT_TBL_DARK {color:#8cbcce;}
.GRP_TITLE {color:#4d88a1; font-size:15pt; font-weight:bold;}
.ASG_TITLE {color:#4d88a1; font-size:15pt; font-weight:bold;}
-.ASG_TITLE_LIGHT {color:#AFC4CC; font-size:15pt; font-weight:bold;}
+.ASG_TITLE_LIGHT {color:#afc4cc; font-size:15pt; font-weight:bold;}
.ASG_LABEL {color:#4d88a1; font-size:13pt;}
-.ASG_LABEL_LIGHT {color:#AFC4CC; font-size:13pt;}
+.ASG_LABEL_LIGHT {color:#afc4cc; font-size:13pt;}
.ASG_GRP {color:#4d88a1; font-size:12pt;}
-.ASG_GRP_LIGHT {color:#AFC4CC; font-size:12pt;}
+.ASG_GRP_LIGHT {color:#afc4cc; font-size:12pt;}
.DATE_RED {color:#660000; font-size:13pt;}
.DATE_RED_LIGHT {color:#f98a8a; font-size:13pt;}
.DATE_GREEN {color:#008000; font-size:13pt;}
-.DATE_GREEN_LIGHT {color:#89BE87; font-size:13pt;}
+.DATE_GREEN_LIGHT {color:#89be87; font-size:13pt;}
.DATE_BLUE {color:#4d88a1; font-size:13pt;}
-.DATE_BLUE_LIGHT {color:#AFC4CC; font-size:13pt;}
+.DATE_BLUE_LIGHT {color:#afc4cc; font-size:13pt;}
.ASG_LST_DATE_GREEN {color:#008000; font-size:11pt; white-space:nowrap;}
.ASG_LST_DATE_RED {color:#660000; font-size:11pt; white-space:nowrap;}
.STATUS_GREEN {color:#008000; font-size:12pt;}
-.STATUS_GREEN_LIGHT {color:#89BE87; font-size:12pt;}
+.STATUS_GREEN_LIGHT {color:#89be87; font-size:12pt;}
.STATUS_RED {color:#660000; font-size:12pt;}
.STATUS_RED_LIGHT {color:#f98a8a; font-size:12pt;}
@@ -3559,7 +3564,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
text-overflow:ellipsis;
}
.AUTHOR_TXT {color:#4d88a1; font-size:11pt;}
-.AUTHOR_TXT_LIGHT {color:#AFC4CC; font-size:11pt;}
+.AUTHOR_TXT_LIGHT {color:#afc4cc; font-size:11pt;}
.AUTHOR_TXT_NEW {color:#4d88a1; font-size:11pt; font-weight:bold;}
/************************** Owner of assignments and works *******************/
@@ -3994,7 +3999,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
}
.MSG_TIT {color:#4d88a1; font-size:13pt;}
.MSG_TIT_NEW {color:#4d88a1; font-size:13pt; font-weight:bold;}
-.MSG_TIT_REM {color:#AFC4CC; font-size:13pt;}
+.MSG_TIT_REM {color:#afc4cc; font-size:13pt;}
.MSG_TIT_BG
{
background-image:-webkit-linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); /* Safari */
@@ -4017,7 +4022,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
background-image:-webkit-linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%); /* Safari */
background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%);
background-repeat:no-repeat;
- color:#AFC4CC;
+ color:#afc4cc;
font-size:13pt;
}
.MSG_AUT_BG
@@ -4042,7 +4047,7 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
background-image:-webkit-linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%); /* Safari */
background-image:linear-gradient(#f3fcff 0,#f3fcff 80%,white 100%);
background-repeat:no-repeat;
- color:#AFC4CC;
+ color:#afc4cc;
font-size:11pt;
}
.MSG_DATE {color:#4d88a1; font-size:11pt;}
@@ -4274,12 +4279,6 @@ a.PAG:hover, .PAG_CUR
border-collapse:collapse;
padding:1px;
}
-.INDICATORS th
- {
- color:#4d88a1;
- font-size:12pt;
- font-weight:bold;
- }
.INDICATORS_INPUT
{
max-width:500px;
diff --git a/swad_agenda.c b/swad_agenda.c
index be56c40e..855ef87c 100644
--- a/swad_agenda.c
+++ b/swad_agenda.c
@@ -626,6 +626,7 @@ static void Agd_ShowEventsToday (struct Agd_Agenda *Agenda,
static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
Agd_AgendaType_t AgendaType)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_START_END_TIME_HELP[2];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Event;
@@ -639,7 +640,7 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
Order <= Dat_END_TIME;
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
switch (AgendaType)
{
case Agd_MY_AGENDA_TODAY:
@@ -676,8 +677,8 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Event ,"LM");
- HTM_TH (1,1,Txt_Location,"LM");
+ HTM_TH (1,1,Txt_Event ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Location,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
}
diff --git a/swad_assignment.c b/swad_assignment.c
index 7766c5d4..6dc869a4 100644
--- a/swad_assignment.c
+++ b/swad_assignment.c
@@ -214,6 +214,7 @@ static void Asg_ShowAllAssignments (struct Asg_Assignments *Assignments)
static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
bool PrintView)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Assignment;
@@ -229,7 +230,7 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
Order++)
{
/* Begin head cell */
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
if (!PrintView)
{
@@ -264,8 +265,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
/* End head cell */
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Assignment,"LM");
- HTM_TH (1,1,Txt_Folder ,"LM");
+ HTM_TH (1,1,Txt_Assignment,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Folder ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
}
diff --git a/swad_attendance.c b/swad_attendance.c
index 872700d4..13fc4d0d 100644
--- a/swad_attendance.c
+++ b/swad_attendance.c
@@ -211,6 +211,7 @@ void Att_SeeAttEvents (void)
static void Att_ShowAllAttEvents (struct Att_Events *Events)
{
extern const char *Hlp_USERS_Attendance;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Events;
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@@ -261,7 +262,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
Order <= Dat_END_TIME;
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeAtt);
WhichGroups = Grp_GetParamWhichGroups ();
@@ -1526,6 +1527,7 @@ static void Att_ShowEvent (struct Att_Events *Events)
static void Att_ListAttOnlyMeAsStudent (struct Att_Event *Event)
{
extern const char *Hlp_USERS_Attendance;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Attendance;
extern const char *Txt_Student_comment;
extern const char *Txt_Teachers_comment;
@@ -1558,9 +1560,9 @@ static void Att_ListAttOnlyMeAsStudent (struct Att_Event *Event)
HTM_TH_Empty (3);
if (Gbl.Usrs.Listing.WithPhotos)
HTM_TH_Empty (1);
- HTM_TH (1,2,Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"TIT_TBL LM");
- HTM_TH (1,1,Txt_Student_comment ,"LM");
- HTM_TH (1,1,Txt_Teachers_comment ,"LM");
+ HTM_TH (1,2,Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Student_comment ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Teachers_comment ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
@@ -2907,6 +2909,7 @@ static void Att_ListUsrsAttendanceTable (const struct Att_Events *Events,
static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
{
+ 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_Attendance;
unsigned NumAttEvent;
@@ -2916,7 +2919,8 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
HTM_TH (1,Gbl.Usrs.Listing.WithPhotos ? 4 :
3,
- Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN],"LM");
+ Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN],
+ "TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
for (NumAttEvent = 0;
NumAttEvent < Events->Num;
@@ -2927,7 +2931,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]);
/***** Put link to this attendance event *****/
- HTM_TH_Begin (1,1,"TIT_TBL CM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),"%u",NumAttEvent + 1);
Att_PutLinkAttEvent (&Events->Lst[NumAttEvent],
Events->Lst[NumAttEvent].Title,
@@ -2935,7 +2939,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Attendance,"RM");
+ HTM_TH (1,1,Txt_Attendance,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
}
diff --git a/swad_building.c b/swad_building.c
index 70e887a8..8bec871f 100644
--- a/swad_building.c
+++ b/swad_building.c
@@ -93,6 +93,7 @@ void Bld_SeeBuildings (void)
{
extern const char *Hlp_CENTER_Buildings;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Buildings;
extern const char *Txt_BUILDINGS_HELP_ORDER[Bld_NUM_ORDERS];
extern const char *Txt_BUILDINGS_ORDER[Bld_NUM_ORDERS];
@@ -126,7 +127,7 @@ void Bld_SeeBuildings (void)
Order <= (Bld_Order_t) (Bld_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeBld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],
diff --git a/swad_center.c b/swad_center.c
index 3cb2e3c1..e2c8588f 100644
--- a/swad_center.c
+++ b/swad_center.c
@@ -1416,6 +1416,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_CENTERS_HELP_ORDER[2];
extern const char *Txt_CENTERS_ORDER[2];
extern const char *Txt_Place;
@@ -1432,8 +1433,8 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
Order <= (Ctr_Order_t) (Ctr_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTER ? "TIT_TBL LM" :
- "TIT_TBL RM");
+ HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTER ? "TIT_TBL_%s LM" :
+ "TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeCtr);
@@ -1454,10 +1455,10 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Place ,"LM");
- HTM_TH (1,1,Txt_Degrees_ABBREVIATION,"RM");
- HTM_TH (1,1,Txt_Courses_ABBREVIATION,"RM");
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH (1,1,Txt_Place ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Degrees_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Courses_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
HTM_BR ();
HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
diff --git a/swad_changelog.h b/swad_changelog.h
index 321770cd..973ad9fd 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.2 (2021-12-30)"
+#define Log_PLATFORM_VERSION "SWAD 21.78.3 (2021-12-30)"
#define CSS_FILE "swad21.78.2.css"
#define JS_FILE "swad21.78.2.js"
/*
+ Version 21.78.3: Dec 30, 2021 Working on design of dark theme. (322440 lines)
Version 21.78.2: Dec 30, 2021 Working on design of dark theme. (322393 lines)
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)
diff --git a/swad_country.c b/swad_country.c
index fc6d552e..81b80453 100644
--- a/swad_country.c
+++ b/swad_country.c
@@ -343,6 +343,7 @@ void Cty_ListCountries2 (void)
static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_COUNTRIES_HELP_ORDER[2];
extern const char *Txt_COUNTRIES_ORDER[2];
extern const char *Txt_Institutions_ABBREVIATION;
@@ -359,8 +360,8 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
Order <= Cty_ORDER_BY_NUM_USRS;
Order++)
{
- HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "TIT_TBL LM" :
- "TIT_TBL RM");
+ HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "TIT_TBL_%s LM" :
+ "TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeCty);
@@ -381,11 +382,11 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Institutions_ABBREVIATION,"RM");
- HTM_TH (1,1,Txt_Centers_ABBREVIATION ,"RM");
- HTM_TH (1,1,Txt_Degrees_ABBREVIATION ,"RM");
- HTM_TH (1,1,Txt_Courses_ABBREVIATION ,"RM");
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH (1,1,Txt_Institutions_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Centers_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Degrees_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Courses_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
HTM_BR ();
HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
diff --git a/swad_degree_type.c b/swad_degree_type.c
index 6b67eb99..15271205 100644
--- a/swad_degree_type.c
+++ b/swad_degree_type.c
@@ -514,6 +514,7 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
HieLvl_Level_t Scope,
DegTyp_Order_t SelectedOrder)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_DEGREE_TYPES_HELP_ORDER[DegTyp_NUM_ORDERS];
extern const char *Txt_DEGREE_TYPES_ORDER[DegTyp_NUM_ORDERS];
DegTyp_Order_t Order;
@@ -527,8 +528,8 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
Order <= DegTyp_ORDER_BY_NUM_DEGREES;
Order++)
{
- HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "TIT_TBL LM" :
- "TIT_TBL RM");
+ HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "TIT_TBL_%s LM" :
+ "TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
/* Begin form to change order */
Frm_BeginForm (NextAction);
diff --git a/swad_department.c b/swad_department.c
index 218e8607..f37dbe65 100644
--- a/swad_department.c
+++ b/swad_department.c
@@ -100,6 +100,7 @@ void Dpt_SeeDepts (void)
{
extern const char *Hlp_INSTITUTION_Departments;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Departments_of_INSTITUTION_X;
extern const char *Txt_DEPARTMENTS_HELP_ORDER[2];
extern const char *Txt_DEPARTMENTS_ORDER[2];
@@ -141,8 +142,8 @@ void Dpt_SeeDepts (void)
Order <= Dpt_ORDER_BY_NUM_TCHS;
Order++)
{
- HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "TIT_TBL RM" :
- "TIT_TBL LM");
+ HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "TIT_TBL_%s RM" :
+ "TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeDpt);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
diff --git a/swad_exam.c b/swad_exam.c
index a8162c89..077342bb 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -210,6 +210,7 @@ void Exa_SeeAllExams (void)
static void Exa_ListAllExams (struct Exa_Exams *Exams)
{
extern const char *Hlp_ASSESSMENT_Exams;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Exams;
extern const char *Txt_EXAMS_ORDER_HELP[Exa_NUM_ORDERS];
extern const char *Txt_EXAMS_ORDER[Exa_NUM_ORDERS];
@@ -254,7 +255,7 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
/* Form to change order */
Frm_BeginForm (ActSeeAllExa);
@@ -273,7 +274,7 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Sessions,"RM");
+ HTM_TH (1,1,Txt_Sessions,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
diff --git a/swad_figure.c b/swad_figure.c
index de352c8b..a66273fe 100644
--- a/swad_figure.c
+++ b/swad_figure.c
@@ -400,6 +400,7 @@ void Fig_ShowFigures (void)
static void Fig_GetAndShowUsersStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_users;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Users;
extern const char *Txt_Number_of_users;
@@ -413,10 +414,10 @@ static void Fig_GetAndShowUsersStats (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Users ,"RM");
- HTM_TH (1,1,Txt_Number_of_users ,"RM");
- HTM_TH (1,1,Txt_Average_number_of_courses_to_which_a_user_belongs,"RM");
- HTM_TH (1,1,Txt_Average_number_of_users_belonging_to_a_course ,"RM");
+ HTM_TH (1,1,Txt_Users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_of_courses_to_which_a_user_belongs,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_of_users_belonging_to_a_course ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Figures *****/
@@ -538,6 +539,7 @@ static void Fig_GetAndShowUsersRanking (void)
{
extern const char *Hlp_ANALYTICS_Figures_ranking;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Clicks;
extern const char *Txt_Clicks_per_day;
@@ -554,13 +556,13 @@ static void Fig_GetAndShowUsersRanking (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Clicks ,"CM");
- HTM_TH (1,1,Txt_Clicks_per_day,"CM");
- HTM_TH (1,1,Txt_Timeline ,"CM");
- HTM_TH (1,1,Txt_Followers ,"CM");
- HTM_TH (1,1,Txt_Downloads ,"CM");
- HTM_TH (1,1,Txt_Forums ,"CM");
- HTM_TH (1,1,Txt_Messages ,"CM");
+ HTM_TH (1,1,Txt_Clicks ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Clicks_per_day,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Timeline ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Followers ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Downloads ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Forums ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Messages ,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Rankings *****/
@@ -621,7 +623,7 @@ static void Fig_GetAndShowHierarchyStats (void)
Fig_GetAndShowHierarchyWithCtrs ();
Fig_GetAndShowHierarchyWithDegs ();
Fig_GetAndShowHierarchyWithCrss ();
- for (Role = Rol_TCH;
+ for (Role = Rol_TCH;
Role >= Rol_STD;
Role--)
Fig_GetAndShowHierarchyWithUsrs (Role);
@@ -637,6 +639,7 @@ static void Fig_GetAndShowHierarchyStats (void)
static void Fig_WriteHeadHierarchy (void)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Countries;
extern const char *Txt_Institutions;
extern const char *Txt_Centers;
@@ -647,35 +650,35 @@ static void Fig_WriteHeadHierarchy (void)
HTM_TH_Empty (1);
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("globe-americas.svg",Ico_BLACK,
Txt_Countries,"CONTEXT_ICO_x16");
HTM_BR ();
HTM_Txt (Txt_Countries);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("university.svg",Ico_BLACK,
Txt_Institutions,"CONTEXT_ICO_x16");
HTM_BR ();
HTM_Txt (Txt_Institutions);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("building.svg",Ico_BLACK,
Txt_Centers,"CONTEXT_ICO_x16");
HTM_BR ();
HTM_Txt (Txt_Centers);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("graduation-cap.svg",Ico_BLACK,
Txt_Degrees,"CONTEXT_ICO_x16");
HTM_BR ();
HTM_Txt (Txt_Degrees);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,
Txt_Courses,"CONTEXT_ICO_x16");
HTM_BR ();
@@ -1194,6 +1197,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institution;
unsigned NumIns;
unsigned NumOrder;
@@ -1243,8 +1247,8 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Draw institutions as a list *****/
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
- HTM_TH (1,1,Txt_Institution,"LM");
- HTM_TH (1,1,TxtFigure,"RM");
+ HTM_TH (1,1,Txt_Institution,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,TxtFigure,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
for (NumIns = 1, NumOrder = 1, NumberLastRow = 0;
@@ -1478,6 +1482,7 @@ static void Fig_GetSizeOfFileZone (Brw_FileBrowser_t FileBrowser,
static void Fig_WriteStatsExpTreesTableHead1 (void)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_File_zones;
extern const char *Txt_Courses;
extern const char *Txt_Groups;
@@ -1488,19 +1493,20 @@ static void Fig_WriteStatsExpTreesTableHead1 (void)
extern const char *Txt_Size;
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_File_zones,"LM");
- HTM_TH (1,1,Txt_Courses ,"RM");
- HTM_TH (1,1,Txt_Groups ,"RM");
- HTM_TH (1,1,Txt_Users ,"RM");
- HTM_TH (1,1,Txt_Max_levels,"RM");
- HTM_TH (1,1,Txt_Folders ,"RM");
- HTM_TH (1,1,Txt_Files ,"RM");
- HTM_TH (1,1,Txt_Size ,"RM");
+ HTM_TH (1,1,Txt_File_zones,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Courses ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Groups ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Max_levels,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Folders ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Files ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Size ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
}
static void Fig_WriteStatsExpTreesTableHead2 (void)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_File_zones;
extern const char *Txt_Folders;
extern const char *Txt_Files;
@@ -1509,21 +1515,21 @@ static void Fig_WriteStatsExpTreesTableHead2 (void)
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_File_zones,"LM");
+ HTM_TH (1,1,Txt_File_zones,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Folders);
HTM_BR ();
HTM_Txt (Txt_course);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Files);
HTM_BR ();
HTM_Txt (Txt_course);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Size);
HTM_BR ();
HTM_Txt (Txt_course);
@@ -1534,6 +1540,7 @@ static void Fig_WriteStatsExpTreesTableHead2 (void)
static void Fig_WriteStatsExpTreesTableHead3 (void)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_File_zones;
extern const char *Txt_Folders;
extern const char *Txt_Files;
@@ -1542,21 +1549,21 @@ static void Fig_WriteStatsExpTreesTableHead3 (void)
HTM_TR_Begin (NULL);
- HTM_TH (1,1,"LM",Txt_File_zones);
+ HTM_TH (1,1,Txt_File_zones,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Folders);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Files);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
- HTM_TH_Begin (1,1,"RM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s/",Txt_Size);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
@@ -1793,6 +1800,7 @@ static void Fig_GetAndShowOERsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_open_educational_resources_oer;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_License;
extern const char *Txt_Number_of_private_files;
@@ -1808,9 +1816,9 @@ static void Fig_GetAndShowOERsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_License ,"LM");
- HTM_TH (1,1,Txt_Number_of_private_files,"RM");
- HTM_TH (1,1,Txt_Number_of_public_files ,"RM");
+ HTM_TH (1,1,Txt_License ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_private_files,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_public_files ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
for (License = (Brw_License_t) 0;
@@ -1888,6 +1896,7 @@ static void Fig_GetAndShowCourseProgramStats (void) // TODO: Change function fro
{
extern const char *Hlp_ANALYTICS_Figures_course_programs;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_program_items;
extern const char *Txt_Number_of_BR_courses_with_BR_program_items;
@@ -1909,9 +1918,9 @@ static void Fig_GetAndShowCourseProgramStats (void) // TODO: Change function fro
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_program_items ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_program_items,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_items_BR_per_course ,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_program_items ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_program_items,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_items_BR_per_course ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of assignments *****/
@@ -1943,6 +1952,7 @@ static void Fig_GetAndShowAssignmentsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_assignments;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_assignments;
extern const char *Txt_Number_of_BR_courses_with_BR_assignments;
@@ -1966,10 +1976,10 @@ static void Fig_GetAndShowAssignmentsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_assignments ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_assignments,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_ASSIG_BR_per_course,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_notifications ,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_assignments ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_assignments,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_ASSIG_BR_per_course,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_notifications ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of assignments *****/
@@ -2005,6 +2015,7 @@ static void Fig_GetAndShowProjectsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_projects;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_projects;
extern const char *Txt_Number_of_BR_courses_with_BR_projects;
@@ -2026,9 +2037,9 @@ static void Fig_GetAndShowProjectsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_projects ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_projects ,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_projects_BR_per_course,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_projects ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_projects ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_projects_BR_per_course,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of projects *****/
@@ -2061,6 +2072,7 @@ static void Fig_GetAndShowTestsStats (void)
extern const char *Hlp_ANALYTICS_Figures_tests;
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_Type_of_BR_answers;
extern const char *Txt_Number_of_BR_courses_BR_with_test_BR_questions;
@@ -2083,15 +2095,15 @@ static void Fig_GetAndShowTestsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Type_of_BR_answers ,"LM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_BR_with_test_BR_questions ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions ,"RM");
- HTM_TH (1,1,Txt_Number_BR_of_test_BR_questions ,"RM");
- HTM_TH (1,1,Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded ,"RM");
- HTM_TH (1,1,Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course,"RM");
- HTM_TH (1,1,Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded ,"RM");
- HTM_TH (1,1,Txt_Average_BR_score_BR_per_question ,"RM");
+ HTM_TH (1,1,Txt_Type_of_BR_answers ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_BR_with_test_BR_questions ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_BR_of_test_BR_questions ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_BR_score_BR_per_question ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
for (AnsType = (Qst_AnswerType_t) 0;
@@ -2207,6 +2219,7 @@ static void Fig_GetAndShowExamsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_exams;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_exams;
extern const char *Txt_Number_of_BR_courses_with_BR_exams;
@@ -2227,9 +2240,9 @@ static void Fig_GetAndShowExamsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_exams ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_exams ,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_exams_BR_per_course,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_exams ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_exams ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_exams_BR_per_course,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of exams *****/
@@ -2261,6 +2274,7 @@ static void Fig_GetAndShowGamesStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_games;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_games;
extern const char *Txt_Number_of_BR_courses_with_BR_games;
@@ -2281,9 +2295,9 @@ static void Fig_GetAndShowGamesStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_games ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_games ,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_games_BR_per_course,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_games ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_games ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_games_BR_per_course,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of games *****/
@@ -2316,6 +2330,7 @@ static void Fig_GetAndShowTimelineActivityStats (void)
extern const char *Hlp_ANALYTICS_Figures_timeline;
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_Type;
extern const char *Txt_Number_of_posts;
@@ -2338,11 +2353,11 @@ static void Fig_GetAndShowTimelineActivityStats (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Type ,"LM");
- HTM_TH (1,1,Txt_Number_of_posts ,"RM");
- HTM_TH (1,1,Txt_Number_of_users ,"RM");
- HTM_TH (1,1,Txt_PERCENT_of_users ,"RM");
- HTM_TH (1,1,Txt_Number_of_posts_BR_per_user,"RM");
+ HTM_TH (1,1,Txt_Type ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_posts ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_PERCENT_of_users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_posts_BR_per_user,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Get total number of users *****/
@@ -2472,6 +2487,7 @@ static void Fig_GetAndShowFollowStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_followed_followers;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Users;
extern const char *Txt_Number_of_users;
@@ -2491,9 +2507,9 @@ static void Fig_GetAndShowFollowStats (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Users ,"LM");
- HTM_TH (1,1,Txt_Number_of_users ,"RM");
- HTM_TH (1,1,Txt_PERCENT_of_users,"RM");
+ HTM_TH (1,1,Txt_Users ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_users ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_PERCENT_of_users,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Get total number of users *****/
@@ -3273,6 +3289,7 @@ static void Fig_GetAndShowSurveysStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_surveys;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_surveys;
extern const char *Txt_Number_of_BR_courses_with_BR_surveys;
@@ -3301,11 +3318,11 @@ static void Fig_GetAndShowSurveysStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Number_of_BR_surveys ,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_surveys ,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_surveys_BR_per_course ,"RM");
- HTM_TH (1,1,Txt_Average_number_BR_of_questions_BR_per_survey,"RM");
- HTM_TH (1,1,Txt_Number_of_BR_notifications ,"RM");
+ HTM_TH (1,1,Txt_Number_of_BR_surveys ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_courses_with_BR_surveys ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_surveys_BR_per_course ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Average_number_BR_of_questions_BR_per_survey,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Number_of_BR_notifications ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write number of surveys *****/
diff --git a/swad_forum.c b/swad_forum.c
index 819c047c..469f34bf 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -1976,6 +1976,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
Ale_AlertType_t AlertType,const char *Message)
{
extern const char *Hlp_COMMUNICATION_Forums_threads;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Forum;
extern const char *Txt_MSG_Subject;
extern const char *Txt_FORUM_THREAD_HELP_ORDER[Dat_NUM_START_END_TIME];
@@ -2052,7 +2053,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
Order <= Dat_END_TIME;
Order++)
{
- HTM_TH_Begin (1,2,"TIT_TBL CM");
+ HTM_TH_Begin (1,2,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginFormAnchor (For_ActionsSeeFor[Forums->Forum.Type],
For_FORUM_THREADS_SECTION_ID);
@@ -2076,10 +2077,10 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Number_BR_msgs,"RM");
- HTM_TH (1,1,Txt_Unread_BR_msgs,"RM");
- HTM_TH (1,1,Txt_WriBRters ,"RM");
- HTM_TH (1,1,Txt_ReaBRders ,"RM");
+ HTM_TH (1,1,Txt_Number_BR_msgs,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Unread_BR_msgs,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_WriBRters ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_ReaBRders ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
diff --git a/swad_game.c b/swad_game.c
index 4b3309e2..e36cfa23 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -225,6 +225,7 @@ void Gam_SeeAllGames (void)
static void Gam_ListAllGames (struct Gam_Games *Games)
{
extern const char *Hlp_ASSESSMENT_Games;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Games;
extern const char *Txt_GAMES_ORDER_HELP[Gam_NUM_ORDERS];
extern const char *Txt_GAMES_ORDER[Gam_NUM_ORDERS];
@@ -276,7 +277,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
/* Form to change order */
Frm_BeginForm (ActSeeAllGam);
@@ -297,7 +298,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Matches,"RM");
+ HTM_TH (1,1,Txt_Matches,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
diff --git a/swad_holiday.c b/swad_holiday.c
index 965bd11f..959eac3b 100644
--- a/swad_holiday.c
+++ b/swad_holiday.c
@@ -96,6 +96,7 @@ void Hld_SeeHolidays (void)
{
extern const char *Hlp_INSTITUTION_Holidays;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Holidays;
extern const char *Txt_HOLIDAYS_HELP_ORDER[2];
extern const char *Txt_HOLIDAYS_ORDER[2];
@@ -134,7 +135,7 @@ void Hld_SeeHolidays (void)
Order <= Hld_ORDER_BY_START_DATE;
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeHld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],
@@ -148,10 +149,10 @@ void Hld_SeeHolidays (void)
Frm_EndForm ();
HTM_TH_End ();
}
- HTM_TH_Begin (1,1,"LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF (" %s ",Txt_End_date);
HTM_TH_End ();
- HTM_TH (1,1,Txt_Holiday,"LM");
+ HTM_TH (1,1,Txt_Holiday,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
diff --git a/swad_indicator.c b/swad_indicator.c
index 87aebef0..f15d00f2 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -448,9 +448,9 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
unsigned Ind;
/***** Initialize classes *****/
- if (asprintf (&ClassNormal ,"RM %s" ,The_ClassDatLight[Gbl.Prefs.Theme]) < 0)
+ if (asprintf (&ClassNormal ,"%s RM" ,The_ClassDatLight[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
- if (asprintf (&ClassHighlight,"RM %s BG_HIGHLIGHT",The_ClassDat [Gbl.Prefs.Theme]) < 0)
+ if (asprintf (&ClassHighlight,"%s RM BG_HIGHLIGHT",The_ClassDat [Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
/***** Write number of courses with each number of indicators valid *****/
@@ -509,15 +509,15 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
if (PutForm)
HTM_TD_Empty (1);
- HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"%s RM LINE_TOP\"",The_ClassDatStrong[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=\"%s RM LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCrss);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"%s RM LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtF ("(%.1f%%)",100.0);
HTM_TD_End ();
@@ -537,6 +537,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
Ind_IndicatorsLayout_t IndicatorsLayout,
unsigned NumCrss,MYSQL_RES *mysql_res)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Degree;
extern const char *Txt_Course;
extern const char *Txt_Institutional_BR_code;
@@ -570,115 +571,122 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
unsigned NumIndicators;
struct Ind_IndicatorsCrs IndicatorsCrs;
long ActCod;
+ char *ClassHead;
/***** Begin table *****/
HTM_TABLE_Begin ("INDICATORS");
/***** Write table heading *****/
+ if (asprintf (&ClassHead,"TIT_TBL_%s %s",
+ The_Colors[Gbl.Prefs.Theme],Gbl.ColorRows[0]) < 0)
+ Err_NotEnoughMemoryExit ();
+
switch (IndicatorsLayout)
{
case Ind_INDICATORS_BRIEF:
HTM_TR_Begin (NULL);
- HTM_TH (3, 1,Txt_Degree ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Course ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Institutional_BR_code ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Web_page_of_the_course,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,11,Txt_Indicators ,"CM %s",Gbl.ColorRows[0]);
+ HTM_TH (3, 1,Txt_Degree ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Course ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Institutional_BR_code ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Web_page_of_the_course,"%s LM",ClassHead);
+ HTM_TH (1,11,Txt_Indicators ,"%s CM",ClassHead);
HTM_TR_End ();
HTM_TR_Begin (NULL);
- HTM_TH (2,1,Txt_No_INDEX,"CT %s",Gbl.ColorRows[0]);
- HTM_TH_Begin (1,2,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH (2,1,Txt_No_INDEX,"%s CT",ClassHead);
+ HTM_TH_Begin (1,2,"%s CT",ClassHead);
HTM_TxtF ("(A) %s",Txt_Syllabus_of_the_course);
HTM_TH_End ();
- HTM_TH_Begin (1,2,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,2,"%s CT",ClassHead);
HTM_TxtF ("(B) %s",Txt_Guided_academic_assignments);
HTM_TH_End ();
- HTM_TH_Begin (1,2,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,2,"%s CT",ClassHead);
HTM_TxtF ("(C) %s",Txt_Online_tutoring);
HTM_TH_End ();
- HTM_TH_Begin (1,2,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,2,"%s CT",ClassHead);
HTM_TxtF ("(D) %s",Txt_Materials);
HTM_TH_End ();
- HTM_TH_Begin (1,2,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,2,"%s CT",ClassHead);
HTM_TxtF ("(E) %s",Txt_Assessment_criteria);
HTM_TH_End ();
HTM_TR_End ();
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_YES,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
+ HTM_TH (1,1,Txt_YES,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_YES,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_YES,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_YES,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_YES,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
HTM_TR_End ();
break;
case Ind_INDICATORS_FULL:
HTM_TR_Begin (NULL);
- HTM_TH (3, 1,Txt_Degree ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Course ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Institutional_BR_code ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_Web_page_of_the_course ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"LM %s",Gbl.ColorRows[0]);
- HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,24,Txt_Indicators ,"CM %s",Gbl.ColorRows[0]);
+ HTM_TH (3, 1,Txt_Degree ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Course ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Institutional_BR_code ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_Web_page_of_the_course ,"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"%s LM",ClassHead);
+ HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"%s LM",ClassHead);
+ HTM_TH (1,24,Txt_Indicators ,"%s CM",ClassHead);
HTM_TR_End ();
HTM_TR_Begin (NULL);
- HTM_TH (2,1,Txt_No_INDEX,"CT %s",Gbl.ColorRows[0]);
- HTM_TH_Begin (1,5,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH (2,1,Txt_No_INDEX,"CT %s",ClassHead);
+ HTM_TH_Begin (1,5,"CT %s",ClassHead);
HTM_TxtF ("(A) %s",Txt_Syllabus_of_the_course);
HTM_TH_End ();
- HTM_TH_Begin (1,5,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,5,"CT %s",ClassHead);
HTM_TxtF ("(B) %s",Txt_Guided_academic_assignments);
HTM_TH_End ();
- HTM_TH_Begin (1,5,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,5,"CT %s",ClassHead);
HTM_TxtF ("(C) %s",Txt_Online_tutoring);
HTM_TH_End ();
- HTM_TH_Begin (1,4,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,4,"CT %s",ClassHead);
HTM_TxtF ("(D) %s",Txt_Materials);
HTM_TH_End ();
- HTM_TH_Begin (1,4,"CT %s",Gbl.ColorRows[0]);
+ HTM_TH_Begin (1,4,"CT %s",ClassHead);
HTM_TxtF ("(E) %s",Txt_Assessment_criteria);
HTM_TH_End ();
HTM_TR_End ();
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_YES ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_INFO_TITLE[Inf_LECTURES] ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_INFO_TITLE[Inf_PRACTICALS] ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Assignments ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Files_assignments ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Files_works ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Forum_threads ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Forum_posts ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Messages_sent_by_teachers ,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Number_of_files_in_DOCUM_zones,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_Number_of_files_in_SHARE_zones,"RM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_YES ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_NO ,"CM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_INFO_TITLE[Inf_ASSESSMENT] ,"LM %s",Gbl.ColorRows[0]);
- HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"LM %s",Gbl.ColorRows[0]);
+ HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_INFO_TITLE[Inf_LECTURES] ,"%s LM",ClassHead);
+ HTM_TH (1,1,Txt_INFO_TITLE[Inf_PRACTICALS] ,"%s LM",ClassHead);
+ HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"%s LM",ClassHead);
+ HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_Assignments ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_Files_assignments ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_Files_works ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_Forum_threads ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_Forum_posts ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_Messages_sent_by_teachers ,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_Number_of_files_in_DOCUM_zones,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_Number_of_files_in_SHARE_zones,"%s RM",ClassHead);
+ HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead);
+ HTM_TH (1,1,Txt_INFO_TITLE[Inf_ASSESSMENT] ,"%s LM",ClassHead);
+ HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"%s LM",ClassHead);
HTM_TR_End ();
break;
}
+ free (ClassHead);
+
/***** List courses *****/
mysql_data_seek (mysql_res,0);
- for (Gbl.RowEvenOdd = 1, NumCrs = 0;
+ for (NumCrs = 0, Gbl.RowEvenOdd = 1;
NumCrs < NumCrss;
NumCrs++, Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd)
{
@@ -707,7 +715,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
case Ind_INDICATORS_BRIEF:
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -715,7 +723,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[0]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -723,7 +731,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[1]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -731,7 +739,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[3]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL LM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL %s LM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_A_Begin ("href=\"%s/?crs=%ld&act=%ld\" target=\"_blank\"",
Cfg_URL_SWAD_CGI,CrsCod,ActCod);
@@ -740,7 +748,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_A_End ();
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -748,61 +756,61 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Unsigned (IndicatorsCrs.NumIndicators);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsSyllabus)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsSyllabus)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereAreAssignments)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereAreAssignments)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsOnlineTutoring)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsOnlineTutoring)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereAreMaterials)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereAreMaterials)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsAssessment)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsAssessment)
HTM_Txt (Txt_NO);
@@ -820,7 +828,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -828,7 +836,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[0]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -836,7 +844,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[1]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -844,7 +852,7 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Txt (row[3]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL LM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL %s LM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_A_Begin ("href=\"%s/?crs=%ld&act=%ld\" target=\"_blank\"",
Cfg_URL_SWAD_CGI,CrsCod,ActCod);
@@ -853,21 +861,21 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_A_End ();
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
NumTchs != 0 ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (NumTchs);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
NumStds != 0 ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (NumStds);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
IndicatorsCrs.CourseAllOK ? "DAT_SMALL_GREEN" :
(IndicatorsCrs.CoursePartiallyOK ? "DAT_SMALL" :
"DAT_SMALL_RED"),
@@ -875,151 +883,151 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I
HTM_Unsigned (IndicatorsCrs.NumIndicators);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsSyllabus)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsSyllabus)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
(IndicatorsCrs.SyllabusLecSrc != Inf_NONE) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Txt (Txt_INFO_SRC_SHORT_TEXT[IndicatorsCrs.SyllabusLecSrc]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
(IndicatorsCrs.SyllabusPraSrc != Inf_NONE) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Txt (Txt_INFO_SRC_SHORT_TEXT[IndicatorsCrs.SyllabusPraSrc]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
(IndicatorsCrs.TeachingGuideSrc != Inf_NONE) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Txt (Txt_INFO_SRC_SHORT_TEXT[IndicatorsCrs.TeachingGuideSrc]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereAreAssignments)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereAreAssignments)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumAssignments != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumAssignments);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumFilesAssignments != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumFilesAssignments);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumFilesWorks != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumFilesWorks);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsOnlineTutoring)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsOnlineTutoring)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumThreads != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumThreads);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumPosts != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumPosts);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumMsgsSentByTchs != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumMsgsSentByTchs);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereAreMaterials)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereAreMaterials)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumFilesInDocumentZones != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumFilesInDocumentZones);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s RM %s\"",
+ HTM_TD_Begin ("class=\"%s %s RM\"",
(IndicatorsCrs.NumFilesInSharedZones != 0) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Unsigned (IndicatorsCrs.NumFilesInSharedZones);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_GREEN CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_GREEN %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (IndicatorsCrs.ThereIsAssessment)
HTM_Txt (Txt_YES);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"DAT_SMALL_RED CM %s\"",
+ HTM_TD_Begin ("class=\"DAT_SMALL_RED %s CM\"",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (!IndicatorsCrs.ThereIsAssessment)
HTM_Txt (Txt_NO);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
(IndicatorsCrs.AssessmentSrc != Inf_NONE) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_Txt (Txt_INFO_SRC_SHORT_TEXT[IndicatorsCrs.AssessmentSrc]);
HTM_TD_End ();
- HTM_TD_Begin ("class=\"%s LM %s\"",
+ HTM_TD_Begin ("class=\"%s %s LM\"",
(IndicatorsCrs.TeachingGuideSrc != Inf_NONE) ? "DAT_SMALL_GREEN" :
"DAT_SMALL_RED",
Gbl.ColorRows[Gbl.RowEvenOdd]);
diff --git a/swad_institution.c b/swad_institution.c
index 44578efe..07dd493e 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -443,6 +443,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_INSTITUTIONS_HELP_ORDER[2];
extern const char *Txt_INSTITUTIONS_ORDER[2];
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
@@ -453,8 +454,8 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
Ins_Order_t Order;
static const char *ClassTH[Ins_NUM_ORDERS] =
{
- [Ins_ORDER_BY_INSTITUTION] = "TIT_TBL LM",
- [Ins_ORDER_BY_NUM_USRS ] = "TIT_TBL RM"
+ [Ins_ORDER_BY_INSTITUTION] = "TIT_TBL_%s LM",
+ [Ins_ORDER_BY_NUM_USRS ] = "TIT_TBL_%s RM"
};
HTM_TR_Begin (NULL);
@@ -464,7 +465,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
Order <= (Ins_Order_t) (Ins_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,ClassTH[Order]);
+ HTM_TH_Begin (1,1,ClassTH[Order],The_Colors[Gbl.Prefs.Theme]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeIns);
diff --git a/swad_log.c b/swad_log.c
index 54e76864..f2b196b5 100644
--- a/swad_log.c
+++ b/swad_log.c
@@ -159,6 +159,7 @@ void Log_ShowLastClicks (void)
void Log_GetAndShowLastClicks (void)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Click;
extern const char *Txt_ELAPSED_TIME;
extern const char *Txt_Role;
@@ -186,14 +187,14 @@ void Log_GetAndShowLastClicks (void)
/* Heading row */
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_Click ,"LC_CLK"); // Click
- HTM_TH (1,1,Txt_ELAPSED_TIME,"LC_TIM"); // Elapsed time
- HTM_TH (1,1,Txt_Role ,"LC_ROL"); // Role
- HTM_TH (1,1,Txt_Country ,"LC_CTY"); // Country
- HTM_TH (1,1,Txt_Institution ,"LC_INS"); // Institution
- HTM_TH (1,1,Txt_Center ,"LC_CTR"); // Center
- HTM_TH (1,1,Txt_Degree ,"LC_DEG"); // Degree
- HTM_TH (1,1,Txt_Action ,"LC_ACT"); // Action
+ HTM_TH (1,1,Txt_Click ,"LC_CLK TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Click
+ HTM_TH (1,1,Txt_ELAPSED_TIME,"LC_TIM TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Elapsed time
+ HTM_TH (1,1,Txt_Role ,"LC_ROL TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Role
+ HTM_TH (1,1,Txt_Country ,"LC_CTY TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Country
+ HTM_TH (1,1,Txt_Institution ,"LC_INS TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Institution
+ HTM_TH (1,1,Txt_Center ,"LC_CTR TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Center
+ HTM_TH (1,1,Txt_Degree ,"LC_DEG TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Degree
+ HTM_TH (1,1,Txt_Action ,"LC_ACT TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Action
HTM_TR_End ();
for (NumClick = 0;
diff --git a/swad_mail.c b/swad_mail.c
index f8e6ec88..5d40d3e9 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -104,6 +104,7 @@ void Mai_SeeMailDomains (void)
{
extern const char *Hlp_START_Domains;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Email_domains_allowed_for_notifications;
extern const char *Txt_EMAIL_DOMAIN_HELP_ORDER[3];
extern const char *Txt_EMAIL_DOMAIN_ORDER[3];
@@ -132,7 +133,7 @@ void Mai_SeeMailDomains (void)
Order <= Mai_ORDER_BY_USERS;
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeMai);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
diff --git a/swad_photo.c b/swad_photo.c
index d50cd27d..c04a72da 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -2221,12 +2221,12 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
/***** Write heading *****/
HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL);
- HTM_TH (1,1,Txt_No_INDEX,"RT");
- HTM_TH (1,1,Txt_Degree ,"CT");
+ HTM_TH (1,1,Txt_No_INDEX,"TIT_TBL_%s RT",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Degree ,"TIT_TBL_%s CT",The_Colors[Gbl.Prefs.Theme]);
for (Sex = (Usr_Sex_t) 0;
Sex <= (Usr_Sex_t) (Usr_NUM_SEXS - 1);
Sex++)
- HTM_TH (1,1,Txt_SEX_PLURAL_Abc[Sex],"CT");
+ HTM_TH (1,1,Txt_SEX_PLURAL_Abc[Sex],"TIT_TBL_%s CT",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Get degrees *****/
diff --git a/swad_place.c b/swad_place.c
index 9445e093..f2a80402 100644
--- a/swad_place.c
+++ b/swad_place.c
@@ -95,6 +95,7 @@ void Plc_SeePlaces (void)
{
extern const char *Hlp_INSTITUTION_Places;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Places;
extern const char *Txt_PLACES_HELP_ORDER[2];
extern const char *Txt_PLACES_ORDER[2];
@@ -128,7 +129,7 @@ void Plc_SeePlaces (void)
Order <= (Plc_Order_t) (Plc_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeePlc);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
diff --git a/swad_project.c b/swad_project.c
index f56a2fc4..29135f98 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -508,7 +508,7 @@ static void Prj_ShowPrjsInCurrentPage (void *Projects)
Prj_ShowProjectsHead ((struct Prj_Projects *) Projects,Prj_LIST_PROJECTS);
/***** Write all projects *****/
- for (NumPrj = Pagination.FirstItemVisible;
+ for (NumPrj = Pagination.FirstItemVisible;
NumPrj <= Pagination.LastItemVisible;
NumPrj++)
{
@@ -964,6 +964,7 @@ static Usr_Who_t Prj_GetParamWho (void)
static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
Prj_ProjectView_t ProjectView)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_No_INDEX;
extern const char *Txt_PROJECT_ORDER_HELP[Prj_NUM_ORDERS];
extern const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS];
@@ -975,7 +976,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
switch (ProjectView)
{
case Prj_LIST_PROJECTS:
- HTM_TH (1,1,Txt_No_INDEX,"CM");
+ HTM_TH (1,1,Txt_No_INDEX,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
break;
default:
break;
@@ -997,7 +998,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
switch (ProjectView)
{
diff --git a/swad_question.c b/swad_question.c
index c603e850..b68b61e6 100644
--- a/swad_question.c
+++ b/swad_question.c
@@ -901,6 +901,7 @@ void Qst_ListOneOrMoreQstsForEdition (struct Qst_Questions *Questions,
void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
{
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_No_INDEX;
extern const char *Txt_Code;
extern const char *Txt_Date;
@@ -929,7 +930,7 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
Order <= (Qst_QuestionsOrder_t) (Qst_NUM_TYPES_ORDER_QST - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LT");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LT",The_Colors[Gbl.Prefs.Theme]);
if (Questions->NumQsts > 1)
{
diff --git a/swad_room.c b/swad_room.c
index 3878ba42..f8af9ad0 100644
--- a/swad_room.c
+++ b/swad_room.c
@@ -146,6 +146,7 @@ void Roo_SeeRooms (void)
{
extern const char *Hlp_CENTER_Rooms;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Rooms;
extern const char *Txt_ROOMS_HELP_ORDER[Roo_NUM_ORDERS];
extern const char *Txt_ROOMS_ORDER[Roo_NUM_ORDERS];
@@ -183,7 +184,7 @@ void Roo_SeeRooms (void)
Order <= (Roo_Order_t) (Roo_NUM_ORDERS - 1);
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeRoo);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_ROOMS_HELP_ORDER[Order],
diff --git a/swad_statistic.c b/swad_statistic.c
index 602f4370..2c5b005c 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -1062,6 +1062,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
{
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Show_previous_X_clicks;
extern const char *Txt_PAGES_Previous;
extern const char *Txt_Clicks;
@@ -1144,7 +1145,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
Par_PutHiddenParamUnsigned (NULL,"RowsPage",Stats->RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
}
- HTM_TD_Begin ("class=\"TIT_TBL LM\"");
+ HTM_TD_Begin ("class=\"TIT_TBL_%s LM\"",The_Colors[Gbl.Prefs.Theme]);
if (FirstRow > 1)
{
if (asprintf (&Title,Txt_Show_previous_X_clicks,Stats->RowsPerPage) < 0)
@@ -1182,7 +1183,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
Par_PutHiddenParamUnsigned (NULL,"RowsPage" ,(unsigned) Stats->RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
}
- HTM_TD_Begin ("class=\"TIT_TBL RM\"");
+ HTM_TD_Begin ("class=\"TIT_TBL_%s RM\"",The_Colors[Gbl.Prefs.Theme]);
if (LastRow < NumHits)
{
if (asprintf (&Title,Txt_Show_next_X_clicks,Stats->RowsPerPage) < 0)
diff --git a/swad_survey.c b/swad_survey.c
index 6ad0bb28..ff16d753 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -195,6 +195,7 @@ void Svy_SeeAllSurveys (void)
static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
{
extern const char *Hlp_ASSESSMENT_Surveys;
+ extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Surveys;
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@@ -249,7 +250,7 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
Order <= Dat_END_TIME;
Order++)
{
- HTM_TH_Begin (1,1,"TIT_TBL LM");
+ HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
/* Form to change order */
Frm_BeginForm (ActSeeAllSvy);
@@ -270,13 +271,13 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
HTM_TH_End ();
}
- HTM_TH (1,1,Txt_Survey,"LM");
- HTM_TH (1,1,Txt_Status,"CM");
+ HTM_TH (1,1,Txt_Survey,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
+ HTM_TH (1,1,Txt_Status,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
HTM_TR_End ();
/***** Write all surveys *****/
- for (NumSvy = Pagination.FirstItemVisible;
+ for (NumSvy = Pagination.FirstItemVisible;
NumSvy <= Pagination.LastItemVisible;
NumSvy++)
Svy_ShowOneSurvey (Surveys,Surveys->LstSvyCods[NumSvy - 1],false);
diff --git a/swad_text.c b/swad_text.c
index ca392477..4b5e2a75 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -28548,7 +28548,7 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] =
#elif L==7 // it
"Sondaggio"
#elif L==8 // pl
- "Badania"
+ "Ankieta"
#elif L==9 // pt
"Inquérito"
#endif
@@ -44355,7 +44355,7 @@ const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES] =
#elif L==7 // it
"Sondaggi"
#elif L==8 // pl
- "Badania"
+ "Ankieta"
#elif L==9 // pt
"Inquéritos"
#endif
@@ -45098,7 +45098,7 @@ const char *Txt_Surname_2 =
const char *Txt_Survey =
#if L==1 // ca
- "Encuesta"; // Necessita traduccio
+ "Enquesta";
#elif L==2 // de
"Umfrage";
#elif L==3 // en
@@ -45112,7 +45112,7 @@ const char *Txt_Survey =
#elif L==7 // it
"Sondaggio";
#elif L==8 // pl
- "Survey"; // Potrzebujesz tlumaczenie
+ "Ankieta";
#elif L==9 // pt
"Inquérito";
#endif
@@ -45259,7 +45259,7 @@ const char *Txt_Survey_X_removed = // Warning: it is very important to include %
#elif L==7 // it
"Sondaggio %s rimosso.";
#elif L==8 // pl
- "Badanie %s usunięte.";
+ "Ankieta %s usunięte.";
#elif L==9 // pt
"Inquérito %s removido.";
#endif
@@ -45280,7 +45280,7 @@ const char *Txt_Survey_X_reset = // Warning: it is very important to include %s
#elif L==7 // it
"Sondaggio %s resettato.";
#elif L==8 // pl
- "Badanie %s zresetowane.";
+ "Ankieta %s zresetowane.";
#elif L==9 // pt
"Inquérito %s fixado em zero.";
#endif