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.6: Mar 26, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-03-26 22:17:38 +01:00
parent e9faa5080d
commit 2bfdac91e2
16 changed files with 151 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_API.c
View File

@ -1393,7 +1393,7 @@ static int API_WriteSyllabusIntoHTMLBuffer (struct soap *soap,
static int API_WritePlainTextIntoHTMLBuffer (struct soap *soap, static int API_WritePlainTextIntoHTMLBuffer (struct soap *soap,
char **HTMLBuffer) char **HTMLBuffer)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES]; extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1]; char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
char FileNameHTMLTmp[PATH_MAX + 1]; char FileNameHTMLTmp[PATH_MAX + 1];
@ -1422,7 +1422,8 @@ static int API_WritePlainTextIntoHTMLBuffer (struct soap *soap,
/***** Write start of HTML code *****/ /***** Write start of HTML code *****/
Lay_BeginHTMLFile (FileHTMLTmp,Txt_INFO_TITLE[Gbl.Crs.Info.Type]); Lay_BeginHTMLFile (FileHTMLTmp,Txt_INFO_TITLE[Gbl.Crs.Info.Type]);
fprintf (FileHTMLTmp,"<body>\n" fprintf (FileHTMLTmp,"<body>\n"
"<div class=\"%s LM\">\n",The_ClassDat[Gbl.Prefs.Theme]); "<div class=\"LM DAT_%s\">\n",
The_Colors[Gbl.Prefs.Theme]);
/***** Write plain text into text buffer *****/ /***** Write plain text into text buffer *****/
/* Convert to respectful HTML and insert links */ /* Convert to respectful HTML and insert links */

10
swad_agenda.c
View File

@ -1668,7 +1668,7 @@ void Agd_PrintAgdQRCode (void)
void Agd_GetAndShowAgendasStats (void) void Agd_GetAndShowAgendasStats (void)
{ {
extern const char *Hlp_ANALYTICS_Figures_agendas; extern const char *Hlp_ANALYTICS_Figures_agendas;
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_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_events; extern const char *Txt_Number_of_events;
extern const char *Txt_Number_of_users; extern const char *Txt_Number_of_users;
@ -1703,21 +1703,21 @@ void Agd_GetAndShowAgendasStats (void)
/***** Write number of users who have chosen each language *****/ /***** Write number of users who have chosen each language *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumEvents); HTM_Unsigned (NumEvents);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs); HTM_Unsigned (NumUsrs);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs * 100.0 / HTM_Percentage (NumUsrsTotal ? (double) NumUsrs * 100.0 /
(double) NumUsrsTotal : (double) NumUsrsTotal :
0); 0);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumUsrs ? (double) NumEvents / HTM_Double2Decimals (NumUsrs ? (double) NumEvents /
(double) NumUsrs : (double) NumUsrs :
0); 0);

6
swad_announcement.c
View File

@ -337,7 +337,7 @@ void Ann_ShowFormAnnouncement (void)
{ {
extern const char *Hlp_COMMUNICATION_Announcements; extern const char *Hlp_COMMUNICATION_Announcements;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; 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_New_announcement; extern const char *Txt_New_announcement;
extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Content; extern const char *Txt_MSG_Content;
@ -359,11 +359,11 @@ void Ann_ShowFormAnnouncement (void)
/***** Users' roles who can view the announcement *****/ /***** Users' roles who can view the announcement *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Users); HTM_TxtColonNBSP (Txt_Users);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Rol_WriteSelectorRoles (1 << Rol_UNK | Rol_WriteSelectorRoles (1 << Rol_UNK |
1 << Rol_GST | 1 << Rol_GST |
1 << Rol_STD | 1 << Rol_STD |

20
swad_assignment.c
View File

@ -1080,7 +1080,7 @@ void Asg_RequestCreatOrEditAsg (void)
{ {
extern const char *Hlp_ASSESSMENT_Assignments_new_assignment; extern const char *Hlp_ASSESSMENT_Assignments_new_assignment;
extern const char *Hlp_ASSESSMENT_Assignments_edit_assignment; extern const char *Hlp_ASSESSMENT_Assignments_edit_assignment;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_assignment; extern const char *Txt_New_assignment;
extern const char *Txt_Edit_assignment; extern const char *Txt_Edit_assignment;
@ -1196,7 +1196,7 @@ void Asg_RequestCreatOrEditAsg (void)
/* Data */ /* Data */
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Folder); HTM_TxtColon (Txt_Folder);
HTM_INPUT_TEXT ("Folder",Brw_MAX_CHARS_FOLDER,Asg.Folder, HTM_INPUT_TEXT ("Folder",Brw_MAX_CHARS_FOLDER,Asg.Folder,
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
@ -1249,7 +1249,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{ {
extern const char *Hlp_USERS_Groups; extern const char *Hlp_USERS_Groups;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; 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_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
unsigned NumGrpTyp; unsigned NumGrpTyp;
@ -1274,8 +1274,8 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
/***** First row: checkbox to select the whole course *****/ /***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"%s LM\"", HTM_TD_Begin ("colspan=\"7\" class=\"LM DAT_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL); HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"WholeCrs\" value=\"Y\"%s" "id=\"WholeCrs\" value=\"Y\"%s"
@ -1647,7 +1647,7 @@ unsigned Asg_GetNumAssignments (HieLvl_Level_t Scope,unsigned *NumNotif)
void Asg_GetAndShowAssignmentsStats (void) void Asg_GetAndShowAssignmentsStats (void)
{ {
extern const char *Hlp_ANALYTICS_Figures_assignments; 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_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_assignments; extern const char *Txt_Number_of_BR_assignments;
extern const char *Txt_Number_of_BR_courses_with_BR_assignments; extern const char *Txt_Number_of_BR_courses_with_BR_assignments;
@ -1680,19 +1680,19 @@ void Asg_GetAndShowAssignmentsStats (void)
/***** Write number of assignments *****/ /***** Write number of assignments *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumAssignments); HTM_Unsigned (NumAssignments);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithAssignments); HTM_Unsigned (NumCoursesWithAssignments);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumAssignmentsPerCourse); HTM_Double2Decimals (NumAssignmentsPerCourse);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumNotif); HTM_Unsigned (NumNotif);
HTM_TD_End (); HTM_TD_End ();

29
swad_attendance.c
View File

@ -1138,7 +1138,7 @@ void Att_RequestCreatOrEditAttEvent (void)
static void Att_ShowLstGrpsToEditAttEvent (long AttCod) static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; 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_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
unsigned NumGrpTyp; unsigned NumGrpTyp;
@ -1163,8 +1163,8 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
/***** First row: checkbox to select the whole course *****/ /***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"%s LM\"", HTM_TD_Begin ("colspan=\"7\" class=\"LM DAT_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL); HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"WholeCrs\" value=\"Y\"%s" "id=\"WholeCrs\" value=\"Y\"%s"
@ -1694,7 +1694,6 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
struct UsrData *UsrDat, struct UsrData *UsrDat,
struct Att_Event *Event) struct Att_Event *Event)
{ {
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
static const char *ClassPhoto[PhoSha_NUM_SHAPES] = static const char *ClassPhoto[PhoSha_NUM_SHAPES] =
@ -2668,7 +2667,7 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
Att_TypeOfView_t TypeOfView) Att_TypeOfView_t TypeOfView)
{ {
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES]; extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Events; extern const char *Txt_Events;
extern const char *Txt_Event; extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -2730,8 +2729,8 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
/* Write a row for this event */ /* Write a row for this event */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s CT %s\"", HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_INPUT_CHECKBOX ("AttCods",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AttCods",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Event%u\" value=\"%ld\"%s", "id=\"Event%u\" value=\"%ld\"%s",
@ -2740,16 +2739,16 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
""); "");
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"", HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_LABEL_Begin ("for=\"Event%u\"",NumAttEvent); HTM_LABEL_Begin ("for=\"Event%u\"",NumAttEvent);
HTM_TxtF ("%u:",NumAttEvent + 1); HTM_TxtF ("%u:",NumAttEvent + 1);
HTM_LABEL_End (); HTM_LABEL_End ();
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT %s\"", HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
if (asprintf (&Id,"att_date_start_%u",UniqueId) < 0) if (asprintf (&Id,"att_date_start_%u",UniqueId) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
@ -2763,14 +2762,14 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
free (Id); free (Id);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT %s\"", HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_Txt (Events->Lst[NumAttEvent].Title); HTM_Txt (Events->Lst[NumAttEvent].Title);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"", HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_Unsigned (Events->Lst[NumAttEvent].NumStdsTotal); HTM_Unsigned (Events->Lst[NumAttEvent].NumStdsTotal);
HTM_TD_End (); HTM_TD_End ();

6
swad_banner.c
View File

@ -168,7 +168,7 @@ void Ban_ShowAllBanners (void)
static void Ban_WriteListOfBanners (const struct Ban_Banners *Banners) static void Ban_WriteListOfBanners (const struct Ban_Banners *Banners)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
unsigned NumBan; unsigned NumBan;
/***** List start *****/ /***** List start *****/
@ -181,10 +181,10 @@ static void Ban_WriteListOfBanners (const struct Ban_Banners *Banners)
{ {
/* Write data of this banner */ /* Write data of this banner */
HTM_LI_Begin (NULL); HTM_LI_Begin (NULL);
HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"%s\" target=\"_blank\"", HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT_%s\" target=\"_blank\"",
Banners->Lst[NumBan].WWW, Banners->Lst[NumBan].WWW,
Banners->Lst[NumBan].FullName, Banners->Lst[NumBan].FullName,
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
HTM_IMG (Cfg_URL_BANNER_PUBLIC,Banners->Lst[NumBan].Img,Banners->Lst[NumBan].FullName, HTM_IMG (Cfg_URL_BANNER_PUBLIC,Banners->Lst[NumBan].Img,Banners->Lst[NumBan].FullName,
"class=\"BANNER\""); "class=\"BANNER\"");
HTM_A_End (); HTM_A_End ();

12
swad_browser.c
View File

@ -3949,7 +3949,7 @@ static void Brw_InitHiddenLevels (void)
static void Brw_ShowAndStoreSizeOfFileTree (void) static void Brw_ShowAndStoreSizeOfFileTree (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_level; extern const char *Txt_level;
extern const char *Txt_levels; extern const char *Txt_levels;
extern const char *Txt_folder; extern const char *Txt_folder;
@ -3959,7 +3959,7 @@ static void Brw_ShowAndStoreSizeOfFileTree (void)
extern const char *Txt_of_PART_OF_A_TOTAL; extern const char *Txt_of_PART_OF_A_TOTAL;
char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1];
HTM_DIV_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_DIV_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type]) if (Brw_FileBrowserIsEditable[Gbl.FileBrowser.Type])
{ {
@ -10915,7 +10915,7 @@ static void Brw_WriteRowStatsFileBrowsers3 (const char *NameOfFileZones,
void Brw_GetAndShowOERsStats (void) void Brw_GetAndShowOERsStats (void)
{ {
extern const char *Hlp_ANALYTICS_Figures_open_educational_resources_oer; 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_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_License; extern const char *Txt_License;
extern const char *Txt_Number_of_private_files; extern const char *Txt_Number_of_private_files;
@ -10944,15 +10944,15 @@ void Brw_GetAndShowOERsStats (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_LICENSES[License]); HTM_Txt (Txt_LICENSES[License]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_UnsignedLong (NumFiles[0]); HTM_UnsignedLong (NumFiles[0]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_UnsignedLong (NumFiles[1]); HTM_UnsignedLong (NumFiles[1]);
HTM_TD_End (); HTM_TD_End ();

19
swad_building.c
View File

@ -92,7 +92,7 @@ void Bld_ResetBuildings (struct Bld_Buildings *Buildings)
void Bld_SeeBuildings (void) void Bld_SeeBuildings (void)
{ {
extern const char *Hlp_CENTER_Buildings; 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;
extern const char *Txt_BUILDINGS_HELP_ORDER[Bld_NUM_ORDERS]; extern const char *Txt_BUILDINGS_HELP_ORDER[Bld_NUM_ORDERS];
extern const char *Txt_BUILDINGS_ORDER[Bld_NUM_ORDERS]; extern const char *Txt_BUILDINGS_ORDER[Bld_NUM_ORDERS];
@ -149,21 +149,20 @@ void Bld_SeeBuildings (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Short name */ /* Short name */
HTM_TD_Begin ("class=\"%s LM %s\"", HTM_TD_Begin ("class=\"LM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
The_GetColorRows ());
HTM_Txt (Buildings.Lst[NumBuilding].ShrtName); HTM_Txt (Buildings.Lst[NumBuilding].ShrtName);
HTM_TD_End (); HTM_TD_End ();
/* Full name */ /* Full name */
HTM_TD_Begin ("class=\"%s LM %s\"", HTM_TD_Begin ("class=\"LM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ()); The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Buildings.Lst[NumBuilding].FullName); HTM_Txt (Buildings.Lst[NumBuilding].FullName);
HTM_TD_End (); HTM_TD_End ();
/* Location */ /* Location */
HTM_TD_Begin ("class=\"%s LM %s\"", HTM_TD_Begin ("class=\"LM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ()); The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Buildings.Lst[NumBuilding].Location); HTM_Txt (Buildings.Lst[NumBuilding].Location);
HTM_TD_End (); HTM_TD_End ();
@ -409,7 +408,7 @@ void Bld_FreeListBuildings (struct Bld_Buildings *Buildings)
static void Bld_ListBuildingsForEdition (const struct Bld_Buildings *Buildings) static void Bld_ListBuildingsForEdition (const struct Bld_Buildings *Buildings)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumBld; unsigned NumBld;
struct Bld_Building *Building; struct Bld_Building *Building;
@ -440,7 +439,7 @@ static void Bld_ListBuildingsForEdition (const struct Bld_Buildings *Buildings)
HTM_TD_End (); HTM_TD_End ();
/* Building code */ /* Building code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
HTM_Long (Building->BldCod); HTM_Long (Building->BldCod);
HTM_ARTICLE_End (); HTM_ARTICLE_End ();

6
swad_calendar.c
View File

@ -342,7 +342,7 @@ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void)
{ {
extern const bool Cal_DayIsValidAsFirstDayOfWeek[7]; extern const bool Cal_DayIsValidAsFirstDayOfWeek[7];
extern const char *Hlp_ANALYTICS_Figures_calendar; extern const char *Hlp_ANALYTICS_Figures_calendar;
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_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Calendar; extern const char *Txt_Calendar;
extern const char *Txt_First_day_of_the_week_X; extern const char *Txt_First_day_of_the_week_X;
@ -405,11 +405,11 @@ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void)
free (Icon); free (Icon);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[FirstDayOfWeek]); HTM_Unsigned (NumUsrs[FirstDayOfWeek]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[FirstDayOfWeek] * 100.0 / HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[FirstDayOfWeek] * 100.0 /
(double) NumUsrsTotal : (double) NumUsrsTotal :
0.0); 0.0);

49
swad_center.c
View File

@ -107,7 +107,7 @@ static void Ctr_FormToGoToMap (struct Ctr_Center *Ctr);
void Ctr_SeeCtrWithPendingDegs (void) void Ctr_SeeCtrWithPendingDegs (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Pending;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Centers_with_pending_degrees; extern const char *Txt_Centers_with_pending_degrees;
extern const char *Txt_Center; extern const char *Txt_Center;
extern const char *Txt_Degrees_ABBREVIATION; extern const char *Txt_Degrees_ABBREVIATION;
@ -154,13 +154,14 @@ void Ctr_SeeCtrWithPendingDegs (void)
/* Center logo and full name */ /* Center logo and full name */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s NOWRAP LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); HTM_TD_Begin ("class=\"LM %s NOWRAP %s\"",
The_Colors[Gbl.Prefs.Theme],BgColor);
Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg,"CM"); Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg,"CM");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending degrees (row[1]) */ /* Number of pending degrees (row[1]) */
HTM_TD_Begin ("class=\"%s RM %s\"", HTM_TD_Begin ("class=\"RM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme],BgColor); The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (row[1]); HTM_Txt (row[1]);
HTM_TD_End (); HTM_TD_End ();
@ -755,7 +756,7 @@ void Ctr_WriteSelectorOfCenter (void)
static void Ctr_ListCentersForEdition (const struct Plc_Places *Places) static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Another_place; extern const char *Txt_Another_place;
extern const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT]; extern const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT];
@ -808,7 +809,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Center code */ /* Center code */
HTM_TD_Begin ("class=\"%s CODE\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"DAT_%s CODE\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Ctr->CtrCod); HTM_Long (Ctr->CtrCod);
HTM_TD_End (); HTM_TD_End ();
@ -818,7 +819,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Place */ /* Place */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit) if (ICanEdit)
{ {
Frm_BeginForm (ActChgCtrPlc); Frm_BeginForm (ActChgCtrPlc);
@ -847,7 +848,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Center short name */ /* Center short name */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit) if (ICanEdit)
{ {
Frm_BeginForm (ActRenCtrSho); Frm_BeginForm (ActRenCtrSho);
@ -863,7 +864,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Center full name */ /* Center full name */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit) if (ICanEdit)
{ {
Frm_BeginForm (ActRenCtrFul); Frm_BeginForm (ActRenCtrFul);
@ -879,7 +880,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Center WWW */ /* Center WWW */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit) if (ICanEdit)
{ {
Frm_BeginForm (ActChgCtrWWW); Frm_BeginForm (ActChgCtrWWW);
@ -895,9 +896,9 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
Str_Copy (WWW,Ctr->WWW,sizeof (WWW) - 1); Str_Copy (WWW,Ctr->WWW,sizeof (WWW) - 1);
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\"");
HTM_A_Begin ("href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"%s\" title=\"%s\"", " class=\"DAT_%s\" title=\"%s\"",
Ctr->WWW, Ctr->WWW,
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
Ctr->WWW); Ctr->WWW);
HTM_Txt (WWW); HTM_Txt (WWW);
HTM_A_End (); HTM_A_End ();
@ -906,17 +907,17 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/* Number of users who claim to belong to this center */ /* Number of users who claim to belong to this center */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsCtr); HTM_Unsigned (NumUsrsCtr);
HTM_TD_End (); HTM_TD_End ();
/* Number of degrees */ /* Number of degrees */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumDegs); HTM_Unsigned (NumDegs);
HTM_TD_End (); HTM_TD_End ();
/* Number of users in courses of this center */ /* Number of users in courses of this center */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsInCrssOfCtr); HTM_Unsigned (NumUsrsInCrssOfCtr);
HTM_TD_End (); HTM_TD_End ();
@ -925,8 +926,8 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat, Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,
Usr_DONT_GET_PREFS, Usr_DONT_GET_PREFS,
Usr_DONT_GET_ROLE_IN_CURRENT_CRS); Usr_DONT_GET_ROLE_IN_CURRENT_CRS);
HTM_TD_Begin ("class=\"%s INPUT_REQUESTER LT\"", HTM_TD_Begin ("class=\"DAT_%s INPUT_REQUESTER LT\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
Msg_WriteMsgAuthor (&UsrDat,true,NULL); Msg_WriteMsgAuthor (&UsrDat,true,NULL);
HTM_TD_End (); HTM_TD_End ();
@ -1303,7 +1304,7 @@ static void Ctr_PutParamGoToCtr (void *CtrCod)
static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places) static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_center; extern const char *Txt_New_center;
extern const char *Txt_Another_place; extern const char *Txt_Another_place;
@ -1382,28 +1383,28 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this center *****/ /***** Number of users who claim to belong to this center *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
/***** Number of degrees *****/ /***** Number of degrees *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
/***** Number of users in courses of this center *****/ /***** Number of users in courses of this center *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
/***** Center requester *****/ /***** Center requester *****/
HTM_TD_Begin ("class=\"%s INPUT_REQUESTER LT\"", HTM_TD_Begin ("class=\"DAT_%s INPUT_REQUESTER LT\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true,NULL); Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true,NULL);
HTM_TD_End (); HTM_TD_End ();
/***** Center status *****/ /***** Center status *****/
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();

20
swad_center_config.c
View File

@ -551,7 +551,7 @@ static void CtrCfg_FreePhotoAttr (char **PhotoAttribution)
static void CtrCfg_Institution (bool PrintView,bool PutForm) static void CtrCfg_Institution (bool PrintView,bool PutForm)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Institution; extern const char *Txt_Institution;
unsigned NumIns; unsigned NumIns;
@ -565,7 +565,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
Txt_Institution); Txt_Institution);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm) if (PutForm)
{ {
/* Get list of institutions of the current country */ /* Get list of institutions of the current country */
@ -643,7 +643,7 @@ static void CtrCfg_ShrtName (bool PutForm)
static void CtrCfg_Place (bool PutForm) static void CtrCfg_Place (bool PutForm)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Place; extern const char *Txt_Place;
extern const char *Txt_Another_place; extern const char *Txt_Another_place;
@ -667,7 +667,7 @@ static void CtrCfg_Place (bool PutForm)
Txt_Place); Txt_Place);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm) if (PutForm)
{ {
/* Get list of places of the current institution */ /* Get list of places of the current institution */
@ -734,7 +734,7 @@ static void CtrCfg_QR (void)
static void CtrCfg_NumUsrs (void) static void CtrCfg_NumUsrs (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Users_of_the_center; extern const char *Txt_Users_of_the_center;
/***** Number of users *****/ /***** Number of users *****/
@ -744,7 +744,7 @@ static void CtrCfg_NumUsrs (void)
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_center); Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_center);
/* Data */ /* Data */
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 (Ctr_GetCachedNumUsrsWhoClaimToBelongToCtr (&Gbl.Hierarchy.Ctr)); HTM_Unsigned (Ctr_GetCachedNumUsrsWhoClaimToBelongToCtr (&Gbl.Hierarchy.Ctr));
HTM_TD_End (); HTM_TD_End ();
@ -757,7 +757,7 @@ static void CtrCfg_NumUsrs (void)
static void CtrCfg_NumDegs (void) static void CtrCfg_NumDegs (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Degrees; extern const char *Txt_Degrees;
extern const char *Txt_Degrees_of_CENTER_X; extern const char *Txt_Degrees_of_CENTER_X;
char *Title; char *Title;
@ -769,7 +769,7 @@ static void CtrCfg_NumDegs (void)
Frm_LabelColumn ("RT",NULL,Txt_Degrees); Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginFormGoTo (ActSeeDeg); Frm_BeginFormGoTo (ActSeeDeg);
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
if (asprintf (&Title,Txt_Degrees_of_CENTER_X,Gbl.Hierarchy.Ctr.ShrtName) < 0) if (asprintf (&Title,Txt_Degrees_of_CENTER_X,Gbl.Hierarchy.Ctr.ShrtName) < 0)
@ -790,7 +790,7 @@ static void CtrCfg_NumDegs (void)
static void CtrCfg_NumCrss (void) static void CtrCfg_NumCrss (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Courses; extern const char *Txt_Courses;
/***** Number of courses *****/ /***** Number of courses *****/
@ -800,7 +800,7 @@ static void CtrCfg_NumCrss (void)
Frm_LabelColumn ("RT",NULL,Txt_Courses); Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */ /* Data */
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 (Crs_GetCachedNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_Unsigned (Crs_GetCachedNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod));
HTM_TD_End (); HTM_TD_End ();

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. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.86.5 (2022-03-25)" #define Log_PLATFORM_VERSION "SWAD 21.86.6 (2022-03-25)"
#define CSS_FILE "swad21.85.1.css" #define CSS_FILE "swad21.85.1.css"
#define JS_FILE "swad21.78.2.js" #define JS_FILE "swad21.78.2.js"
/* /*
Version 21.86.6: Mar 26, 2022 Working on design of dark theme. (323751 lines)
Version 21.86.5: Mar 26, 2022 Working on design of dark theme. (323750 lines) Version 21.86.5: Mar 26, 2022 Working on design of dark theme. (323750 lines)
Version 21.86.4: Mar 26, 2022 Working on design of dark theme. (323737 lines) Version 21.86.4: Mar 26, 2022 Working on design of dark theme. (323737 lines)
Version 21.86.3: Mar 25, 2022 Working on design of dark theme. (323709 lines) Version 21.86.3: Mar 25, 2022 Working on design of dark theme. (323709 lines)

10
swad_chat.c
View File

@ -103,7 +103,7 @@ void Cht_ShowChatRooms (void)
void Cht_ShowListOfAvailableChatRooms (void) void Cht_ShowListOfAvailableChatRooms (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Chat_rooms; extern const char *Txt_Chat_rooms;
extern const char *Txt_General; extern const char *Txt_General;
extern const char *Txt_SEX_PLURAL_Abc[Usr_NUM_SEXS]; extern const char *Txt_SEX_PLURAL_Abc[Usr_NUM_SEXS];
@ -136,7 +136,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
HTM_UL_Begin ("class=\"LIST_TREE\""); HTM_UL_Begin ("class=\"LIST_TREE\"");
/***** Title of top level *****/ /***** Title of top level *****/
HTM_LI_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_LI_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon ("comments.svg",Ico_BLACK,Txt_Chat_rooms,"ICO16x16"); Ico_PutIcon ("comments.svg",Ico_BLACK,Txt_Chat_rooms,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Txt_Chat_rooms); HTM_TxtF ("&nbsp;%s",Txt_Chat_rooms);
HTM_LI_End (); HTM_LI_End ();
@ -243,7 +243,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
void Cht_ShowListOfChatRoomsWithUsrs (void) void Cht_ShowListOfChatRoomsWithUsrs (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Rooms_with_users; extern const char *Txt_Rooms_with_users;
extern const char *Txt_CHAT_Room_code; extern const char *Txt_CHAT_Room_code;
extern const char *Txt_Number_of_users; extern const char *Txt_Number_of_users;
@ -277,11 +277,11 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (row[0]); HTM_Txt (row[0]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (row[1]); HTM_Txt (row[1]);
HTM_TD_End (); HTM_TD_End ();

6
swad_cookie.c
View File

@ -140,7 +140,7 @@ void Coo_ChangeMyPrefsCookies (void)
void Coo_GetAndShowNumUsrsPerCookies (void) void Coo_GetAndShowNumUsrsPerCookies (void)
{ {
extern const char *Hlp_ANALYTICS_Figures_cookies; extern const char *Hlp_ANALYTICS_Figures_cookies;
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_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Cookies; extern const char *Txt_Cookies;
extern const char *Txt_Number_of_users; extern const char *Txt_Number_of_users;
@ -201,11 +201,11 @@ void Coo_GetAndShowNumUsrsPerCookies (void)
Accepted[i].Title,"ICOx16"); Accepted[i].Title,"ICOx16");
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[i]); HTM_Unsigned (NumUsrs[i]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[i] * 100.0 / HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[i] * 100.0 /
(double) NumUsrsTotal : (double) NumUsrsTotal :
0.0); 0.0);

80
swad_country.c
View File

@ -98,7 +98,7 @@ static void Cty_FormToGoToMap (struct Cty_Countr *Cty);
void Cty_SeeCtyWithPendingInss (void) void Cty_SeeCtyWithPendingInss (void)
{ {
extern const char *Hlp_SYSTEM_Pending; extern const char *Hlp_SYSTEM_Pending;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Countries_with_pending_institutions; extern const char *Txt_Countries_with_pending_institutions;
extern const char *Txt_Country; extern const char *Txt_Country;
extern const char *Txt_Institutions_ABBREVIATION; extern const char *Txt_Institutions_ABBREVIATION;
@ -153,16 +153,16 @@ void Cty_SeeCtyWithPendingInss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Country map */ /* Country map */
HTM_TD_Begin ("class=\"%s LM %s\"", HTM_TD_Begin ("class=\"LM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme],BgColor); The_Colors[Gbl.Prefs.Theme],BgColor);
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns, Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
"COUNTRY_SMALL", "COUNTRY_SMALL",
"COUNTRY_MAP_SMALL"); "COUNTRY_MAP_SMALL");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending institutions (row[1]) */ /* Number of pending institutions (row[1]) */
HTM_TD_Begin ("class=\"%s RM %s\"", HTM_TD_Begin ("class=\"RM DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme],BgColor); The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (row[1]); HTM_Txt (row[1]);
HTM_TD_End (); HTM_TD_End ();
@ -206,7 +206,7 @@ void Cty_ListCountries1 (void)
void Cty_ListCountries2 (void) void Cty_ListCountries2 (void)
{ {
extern const char *Hlp_SYSTEM_Countries; extern const char *Hlp_SYSTEM_Countries;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Countries; extern const char *Txt_Countries;
extern const char *Txt_Other_countries; extern const char *Txt_Other_countries;
extern const char *Txt_Country_unspecified; extern const char *Txt_Country_unspecified;
@ -231,8 +231,8 @@ void Cty_ListCountries2 (void)
/***** Separation row *****/ /***** Separation row *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"8\" class=\"%s CM\"", HTM_TD_Begin ("colspan=\"8\" class=\"CM DAT_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
HTM_NBSP (); HTM_NBSP ();
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();
@ -240,40 +240,40 @@ void Cty_ListCountries2 (void)
/***** Write users and institutions in other countries *****/ /***** Write users and institutions in other countries *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Other_countries); HTM_Txt (Txt_Other_countries);
HTM_TD_End (); HTM_TD_End ();
/* Number of users who claim to belong to another country */ /* Number of users who claim to belong to another country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Cty_GetCachedNumUsrsWhoClaimToBelongToAnotherCty ()); HTM_Unsigned (Cty_GetCachedNumUsrsWhoClaimToBelongToAnotherCty ());
HTM_TD_End (); HTM_TD_End ();
/* Number of institutions in other countries */ /* Number of institutions in other countries */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ins_GetCachedNumInssInCty (0)); HTM_Unsigned (Ins_GetCachedNumInssInCty (0));
HTM_TD_End (); HTM_TD_End ();
/* Number of centers in other countries */ /* Number of centers in other countries */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ctr_GetCachedNumCtrsInCty (0)); HTM_Unsigned (Ctr_GetCachedNumCtrsInCty (0));
HTM_TD_End (); HTM_TD_End ();
/* Number of degrees in other countries */ /* Number of degrees in other countries */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Deg_GetCachedNumDegsInCty (0)); HTM_Unsigned (Deg_GetCachedNumDegsInCty (0));
HTM_TD_End (); HTM_TD_End ();
/* Number of courses in other countries */ /* Number of courses in other countries */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Crs_GetCachedNumCrssInCty (0)); HTM_Unsigned (Crs_GetCachedNumCrssInCty (0));
HTM_TD_End (); HTM_TD_End ();
/* Number of users in courses of other countries */ /* Number of users in courses of other countries */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_CTY,0, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_CTY,0,
1 << Rol_STD | 1 << Rol_STD |
1 << Rol_NET | 1 << Rol_NET |
@ -285,39 +285,39 @@ void Cty_ListCountries2 (void)
/***** Write users and institutions with unknown country *****/ /***** Write users and institutions with unknown country *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Country_unspecified); HTM_Txt (Txt_Country_unspecified);
HTM_TD_End (); HTM_TD_End ();
/* Number of users who do not claim to belong to any country */ /* Number of users who do not claim to belong to any country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Cty_GetCachedNumUsrsWhoDontClaimToBelongToAnyCty ()); HTM_Unsigned (Cty_GetCachedNumUsrsWhoDontClaimToBelongToAnyCty ());
HTM_TD_End (); HTM_TD_End ();
/* Number of institutions with unknown country */ /* Number of institutions with unknown country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ins_GetCachedNumInssInCty (-1L)); HTM_Unsigned (Ins_GetCachedNumInssInCty (-1L));
HTM_TD_End (); HTM_TD_End ();
/* Number of centers with unknown country */ /* Number of centers with unknown country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ctr_GetCachedNumCtrsInCty (-1L)); HTM_Unsigned (Ctr_GetCachedNumCtrsInCty (-1L));
HTM_TD_End (); HTM_TD_End ();
/* Number of degrees with unknown country */ /* Number of degrees with unknown country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Deg_GetCachedNumDegsInCty (-1L)); HTM_Unsigned (Deg_GetCachedNumDegsInCty (-1L));
HTM_TD_End (); HTM_TD_End ();
/* Number of courses with unknown country */ /* Number of courses with unknown country */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Crs_GetCachedNumCrssInCty (-1L)); HTM_Unsigned (Crs_GetCachedNumCrssInCty (-1L));
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
@ -1057,7 +1057,7 @@ void Cty_FreeListCountries (void)
static void Cty_ListCountriesForEdition (void) static void Cty_ListCountriesForEdition (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES]; extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES];
unsigned NumCty; unsigned NumCty;
@ -1101,28 +1101,28 @@ static void Cty_ListCountriesForEdition (void)
HTM_TD_End (); HTM_TD_End ();
/* Numerical country code (ISO 3166-1) */ /* Numerical country code (ISO 3166-1) */
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%03ld",Cty->CtyCod); HTM_TxtF ("%03ld",Cty->CtyCod);
HTM_TD_End (); HTM_TD_End ();
/* Alphabetic country code with 2 letters (ISO 3166-1) */ /* Alphabetic country code with 2 letters (ISO 3166-1) */
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Cty->Alpha2); HTM_Txt (Cty->Alpha2);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Empty (3); HTM_TD_Empty (3);
/* Number of users */ /* Number of users */
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsCty); HTM_Unsigned (NumUsrsCty);
HTM_TD_End (); HTM_TD_End ();
/* Number of institutions */ /* Number of institutions */
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumInss); HTM_Unsigned (NumInss);
HTM_TD_End (); HTM_TD_End ();
@ -1136,7 +1136,7 @@ static void Cty_ListCountriesForEdition (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Language */ /* Language */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_STR_LANG_NAME[Lan]); HTM_TxtColon (Txt_STR_LANG_NAME[Lan]);
HTM_TD_End (); HTM_TD_End ();
@ -1443,7 +1443,7 @@ static void Cty_PutParamGoToCty (void *CtyCod)
static void Cty_PutFormToCreateCountry (void) static void Cty_PutFormToCreateCountry (void)
{ {
extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES];
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_country; extern const char *Txt_New_country;
extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES]; extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES];
@ -1490,14 +1490,14 @@ static void Cty_PutFormToCreateCountry (void)
HTM_TD_Empty (3); HTM_TD_Empty (3);
/***** Number of users *****/ /***** Number of users *****/
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
/***** Number of institutions *****/ /***** Number of institutions *****/
HTM_TD_Begin ("rowspan=\"%u\" class=\"%s RT\"", HTM_TD_Begin ("rowspan=\"%u\" class=\"RT DAT_%s\"",
1 + Lan_NUM_LANGUAGES,The_ClassDat[Gbl.Prefs.Theme]); 1 + Lan_NUM_LANGUAGES,The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); HTM_Unsigned (0);
HTM_TD_End (); HTM_TD_End ();
@ -1511,7 +1511,7 @@ static void Cty_PutFormToCreateCountry (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Language */ /* Language */
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_STR_LANG_NAME[Lan]); HTM_Txt (Txt_STR_LANG_NAME[Lan]);
HTM_TD_End (); HTM_TD_End ();

20
swad_country_config.c
View File

@ -361,7 +361,7 @@ static void CtyCfg_MapImage (bool PrintView,bool PutLink)
static void CtyCfg_Platform (bool PrintView) static void CtyCfg_Platform (bool PrintView)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Platform; extern const char *Txt_Platform;
/***** Institution *****/ /***** Institution *****/
@ -371,7 +371,7 @@ static void CtyCfg_Platform (bool PrintView)
Frm_LabelColumn ("RT",NULL,Txt_Platform); Frm_LabelColumn ("RT",NULL,Txt_Platform);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (!PrintView) if (!PrintView)
{ {
Frm_BeginFormGoTo (ActSeeSysInf); Frm_BeginFormGoTo (ActSeeSysInf);
@ -445,7 +445,7 @@ static void CtyCfg_QR (void)
static void CtyCfg_NumUsrs (void) static void CtyCfg_NumUsrs (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Users_of_the_country; extern const char *Txt_Users_of_the_country;
/***** Number of users *****/ /***** Number of users *****/
@ -455,7 +455,7 @@ static void CtyCfg_NumUsrs (void)
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_country); Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_country);
/* Data */ /* Data */
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 (Cty_GetCachedNumUsrsWhoClaimToBelongToCty (&Gbl.Hierarchy.Cty)); HTM_Unsigned (Cty_GetCachedNumUsrsWhoClaimToBelongToCty (&Gbl.Hierarchy.Cty));
HTM_TD_End (); HTM_TD_End ();
@ -468,7 +468,7 @@ static void CtyCfg_NumUsrs (void)
static void CtyCfg_NumInss (void) static void CtyCfg_NumInss (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institutions; extern const char *Txt_Institutions;
extern const char *Txt_Institutions_of_COUNTRY_X; extern const char *Txt_Institutions_of_COUNTRY_X;
char *Title; char *Title;
@ -480,7 +480,7 @@ static void CtyCfg_NumInss (void)
Frm_LabelColumn ("RT",NULL,Txt_Institutions); Frm_LabelColumn ("RT",NULL,Txt_Institutions);
/* Data */ /* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginFormGoTo (ActSeeIns); Frm_BeginFormGoTo (ActSeeIns);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X, if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X,
@ -502,7 +502,7 @@ static void CtyCfg_NumInss (void)
static void CtyCfg_NumDegs (void) static void CtyCfg_NumDegs (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Degrees; extern const char *Txt_Degrees;
/***** Number of degrees *****/ /***** Number of degrees *****/
@ -512,7 +512,7 @@ static void CtyCfg_NumDegs (void)
Frm_LabelColumn ("RT",NULL,Txt_Degrees); Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */ /* Data */
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 (Deg_GetCachedNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_Unsigned (Deg_GetCachedNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End (); HTM_TD_End ();
@ -525,7 +525,7 @@ static void CtyCfg_NumDegs (void)
static void CtyCfg_NumCrss (void) static void CtyCfg_NumCrss (void)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Courses; extern const char *Txt_Courses;
/***** Number of courses *****/ /***** Number of courses *****/
@ -535,7 +535,7 @@ static void CtyCfg_NumCrss (void)
Frm_LabelColumn ("RT",NULL,Txt_Courses); Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */ /* Data */
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 (Crs_GetCachedNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod)); HTM_Unsigned (Crs_GetCachedNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_TD_End (); HTM_TD_End ();