Version 21.93.3: Apr 22, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-04-22 13:33:30 +02:00
parent 3258c5c4d0
commit e604938efc
9 changed files with 89 additions and 106 deletions

View File

@ -842,24 +842,25 @@ static void Agd_ShowOneEvent (struct Agd_Agenda *Agenda,
} }
/* Event */ /* Event */
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
AgdEvent.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
HTM_Txt (AgdEvent.Event); HTM_SPAN_Begin ("class=\"%s_%s\"",
AgdEvent.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (AgdEvent.Event);
HTM_SPAN_End ();
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
HTM_TD_End (); HTM_TD_End ();
/* Location */ /* Location */
HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
HTM_DIV_Begin ("class=\"%s_%s\"", HTM_SPAN_Begin ("class=\"%s_%s\"",
AgdEvent.Hidden ? "ASG_TITLE_LIGHT" : AgdEvent.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE", "ASG_TITLE",
The_GetSuffix ()); The_GetSuffix ());
HTM_Txt (AgdEvent.Location); HTM_Txt (AgdEvent.Location);
HTM_DIV_End (); HTM_SPAN_End ();
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();

View File

@ -457,18 +457,16 @@ static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments,
/* Assignment title */ /* Assignment title */
if (PrintView) if (PrintView)
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
Asg.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Asg.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
HTM_Txt (Asg.Title); HTM_SPAN_Begin ("class=\"%s_%s\"",
Asg.Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Asg.Title);
HTM_SPAN_End ();
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
HTM_TD_End (); HTM_TD_End ();

View File

@ -123,7 +123,7 @@ static void Att_ListAttStudents (struct Att_Events *Events,
static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
struct UsrData *UsrDat, struct UsrData *UsrDat,
struct Att_Event *Event); struct Att_Event *Event);
static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, static void Att_PutLinkAttEvent (struct Att_Event *Event,
const char *Title,const char *Txt); const char *Title,const char *Txt);
static void Att_PutParamsCodGrps (long AttCod); static void Att_PutParamsCodGrps (long AttCod);
static unsigned Att_GetNumUsrsFromAListWhoAreInAttEvent (long AttCod, static unsigned Att_GetNumUsrsFromAListWhoAreInAttEvent (long AttCod,
@ -515,16 +515,9 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events,
/* Attendance event title */ /* Attendance event title */
if (ShowOnlyThisAttEventComplete) if (ShowOnlyThisAttEventComplete)
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title); Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title);
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
@ -532,17 +525,15 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events,
/* Number of students in this event */ /* Number of students in this event */
if (ShowOnlyThisAttEventComplete) if (ShowOnlyThisAttEventComplete)
HTM_TD_Begin ("class=\"RT %s_%s\"", HTM_TD_Begin ("class=\"RT\"");
else
HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
HTM_SPAN_Begin ("class=\"%s_%s\"",
Event->Hidden ? "ASG_TITLE_LIGHT" : Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE", "ASG_TITLE",
The_GetSuffix ()); The_GetSuffix ());
else HTM_Unsigned (Event->NumStdsTotal);
HTM_TD_Begin ("class=\"RT %s_%s %s\"", HTM_SPAN_End ();
Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
HTM_Unsigned (Event->NumStdsTotal);
HTM_TD_End (); HTM_TD_End ();
HTM_TR_End (); HTM_TR_End ();
@ -1857,16 +1848,19 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
/**************** Put link to view one attendance event **********************/ /**************** Put link to view one attendance event **********************/
/*****************************************************************************/ /*****************************************************************************/
static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, static void Att_PutLinkAttEvent (struct Att_Event *Event,
const char *Title,const char *Txt) const char *Title,const char *Txt)
{ {
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginForm (ActSeeOneAtt); Frm_BeginForm (ActSeeOneAtt);
Att_PutParamAttCod (AttEvent->AttCod); Att_PutParamAttCod (Event->AttCod);
Att_PutParamsCodGrps (AttEvent->AttCod); Att_PutParamsCodGrps (Event->AttCod);
/***** Link to view attendance event *****/ /***** Link to view attendance event *****/
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK %s_%s\"",
Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_BUTTON_End (); HTM_BUTTON_End ();

View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.93.2 (2022-04-22)" #define Log_PLATFORM_VERSION "SWAD 21.93.3 (2022-04-22)"
#define CSS_FILE "swad21.93.1.css" #define CSS_FILE "swad21.93.1.css"
#define JS_FILE "swad21.92.js" #define JS_FILE "swad21.92.js"
/* /*
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.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) Version 21.93.1: Apr 21, 2022 Working on design of dark theme. (323269 lines)
Version 21.93: Apr 21, 2022 Homogenization of lists in forums, chat and my courses. (323245 lines) Version 21.93: Apr 21, 2022 Homogenization of lists in forums, chat and my courses. (323245 lines)

View File

@ -539,23 +539,19 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
/***** Exam title and main data *****/ /***** Exam title and main data *****/
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
/* Exam title */ /* Exam title */
Exams->ExaCod = Exam->ExaCod; Exams->ExaCod = Exam->ExaCod;
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeExa); Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams); Exa_PutParams (Exams);
HTM_BUTTON_Submit_Begin (Txt_View_exam,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Txt_View_exam,"class=\"BT_LINK %s_%s\"",
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Exam->Title); HTM_Txt (Exam->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -576,21 +572,17 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
/***** Number of sessions in exam *****/ /***** Number of sessions in exam *****/
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TD_Begin ("class=\"RT %s_%s\"", HTM_TD_Begin ("class=\"RT\"");
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"RT %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
Exams->ExaCod = Exam->ExaCod; Exams->ExaCod = Exam->ExaCod;
Frm_BeginForm (ActSeeExa); Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams); Exa_PutParams (Exams);
HTM_BUTTON_Submit_Begin (Txt_Sessions,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Txt_Sessions,"class=\"BT_LINK %s_%s\"",
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TxtColonNBSP (Txt_Sessions); HTM_TxtColonNBSP (Txt_Sessions);
HTM_Unsigned (Exam->NumSess); HTM_Unsigned (Exam->NumSess);

View File

@ -514,11 +514,7 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
extern const char *Txt_Play; extern const char *Txt_Play;
extern const char *Txt_Resume; extern const char *Txt_Resume;
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Session->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
/***** Session title *****/ /***** Session title *****/
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
@ -529,13 +525,23 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
ExaSes_PutParamSesCod (Session->SesCod); ExaSes_PutParamSesCod (Session->SesCod);
HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume, Txt_Resume,
"class=\"BT_LINK\""); "class=\"BT_LINK %s_%s\"",
Session->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Session->Title); HTM_Txt (Session->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
} }
else else
HTM_Txt (Session->Title); {
HTM_SPAN_Begin ("class=\"%s_%s\"",
Session->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Session->Title);
HTM_SPAN_End ();
}
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
/***** Groups whose students can answer this exam session *****/ /***** Groups whose students can answer this exam session *****/

View File

@ -590,23 +590,19 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
/***** Game title and main data *****/ /***** Game title and main data *****/
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
/* Game title */ /* Game title */
Games->GamCod = Game->GamCod; Games->GamCod = Game->GamCod;
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeGam); Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games); Gam_PutParams (Games);
HTM_BUTTON_Submit_Begin (Txt_View_game,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Txt_View_game,"class=\"BT_LINK %s_%s\"",
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Game->Title); HTM_Txt (Game->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -627,21 +623,17 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
/***** Number of matches in game *****/ /***** Number of matches in game *****/
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TD_Begin ("class=\"RT %s_%s\"", HTM_TD_Begin ("class=\"RT\"");
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"RT %s_%s %s\"", HTM_TD_Begin ("class=\"RT %s\"",The_GetColorRows ());
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix (),
The_GetColorRows ());
Games->GamCod = Game->GamCod; Games->GamCod = Game->GamCod;
Frm_BeginForm (ActSeeGam); Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games); Gam_PutParams (Games);
HTM_BUTTON_Submit_Begin (Txt_Matches,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Txt_Matches,"class=\"BT_LINK %s_%s\"",
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE",
The_GetSuffix ());
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TxtColonNBSP (Txt_Matches); HTM_TxtColonNBSP (Txt_Matches);
HTM_Unsigned (Game->NumMchs); HTM_Unsigned (Game->NumMchs);

View File

@ -1252,7 +1252,6 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
bool ICanViewProjectFiles = Brw_CheckIfICanViewProjectFiles (Prj->PrjCod); bool ICanViewProjectFiles = Brw_CheckIfICanViewProjectFiles (Prj->PrjCod);
const char *ClassLabel; const char *ClassLabel;
const char *ClassDate; const char *ClassDate;
const char *ClassTitle;
const char *ClassData; const char *ClassData;
struct Prj_Faults Faults; struct Prj_Faults Faults;
bool PrjIsFaulty; bool PrjIsFaulty;
@ -1264,8 +1263,6 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
"ASG_LABEL"; "ASG_LABEL";
ClassDate = (Prj->Hidden == Prj_HIDDEN) ? "DATE_BLUE_LIGHT" : ClassDate = (Prj->Hidden == Prj_HIDDEN) ? "DATE_BLUE_LIGHT" :
"DATE_BLUE"; "DATE_BLUE";
ClassTitle = (Prj->Hidden == Prj_HIDDEN) ? "ASG_TITLE_LIGHT" :
"ASG_TITLE";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
"DAT"; "DAT";
@ -1322,11 +1319,11 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", HTM_TD_Begin ("id=\"%s\" class=\"LT %s %s\"",
Id,ClassDate,The_GetColorRows ()); Id,ClassDate,The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("id=\"%s\" class=\"%s LT\"", HTM_TD_Begin ("id=\"%s\" class=\"LT %s\"",
Id,ClassDate); Id,ClassDate);
break; break;
} }
@ -1361,12 +1358,10 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("class=\"LT %s_%s %s\"", HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
ClassTitle,The_GetSuffix (),The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
ClassTitle,The_GetSuffix ());
break; break;
} }
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
@ -1377,7 +1372,10 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
Frm_BeginForm (ActAdmDocPrj); Frm_BeginForm (ActAdmDocPrj);
Prj_PutCurrentParams (Projects); Prj_PutCurrentParams (Projects);
HTM_BUTTON_Submit_Begin (Txt_Project_files, HTM_BUTTON_Submit_Begin (Txt_Project_files,
"class=\"BT_LINK\""); "class=\"BT_LINK %s_%s\"",
Prj->Hidden == Prj_HIDDEN ? "ASG_TITLE_LIGHT" :
"ASG_TITLE",
The_GetSuffix ());
HTM_Txt (Prj->Title); HTM_Txt (Prj->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

View File

@ -529,12 +529,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
/* Survey title */ /* Survey title */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
HTM_TD_Begin ("class=\"LT %s_%s\"", HTM_TD_Begin ("class=\"LT\"");
Svy.Status.Visible ? "ASG_TITLE" :
"ASG_TITLE_LIGHT",
The_GetSuffix ());
else else
HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s\"",The_GetColorRows ());
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeSvy); Frm_BeginForm (ActSeeSvy);
Svy_PutParamSvyCod (SvyCod); Svy_PutParamSvyCod (SvyCod);
@ -542,7 +540,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
WhichGroups = Grp_GetParamWhichGroups (); WhichGroups = Grp_GetParamWhichGroups ();
Grp_PutParamWhichGroups (&WhichGroups); Grp_PutParamWhichGroups (&WhichGroups);
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
HTM_BUTTON_Submit_Begin (Txt_View_survey,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Txt_View_survey,"class=\"BT_LINK %s_%s\"",
Svy.Status.Visible ? "ASG_TITLE" :
"ASG_TITLE_LIGHT",
The_GetSuffix ());
HTM_Txt (Svy.Title); HTM_Txt (Svy.Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();