From ed7ca2489eeb3d55efe8e85c8246170e665a691b Mon Sep 17 00:00:00 2001 From: acanas Date: Sat, 26 Mar 2022 13:12:22 +0100 Subject: [PATCH] Version 21.86.4: Mar 26, 2022 Working on design of dark theme. --- swad_changelog.h | 3 +- swad_notice.c | 18 ++++--- swad_notification.c | 33 ++++++++----- swad_photo.c | 10 ++-- swad_privacy.c | 11 ++--- swad_profile.c | 12 ++--- swad_record.c | 115 +++++++++++++++++++++++++------------------- 7 files changed, 115 insertions(+), 87 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 8ad8f726..61aa90d7 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.3 (2022-03-25)" +#define Log_PLATFORM_VERSION "SWAD 21.86.4 (2022-03-25)" #define CSS_FILE "swad21.85.1.css" #define JS_FILE "swad21.78.2.js" /* + 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.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) diff --git a/swad_notice.c b/swad_notice.c index 11c3c28c..af6bd9b6 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -844,8 +844,7 @@ static long Not_GetParamNotCod (void) void Not_GetAndShowNoticesStats (void) { extern const char *Hlp_ANALYTICS_Figures_notices; - 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_NOTICE_Active_BR_notices; extern const char *Txt_NOTICE_Obsolete_BR_notices; @@ -889,23 +888,28 @@ void Not_GetAndShowNoticesStats (void) /***** Write number of notices *****/ HTM_TR_Begin (NULL); - 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 (NumNotices[Not_ACTIVE_NOTICE]); 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 (NumNotices[Not_OBSOLETE_NOTICE]); 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 (NumNoticesDeleted); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned ( NumTotalNotices); 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 (NumTotalNotifications); HTM_TD_End (); diff --git a/swad_notification.c b/swad_notification.c index 7596cad0..6690b4dd 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1681,8 +1681,7 @@ void Ntf_WriteNumberOfNewNtfs (void) void Ntf_GetAndShowNumUsrsPerNotifyEvent (void) { extern const char *Hlp_ANALYTICS_Figures_notifications; - 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_Event; extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS]; @@ -1781,25 +1780,30 @@ void Ntf_GetAndShowNumUsrsPerNotifyEvent (void) { 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_NOTIFY_EVENTS_PLURAL[NotifyEvent]); 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[NotifyEvent]); 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[NotifyEvent] * 100.0 / (double) NumUsrsTotal : 0.0); 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 (NumEvents[NotifyEvent]); 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 (NumMails[NotifyEvent]); HTM_TD_End (); @@ -1809,25 +1813,30 @@ void Ntf_GetAndShowNumUsrsPerNotifyEvent (void) /***** Write total number of users who want to be notified by email on some event *****/ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"LM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"LM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Txt_Total); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Percentage (NumUsrsTotal ? (double) NumUsrsTotalWhoWantToBeNotifiedByEMailAboutSomeEvent * 100.0 / (double) NumUsrsTotal : 0.0); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (NumEventsTotal); HTM_TD_End (); - HTM_TD_Begin ("class=\"RM %s LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Unsigned (NumMailsTotal); HTM_TD_End (); diff --git a/swad_photo.c b/swad_photo.c index 7ca94f3f..8bd30acf 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1061,7 +1061,6 @@ void Pho_BuildHTMLUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, char **CaptionStr) { extern const char *Rol_Icons[Rol_NUM_ROLES]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Following; extern const char *Txt_Followers; @@ -1092,11 +1091,11 @@ void Pho_BuildHTMLUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, if (PutZoomCode) { /* First name and surnames */ - if (asprintf (&Caption.Name,"
" // Limited width + if (asprintf (&Caption.Name,"
" // Limited width "%s
" "%s%s%s" "
", - The_ClassDatStrong[Gbl.Prefs.Theme], + The_Colors[Gbl.Prefs.Theme], UsrDat->FrstName, UsrDat->Surname1, UsrDat->Surname2[0] ? " " : @@ -2368,7 +2367,6 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg, int NumStds,int NumStdsWithPhoto) { extern const char *Usr_StringsSexDB[Usr_NUM_SEXS]; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_students_ABBREVIATION; extern const char *Txt_SEX_PLURAL_abc[Usr_NUM_SEXS]; @@ -2434,8 +2432,8 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg, 0); Frm_SetUniqueId (IdCaption); HTM_DIV_Begin ("id=\"%s\" class=\"NOT_SHOWN\"",IdCaption); - HTM_DIV_Begin ("class=\"ZOOM_TXT_LINE %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_DIV_Begin ("class=\"ZOOM_TXT_LINE DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (PhotoCaption); HTM_DIV_End (); HTM_DIV_End (); diff --git a/swad_privacy.c b/swad_privacy.c index 975a4fbc..2ff4d6e4 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -162,8 +162,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel, unsigned MaskAllowedVisibility) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; - 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_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY]; Pri_Visibility_t Visibility; @@ -186,11 +185,11 @@ static void Pri_PutFormVisibility (const char *TxtLabel, if (MaskAllowedVisibility & (1 << Visibility)) { if (Visibility == CurrentVisibilityInDB) - 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 (ParamName,Action != ActUnk, "value=\"%u\"%s%s", diff --git a/swad_profile.c b/swad_profile.c index d5f4b307..de8ea7c9 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -375,7 +375,7 @@ void Prf_ChangeExtendedProfileVis (void) void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; bool UsrIsBannedFromRanking; struct Prf_UsrFigures UsrFigures; Rol_Role_t Role; @@ -386,14 +386,14 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Left list *****/ /* Begin left list */ HTM_DIV_Begin ("class=\"PRF_FIG_LEFT_CONT\""); - HTM_UL_Begin ("class=\"PRF_FIG_UL %s NOWRAP\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_STRONG_%s NOWRAP\"", + The_Colors[Gbl.Prefs.Theme]); /* Time since first click */ Prf_ShowTimeSinceFirstClick (UsrDat,&UsrFigures); /* Number of courses in which the user has a role */ - for (Role = Rol_TCH; + for (Role = Rol_TCH; Role >= Rol_STD; Role--) Prf_ShowNumCrssWithRole (UsrDat,Role); @@ -412,8 +412,8 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) if (!UsrIsBannedFromRanking) { /* Begin right list */ - HTM_UL_Begin ("class=\"PRF_FIG_UL %s NOWRAP\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_STRONG_%s NOWRAP\"", + The_Colors[Gbl.Prefs.Theme]); /* Number of clicks */ Prf_ShowNumClicks (UsrDat,&UsrFigures); diff --git a/swad_record.c b/swad_record.c index 64da6242..72e0c8af 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1575,7 +1575,6 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, struct UsrData *UsrDat,const char *Anchor) { extern const char *Hlp_USERS_Students_course_record_card; - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES]; @@ -1748,8 +1747,8 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, /* Write form, text, or nothing depending on the user's role and the visibility of the field */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme], + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s %s\"", + The_Colors[Gbl.Prefs.Theme], The_GetColorRows ()); if (ICanEditThisField) // Show with form { @@ -2698,10 +2697,10 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks) static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; - HTM_TD_Begin ("class=\"REC_C2_MID LT %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_MID LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData && UsrDat->CtyCod > 0) /* Link to see country information */ Cty_WriteCountryName (UsrDat->CtyCod); // Put link to country @@ -2727,7 +2726,7 @@ static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat, static void Rec_ShowEmail (struct UsrData *UsrDat) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Email; /***** Email *****/ @@ -2737,14 +2736,15 @@ static void Rec_ShowEmail (struct UsrData *UsrDat) Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Email); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (UsrDat->Email[0]) { HTM_DIV_Begin ("class=\"REC_EMAIL\""); // Limited width if (Mai_ICanSeeOtherUsrEmail (UsrDat)) { - HTM_A_Begin ("href=\"mailto:%s\" class=\"%s\"", - UsrDat->Email,The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"mailto:%s\" class=\"DAT_STRONG_%s\"", + UsrDat->Email,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (UsrDat->Email); HTM_A_End (); } @@ -2763,7 +2763,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat) static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *Anchor) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_ID; /***** User's IDs *****/ @@ -2773,7 +2773,8 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *Anchor) Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_ID); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); ID_WriteUsrIDs (UsrDat,Anchor); HTM_TD_End (); @@ -2788,7 +2789,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, Rec_SharedRecordViewType_t TypeOfView) { extern const char *Usr_StringsSexIcons[Usr_NUM_SEXS]; - 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_Role; extern const char *Txt_Sex; @@ -2816,7 +2817,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, Frm_LabelColumn ("REC_C1_BOT RM","Role",Txt_Role); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); switch (TypeOfView) { case Rec_SHA_SIGN_UP_IN_CRS_FORM: // I want to apply for enrolment @@ -3026,7 +3028,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, Sex <= Usr_SEX_MALE; Sex++) { - HTM_LABEL_Begin ("class=\"%s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_LABEL_Begin ("class=\"DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_INPUT_RADIO ("Sex",false, "value=\"%u\"%s required=\"required\"", (unsigned) Sex, @@ -3043,7 +3046,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Role); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs][UsrDat->Sex]); HTM_TD_End (); } @@ -3057,7 +3061,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) { - 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_Surname_1; char *Label; @@ -3076,7 +3080,8 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Surname_1); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (PutForm) HTM_INPUT_TEXT ("Surname1",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME,UsrDat->Surname1, HTM_DONT_SUBMIT_ON_CHANGE, @@ -3100,7 +3105,7 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) { - 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_Surname_2; @@ -3112,7 +3117,8 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) Txt_Surname_2); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (PutForm) HTM_INPUT_TEXT ("Surname2",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME, UsrDat->Surname2, @@ -3136,7 +3142,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm) { - 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_First_name; char *Label; @@ -3155,8 +3161,8 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm) Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_First_name); /* Data */ - HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT LM %s\"", - The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (PutForm) HTM_INPUT_TEXT ("FirstName",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME, UsrDat->FrstName, @@ -3235,7 +3241,7 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutForm) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Date_of_birth; /***** Date of birth *****/ @@ -3247,7 +3253,8 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo Txt_Date_of_birth); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { if (PutForm) @@ -3272,7 +3279,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, unsigned NumPhone) { - 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_Phone; char *Name; @@ -3295,7 +3302,8 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, Label); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { if (PutForm) @@ -3306,8 +3314,8 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, The_ClassInput[Gbl.Prefs.Theme]); else if (UsrDat->Phone[NumPhone][0]) { - HTM_A_Begin ("href=\"tel:%s\" class=\"%s\"", - UsrDat->Phone[NumPhone],The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_STRONG_%s\"", + UsrDat->Phone[NumPhone],The_Colors[Gbl.Prefs.Theme]); HTM_Txt (UsrDat->Phone[NumPhone]); HTM_A_End (); } @@ -3329,7 +3337,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm) { - 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_USER_comments; @@ -3342,7 +3350,8 @@ static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm) Txt_USER_comments); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { if (PutForm) @@ -3394,7 +3403,7 @@ static void Rec_ShowTeacherRows (struct UsrData *UsrDat,struct Ins_Instit *Ins, static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Institution; /***** Institution *****/ @@ -3404,13 +3413,15 @@ static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData) Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Institution); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) if (Ins->InsCod > 0) { if (Ins->WWW[0]) - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", - Ins->WWW,The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"%s\" target=\"_blank\"" + " class=\"DAT_STRONG_%s\"", + Ins->WWW,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Ins->FullName); if (Ins->WWW[0]) HTM_A_End (); @@ -3426,7 +3437,7 @@ static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData) static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Center; struct Ctr_Center Ctr; @@ -3437,7 +3448,8 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData) Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Center); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { if (UsrDat->Tch.CtrCod > 0) @@ -3445,8 +3457,9 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData) Ctr.CtrCod = UsrDat->Tch.CtrCod; Ctr_GetDataOfCenterByCod (&Ctr); if (Ctr.WWW[0]) - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", - Ctr.WWW,The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"%s\" target=\"_blank\"" + " class=\"DAT_STRONG_%s\"", + Ctr.WWW,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Ctr.FullName); if (Ctr.WWW[0]) HTM_A_End (); @@ -3463,7 +3476,7 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData) static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Department; struct Dpt_Department Dpt; @@ -3474,7 +3487,8 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData) Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Department); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { if (UsrDat->Tch.DptCod > 0) @@ -3482,8 +3496,9 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData) Dpt.DptCod = UsrDat->Tch.DptCod; Dpt_GetDataOfDepartmentByCod (&Dpt); if (Dpt.WWW[0]) - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", - Dpt.WWW,The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"%s\" target=\"_blank\"" + " class=\"DAT_STRONG_%s\"", + Dpt.WWW,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (Dpt.FullName); if (Dpt.WWW[0]) HTM_A_End (); @@ -3500,7 +3515,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData) static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Office; /***** Office *****/ @@ -3510,7 +3525,8 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData) Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Office); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) HTM_Txt (UsrDat->Tch.Office); HTM_TD_End (); @@ -3524,7 +3540,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData) static void Rec_ShowOfficePhone (struct UsrData *UsrDat,bool ShowData) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Phone; /***** Office phone *****/ @@ -3534,11 +3550,12 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,bool ShowData) Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Phone); /* Data */ - HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"REC_C2_BOT LM DAT_STRONG_%s\"", + The_Colors[Gbl.Prefs.Theme]); if (ShowData) { - HTM_A_Begin ("href=\"tel:%s\" class=\"%s\"", - UsrDat->Tch.OfficePhone,The_ClassDatStrong[Gbl.Prefs.Theme]); + HTM_A_Begin ("href=\"tel:%s\" class=\"DAT_STRONG_%s\"", + UsrDat->Tch.OfficePhone,The_Colors[Gbl.Prefs.Theme]); HTM_Txt (UsrDat->Tch.OfficePhone); HTM_A_End (); }