diff --git a/css/swad21.93.4.css b/css/swad21.93.4.css index 91228333b..82f0d8fc6 100644 --- a/css/swad21.93.4.css +++ b/css/swad21.93.4.css @@ -3045,11 +3045,37 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .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_GREEN_WHITE, +.STATUS_GREEN_GREY, +.STATUS_GREEN_PURPLE, +.STATUS_GREEN_BLUE, +.STATUS_GREEN_YELLOW, +.STATUS_GREEN_PINK {color:#246600; font-size:12pt;} +.STATUS_GREEN_DARK {color:#80c040; font-size:12pt;} -.STATUS_RED {color:#660000; font-size:12pt;} -.STATUS_RED_LIGHT {color:#f98a8a; font-size:12pt;} +.STATUS_GREEN_LIGHT_WHITE, +.STATUS_GREEN_LIGHT_GREY, +.STATUS_GREEN_LIGHT_PURPLE, +.STATUS_GREEN_LIGHT_BLUE, +.STATUS_GREEN_LIGHT_YELLOW, +.STATUS_GREEN_LIGHT_PINK {color:rgba( 36,102, 0,0.3); font-size:12pt;} +.STATUS_GREEN_LIGHT_DARK {color:rgba(128,192, 64,0.3); font-size:12pt;} + +.STATUS_RED_WHITE, +.STATUS_RED_GREY, +.STATUS_RED_PURPLE, +.STATUS_RED_BLUE, +.STATUS_RED_YELLOW, +.STATUS_RED_PINK {color:#660000; font-size:12pt;} +.STATUS_RED_DARK {color:#ff8080; font-size:12pt;} + +.STATUS_RED_LIGHT_WHITE, +.STATUS_RED_LIGHT_GREY, +.STATUS_RED_LIGHT_PURPLE, +.STATUS_RED_LIGHT_BLUE, +.STATUS_RED_LIGHT_YELLOW, +.STATUS_RED_LIGHT_PINK {color:rgba(102, 0, 0,0.3); font-size:12pt;} +.STATUS_RED_LIGHT_DARK {color:rgba(255,128,128,0.3); font-size:12pt;} /********************** Number of question, project, etc. ********************/ .BIG_INDEX_WHITE, diff --git a/swad_attendance.c b/swad_attendance.c index e86c2631d..84456916f 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1859,7 +1859,7 @@ static void Att_PutLinkAttEvent (struct Att_Event *Event, Att_PutParamsCodGrps (Event->AttCod); /***** Link to view attendance event *****/ - HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Title,"class=\"LT BT_LINK %s_%s\"", Event->Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", The_GetSuffix ()); diff --git a/swad_changelog.h b/swad_changelog.h index 6dabf4089..84b46b8f7 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.93.4 (2022-04-22)" +#define Log_PLATFORM_VERSION "SWAD 21.93.5 (2022-04-23)" #define CSS_FILE "swad21.93.4.css" #define JS_FILE "swad21.92.js" /* + Version 21.93.5: Apr 23, 2022 Working on design of dark theme. (323346 lines) Version 21.93.4: Apr 22, 2022 Working on design of dark theme. (323313 lines) Version 21.93.3: Apr 22, 2022 Working on design of dark theme. (323259 lines) Version 21.93.2: Apr 22, 2022 Working on design of dark theme. (323277 lines) diff --git a/swad_exam.c b/swad_exam.c index 8f134172d..78ae6baef 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -548,7 +548,7 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, HTM_ARTICLE_Begin (Anchor); Frm_BeginForm (ActSeeExa); Exa_PutParams (Exams); - HTM_BUTTON_Submit_Begin (Txt_View_exam,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Txt_View_exam,"class=\"LT BT_LINK %s_%s\"", Exam->Hidden ? "ASG_TITLE_LIGHT": "ASG_TITLE", The_GetSuffix ()); @@ -581,7 +581,7 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, Exams->ExaCod = Exam->ExaCod; Frm_BeginForm (ActSeeExa); Exa_PutParams (Exams); - HTM_BUTTON_Submit_Begin (Txt_Sessions,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Txt_Sessions,"class=\"LT BT_LINK %s_%s\"", Exam->Hidden ? "ASG_TITLE_LIGHT": "ASG_TITLE", The_GetSuffix ()); diff --git a/swad_exam_session.c b/swad_exam_session.c index 14bb333fc..a1b15e303 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -525,7 +525,7 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams, ExaSes_PutParamSesCod (Session->SesCod); HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : Txt_Resume, - "class=\"BT_LINK %s_%s\"", + "class=\"LT BT_LINK %s_%s\"", Session->Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE", The_GetSuffix ()); diff --git a/swad_game.c b/swad_game.c index a7bb50aff..bc8dd0185 100644 --- a/swad_game.c +++ b/swad_game.c @@ -599,7 +599,7 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, HTM_ARTICLE_Begin (Anchor); Frm_BeginForm (ActSeeGam); Gam_PutParams (Games); - HTM_BUTTON_Submit_Begin (Txt_View_game,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Txt_View_game,"class=\"LT BT_LINK %s_%s\"", Game->Hidden ? "ASG_TITLE_LIGHT": "ASG_TITLE", The_GetSuffix ()); @@ -632,7 +632,7 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, Games->GamCod = Game->GamCod; Frm_BeginForm (ActSeeGam); Gam_PutParams (Games); - HTM_BUTTON_Submit_Begin (Txt_Matches,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Txt_Matches,"class=\"LT BT_LINK %s_%s\"", Game->Hidden ? "ASG_TITLE_LIGHT": "ASG_TITLE", The_GetSuffix ()); diff --git a/swad_match.c b/swad_match.c index f2b138f98..750849c1c 100644 --- a/swad_match.c +++ b/swad_match.c @@ -640,7 +640,7 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match, HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : Txt_Resume, - "class=\"BT_LINK LT ASG_TITLE_%s\"", + "class=\"LT BT_LINK ASG_TITLE_%s\"", The_GetSuffix ()); HTM_Txt (Match->Title); HTM_BUTTON_End (); diff --git a/swad_project.c b/swad_project.c index c276b0696..71b97cbac 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1378,7 +1378,7 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, Frm_BeginForm (ActAdmDocPrj); Prj_PutCurrentParams (Projects); HTM_BUTTON_Submit_Begin (Txt_Project_files, - "class=\"BT_LINK %s_%s\"", + "class=\"LT BT_LINK %s_%s\"", Prj->Hidden == Prj_HIDDEN ? "ASG_TITLE_LIGHT" : "ASG_TITLE", The_GetSuffix ()); diff --git a/swad_survey.c b/swad_survey.c index 5d912ac4e..43551c1c1 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -540,7 +540,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, WhichGroups = Grp_GetParamWhichGroups (); Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage); - HTM_BUTTON_Submit_Begin (Txt_View_survey,"class=\"BT_LINK %s_%s\"", + HTM_BUTTON_Submit_Begin (Txt_View_survey,"class=\"LT BT_LINK %s_%s\"", Svy.Status.Visible ? "ASG_TITLE" : "ASG_TITLE_LIGHT", The_GetSuffix ()); @@ -755,12 +755,12 @@ static void Svy_WriteStatus (struct Svy_Survey *Svy) /* Write whether survey is visible or hidden */ if (Svy->Status.Visible) { - HTM_LI_Begin ("class=\"STATUS_GREEN\""); + HTM_LI_Begin ("class=\"STATUS_GREEN_%s\"",The_GetSuffix ()); HTM_Txt (Txt_Visible_survey); } else { - HTM_LI_Begin ("class=\"STATUS_RED_LIGHT\""); + HTM_LI_Begin ("class=\"STATUS_RED_LIGHT_%s\"",The_GetSuffix ()); HTM_Txt (Txt_Hidden_survey); } HTM_LI_End (); @@ -768,16 +768,18 @@ static void Svy_WriteStatus (struct Svy_Survey *Svy) /* Write whether survey is open or closed */ if (Svy->Status.Open) { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_GREEN" : - "STATUS_GREEN_LIGHT"); + "STATUS_GREEN_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_Open_survey); } else { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_RED" : - "STATUS_RED_LIGHT"); + "STATUS_RED_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_Closed_survey); } HTM_LI_End (); @@ -785,16 +787,18 @@ static void Svy_WriteStatus (struct Svy_Survey *Svy) /* Write whether survey can be answered by me or not depending on user type */ if (Svy->Status.IAmLoggedWithAValidRoleToAnswer) { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_GREEN" : - "STATUS_GREEN_LIGHT"); + "STATUS_GREEN_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_Type_of_user_allowed); } else { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_RED" : - "STATUS_RED_LIGHT"); + "STATUS_RED_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_Type_of_user_not_allowed); } HTM_LI_End (); @@ -802,16 +806,18 @@ static void Svy_WriteStatus (struct Svy_Survey *Svy) /* Write whether survey can be answered by me or not depending on groups */ if (Svy->Status.IBelongToScope) { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_GREEN" : - "STATUS_GREEN_LIGHT"); + "STATUS_GREEN_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_You_belong_to_the_scope_of_the_survey); } else { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_RED" : - "STATUS_RED_LIGHT"); + "STATUS_RED_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_You_dont_belong_to_the_scope_of_the_survey); } HTM_LI_End (); @@ -819,16 +825,18 @@ static void Svy_WriteStatus (struct Svy_Survey *Svy) /* Write whether survey has been already answered by me or not */ if (Svy->Status.IHaveAnswered) { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_GREEN" : - "STATUS_GREEN_LIGHT"); + "STATUS_GREEN_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_You_have_already_answered); } else { - HTM_LI_Begin ("class=\"%s\"", + HTM_LI_Begin ("class=\"%s_%s\"", Svy->Status.Visible ? "STATUS_RED" : - "STATUS_RED_LIGHT"); + "STATUS_RED_LIGHT", + The_GetSuffix ()); HTM_Txt (Txt_SURVEY_You_have_not_answered); } HTM_LI_End ();