From daf16e48710207b87cce69dcfbbab0a0a3133763 Mon Sep 17 00:00:00 2001 From: acanas Date: Fri, 25 Mar 2022 14:39:30 +0100 Subject: [PATCH] Version 21.86.2: Mar 25, 2022 Working on design of dark theme. --- swad_account.c | 5 +- swad_attendance.c | 46 ++++++------- swad_browser.c | 153 +++++++++++++++++------------------------- swad_call_for_exam.c | 45 ++++++++----- swad_changelog.h | 3 +- swad_cookie.c | 11 ++- swad_country.c | 28 +++++--- swad_country_config.c | 8 +-- swad_course.c | 28 +++++--- swad_date.c | 23 ++++--- 10 files changed, 172 insertions(+), 178 deletions(-) diff --git a/swad_account.c b/swad_account.c index ff8be436..d9a85cde 100644 --- a/swad_account.c +++ b/swad_account.c @@ -278,7 +278,6 @@ void Acc_CheckIfEmptyAccountExists (void) static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrData *UsrDat) { extern const char *The_Colors[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *Txt_ID; extern const char *Txt_Name; extern const char *Txt_yet_unnamed; @@ -295,8 +294,8 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD HTM_TD_End (); /***** Write user's ID and name *****/ - HTM_TD_Begin ("class=\"%s LT %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme], + HTM_TD_Begin ("class=\"LT DAT_STRONG_%s %s\"", + The_Colors[Gbl.Prefs.Theme], The_GetColorRows ()); HTM_TxtF ("%s: %s",Txt_ID,ID); HTM_BR (); diff --git a/swad_attendance.c b/swad_attendance.c index aa826d58..1ac1c188 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -2830,7 +2830,7 @@ static void Att_ListUsrsAttendanceTable (const struct Att_Events *Events, unsigned NumUsrsInList, long *LstSelectedUsrCods) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Number_of_users; struct UsrData UsrDat; unsigned NumUsr; @@ -2873,10 +2873,10 @@ static void Att_ListUsrsAttendanceTable (const struct Att_Events *Events, { HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"%u\" class=\"%s LINE_TOP RM\"", + HTM_TD_Begin ("colspan=\"%u\" class=\"RM DAT_STRONG_%s LINE_TOP\"", Gbl.Usrs.Listing.WithPhotos ? 4 : 3, - The_ClassDatStrong[Gbl.Prefs.Theme]); + The_Colors[Gbl.Prefs.Theme]); HTM_TxtColon (Txt_Number_of_users); HTM_TD_End (); @@ -2885,16 +2885,16 @@ static void Att_ListUsrsAttendanceTable (const struct Att_Events *Events, NumAttEvent++) if (Events->Lst[NumAttEvent].Selected) { - HTM_TD_Begin ("class=\"%s LINE_TOP RM\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (Events->Lst[NumAttEvent].NumStdsFromList); HTM_TD_End (); Total += Events->Lst[NumAttEvent].NumStdsFromList; } - HTM_TD_Begin ("class=\"%s LINE_TOP RM\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (Total); HTM_TD_End (); @@ -2961,8 +2961,6 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) static void Att_WriteRowUsrSeveralAttEvents (const struct Att_Events *Events, unsigned NumUsr,struct UsrData *UsrDat) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES]; static const char *ClassPhoto[PhoSha_NUM_SHAPES] = { @@ -2978,9 +2976,10 @@ static void Att_WriteRowUsrSeveralAttEvents (const struct Att_Events *Events, /***** Write number of user in the list *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM %s\"", - UsrDat->Accepted ? The_ClassDatStrong[Gbl.Prefs.Theme] : - The_ClassDat[Gbl.Prefs.Theme], + HTM_TD_Begin ("class=\"RM %s_%s %s\"", + UsrDat->Accepted ? "DAT_STRONG" : + "DAT", + The_Colors[Gbl.Prefs.Theme], The_GetColorRows ()); HTM_Unsigned (NumUsr + 1); HTM_TD_End (); @@ -3037,9 +3036,8 @@ static void Att_WriteRowUsrSeveralAttEvents (const struct Att_Events *Events, } /***** Last column with the number of times this user is present *****/ - HTM_TD_Begin ("class=\"%s RM %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme], - The_GetColorRows ()); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s %s\"", + The_Colors[Gbl.Prefs.Theme],The_GetColorRows ()); HTM_Unsigned (NumTimesPresent); HTM_TD_End (); @@ -3130,8 +3128,6 @@ static void Att_ListStdsWithAttEventsDetails (const struct Att_Events *Events, static void Att_ListAttEventsForAStd (const struct Att_Events *Events, unsigned NumUsr,struct UsrData *UsrDat) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Student_comment; extern const char *Txt_Teachers_comment; @@ -3155,9 +3151,10 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, NumUsr++; HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s RM %s\"", - UsrDat->Accepted ? The_ClassDatStrong[Gbl.Prefs.Theme] : - The_ClassDat[Gbl.Prefs.Theme], + HTM_TD_Begin ("class=\"RM %s_%s %s\"", + UsrDat->Accepted ? "DAT_STRONG" : + "DAT", + The_Colors[Gbl.Prefs.Theme], The_GetColorRows ()); HTM_TxtF ("%u:",NumUsr); HTM_TD_End (); @@ -3234,8 +3231,8 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, Att_PutCheckOrCross (Present); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s LT %s\"", - The_ClassDat[Gbl.Prefs.Theme], + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme], The_GetColorRows ()); if (asprintf (&Id,"att_date_start_%u_%u",NumUsr,UniqueId) < 0) Err_NotEnoughMemoryExit (); @@ -3261,9 +3258,8 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, HTM_TD_Begin ("class=\"BT %s\"",The_GetColorRows ()); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s LM %s\"", - The_ClassDat[Gbl.Prefs.Theme], - The_GetColorRows ()); + HTM_TD_Begin ("class=\"LM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],The_GetColorRows ()); HTM_DL_Begin (); if (ShowCommentStd) diff --git a/swad_browser.c b/swad_browser.c index c5928454..80576ee3 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -7865,7 +7865,7 @@ bool Brw_CheckIfFileOrFolderIsSetAsHiddenInDB (Brw_FileType_t FileType,const cha void Brw_ShowFileMetadata (void) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_The_file_of_folder_no_longer_exists_or_is_now_hidden; extern const char *Txt_Filename; extern const char *Txt_File_size; @@ -8034,7 +8034,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_Filename); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); Brw_WriteSmallLinkToDownloadFile (URL,&FileMetadata,FileNameToShow); HTM_TD_End (); @@ -8045,7 +8046,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_Uploaded_by); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (FileHasPublisher) { /* Show photo */ @@ -8074,7 +8076,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_File_size); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (FileSizeStr); HTM_TD_End (); @@ -8085,8 +8088,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_Date_of_creation); - HTM_TD_Begin ("id=\"filedate\" class=\"LB %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("id=\"filedate\" class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); Dat_WriteLocalDateHMSFromUTC ("filedate",FileMetadata.Time, Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA, true,true,true,0x7); @@ -8103,7 +8106,8 @@ void Brw_ShowFileMetadata (void) Txt_Availability); /* Data */ - HTM_TD_Begin ("class=\"LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ICanChangePublic) // I can change file to public { HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, @@ -8132,7 +8136,8 @@ void Brw_ShowFileMetadata (void) Txt_License); /* Data */ - HTM_TD_Begin ("class=\"LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ICanEdit) // I can edit file properties { HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, @@ -8161,7 +8166,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_My_views); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (FileMetadata.NumMyViews); HTM_TD_End (); @@ -8173,7 +8179,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_Identified_views); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_TxtF ("%u ",FileMetadata.NumViewsFromLoggedUsrs); HTM_TxtF ("(%u %s)", FileMetadata.NumLoggedUsrs, @@ -8188,7 +8195,8 @@ void Brw_ShowFileMetadata (void) Frm_LabelColumn ("RT",NULL,Txt_Public_views); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (FileMetadata.NumPublicViews); HTM_TD_End (); @@ -8585,7 +8593,7 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL, struct FileMetadata *FileMetadata, const char *FileNameToShow) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Check_marks_in_the_file; /***** On the screen a link will be shown to download the file *****/ @@ -8617,8 +8625,9 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL, else { /* Put anchor and filename */ - HTM_A_Begin ("href=\"%s\" class=\"%s\" title=\"%s\" target=\"_blank\"", - URL,The_ClassDatStrong[Gbl.Prefs.Theme],FileNameToShow); + HTM_A_Begin ("href=\"%s\" class=\"DAT_STRONG_%s\"" + " title=\"%s\" target=\"_blank\"", + URL,The_Colors[Gbl.Prefs.Theme],FileNameToShow); HTM_Txt (FileNameToShow); HTM_A_End (); } @@ -9911,8 +9920,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned NumDocs, static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) { - 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_Documents_area; extern const char *Txt_Teachers_files_area; extern const char *Txt_Shared_files_area; @@ -9984,13 +9992,14 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) HTM_TR_Begin (NULL); /***** Write number of document in this search *****/ - HTM_TD_Begin ("class=\"RT %s %s\"", - The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (++(*NumDocsNotHidden)); HTM_TD_End (); /***** Write institution logo, institution short name *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); if (InsCod > 0) { Frm_BeginFormGoTo (ActSeeInsInf); @@ -10006,7 +10015,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write center logo, center short name *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); if (CtrCod > 0) { Frm_BeginFormGoTo (ActSeeCtrInf); @@ -10022,7 +10032,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write degree logo, degree short name *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); if (DegCod > 0) { Frm_BeginFormGoTo (ActSeeDegInf); @@ -10038,7 +10049,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write course short name *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); if (CrsCod > 0) { Frm_BeginFormGoTo (ActSeeCrsInf); @@ -10097,8 +10109,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) break; } - HTM_TD_Begin ("class=\"%s LT %s\"", - The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Txt (Title); HTM_TD_End (); @@ -10108,8 +10120,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) FileNameToShow); /***** Write file name using path (row[1]) *****/ - HTM_TD_Begin ("class=\"%s LT %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LT DAT_STRONG_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); /* Begin form */ Action = Brw_ActReqDatFile[Brw_FileBrowserForFoundDocs[FileMetadata.FileBrowser]]; @@ -10723,23 +10735,13 @@ static void Brw_WriteRowStatsFileBrowsers1 (const char *NameOfFileZones, Brw_FileBrowser_t FileZone, struct Brw_SizeOfFileZones *SizeOfFileZones) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; char StrNumCrss[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char StrNumGrps[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char StrNumUsrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char FileSizeStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; - char *Cl; - const char *Class; - - if (FileZone == Brw_UNKNOWN) - { - if (asprintf (&Cl,"%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) < 0) - Err_NotEnoughMemoryExit (); - Class = Cl; - } - else - Class = The_ClassDat[Gbl.Prefs.Theme]; + const char *Class = (FileZone == Brw_UNKNOWN) ? "LINE_TOP DAT_STRONG" : + "DAT"; Fil_WriteFileSizeFull ((double) SizeOfFileZones->Size,FileSizeStr); @@ -10763,64 +10765,51 @@ static void Brw_WriteRowStatsFileBrowsers1 (const char *NameOfFileZones, HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s LM\"",Class); + HTM_TD_Begin ("class=\"LM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (NameOfFileZones); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumCrss); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumGrps); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumUsrs); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (SizeOfFileZones->MaxLevels); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_UnsignedLong (SizeOfFileZones->NumFolders); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_UnsignedLong (SizeOfFileZones->NumFiles); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (FileSizeStr); HTM_TD_End (); HTM_TR_End (); - - if (FileZone == Brw_UNKNOWN) - free (Cl); } static void Brw_WriteRowStatsFileBrowsers2 (const char *NameOfFileZones, Brw_FileBrowser_t FileZone, struct Brw_SizeOfFileZones *SizeOfFileZones) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; char StrNumFoldersPerCrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char StrNumFilesPerCrs[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char FileSizePerCrsStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; - char *Cl; - const char *Class; - - if (FileZone == Brw_UNKNOWN) - { - if (asprintf (&Cl,"%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) < 0) - Err_NotEnoughMemoryExit (); - Class = Cl; - } - else - Class = The_ClassDat[Gbl.Prefs.Theme]; + const char *Class = (FileZone == Brw_UNKNOWN) ? "LINE_TOP DAT_STRONG" : + "DAT"; if (SizeOfFileZones->NumCrss == -1) // Not applicable { @@ -10846,48 +10835,35 @@ static void Brw_WriteRowStatsFileBrowsers2 (const char *NameOfFileZones, HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s LM\"",Class); + HTM_TD_Begin ("class=\"LM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (NameOfFileZones); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumFoldersPerCrs); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumFilesPerCrs); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (FileSizePerCrsStr); HTM_TD_End (); HTM_TR_End (); - - if (FileZone == Brw_UNKNOWN) - free (Cl); } static void Brw_WriteRowStatsFileBrowsers3 (const char *NameOfFileZones, Brw_FileBrowser_t FileZone, struct Brw_SizeOfFileZones *SizeOfFileZones) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; char StrNumFoldersPerUsr[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char StrNumFilesPerUsr[Cns_MAX_DECIMAL_DIGITS_UINT + 1]; char FileSizePerUsrStr[Fil_MAX_BYTES_FILE_SIZE_STRING + 1]; - char *Cl; - const char *Class; - - if (FileZone == Brw_UNKNOWN) - { - if (asprintf (&Cl,"%s LINE_TOP",The_ClassDatStrong[Gbl.Prefs.Theme]) < 0) - Err_NotEnoughMemoryExit (); - Class = Cl; - } - else - Class = The_ClassDat[Gbl.Prefs.Theme]; + const char *Class = (FileZone == Brw_UNKNOWN) ? "LINE_TOP DAT_STRONG" : + "DAT"; if (SizeOfFileZones->NumUsrs == -1) // Not applicable { @@ -10913,26 +10889,23 @@ static void Brw_WriteRowStatsFileBrowsers3 (const char *NameOfFileZones, HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s LM\"",Class); + HTM_TD_Begin ("class=\"LM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (NameOfFileZones); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumFoldersPerUsr); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrNumFilesPerUsr); HTM_TD_End (); - HTM_TD_Begin ("class=\"%s RM\"",Class); + HTM_TD_Begin ("class=\"RM %s_%s\"",Class,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (FileSizePerUsrStr); HTM_TD_End (); HTM_TR_End (); - - if (FileZone == Brw_UNKNOWN) - free (Cl); } /*****************************************************************************/ diff --git a/swad_call_for_exam.c b/swad_call_for_exam.c index e4156036..36f0c979 100644 --- a/swad_call_for_exam.c +++ b/swad_call_for_exam.c @@ -886,7 +886,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, { extern const char *Hlp_ASSESSMENT_Calls_for_exam_new_call; extern const char *Hlp_ASSESSMENT_Announcements_edit_announcement; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_CALL_FOR_EXAM; @@ -1022,8 +1022,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, /***** Title *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"CM %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("colspan=\"2\" class=\"CM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_NBSP (); HTM_BR (); HTM_STRONG_Begin (); @@ -1044,7 +1044,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Course); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) HTM_INPUT_TEXT ("CrsName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,CallsForExams->CallForExam.CrsFullName, HTM_DONT_SUBMIT_ON_CHANGE, @@ -1070,7 +1071,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Year_or_semester); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, @@ -1100,7 +1102,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Session); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) HTM_INPUT_TEXT ("ExamSession",Cfe_MAX_CHARS_SESSION,CallsForExams->CallForExam.Session, HTM_DONT_SUBMIT_ON_CHANGE, @@ -1136,7 +1139,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, { Dat_ConvDateToDateStr (&CallsForExams->CallForExam.ExamDate, StrExamDate); - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (StrExamDate); HTM_TD_End (); } @@ -1152,7 +1156,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Start_time); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, @@ -1198,7 +1203,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Approximate_duration); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, @@ -1259,7 +1265,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Place_of_exam); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"Place\" name=\"Place\"" @@ -1289,7 +1296,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Mode); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"ExamMode\" name=\"ExamMode\"" @@ -1319,7 +1327,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Structure_of_the_exam); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"Structure\" name=\"Structure\"" @@ -1349,7 +1358,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Documentation_required); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"DocRequired\" name=\"DocRequired\"" @@ -1379,7 +1389,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Material_required); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"MatRequired\" name=\"MatRequired\"" @@ -1409,7 +1420,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Material_allowed); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"MatAllowed\" name=\"MatAllowed\"" @@ -1439,7 +1451,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams, Txt_CALL_FOR_EXAM_Other_information); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (TypeViewCallForExam == Cfe_FORM_VIEW) { HTM_TEXTAREA_Begin ("id=\"OtherInfo\" name=\"OtherInfo\"" diff --git a/swad_changelog.h b/swad_changelog.h index c52cd2ae..1a9378ad 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate TODO: Attach pdf files in multimedia. */ -#define Log_PLATFORM_VERSION "SWAD 21.86.1 (2022-03-25)" +#define Log_PLATFORM_VERSION "SWAD 21.86.2 (2022-03-25)" #define CSS_FILE "swad21.85.1.css" #define JS_FILE "swad21.78.2.js" /* + Version 21.86.2: Mar 25, 2022 Working on design of dark theme. (323687 lines) Version 21.86.1: Mar 25, 2022 Working on design of dark theme. (323687 lines) Version 21.86: Mar 25, 2022 Working on design of dark theme. (323663 lines) Version 21.85.1: Mar 24, 2022 Working on design of dark theme. (323724 lines) diff --git a/swad_cookie.c b/swad_cookie.c index ea4f2297..b7360fce 100644 --- a/swad_cookie.c +++ b/swad_cookie.c @@ -60,8 +60,7 @@ static void Coo_PutIconsCookies (__attribute__((unused)) void *Args); void Coo_EditMyPrefsOnCookies (void) { extern const char *Hlp_PROFILE_Settings_cookies; - 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_Cookies; extern const char *Txt_Accept_third_party_cookies_to_view_multimedia_content_from_other_websites; @@ -79,11 +78,11 @@ void Coo_EditMyPrefsOnCookies (void) /* Begin container */ if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptCookies) - HTM_DIV_Begin ("class=\"%s BG_HIGHLIGHT\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_DIV_Begin ("class=\"DAT_STRONG_%s BG_HIGHLIGHT\"", + The_Colors[Gbl.Prefs.Theme]); else - HTM_DIV_Begin ("class=\"%s\"", - The_ClassDat[Gbl.Prefs.Theme]); + HTM_DIV_Begin ("class=\"DAT_%s\"", + The_Colors[Gbl.Prefs.Theme]); /* Check box */ HTM_LABEL_Begin (NULL); diff --git a/swad_country.c b/swad_country.c index 8e861686..458a329d 100644 --- a/swad_country.c +++ b/swad_country.c @@ -403,8 +403,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty) { - extern const char *The_ClassDat[The_NUM_THEMES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; const char *BgColor; BgColor = (Cty->CtyCod == Gbl.Hierarchy.Cty.CtyCod) ? "BG_HIGHLIGHT" : @@ -413,45 +412,52 @@ static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty) HTM_TR_Begin (NULL); /***** Number of country in this list *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (NumCty); HTM_TD_End (); /***** Country map (and link to WWW if exists) *****/ - HTM_TD_Begin ("class=\"%s LM %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"LM DAT_STRONG_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns, "COUNTRY_SMALL", "COUNTRY_MAP_SMALL"); HTM_TD_End (); /***** Number of users who claim to belong to this country *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Cty_GetCachedNumUsrsWhoClaimToBelongToCty (Cty)); HTM_TD_End (); /***** Number of institutions *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Ins_GetCachedNumInssInCty (Cty->CtyCod)); HTM_TD_End (); /***** Number of centers *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Ctr_GetCachedNumCtrsInCty (Cty->CtyCod)); HTM_TD_End (); /***** Number of degrees *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Deg_GetCachedNumDegsInCty (Cty->CtyCod)); HTM_TD_End (); /***** Number of courses *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Crs_GetCachedNumCrssInCty (Cty->CtyCod)); HTM_TD_End (); /***** Number of users in courses *****/ - HTM_TD_Begin ("class=\"%s RM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + HTM_TD_Begin ("class=\"RM DAT_%s %s\"", + The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_CTY,Cty->CtyCod, 1 << Rol_STD | 1 << Rol_NET | diff --git a/swad_country_config.c b/swad_country_config.c index e3945c7a..af936edf 100644 --- a/swad_country_config.c +++ b/swad_country_config.c @@ -398,7 +398,7 @@ static void CtyCfg_Platform (bool PrintView) static void CtyCfg_Name (bool PutLink) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Country; /***** Country name *****/ @@ -408,11 +408,11 @@ static void CtyCfg_Name (bool PutLink) Frm_LabelColumn ("RT",NULL,Txt_Country); /* Data */ - HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LB DAT_STRONG_%s\"",The_Colors[Gbl.Prefs.Theme]); if (PutLink) - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", + HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_STRONG_%s\"", Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language], - The_ClassDatStrong[Gbl.Prefs.Theme]); + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); if (PutLink) HTM_A_End (); diff --git a/swad_course.c b/swad_course.c index 5ef680f7..605828a1 100644 --- a/swad_course.c +++ b/swad_course.c @@ -2399,8 +2399,7 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnAccepted) { - 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_Enrolment_confirmed; extern const char *Txt_Enrolment_not_confirmed; extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; @@ -2439,8 +2438,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA NumNETs = Enr_GetNumUsrsInCrss (HieLvl_CRS,CrsCod,1 << Rol_NET); NumTchs = Enr_GetNumUsrsInCrss (HieLvl_CRS,CrsCod,1 << Rol_TCH); NumUsrs = NumStds + NumNETs + NumTchs; - ClassTxt = NumUsrs ? The_ClassDatStrong[Gbl.Prefs.Theme] : - The_ClassDat[Gbl.Prefs.Theme]; + ClassTxt = NumUsrs ? "DAT_STRONG" : + "DAT"; BgColor = (CrsCod == Gbl.Hierarchy.Crs.CrsCod) ? "BG_HIGHLIGHT" : The_GetColorRows (); @@ -2461,13 +2460,15 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA } /***** Write number of course in this search *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"RT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (NumCrs); HTM_TD_End (); /***** Write degree logo, degree short name (row[2]) and center short name (row[6]) *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"LT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); Frm_BeginFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (Deg.DegCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (row[2]), @@ -2480,12 +2481,14 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA HTM_TD_End (); /***** Write year (row[4]) *****/ - HTM_TD_Begin ("class=\"%s CT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"CT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Txt (Txt_YEAR_OF_DEGREE[Deg_ConvStrToYear (row[4])]); HTM_TD_End (); /***** Write course full name (row[5]) *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"LT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); Frm_BeginFormGoTo (ActSeeCrsInf); Crs_PutParamCrsCod (CrsCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (row[5]), @@ -2497,17 +2500,20 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA HTM_TD_End (); /***** Write number of teachers in course *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"RT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (NumTchs); HTM_TD_End (); /***** Write number of non-editing teachers in course *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"RT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (NumNETs); HTM_TD_End (); /***** Write number of students in course *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); + HTM_TD_Begin ("class=\"RT %s_%s %s\"", + ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor); HTM_Unsigned (NumStds); HTM_TD_End (); diff --git a/swad_date.c b/swad_date.c index 94ccc289..869c62b6 100644 --- a/swad_date.c +++ b/swad_date.c @@ -123,8 +123,7 @@ void Dat_ResetHour (struct Dat_Hour *Hour) void Dat_PutBoxToSelectDateFormat (void) { extern const char *Hlp_PROFILE_Settings_dates; - 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_Dates; Dat_Format_t Format; @@ -144,11 +143,11 @@ void Dat_PutBoxToSelectDateFormat (void) Format++) { if (Format == Gbl.Prefs.DateFormat) - HTM_LI_Begin ("class=\"%s BG_HIGHLIGHT\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_LI_Begin ("class=\"DAT_STRONG_%s BG_HIGHLIGHT\"", + The_Colors[Gbl.Prefs.Theme]); else - HTM_LI_Begin ("class=\"%s\"", - The_ClassDat[Gbl.Prefs.Theme]); + HTM_LI_Begin ("class=\"DAT_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_LABEL_Begin (NULL); HTM_INPUT_RADIO ("DateFormat",true, " value=\"%u\"%s", @@ -1752,8 +1751,7 @@ void Dat_PutHiddenParamOrder (Dat_StartEndTime_t SelectedOrder) void Dat_GetAndShowNumUsrsPerDateFormat (void) { extern const char *Hlp_ANALYTICS_Figures_dates; - 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_Format; extern const char *Txt_Number_of_users; @@ -1798,16 +1796,19 @@ void Dat_GetAndShowNumUsrsPerDateFormat (void) { HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); Dat_PutSpanDateFormat (Format); Dat_PutScriptDateFormat (Format); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (NumUsrs[Format]); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Format] * 100.0 / (double) NumUsrsTotal : 0.0);