From 003951946afa3b76930ea7f4d50f4ade927cc91a Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 7 Apr 2022 13:04:45 +0200 Subject: [PATCH] Version 21.91.5: Apr 07, 2022 Working on design of dark theme. --- css/{swad21.91.2.css => swad21.91.5.css} | 148 ++++++++++++++++------- swad_agenda.c | 3 +- swad_assignment.c | 18 +-- swad_attendance.c | 21 ++-- swad_browser.c | 3 +- swad_changelog.h | 5 +- swad_exam.c | 8 +- swad_exam_result.c | 16 ++- swad_exam_session.c | 4 +- swad_game.c | 8 +- swad_match.c | 3 +- swad_program.c | 18 +-- swad_survey.c | 36 +++--- 13 files changed, 183 insertions(+), 108 deletions(-) rename css/{swad21.91.2.css => swad21.91.5.css} (97%) diff --git a/css/swad21.91.2.css b/css/swad21.91.5.css similarity index 97% rename from css/swad21.91.2.css rename to css/swad21.91.5.css index 4c4b3f77..cae5cc6d 100644 --- a/css/swad21.91.2.css +++ b/css/swad21.91.5.css @@ -1488,64 +1488,65 @@ a:hover img.CENTER_PHOTO_SHOW .DAY_WRK_HEAD_PURPLE, .DAY_WRK_HEAD_BLUE, .DAY_WRK_HEAD_YELLOW, -.DAY_WRK_HEAD_PINK {color:#4d88a1;} -.DAY_WRK_HEAD_DARK {color:#8cbcce;} +.DAY_WRK_HEAD_PINK {color:#4d88a1;} +.DAY_WRK_HEAD_DARK {color:#8cbcce;} .DAY_NO_WRK_HEAD_WHITE, .DAY_NO_WRK_HEAD_GREY, .DAY_NO_WRK_HEAD_PURPLE, .DAY_NO_WRK_HEAD_BLUE, .DAY_NO_WRK_HEAD_YELLOW, -.DAY_NO_WRK_HEAD_PINK {color:red;} -.DAY_NO_WRK_HEAD_DARK {color:#ff8080;} +.DAY_NO_WRK_HEAD_PINK {color:red;} +.DAY_NO_WRK_HEAD_DARK {color:#ff8080;} .DAY_WRK_WHITE, .DAY_WRK_GREY, .DAY_WRK_PURPLE, .DAY_WRK_BLUE, .DAY_WRK_YELLOW, -.DAY_WRK_PINK {color:#202020;} -.DAY_WRK_DARK {color:white;} - -.DAY_NO_WORK_WHITE, -.DAY_NO_WORK_GREY, -.DAY_NO_WORK_PURPLE, -.DAY_NO_WORK_BLUE, -.DAY_NO_WORK_YELLOW, -.DAY_NO_WORK_PINK {color:#c04080;} -.DAY_NO_WORK_DARK {color:#e0a0c0;} - -.DAY_HLD_WHITE, -.DAY_HLD_GREY, -.DAY_HLD_PURPLE, -.DAY_HLD_BLUE, -.DAY_HLD_YELLOW, -.DAY_HLD_PINK {color:red;} -.DAY_HLD_DARK {color:#ff8080;} +.DAY_WRK_PINK {color:#202020;} +.DAY_WRK_DARK {color:white;} .DAY_WRK_LIGHT_WHITE, .DAY_WRK_LIGHT_GREY, .DAY_WRK_LIGHT_PURPLE, .DAY_WRK_LIGHT_BLUE, .DAY_WRK_LIGHT_YELLOW, -.DAY_WRK_LIGHT_PINK {color:#e0e0e0;} -.DAY_WRK_LIGHT_DARK {color:#606060;} +.DAY_WRK_LIGHT_PINK {color:rgba( 32, 32, 32,0.3);} +.DAY_WRK_LIGHT_DARK {color:rgba(255,255,255,0.3);} + +.DAY_NO_WORK_WHITE, +.DAY_NO_WORK_GREY, +.DAY_NO_WORK_PURPLE, +.DAY_NO_WORK_BLUE, +.DAY_NO_WORK_YELLOW, +.DAY_NO_WORK_PINK {color:#c04080;} +.DAY_NO_WORK_DARK {color:#e0a0c0;} .DAY_NO_WORK_LIGHT_WHITE, .DAY_NO_WORK_LIGHT_GREY, .DAY_NO_WORK_LIGHT_PURPLE, .DAY_NO_WORK_LIGHT_BLUE, .DAY_NO_WORK_LIGHT_YELLOW, -.DAY_NO_WORK_LIGHT_PINK {color:#ffe0ff;} -.DAY_NO_WORK_LIGHT_DARK {color:#807080;} +.DAY_NO_WORK_LIGHT_PINK {color:rgba(192, 64,128,0.3);} +.DAY_NO_WORK_LIGHT_DARK {color:rgba(224,160,192,0.3);} + + +.DAY_HLD_WHITE, +.DAY_HLD_GREY, +.DAY_HLD_PURPLE, +.DAY_HLD_BLUE, +.DAY_HLD_YELLOW, +.DAY_HLD_PINK {color:red;} +.DAY_HLD_DARK {color:#ff8080;} .DAY_HLD_LIGHT_WHITE, .DAY_HLD_LIGHT_GREY, .DAY_HLD_LIGHT_PURPLE, .DAY_HLD_LIGHT_BLUE, .DAY_HLD_LIGHT_YELLOW, -.DAY_HLD_LIGHT_PINK {color:#ffe0e0;} -.DAY_HLD_LIGHT_DARK {color:#807070;} +.DAY_HLD_LIGHT_PINK {color:rgba(255, 0, 0,0.3);} +.DAY_HLD_LIGHT_DARK {color:rgba(255,128,128,0.3);} .DAY { @@ -2660,8 +2661,21 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .DAT_SMALL_NOBR_STRONG_PINK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:black; font-size:12pt; white-space:nowrap;} .DAT_SMALL_NOBR_STRONG_DARK {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:white; font-size:12pt; white-space:nowrap;} -.DAT_GREEN {color:#246600; font-size:13pt;} -.DAT_RED {color:#660000; font-size:13pt;} +.DAT_GREEN_WHITE, +.DAT_GREEN_GREY, +.DAT_GREEN_PURPLE, +.DAT_GREEN_BLUE, +.DAT_GREEN_YELLOW, +.DAT_GREEN_PINK {color:#246600; font-size:13pt;} +.DAT_GREEN_DARK {color:#80c040; font-size:13pt;} + +.DAT_RED_WHITE, +.DAT_RED_GREY, +.DAT_RED_PURPLE, +.DAT_RED_BLUE, +.DAT_RED_YELLOW, +.DAT_RED_PINK {color:#660000; font-size:13pt;} +.DAT_RED_DARK {color:#ff8080; font-size:13pt;} .NOWRAP {white-space:nowrap;} .BOLD {font-weight:bold;} @@ -2897,18 +2911,60 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .ASG_GRP {color:#4d88a1; font-size:12pt;} .ASG_GRP_LIGHT {color:#afc4cc; font-size:12pt;} -.DATE_RED {color:#660000; font-size:13pt;} -.DATE_RED_LIGHT {color:#f98a8a; font-size:13pt;} -.DATE_GREEN {color:#246600; font-size:13pt;} -.DATE_GREEN_LIGHT {color:#89be87; font-size:13pt;} -.DATE_BLUE {color:#4d88a1; font-size:13pt;} -.DATE_BLUE_LIGHT {color:#afc4cc; font-size:13pt;} +.DATE_RED_WHITE, +.DATE_RED_GREY, +.DATE_RED_PURPLE, +.DATE_RED_BLUE, +.DATE_RED_YELLOW, +.DATE_RED_PINK {color:#660000; font-size:13pt;} +.DATE_RED_DARK {color:#f98a8a; font-size:13pt;} + +.DATE_RED_LIGHT_WHITE, +.DATE_RED_LIGHT_GREY, +.DATE_RED_LIGHT_PURPLE, +.DATE_RED_LIGHT_BLUE, +.DATE_RED_LIGHT_YELLOW, +.DATE_RED_LIGHT_PINK {color:rgba(102, 0, 0,0.3); font-size:13pt;} +.DATE_RED_LIGHT_DARK {color:rgba(249,138,138,0.3); font-size:13pt;} + +.DATE_GREEN_WHITE, +.DATE_GREEN_GREY, +.DATE_GREEN_PURPLE, +.DATE_GREEN_BLUE, +.DATE_GREEN_YELLOW, +.DATE_GREEN_PINK {color:#246600; font-size:13pt;} +.DATE_GREEN_DARK {color:#80c040; font-size:13pt;} + +.DATE_GREEN_LIGHT_WHITE, +.DATE_GREEN_LIGHT_GREY, +.DATE_GREEN_LIGHT_PURPLE, +.DATE_GREEN_LIGHT_BLUE, +.DATE_GREEN_LIGHT_YELLOW, +.DATE_GREEN_LIGHT_PINK {color:rgba( 36,100, 0,0.3); font-size:13pt;} +.DATE_GREEN_LIGHT_DARK {color:rgba(128,196, 64,0.3); font-size:13pt;} + +.DATE_BLUE_WHITE, +.DATE_BLUE_GREY, +.DATE_BLUE_PURPLE, +.DATE_BLUE_BLUE, +.DATE_BLUE_YELLOW, +.DATE_BLUE_PINK {color:#4d88a1; font-size:13pt;} +.DATE_BLUE_DARK {color:#afc4cc; font-size:13pt;} + +.DATE_BLUE_LIGHT_WHITE, +.DATE_BLUE_LIGHT_GREY, +.DATE_BLUE_LIGHT_PURPLE, +.DATE_BLUE_LIGHT_BLUE, +.DATE_BLUE_LIGHT_YELLOW, +.DATE_BLUE_LIGHT_PINK {color:rgba( 77,136,161,0.3); font-size:13pt;} +.DATE_BLUE_LIGHT_DARK {color:rgba(175,196,204,0.3); font-size:13pt;} .ASG_LST_DATE_GREEN {color:#246600; font-size:11pt; white-space:nowrap;} .ASG_LST_DATE_RED {color:#660000; font-size:11pt; white-space:nowrap;} .STATUS_GREEN {color:#246600; font-size:12pt;} .STATUS_GREEN_LIGHT {color:#89be87; font-size:12pt;} + .STATUS_RED {color:#660000; font-size:12pt;} .STATUS_RED_LIGHT {color:#f98a8a; font-size:12pt;} @@ -3002,6 +3058,14 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .Qst_TXT_PINK {color:#202020; font-size:12pt;} .Qst_TXT_DARK {color:#e0e0e0; font-size:12pt;} +.Qst_TXT_LIGHT_WHITE, +.Qst_TXT_LIGHT_GREY, +.Qst_TXT_LIGHT_PURPLE, +.Qst_TXT_LIGHT_BLUE, +.Qst_TXT_LIGHT_YELLOW, +.Qst_TXT_LIGHT_PINK {color:rgba( 32, 32, 32,0.3); font-size:12pt;} +.Qst_TXT_LIGHT_DARK {color:rgba(224,224,224,0.3); font-size:12pt;} + .Qst_TXT_RED_WHITE, .Qst_TXT_RED_GREY, .Qst_TXT_RED_PURPLE, @@ -3010,21 +3074,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .Qst_TXT_RED_PINK {color:#660000; font-size:12pt;} .Qst_TXT_RED_DARK {color:#ff8080; font-size:12pt;} -.Qst_TXT_LIGHT_WHITE, -.Qst_TXT_LIGHT_GREY, -.Qst_TXT_LIGHT_PURPLE, -.Qst_TXT_LIGHT_BLUE, -.Qst_TXT_LIGHT_YELLOW, -.Qst_TXT_LIGHT_PINK {color:#a0a0a0; font-size:12pt;} -.Qst_TXT_LIGHT_DARK {color:#808080; font-size:12pt;} - .Qst_TXT_LIGHT_RED_WHITE, .Qst_TXT_LIGHT_RED_GREY, .Qst_TXT_LIGHT_RED_PURPLE, .Qst_TXT_LIGHT_RED_BLUE, .Qst_TXT_LIGHT_RED_YELLOW, -.Qst_TXT_LIGHT_RED_PINK {color:#f98a8a; font-size:12pt;} -.Qst_TXT_LIGHT_RED_DARK {color:#f98a8a; font-size:12pt;} +.Qst_TXT_LIGHT_RED_PINK {color:rgba(102, 0, 0,0.3); font-size:12pt;} +.Qst_TXT_LIGHT_RED_DARK {color:rgba(255,128,128,0.3); font-size:12pt;} .Qst_ANS_0_WHITE, .Qst_ANS_0_GREY, diff --git a/swad_agenda.c b/swad_agenda.c index c5e1618b..5f8376df 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -828,10 +828,11 @@ static void Agd_ShowOneEvent (struct Agd_Agenda *Agenda, { if (asprintf (&Id,"agd_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); - HTM_TD_Begin ("id=\"%s\" class=\"%s LB %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LB %s_%s %s\"", Id, AgdEvent.Hidden ? Dat_TimeStatusClassHidden[AgdEvent.TimeStatus] : Dat_TimeStatusClassVisible[AgdEvent.TimeStatus], + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,AgdEvent.TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_assignment.c b/swad_assignment.c index d3732934..a1ac8526 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -432,19 +432,21 @@ static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments, if (asprintf (&Id,"asg_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); if (PrintView) - HTM_TD_Begin ("id=\"%s\" class=\"%s LB\"", - Id, - Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : - "DATE_RED_LIGHT") : - (Asg.Open ? "DATE_GREEN" : - "DATE_RED")); - else - HTM_TD_Begin ("id=\"%s\" class=\"%s LB %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LB %s_%s\"", Id, Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : (Asg.Open ? "DATE_GREEN" : "DATE_RED"), + The_GetSuffix ()); + else + HTM_TD_Begin ("id=\"%s\" class=\"LB %s_%s %s\"", + Id, + Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : + "DATE_RED_LIGHT") : + (Asg.Open ? "DATE_GREEN" : + "DATE_RED"), + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Asg.TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_attendance.c b/swad_attendance.c index 23985afe..4ada7262 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -490,19 +490,21 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events, if (asprintf (&Id,"att_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); if (ShowOnlyThisAttEventComplete) - HTM_TD_Begin ("id=\"%s\" class=\"%s LB\"", - Id, - Event->Hidden ? (Event->Open ? "DATE_GREEN_LIGHT" : - "DATE_RED_LIGHT") : - (Event->Open ? "DATE_GREEN" : - "DATE_RED")); - else - HTM_TD_Begin ("id=\"%s\" class=\"%s LB %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LB %s_%s\"", Id, Event->Hidden ? (Event->Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : (Event->Open ? "DATE_GREEN" : "DATE_RED"), + The_GetSuffix ()); + else + HTM_TD_Begin ("id=\"%s\" class=\"LB %s_%s %s\"", + Id, + Event->Hidden ? (Event->Open ? "DATE_GREEN_LIGHT" : + "DATE_RED_LIGHT") : + (Event->Open ? "DATE_GREEN" : + "DATE_RED"), + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Event->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, @@ -3207,9 +3209,10 @@ static void Att_ListAttEventsForAStd (const struct Att_Events *Events, HTM_TD_ColouredEmpty (1); - HTM_TD_Begin ("class=\"%s RT %s\"", + HTM_TD_Begin ("class=\"RT %s_%s %s\"", Present ? "DAT_GREEN" : "DAT_RED", + The_GetSuffix (), The_GetColorRows ()); HTM_TxtF ("%u:",NumAttEvent + 1); HTM_TD_End (); diff --git a/swad_browser.c b/swad_browser.c index 8c28d216..7af0f716 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -5393,9 +5393,10 @@ static void Brw_WriteDatesAssignment (void) char *Id; /***** Begin table cell *****/ - HTM_TD_Begin ("colspan=\"2\" class=\"%s RM %s\"", + HTM_TD_Begin ("colspan=\"2\" class=\"RM %s_%s %s\"", Gbl.FileBrowser.Asg.Open ? "ASG_LST_DATE_GREEN" : "ASG_LST_DATE_RED", + The_GetSuffix (), The_GetColorRows ()); if (Gbl.FileBrowser.Asg.AsgCod > 0) diff --git a/swad_changelog.h b/swad_changelog.h index dcc1dae8..ef8d8e99 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.91.4 (2022-04-05)" -#define CSS_FILE "swad21.91.2.css" +#define Log_PLATFORM_VERSION "SWAD 21.91.5 (2022-04-07)" +#define CSS_FILE "swad21.91.5.css" #define JS_FILE "swad21.78.2.js" /* + Version 21.91.5: Apr 07, 2022 Working on design of dark theme. (323314 lines) Version 21.91.4: Apr 05, 2022 Working on design of dark theme. (323247 lines) Version 21.91.3: Apr 05, 2022 Changes in syllabus. (323227 lines) Version 21.91.2: Apr 05, 2022 Working on design of dark theme. (323232 lines) diff --git a/swad_exam.c b/swad_exam.c index 77be0ada..01981287 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -524,11 +524,11 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, (Exam->Hidden ? "DATE_RED_LIGHT": "DATE_RED"); if (ShowOnlyThisExam) - HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", - Id,Color); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", + Id,Color,The_GetSuffix ()); else - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", - Id,Color,The_GetColorRows ()); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id,Color,The_GetSuffix (),The_GetColorRows ()); if (Exam->TimeUTC[Dat_STR_TIME]) Dat_WriteLocalDateHMSFromUTC (Id,Exam->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_exam_result.c b/swad_exam_result.c index cdd9141a..4325d969 100644 --- a/swad_exam_result.c +++ b/swad_exam_result.c @@ -894,7 +894,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams, HTM_TD_End (); /* Valid questions */ - HTM_TD_Begin ("class=\"DAT_GREEN RT %s\"", + HTM_TD_Begin ("class=\"RT DAT_GREEN_%s %s\"", + The_GetSuffix (), The_GetColorRows ()); if (ICanView.Score) { @@ -908,7 +909,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams, HTM_TD_End (); /* Invalid questions */ - HTM_TD_Begin ("class=\"DAT_RED RT %s\"", + HTM_TD_Begin ("class=\"RT DAT_RED_%s %s\"", + The_GetSuffix (), The_GetColorRows ()); if (ICanView.Score) { @@ -1138,7 +1140,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults, HTM_TD_End (); /***** Write total number of valid questions *****/ - HTM_TD_Begin ("class=\"RT DAT_GREEN LINE_TOP LINE_BOTTOM %s\"", + HTM_TD_Begin ("class=\"RT DAT_GREEN_%s LINE_TOP LINE_BOTTOM %s\"", + The_GetSuffix (), The_GetColorRows ()); if (NumTotalQsts->Valid.Total) HTM_Unsigned (NumTotalQsts->Valid.Total); @@ -1147,7 +1150,8 @@ static void ExaRes_ShowResultsSummaryRow (unsigned NumResults, HTM_TD_End (); /***** Write total number of invalid questions *****/ - HTM_TD_Begin ("class=\"DAT_RED RT LINE_TOP LINE_BOTTOM %s\"", + HTM_TD_Begin ("class=\"RT DAT_RED_%s LINE_TOP LINE_BOTTOM %s\"", + The_GetSuffix (), The_GetColorRows ()); NumTotalQstsInvalid = NumTotalQsts->All - NumTotalQsts->Valid.Total; if (NumTotalQstsInvalid) @@ -1642,7 +1646,7 @@ static void ExaRes_ShowExamResultNumQsts (struct ExaPrn_Print *Print, HTM_Txt (" ("); /* Valid questions */ - HTM_SPAN_Begin ("class=\"DAT_GREEN\""); + HTM_SPAN_Begin ("class=\"DAT_GREEN_%s\"",The_GetSuffix ()); HTM_TxtColonNBSP (Txt_QUESTIONS_valid); HTM_Unsigned (Print->NumQsts.Valid.Total); HTM_SPAN_End (); @@ -1650,7 +1654,7 @@ static void ExaRes_ShowExamResultNumQsts (struct ExaPrn_Print *Print, HTM_TxtF ("; "); /* Invalid questions */ - HTM_SPAN_Begin ("class=\"DAT_RED\""); + HTM_SPAN_Begin ("class=\"DAT_RED_%s\"",The_GetSuffix ()); HTM_TxtColonNBSP (Txt_QUESTIONS_invalid); HTM_Unsigned (Print->NumQsts.All - Print->NumQsts.Valid.Total); HTM_SPAN_End (); diff --git a/swad_exam_session.c b/swad_exam_session.c index 64ba7a21..a8cf600d 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -492,8 +492,8 @@ static void ExaSes_ListOneOrMoreSessionsTimes (const struct ExaSes_Session *Sess if (asprintf (&Id,"exa_time_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", - Id,Color,The_GetColorRows ()); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id,Color,The_GetSuffix (),The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Session->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, true,true,true,0x6); diff --git a/swad_game.c b/swad_game.c index f1c7a5e2..871eadc8 100644 --- a/swad_game.c +++ b/swad_game.c @@ -575,11 +575,11 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, (Game->Hidden ? "DATE_RED_LIGHT": "DATE_RED"); if (ShowOnlyThisGame) - HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", - Id,Color); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", + Id,Color,The_GetSuffix ()); else - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", - Id,Color,The_GetColorRows ()); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id,Color,The_GetSuffix (),The_GetColorRows ()); if (Game->TimeUTC[Dat_STR_TIME]) Dat_WriteLocalDateHMSFromUTC (Id,Game->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_match.c b/swad_match.c index 05d6402e..03d03ae7 100644 --- a/swad_match.c +++ b/swad_match.c @@ -606,10 +606,11 @@ void Mch_ListOneOrMoreMatchesTimes (const struct Mch_Match *Match,unsigned Uniqu { if (asprintf (&Id,"mch_time_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", Id, Match->Status.Showing == Mch_END ? "DATE_RED" : "DATE_GREEN", + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Match->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_program.c b/swad_program.c index 5eeb594b..48a31a88 100644 --- a/swad_program.c +++ b/swad_program.c @@ -460,19 +460,21 @@ static void Prg_WriteRowItem (unsigned NumItem,struct Prg_Item *Item, if (asprintf (&Id,"scd_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) Err_NotEnoughMemoryExit (); if (PrintView) - HTM_TD_Begin ("id=\"%s\" class=\"PRG_DATE %s LT\"", - Id, - LightStyle ? (Item->Open ? "DATE_GREEN_LIGHT" : - "DATE_RED_LIGHT") : - (Item->Open ? "DATE_GREEN" : - "DATE_RED")); - else - HTM_TD_Begin ("id=\"%s\" class=\"PRG_DATE %s LT %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"PRG_DATE LT %s_%s\"", Id, LightStyle ? (Item->Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : (Item->Open ? "DATE_GREEN" : "DATE_RED"), + The_GetSuffix ()); + else + HTM_TD_Begin ("id=\"%s\" class=\"PRG_DATE LT %s_%s %s\"", + Id, + LightStyle ? (Item->Open ? "DATE_GREEN_LIGHT" : + "DATE_RED_LIGHT") : + (Item->Open ? "DATE_GREEN" : + "DATE_RED"), + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Item->TimeUTC[StartEndTime], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, diff --git a/swad_survey.c b/swad_survey.c index e0d99fba..1de1fb73 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -479,19 +479,21 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, if (asprintf (&Id,"svy_date_start_%u",UniqueId) < 0) Err_NotEnoughMemoryExit (); if (ShowOnlyThisSvyComplete) - HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", - Id, - Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : - "DATE_RED") : - (Svy.Status.Open ? "DATE_GREEN_LIGHT" : - "DATE_RED_LIGHT")); - else - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", Id, Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : "DATE_RED") : (Svy.Status.Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT"), + The_GetSuffix ()); + else + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id, + Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : + "DATE_RED") : + (Svy.Status.Open ? "DATE_GREEN_LIGHT" : + "DATE_RED_LIGHT"), + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Dat_STR_TIME], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, @@ -503,19 +505,21 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, if (asprintf (&Id,"svy_date_end_%u",UniqueId) < 0) Err_NotEnoughMemoryExit (); if (ShowOnlyThisSvyComplete) - HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", - Id, - Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : - "DATE_RED") : - (Svy.Status.Open ? "DATE_GREEN_LIGHT" : - "DATE_RED_LIGHT")); - else - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", Id, Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : "DATE_RED") : (Svy.Status.Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT"), + The_GetSuffix ()); + else + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id, + Svy.Status.Visible ? (Svy.Status.Open ? "DATE_GREEN" : + "DATE_RED") : + (Svy.Status.Open ? "DATE_GREEN_LIGHT" : + "DATE_RED_LIGHT"), + The_GetSuffix (), The_GetColorRows ()); Dat_WriteLocalDateHMSFromUTC (Id,Svy.TimeUTC[Dat_END_TIME], Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK,