diff --git a/css/swad21.93.1.css b/css/swad21.93.4.css similarity index 99% rename from css/swad21.93.1.css rename to css/swad21.93.4.css index 2bd4390d..91228333 100644 --- a/css/swad21.93.1.css +++ b/css/swad21.93.4.css @@ -2962,10 +2962,37 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} .ASG_TITLE_LIGHT_PINK {color:rgba( 77,136,161,0.3); font-size:15pt; font-weight:bold;} .ASG_TITLE_LIGHT_DARK {color:rgba(175,196,204,0.3); font-size:15pt; font-weight:bold;} -.ASG_LABEL {color:#4d88a1; font-size:13pt;} -.ASG_LABEL_LIGHT {color:#afc4cc; font-size:13pt;} -.ASG_GRP {color:#4d88a1; font-size:12pt;} -.ASG_GRP_LIGHT {color:#afc4cc; font-size:12pt;} +.ASG_LABEL_WHITE, +.ASG_LABEL_GREY, +.ASG_LABEL_PURPLE, +.ASG_LABEL_BLUE, +.ASG_LABEL_YELLOW, +.ASG_LABEL_PINK {color:#4d88a1; font-size:13pt;} +.ASG_LABEL_DARK {color:#afc4cc; font-size:13pt;} + +.ASG_LABEL_LIGHT_WHITE, +.ASG_LABEL_LIGHT_GREY, +.ASG_LABEL_LIGHT_PURPLE, +.ASG_LABEL_LIGHT_BLUE, +.ASG_LABEL_LIGHT_YELLOW, +.ASG_LABEL_LIGHT_PINK {color:rgba( 77,136,161,0.3); font-size:13pt;} +.ASG_LABEL_LIGHT_DARK {color:rgba(175,196,204,0.3); font-size:13pt;} + +.ASG_GRP_WHITE, +.ASG_GRP_GREY, +.ASG_GRP_PURPLE, +.ASG_GRP_BLUE, +.ASG_GRP_YELLOW, +.ASG_GRP_PINK {color:#4d88a1; font-size:12pt;} +.ASG_GRP_DARK {color:#afc4cc; font-size:12pt;} + +.ASG_GRP_LIGHT_WHITE, +.ASG_GRP_LIGHT_GREY, +.ASG_GRP_LIGHT_PURPLE, +.ASG_GRP_LIGHT_BLUE, +.ASG_GRP_LIGHT_YELLOW, +.ASG_GRP_LIGHT_PINK {color:rgba( 77,136,161,0.3); font-size:12pt;} +.ASG_GRP_LIGHT_DARK {color:rgba(175,196,204,0.3); font-size:12pt;} .DATE_RED_WHITE, .DATE_RED_GREY, @@ -3067,13 +3094,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} text-align:center; vertical-align:middle; } -.PRJ_MEMBER_NAM - { - text-align:left; - vertical-align:middle; - color:#4d88a1; - font-size:11pt; - } /********************************** Tests ************************************/ .TAG_SEL {box-sizing:border-box; width:346px;} diff --git a/swad_assignment.c b/swad_assignment.c index 775fc95d..a4e391e1 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1530,8 +1530,10 @@ static void Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (struct Asg_Assignment *As NumGrps = Asg_DB_GetGrps (&mysql_res,Asg->AsgCod); /***** Write heading *****/ - HTM_DIV_Begin ("class=\"%s\"",Asg->Hidden ? "ASG_GRP_LIGHT" : - "ASG_GRP"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Asg->Hidden ? "ASG_GRP_LIGHT" : + "ASG_GRP", + The_GetSuffix ()); HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group : Txt_Groups); diff --git a/swad_attendance.c b/swad_attendance.c index 04088444..e86c2631 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1352,8 +1352,10 @@ static void Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (struct Att_Event *Ev NumGrps = Att_DB_GetGroupsAssociatedToEvent (&mysql_res,Event->AttCod); /***** Begin container *****/ - HTM_DIV_Begin ("class=\"%s\"",Event->Hidden ? "ASG_GRP_LIGHT" : - "ASG_GRP"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Event->Hidden ? "ASG_GRP_LIGHT" : + "ASG_GRP", + The_GetSuffix ()); /***** Write heading *****/ HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group : diff --git a/swad_changelog.h b/swad_changelog.h index a5ba9fe1..6dabf408 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.3 (2022-04-22)" -#define CSS_FILE "swad21.93.1.css" +#define Log_PLATFORM_VERSION "SWAD 21.93.4 (2022-04-22)" +#define CSS_FILE "swad21.93.4.css" #define JS_FILE "swad21.92.js" /* + 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) Version 21.93.1: Apr 21, 2022 Working on design of dark theme. (323269 lines) diff --git a/swad_exam.c b/swad_exam.c index b7ff4cbe..8f134172 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -558,8 +558,10 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, HTM_ARTICLE_End (); /* Number of questions, maximum grade, visibility of results */ - HTM_DIV_Begin ("class=\"%s\"",Exam->Hidden ? "ASG_GRP_LIGHT" : - "ASG_GRP"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Exam->Hidden ? "ASG_GRP_LIGHT" : + "ASG_GRP", + The_GetSuffix ()); HTM_TxtColonNBSP (Txt_Sets_of_questions); HTM_Unsigned (Exam->NumSets); HTM_BR (); diff --git a/swad_exam_session.c b/swad_exam_session.c index f04dcddf..14bb333f 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -570,8 +570,10 @@ static void ExaSes_GetAndWriteNamesOfGrpsAssociatedToSession (const struct ExaSe NumGrps = Exa_DB_GetGrpsAssociatedToSes (&mysql_res,Session->SesCod); /***** Write heading *****/ - HTM_DIV_Begin ("class=\"%s\"",Session->Hidden ? "ASG_GRP_LIGHT": - "ASG_GRP"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Session->Hidden ? "ASG_GRP_LIGHT": + "ASG_GRP", + The_GetSuffix ()); HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group : Txt_Groups); diff --git a/swad_game.c b/swad_game.c index 74a2c731..a7bb50af 100644 --- a/swad_game.c +++ b/swad_game.c @@ -609,8 +609,10 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, HTM_ARTICLE_End (); /* Number of questions, maximum grade, visibility of results */ - HTM_DIV_Begin ("class=\"%s\"",Game->Hidden ? "ASG_GRP_LIGHT" : - "ASG_GRP"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Game->Hidden ? "ASG_GRP_LIGHT" : + "ASG_GRP", + The_GetSuffix ()); HTM_TxtColonNBSP (Txt_Number_of_questions); HTM_Unsigned (Game->NumQsts); HTM_BR (); diff --git a/swad_match.c b/swad_match.c index d405fe40..f2b138f9 100644 --- a/swad_match.c +++ b/swad_match.c @@ -673,7 +673,7 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match /***** Get groups associated to a match from database *****/ NumGrps = Mch_DB_GetGrpNamesAssociatedToMatch (&mysql_res,Match->MchCod); - HTM_DIV_Begin ("class=\"ASG_GRP\""); + HTM_DIV_Begin ("class=\"ASG_GRP_%s\"",The_GetSuffix ()); /***** Write heading *****/ HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group : diff --git a/swad_project.c b/swad_project.c index 72be2a88..c276b069 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1319,12 +1319,15 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("id=\"%s\" class=\"LT %s %s\"", - Id,ClassDate,The_GetColorRows ()); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id, + ClassDate,The_GetSuffix (), + The_GetColorRows ()); break; default: - HTM_TD_Begin ("id=\"%s\" class=\"LT %s\"", - Id,ClassDate); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", + Id, + ClassDate,The_GetSuffix ()); break; } Dat_WriteLocalDateHMSFromUTC (Id,Prj->CreatTime, @@ -1340,12 +1343,15 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", - Id,ClassDate,The_GetColorRows ()); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"", + Id, + ClassDate,The_GetSuffix (), + The_GetColorRows ()); break; default: - HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", - Id,ClassDate); + HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s\"", + Id, + ClassDate,The_GetSuffix ()); break; } Dat_WriteLocalDateHMSFromUTC (Id,Prj->ModifTime, @@ -1397,12 +1403,12 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); break; default: - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"", - ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; } HTM_TxtColon (Txt_Assigned_QUESTION); @@ -1412,8 +1418,7 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, { case Prj_LIST_PROJECTS: HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"", - ClassData,The_GetSuffix (), - The_GetColorRows ()); + ClassData,The_GetSuffix (),The_GetColorRows ()); break; default: HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"", @@ -1438,12 +1443,12 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); break; default: - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"", - ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; } HTM_TxtColon (Txt_Number_of_students); @@ -1452,12 +1457,12 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", - ClassData,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"", + ClassData,The_GetSuffix (),The_GetColorRows ()); break; default: - HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", - ClassData); + HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"", + ClassData,The_GetSuffix ()); break; } HTM_Unsigned (Prj->NumStds); @@ -1510,16 +1515,18 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, { case Prj_LIST_PROJECTS: HTM_TR_Begin ("id=\"prj_pro_%u\" style=\"display:none;\"",UniqueId); - HTM_TD_Begin ("colspan=\"4\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"4\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); break; case Prj_FILE_BROWSER_PROJECT: HTM_TR_Begin ("id=\"prj_pro_%u\" style=\"display:none;\"",UniqueId); - HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"3\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; default: HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; } HTM_TxtColon (Txt_Proposal); @@ -1528,12 +1535,13 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", - ClassData,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"", + ClassData,The_GetSuffix (), + The_GetColorRows ()); break; default: - HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", - ClassData); + HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"", + ClassData,The_GetSuffix ()); break; } HTM_Txt (Txt_PROJECT_STATUS[Prj->Proposal]); @@ -1859,16 +1867,18 @@ static void Prj_ShowOneProjectTxtField (struct Prj_Project *Prj, { case Prj_LIST_PROJECTS: HTM_TR_Begin ("id=\"%s%u\" style=\"display:none;\"",id,UniqueId); - HTM_TD_Begin ("colspan=\"4\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"4\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); break; case Prj_FILE_BROWSER_PROJECT: HTM_TR_Begin ("id=\"%s%u\" style=\"display:none;\"",id,UniqueId); - HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"3\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; case Prj_PRINT_ONE_PROJECT: HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; default: // Not applicable @@ -1957,16 +1967,18 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj, { case Prj_LIST_PROJECTS: HTM_TR_Begin ("id=\"%s%u\" style=\"display:none;\"",id,UniqueId); - HTM_TD_Begin ("colspan=\"4\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"4\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); break; case Prj_FILE_BROWSER_PROJECT: HTM_TR_Begin ("id=\"%s%u\" style=\"display:none;\"",id,UniqueId); - HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"3\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; case Prj_PRINT_ONE_PROJECT: HTM_TR_Begin (NULL); - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); break; default: // Not applicable @@ -2095,23 +2107,26 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TD_Begin ("colspan=\"4\" class=\"RT %s %s\"", - ClassLabel,The_GetColorRows ()); + HTM_TD_Begin ("colspan=\"4\" class=\"RT %s_%s %s\"", + ClassLabel,The_GetSuffix (),The_GetColorRows ()); HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInPrj] : Txt_PROJECT_ROLES_PLURAL_Abc[RoleInPrj]); break; case Prj_FILE_BROWSER_PROJECT: - HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"3\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInPrj] : Txt_PROJECT_ROLES_PLURAL_Abc[RoleInPrj]); break; case Prj_PRINT_ONE_PROJECT: - HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); + HTM_TD_Begin ("colspan=\"2\" class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInPrj] : Txt_PROJECT_ROLES_PLURAL_Abc[RoleInPrj]); break; case Prj_EDIT_ONE_PROJECT: - HTM_TD_Begin ("class=\"RT ASG_LABEL\""); + HTM_TD_Begin ("class=\"RT %s_%s\"", + ClassLabel,The_GetSuffix ()); HTM_TxtColon (Txt_PROJECT_ROLES_PLURAL_Abc[RoleInPrj]); break; } @@ -2175,7 +2190,10 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects, HTM_TD_End (); /* Write user's name */ - HTM_TD_Begin ("class=\"PRJ_MEMBER_NAM\""); + HTM_TD_Begin ("class=\"LM %s_%s\"", + Prj->Hidden == Prj_HIDDEN ? "MSG_AUT_LIGHT" : + "MSG_AUT", + The_GetSuffix ()); HTM_Txt (Gbl.Usrs.Other.UsrDat.FullName); HTM_TD_End (); @@ -2202,7 +2220,8 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects, HTM_TD_Begin ("class=\"PRJ_MEMBER_PHO\""); // Column for photo HTM_TD_End (); - HTM_TD_Begin ("class=\"PRJ_MEMBER_NAM\""); // Column for name + HTM_TD_Begin ("class=\"LM MSG_AUT_%s\"", // Column for name + The_GetSuffix ()); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_survey.c b/swad_survey.c index cba1e3f2..5d912ac4 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -550,9 +550,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, HTM_ARTICLE_End (); /* Number of questions and number of distinct users who have already answered this survey */ - HTM_DIV_Begin ("class=\"%s\"", + HTM_DIV_Begin ("class=\"%s_%s\"", Svy.Status.Visible ? "ASG_GRP" : - "ASG_GRP_LIGHT"); + "ASG_GRP_LIGHT", + The_GetSuffix ()); HTM_TxtColonNBSP (Txt_Number_of_questions); HTM_Unsigned (Svy.NumQsts); HTM_Txt ("; "); @@ -628,8 +629,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ()); /* Scope of the survey */ - HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" : - "ASG_GRP_LIGHT"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Svy.Status.Visible ? "ASG_GRP" : + "ASG_GRP_LIGHT", + The_GetSuffix ()); HTM_TxtColonNBSP (Txt_Scope); switch (Svy.Scope) { @@ -658,8 +661,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, HTM_DIV_End (); /* Users' roles who can answer the survey */ - HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" : - "ASG_GRP_LIGHT"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Svy.Status.Visible ? "ASG_GRP" : + "ASG_GRP_LIGHT", + The_GetSuffix ()); HTM_TxtColon (Txt_Users); HTM_BR (); Rol_WriteSelectorRoles (1 << Rol_STD | @@ -2195,8 +2200,10 @@ static void Svy_GetAndWriteNamesOfGrpsAssociatedToSvy (struct Svy_Survey *Svy) NumGrps = Svy_DB_GetGrpNamesAssociatedToSvy (&mysql_res,Svy->SvyCod); /***** Write heading *****/ - HTM_DIV_Begin ("class=\"%s\"",Svy->Status.Visible ? "ASG_GRP" : - "ASG_GRP_LIGHT"); + HTM_DIV_Begin ("class=\"%s_%s\"", + Svy->Status.Visible ? "ASG_GRP" : + "ASG_GRP_LIGHT", + The_GetSuffix ()); HTM_TxtColonNBSP (NumGrps == 1 ? Txt_Group : Txt_Groups);