Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 21.86.1: Mar 25, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-03-25 11:09:51 +01:00
parent 693552ae01
commit d43a7cede8
21 changed files with 231 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swad_agenda.c
View File

@ -796,8 +796,7 @@ static void Agd_ShowOneEvent (struct Agd_Agenda *Agenda,
{ {
extern const char *Dat_TimeStatusClassVisible[Dat_NUM_TIME_STATUS]; extern const char *Dat_TimeStatusClassVisible[Dat_NUM_TIME_STATUS];
extern const char *Dat_TimeStatusClassHidden[Dat_NUM_TIME_STATUS]; extern const char *Dat_TimeStatusClassHidden[Dat_NUM_TIME_STATUS];
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -884,9 +883,10 @@ static void Agd_ShowOneEvent (struct Agd_Agenda *Agenda,
/* Text of the event */ /* Text of the event */
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"",The_GetColorRows ()); HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"",The_GetColorRows ());
HTM_DIV_Begin ("class=\"PAR %s\"", HTM_DIV_Begin ("class=\"PAR %s_%s\"",
AgdEvent.Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : AgdEvent.Hidden ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]); "DAT",
The_Colors[Gbl.Prefs.Theme]);
Agd_DB_GetEventTxt (&AgdEvent,Txt); Agd_DB_GetEventTxt (&AgdEvent,Txt);
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML

17
swad_assignment.c
View File

@ -394,8 +394,7 @@ void Asg_PrintOneAssignment (void)
static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments, static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments,
long AsgCod,bool PrintView) long AsgCod,bool PrintView)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
char *Id; char *Id;
@ -472,11 +471,11 @@ static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments,
/* Assignment folder */ /* Assignment folder */
if (PrintView) if (PrintView)
HTM_TD_Begin ("class=\"%s LT\"", HTM_TD_Begin ("class=\"LT DAT_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
else else
HTM_TD_Begin ("class=\"%s LT %s\"", HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_ClassDat[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
if (Asg.SendWork == Asg_SEND_WORK) if (Asg.SendWork == Asg_SEND_WORK)
Asg_WriteAssignmentFolder (&Asg,PrintView); Asg_WriteAssignmentFolder (&Asg,PrintView);
@ -508,8 +507,10 @@ static void Asg_ShowOneAssignment (struct Asg_Assignments *Assignments,
if (Gbl.Crs.Grps.NumGrps) if (Gbl.Crs.Grps.NumGrps)
Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (&Asg); Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (&Asg);
HTM_DIV_Begin ("class=\"PAR %s\"",Asg.Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : HTM_DIV_Begin ("class=\"PAR %s_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); Asg.Hidden ? "DAT_LIGHT" :
"DAT",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_DIV_End (); HTM_DIV_End ();

9
swad_attendance.c
View File

@ -447,8 +447,7 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events,
struct Att_Event *Event, struct Att_Event *Event,
bool ShowOnlyThisAttEventComplete) bool ShowOnlyThisAttEventComplete)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_View_event; extern const char *Txt_View_event;
char *Anchor = NULL; char *Anchor = NULL;
static unsigned UniqueId = 0; static unsigned UniqueId = 0;
@ -566,8 +565,10 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events,
if (Gbl.Crs.Grps.NumGrps) if (Gbl.Crs.Grps.NumGrps)
Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Event); Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Event);
HTM_DIV_Begin ("class=\"%s\"",Event->Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : HTM_DIV_Begin ("class=\"%s_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); Event->Hidden ? "DAT_LIGHT" :
"DAT",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Description); HTM_Txt (Description);
HTM_DIV_End (); HTM_DIV_End ();

10
swad_banner.c
View File

@ -402,8 +402,7 @@ void Ban_PutIconToViewBanners (void)
static void Ban_ListBannersForEdition (struct Ban_Banners *Banners) static void Ban_ListBannersForEdition (struct Ban_Banners *Banners)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumBan; unsigned NumBan;
struct Ban_Banner *Ban; struct Ban_Banner *Ban;
@ -449,9 +448,10 @@ static void Ban_ListBannersForEdition (struct Ban_Banners *Banners)
HTM_TD_End (); HTM_TD_End ();
/* Banner code */ /* Banner code */
HTM_TD_Begin ("class=\"%s RM\"", HTM_TD_Begin ("class=\"RM %s_%s\"",
Ban->Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : Ban->Hidden ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]); "DAT",
The_Colors[Gbl.Prefs.Theme]);
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
HTM_Long (Ban->BanCod); HTM_Long (Ban->BanCod);
HTM_ARTICLE_End (); HTM_ARTICLE_End ();

5
swad_browser.c
View File

@ -6912,7 +6912,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow) static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
{ {
extern const char *The_ClassDatLight[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Upload_files; extern const char *Txt_Upload_files;
extern const char *Txt_or_you_can_upload_new_files_to_the_folder_X; extern const char *Txt_or_you_can_upload_new_files_to_the_folder_X;
extern const char *Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here; extern const char *Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here;
@ -6946,7 +6946,8 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk); Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
HTM_DIV_Begin ("class=\"dz-message\""); HTM_DIV_Begin ("class=\"dz-message\"");
HTM_SPAN_Begin ("class=\"%s\"",The_ClassDatLight[Gbl.Prefs.Theme]); HTM_SPAN_Begin ("class=\"DAT_LIGHT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here); HTM_Txt (Txt_Select_one_or_more_files_from_your_computer_or_drag_and_drop_here);
HTM_SPAN_End (); HTM_SPAN_End ();
HTM_DIV_End (); HTM_DIV_End ();

31
swad_center.c
View File

@ -329,9 +329,7 @@ static void Ctr_PutIconToEditCenters (void)
static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr) static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT]; extern const char *Txt_CENTER_STATUS[Hie_NUM_STATUS_TXT];
struct Plc_Place Plc; struct Plc_Place Plc;
const char *TxtClassNormal; const char *TxtClassNormal;
@ -345,12 +343,12 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
if (Ctr->Status & Hie_STATUS_BIT_PENDING) if (Ctr->Status & Hie_STATUS_BIT_PENDING)
{ {
TxtClassNormal = TxtClassNormal =
TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_LIGHT";
} }
else else
{ {
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme]; TxtClassNormal = "DAT";
TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_STRONG";
} }
BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? "BG_HIGHLIGHT" : BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? "BG_HIGHLIGHT" :
The_GetColorRows (); The_GetColorRows ();
@ -358,37 +356,44 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Number of center in this list *****/ /***** Number of center in this list *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumCtr); HTM_Unsigned (NumCtr);
HTM_TD_End (); HTM_TD_End ();
/***** Center logo and name *****/ /***** Center logo and name *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassStrong,The_Colors[Gbl.Prefs.Theme],BgColor);
Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CM"); Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CM");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this center *****/ /***** Number of users who claim to belong to this center *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Ctr_GetCachedNumUsrsWhoClaimToBelongToCtr (Ctr)); HTM_Unsigned (Ctr_GetCachedNumUsrsWhoClaimToBelongToCtr (Ctr));
HTM_TD_End (); HTM_TD_End ();
/***** Place *****/ /***** Place *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (Plc.ShrtName); HTM_Txt (Plc.ShrtName);
HTM_TD_End (); HTM_TD_End ();
/***** Number of degrees *****/ /***** Number of degrees *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Deg_GetCachedNumDegsInCtr (Ctr->CtrCod)); HTM_Unsigned (Deg_GetCachedNumDegsInCtr (Ctr->CtrCod));
HTM_TD_End (); HTM_TD_End ();
/***** Number of courses *****/ /***** Number of courses *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Crs_GetCachedNumCrssInCtr (Ctr->CtrCod)); HTM_Unsigned (Crs_GetCachedNumCrssInCtr (Ctr->CtrCod));
HTM_TD_End (); HTM_TD_End ();
/***** Number of users in courses of this center *****/ /***** Number of users in courses of this center *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_CTR,Ctr->CtrCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_CTR,Ctr->CtrCod,
1 << Rol_STD | 1 << Rol_STD |
1 << Rol_NET | 1 << Rol_NET |

3
swad_changelog.h
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.86 (2022-03-25)" #define Log_PLATFORM_VERSION "SWAD 21.86.1 (2022-03-25)"
#define CSS_FILE "swad21.85.1.css" #define CSS_FILE "swad21.85.1.css"
#define JS_FILE "swad21.78.2.js" #define JS_FILE "swad21.78.2.js"
/* /*
Version 21.86.1: Mar 25, 2022 Working on design of dark theme. (323687 lines)
Version 21.86: Mar 25, 2022 Working on design of dark theme. (323663 lines) Version 21.86: Mar 25, 2022 Working on design of dark theme. (323663 lines)
Version 21.85.1: Mar 24, 2022 Working on design of dark theme. (323724 lines) Version 21.85.1: Mar 24, 2022 Working on design of dark theme. (323724 lines)
Version 21.85: Mar 24, 2022 Working on design of dark theme. (323634 lines) Version 21.85: Mar 24, 2022 Working on design of dark theme. (323634 lines)

29
swad_course.c
View File

@ -921,9 +921,7 @@ static void Crs_PutIconToEditCourses (void)
static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_COURSE_With_users; extern const char *Txt_COURSE_With_users;
extern const char *Txt_COURSE_Without_users; extern const char *Txt_COURSE_Without_users;
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
@ -948,12 +946,12 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
if (Crs->Status & Hie_STATUS_BIT_PENDING) if (Crs->Status & Hie_STATUS_BIT_PENDING)
{ {
TxtClassNormal = TxtClassNormal =
TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_LIGHT";
} }
else else
{ {
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme]; TxtClassNormal = "DAT";
TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_STRONG";
} }
/* Check if this course is one of my courses */ /* Check if this course is one of my courses */
@ -971,8 +969,8 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
NumUsrs[Rol_TCH]; NumUsrs[Rol_TCH];
/* Put green tip if course has users */ /* Put green tip if course has users */
HTM_TD_Begin ("class=\"%s CM %s\" title=\"%s\"", HTM_TD_Begin ("class=\"CM %s_%s %s\" title=\"%s\"",
TxtClassNormal,BgColor, TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor,
NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : NumUsrs[Rol_UNK] ? Txt_COURSE_With_users :
Txt_COURSE_Without_users); Txt_COURSE_Without_users);
HTM_Txt (NumUsrs[Rol_UNK] ? "&check;" : HTM_Txt (NumUsrs[Rol_UNK] ? "&check;" :
@ -980,17 +978,20 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
HTM_TD_End (); HTM_TD_End ();
/* Institutional code of the course */ /* Institutional code of the course */
HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"CM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (Crs->InstitutionalCrsCod); HTM_Txt (Crs->InstitutionalCrsCod);
HTM_TD_End (); HTM_TD_End ();
/* Course year */ /* Course year */
HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"CM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Year]); HTM_Txt (Txt_YEAR_OF_DEGREE[Crs->Year]);
HTM_TD_End (); HTM_TD_End ();
/* Course full name */ /* Course full name */
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassStrong,The_Colors[Gbl.Prefs.Theme],BgColor);
Frm_BeginFormGoTo (ActSeeCrsInf); Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs->CrsCod); Crs_PutParamCrsCod (Crs->CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs->FullName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs->FullName),
@ -1002,13 +1003,15 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
HTM_TD_End (); HTM_TD_End ();
/* Number of teachers in this course */ /* Number of teachers in this course */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumUsrs[Rol_TCH] + HTM_Unsigned (NumUsrs[Rol_TCH] +
NumUsrs[Rol_NET]); NumUsrs[Rol_NET]);
HTM_TD_End (); HTM_TD_End ();
/* Number of students in this course */ /* Number of students in this course */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumUsrs[Rol_STD]); HTM_Unsigned (NumUsrs[Rol_STD]);
HTM_TD_End (); HTM_TD_End ();

29
swad_degree.c
View File

@ -794,9 +794,7 @@ static void Deg_PutIconToEditDegrees (void)
static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg) static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_DEGREE_With_courses; extern const char *Txt_DEGREE_With_courses;
extern const char *Txt_DEGREE_Without_courses; extern const char *Txt_DEGREE_Without_courses;
extern const char *Txt_DEGREE_STATUS[Hie_NUM_STATUS_TXT]; extern const char *Txt_DEGREE_STATUS[Hie_NUM_STATUS_TXT];
@ -814,12 +812,12 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
if (Deg->Status & Hie_STATUS_BIT_PENDING) if (Deg->Status & Hie_STATUS_BIT_PENDING)
{ {
TxtClassNormal = TxtClassNormal =
TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_LIGHT";
} }
else else
{ {
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme]; TxtClassNormal = "DAT";
TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_STRONG";
} }
BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? "BG_HIGHLIGHT" : BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? "BG_HIGHLIGHT" :
The_GetColorRows (); The_GetColorRows ();
@ -828,8 +826,8 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Put tip if degree has courses *****/ /***** Put tip if degree has courses *****/
HTM_TD_Begin ("class=\"%s CM %s\" title=\"%s\"", HTM_TD_Begin ("class=\"CM %s_%s %s\" title=\"%s\"",
TxtClassNormal,BgColor, TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor,
NumCrss ? Txt_DEGREE_With_courses : NumCrss ? Txt_DEGREE_With_courses :
Txt_DEGREE_Without_courses); Txt_DEGREE_Without_courses);
HTM_Txt (NumCrss ? "&check;" : HTM_Txt (NumCrss ? "&check;" :
@ -837,27 +835,32 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
HTM_TD_End (); HTM_TD_End ();
/***** Number of degree in this list *****/ /***** Number of degree in this list *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumDeg); HTM_Unsigned (NumDeg);
HTM_TD_End (); HTM_TD_End ();
/***** Degree logo and name *****/ /***** Degree logo and name *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassStrong,The_Colors[Gbl.Prefs.Theme],BgColor);
Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM"); Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM");
HTM_TD_End (); HTM_TD_End ();
/***** Type of degree *****/ /***** Type of degree *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (DegTyp.DegTypName); HTM_Txt (DegTyp.DegTypName);
HTM_TD_End (); HTM_TD_End ();
/***** Current number of courses in this degree *****/ /***** Current number of courses in this degree *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumCrss); HTM_Unsigned (NumCrss);
HTM_TD_End (); HTM_TD_End ();
/***** Number of users in courses of this degree *****/ /***** Number of users in courses of this degree *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_DEG,Deg->DegCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_DEG,Deg->DegCod,
1 << Rol_STD | 1 << Rol_STD |
1 << Rol_NET | 1 << Rol_NET |

9
swad_exam.c
View File

@ -474,8 +474,7 @@ void Exa_ShowOnlyOneExamEnd (void)
static void Exa_ShowOneExam (struct Exa_Exams *Exams, static void Exa_ShowOneExam (struct Exa_Exams *Exams,
struct Exa_Exam *Exam,bool ShowOnlyThisExam) struct Exa_Exam *Exam,bool ShowOnlyThisExam)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_View_exam; extern const char *Txt_View_exam;
extern const char *Txt_Sets_of_questions; extern const char *Txt_Sets_of_questions;
extern const char *Txt_Maximum_grade; extern const char *Txt_Maximum_grade;
@ -622,8 +621,10 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML
ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
HTM_DIV_Begin ("class=\"PAR %s\"",Exam->Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : HTM_DIV_Begin ("class=\"PAR %s_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); Exam->Hidden ? "DAT_LIGHT" :
"DAT",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_DIV_End (); HTM_DIV_End ();
HTM_TD_End (); HTM_TD_End ();

5
swad_follow.c
View File

@ -317,7 +317,7 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
unsigned NumFollowing,unsigned NumFollowers, unsigned NumFollowing,unsigned NumFollowers,
bool UsrFollowsMe,bool IFollowUsr) bool UsrFollowsMe,bool IFollowUsr)
{ {
extern const char *The_ClassDatLight[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FOLLOWS_YOU; extern const char *Txt_FOLLOWS_YOU;
extern const char *Txt_Following; extern const char *Txt_Following;
extern const char *Txt_Followers; extern const char *Txt_Followers;
@ -332,7 +332,8 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
HTM_DIV_Begin ("class=\"FOLLOW_SIDE\""); HTM_DIV_Begin ("class=\"FOLLOW_SIDE\"");
/* User follows me? */ /* User follows me? */
HTM_DIV_Begin ("id=\"follows_me\" class=\"%s\"",The_ClassDatLight[Gbl.Prefs.Theme]); HTM_DIV_Begin ("id=\"follows_me\" class=\"DAT_LIGHT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (UsrFollowsMe) if (UsrFollowsMe)
HTM_Txt (Txt_FOLLOWS_YOU); HTM_Txt (Txt_FOLLOWS_YOU);
HTM_DIV_End (); HTM_DIV_End ();

9
swad_game.c
View File

@ -515,8 +515,7 @@ void Gam_ShowOnlyOneGameEnd (void)
static void Gam_ShowOneGame (struct Gam_Games *Games, static void Gam_ShowOneGame (struct Gam_Games *Games,
struct Gam_Game *Game,bool ShowOnlyThisGame) struct Gam_Game *Game,bool ShowOnlyThisGame)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_View_game; extern const char *Txt_View_game;
extern const char *Txt_Number_of_questions; extern const char *Txt_Number_of_questions;
extern const char *Txt_Maximum_grade; extern const char *Txt_Maximum_grade;
@ -673,8 +672,10 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML
ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
HTM_DIV_Begin ("class=\"PAR %s\"",Game->Hidden ? The_ClassDatLight[Gbl.Prefs.Theme] : HTM_DIV_Begin ("class=\"PAR %s_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); Game->Hidden ? "DAT_LIGHT" :
"DAT",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_DIV_End (); HTM_DIV_End ();
HTM_TD_End (); HTM_TD_End ();

4
swad_hierarchy.c
View File

@ -754,9 +754,11 @@ void Hie_WriteStatusCell (Hie_Status_t Status,
const char *Class,const char *BgColor, const char *Class,const char *BgColor,
const char *Txt[Hie_NUM_STATUS_TXT]) const char *Txt[Hie_NUM_STATUS_TXT])
{ {
extern const char *The_Colors[The_NUM_THEMES];
Hie_StatusTxt_t StatusTxt = Hie_GetStatusTxtFromStatusBits (Status); Hie_StatusTxt_t StatusTxt = Hie_GetStatusTxtFromStatusBits (Status);
HTM_TD_Begin ("class=\"%s LM %s\"",Class,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
Class,The_Colors[Gbl.Prefs.Theme],BgColor);
if (StatusTxt != Hie_STATUS_ACTIVE) // If active ==> do not show anything if (StatusTxt != Hie_STATUS_ACTIVE) // If active ==> do not show anything
HTM_Txt (Txt[StatusTxt]); HTM_Txt (Txt[StatusTxt]);
HTM_TD_End (); HTM_TD_End ();

17
swad_indicator.c
View File

@ -436,9 +436,7 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS], unsigned NumCrssWithIndicatorYes[1 + Ind_NUM_INDICATORS],
unsigned NumCrss,bool PutForm) unsigned NumCrss,bool PutForm)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Indicators; extern const char *Txt_Indicators;
extern const char *Txt_Courses; extern const char *Txt_Courses;
extern const char *Txt_Total; extern const char *Txt_Total;
@ -448,9 +446,9 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
unsigned Ind; unsigned Ind;
/***** Initialize classes *****/ /***** Initialize classes *****/
if (asprintf (&ClassNormal ,"%s RM" ,The_ClassDatLight[Gbl.Prefs.Theme]) < 0) if (asprintf (&ClassNormal ,"RM DAT_LIGHT_%s" ,The_Colors[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
if (asprintf (&ClassHighlight,"%s RM BG_HIGHLIGHT",The_ClassDat [Gbl.Prefs.Theme]) < 0) if (asprintf (&ClassHighlight,"RM DAT_%s BG_HIGHLIGHT",The_Colors[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
/***** Write number of courses with each number of indicators valid *****/ /***** Write number of courses with each number of indicators valid *****/
@ -509,15 +507,18 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic
if (PutForm) if (PutForm)
HTM_TD_Empty (1); HTM_TD_Empty (1);
HTM_TD_Begin ("class=\"%s RM LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Total); HTM_Txt (Txt_Total);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCrss); HTM_Unsigned (NumCrss);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM LINE_TOP\"",The_ClassDatStrong[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM DAT_STRONG_%s LINE_TOP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("(%.1f%%)",100.0); HTM_TxtF ("(%.1f%%)",100.0);
HTM_TD_End (); HTM_TD_End ();

34
swad_institution.c
View File

@ -371,9 +371,7 @@ static void Ins_PutIconToEditInstitutions (void)
static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned NumIns) static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned NumIns)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_INSTITUTION_STATUS[Hie_NUM_STATUS_TXT]; extern const char *Txt_INSTITUTION_STATUS[Hie_NUM_STATUS_TXT];
const char *TxtClassNormal; const char *TxtClassNormal;
const char *TxtClassStrong; const char *TxtClassStrong;
@ -382,12 +380,12 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
if (Ins->Status & Hie_STATUS_BIT_PENDING) if (Ins->Status & Hie_STATUS_BIT_PENDING)
{ {
TxtClassNormal = TxtClassNormal =
TxtClassStrong = The_ClassDatLight[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_LIGHT";
} }
else else
{ {
TxtClassNormal = The_ClassDat[Gbl.Prefs.Theme]; TxtClassNormal = "DAT";
TxtClassStrong = The_ClassDatStrong[Gbl.Prefs.Theme]; TxtClassStrong = "DAT_STRONG";
} }
BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? "BG_HIGHLIGHT" : BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? "BG_HIGHLIGHT" :
The_GetColorRows (); The_GetColorRows ();
@ -395,43 +393,51 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Number of institution in this list *****/ /***** Number of institution in this list *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (NumIns); HTM_Unsigned (NumIns);
HTM_TD_End (); HTM_TD_End ();
/***** Institution logo and name *****/ /***** Institution logo and name *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"LM %s_%s %s\"",
TxtClassStrong,The_Colors[Gbl.Prefs.Theme],BgColor);
Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CM"); Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CM");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this institution *****/ /***** Number of users who claim to belong to this institution *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Ins_GetCachedNumUsrsWhoClaimToBelongToIns (Ins)); HTM_Unsigned (Ins_GetCachedNumUsrsWhoClaimToBelongToIns (Ins));
HTM_TD_End (); HTM_TD_End ();
/***** Other stats *****/ /***** Other stats *****/
/* Number of centers in this institution */ /* Number of centers in this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Ctr_GetCachedNumCtrsInIns (Ins->InsCod)); HTM_Unsigned (Ctr_GetCachedNumCtrsInIns (Ins->InsCod));
HTM_TD_End (); HTM_TD_End ();
/* Number of degrees in this institution */ /* Number of degrees in this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Deg_GetCachedNumDegsInIns (Ins->InsCod)); HTM_Unsigned (Deg_GetCachedNumDegsInIns (Ins->InsCod));
HTM_TD_End (); HTM_TD_End ();
/* Number of courses in this institution */ /* Number of courses in this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Crs_GetCachedNumCrssInIns (Ins->InsCod)); HTM_Unsigned (Crs_GetCachedNumCrssInIns (Ins->InsCod));
HTM_TD_End (); HTM_TD_End ();
/* Number of departments in this institution */ /* Number of departments in this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Dpt_GetNumDptsInIns (Ins->InsCod)); HTM_Unsigned (Dpt_GetNumDptsInIns (Ins->InsCod));
HTM_TD_End (); HTM_TD_End ();
/* Number of users in courses of this institution */ /* Number of users in courses of this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_TD_Begin ("class=\"RM %s_%s %s\"",
TxtClassNormal,The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_INS,Ins->InsCod, HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (HieLvl_INS,Ins->InsCod,
1 << Rol_STD | 1 << Rol_STD |
1 << Rol_NET | 1 << Rol_NET |

146
swad_project.c
View File

@ -1241,8 +1241,6 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
struct Prj_Project *Prj, struct Prj_Project *Prj,
Prj_ProjectView_t ProjectView) Prj_ProjectView_t ProjectView)
{ {
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Project_files; extern const char *Txt_Project_files;
extern const char *Txt_Assigned_QUESTION; extern const char *Txt_Assigned_QUESTION;
@ -1275,8 +1273,8 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
"DATE_BLUE"; "DATE_BLUE";
ClassTitle = (Prj->Hidden == Prj_HIDDEN) ? "ASG_TITLE_LIGHT" : ClassTitle = (Prj->Hidden == Prj_HIDDEN) ? "ASG_TITLE_LIGHT" :
"ASG_TITLE"; "ASG_TITLE";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Set anchor string *****/ /***** Set anchor string *****/
Frm_SetAnchorStr (Prj->PrjCod,&Anchor); Frm_SetAnchorStr (Prj->PrjCod,&Anchor);
@ -1422,12 +1420,13 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"",
ClassData); ClassData,The_Colors[Gbl.Prefs.Theme]);
break; break;
} }
HTM_TxtF ("%s&nbsp;",Prj->Assigned == Prj_ASSIGNED ? Txt_Yes : HTM_TxtF ("%s&nbsp;",Prj->Assigned == Prj_ASSIGNED ? Txt_Yes :
@ -1684,8 +1683,7 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj) static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Yes; extern const char *Txt_Yes;
extern const char *Txt_No; extern const char *Txt_No;
extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES]; extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES];
@ -1701,8 +1699,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassDate = (Prj->Hidden == Prj_HIDDEN) ? "DATE_BLUE_LIGHT" : ClassDate = (Prj->Hidden == Prj_HIDDEN) ? "DATE_BLUE_LIGHT" :
"DATE_BLUE"; "DATE_BLUE";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Begin row *****/ /***** Begin row *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
@ -1732,8 +1730,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
free (Id); free (Id);
/***** Project title *****/ /***** Project title *****/
HTM_TD_Begin ("class=\"LT %s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Prj->Title); HTM_Txt (Prj->Title);
HTM_TD_End (); HTM_TD_End ();
@ -1741,13 +1739,15 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
Prj_ShowTableAllProjectsDepartment (Prj); Prj_ShowTableAllProjectsDepartment (Prj);
/***** Assigned? *****/ /***** Assigned? *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt ((Prj->Assigned == Prj_ASSIGNED) ? Txt_Yes : HTM_Txt ((Prj->Assigned == Prj_ASSIGNED) ? Txt_Yes :
Txt_No); Txt_No);
HTM_TD_End (); HTM_TD_End ();
/***** Number of students *****/ /***** Number of students *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Unsigned (Prj->NumStds); HTM_Unsigned (Prj->NumStds);
HTM_TD_End (); HTM_TD_End ();
@ -1758,7 +1758,8 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
Prj_ShowTableAllProjectsMembersWithARole (Prj,Prj_RolesToShow[NumRoleToShow]); Prj_ShowTableAllProjectsMembersWithARole (Prj,Prj_RolesToShow[NumRoleToShow]);
/***** Proposal *****/ /***** Proposal *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Txt_PROJECT_STATUS[Prj->Proposal]); HTM_Txt (Txt_PROJECT_STATUS[Prj->Proposal]);
HTM_TD_End (); HTM_TD_End ();
@ -1788,15 +1789,14 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj, static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj,
Prj_ProjectView_t ProjectView) Prj_ProjectView_t ProjectView)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
struct Dpt_Department Dpt; struct Dpt_Department Dpt;
bool PutLink; bool PutLink;
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Get data of department *****/ /***** Get data of department *****/
Dpt.DptCod = Prj->DptCod; Dpt.DptCod = Prj->DptCod;
@ -1810,17 +1810,17 @@ static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("class=\"LT %s %s\"", HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("class=\"LT %s\"", HTM_TD_Begin ("class=\"LT %s_%s\"",
ClassData); ClassData,The_Colors[Gbl.Prefs.Theme]);
break; break;
} }
if (PutLink) if (PutLink)
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s_%s\"",
Dpt.WWW,ClassData); Dpt.WWW,ClassData,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Dpt.FullName); HTM_Txt (Dpt.FullName);
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();
@ -1830,21 +1830,21 @@ static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj,
static void Prj_ShowTableAllProjectsDepartment (const struct Prj_Project *Prj) static void Prj_ShowTableAllProjectsDepartment (const struct Prj_Project *Prj)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
struct Dpt_Department Dpt; struct Dpt_Department Dpt;
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Get data of department *****/ /***** Get data of department *****/
Dpt.DptCod = Prj->DptCod; Dpt.DptCod = Prj->DptCod;
Dpt_GetDataOfDepartmentByCod (&Dpt); Dpt_GetDataOfDepartmentByCod (&Dpt);
/***** Show department *****/ /***** Show department *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Dpt.FullName); HTM_Txt (Dpt.FullName);
HTM_TD_End (); HTM_TD_End ();
} }
@ -1859,16 +1859,15 @@ static void Prj_ShowOneProjectTxtField (struct Prj_Project *Prj,
const char *Label,char *TxtField, const char *Label,char *TxtField,
bool Warning) bool Warning)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassLabel; const char *ClassLabel;
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" : ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL"; "ASG_LABEL";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Label *****/ /***** Label *****/
switch (ProjectView) switch (ProjectView)
@ -1910,12 +1909,13 @@ static void Prj_ShowOneProjectTxtField (struct Prj_Project *Prj,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"",
ClassData); ClassData,The_Colors[Gbl.Prefs.Theme]);
break; break;
} }
HTM_Txt (TxtField); HTM_Txt (TxtField);
@ -1929,20 +1929,20 @@ static void Prj_ShowOneProjectTxtField (struct Prj_Project *Prj,
static void Prj_ShowTableAllProjectsTxtField (struct Prj_Project *Prj, static void Prj_ShowTableAllProjectsTxtField (struct Prj_Project *Prj,
char *TxtField) char *TxtField)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Change format *****/ /***** Change format *****/
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
TxtField,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML TxtField,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
/***** Write text *****/ /***** Write text *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (TxtField); HTM_Txt (TxtField);
HTM_TD_End (); HTM_TD_End ();
} }
@ -1955,8 +1955,7 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
Prj_ProjectView_t ProjectView, Prj_ProjectView_t ProjectView,
const char *id,unsigned UniqueId) const char *id,unsigned UniqueId)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_URL; extern const char *Txt_URL;
const char *ClassLabel; const char *ClassLabel;
const char *ClassData; const char *ClassData;
@ -1967,8 +1966,8 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" : ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL"; "ASG_LABEL";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Write row with label and text *****/ /***** Write row with label and text *****/
switch (ProjectView) switch (ProjectView)
@ -1996,12 +1995,13 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
break; break;
default: default:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"",
ClassData); ClassData,The_Colors[Gbl.Prefs.Theme]);
break; break;
} }
if (PutLink) if (PutLink)
@ -2016,16 +2016,16 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
static void Prj_ShowTableAllProjectsURL (const struct Prj_Project *Prj) static void Prj_ShowTableAllProjectsURL (const struct Prj_Project *Prj)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Show URL *****/ /***** Show URL *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Txt (Prj->URL); HTM_Txt (Prj->URL);
HTM_TD_End (); HTM_TD_End ();
} }
@ -2058,8 +2058,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
Prj_RoleInProject_t RoleInPrj) Prj_RoleInProject_t RoleInPrj)
{ {
; ;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT]; extern const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_PROJECT_ROLES_PLURAL_Abc[Prj_NUM_ROLES_IN_PROJECT]; extern const char *Txt_PROJECT_ROLES_PLURAL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_Remove; extern const char *Txt_Remove;
@ -2098,8 +2097,8 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" : ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL"; "ASG_LABEL";
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Get users in project from database *****/ /***** Get users in project from database *****/
NumUsrs = Prj_DB_GetUsrsInPrj (&mysql_res,Prj->PrjCod,RoleInPrj); NumUsrs = Prj_DB_GetUsrsInPrj (&mysql_res,Prj->PrjCod,RoleInPrj);
@ -2141,17 +2140,18 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
switch (ProjectView) switch (ProjectView)
{ {
case Prj_LIST_PROJECTS: case Prj_LIST_PROJECTS:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s %s\"",
ClassData,The_GetColorRows ()); ClassData,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
break; break;
case Prj_FILE_BROWSER_PROJECT: case Prj_FILE_BROWSER_PROJECT:
case Prj_PRINT_ONE_PROJECT: case Prj_PRINT_ONE_PROJECT:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT %s_%s\"",
ClassData); ClassData,The_Colors[Gbl.Prefs.Theme]);
break; break;
case Prj_EDIT_ONE_PROJECT: case Prj_EDIT_ONE_PROJECT:
HTM_TD_Begin ("colspan=\"2\" class=\"LT %s\"", HTM_TD_Begin ("colspan=\"2\" class=\"LT DAT_%s\"",
The_ClassDat[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
break; break;
} }
@ -2245,8 +2245,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
static void Prj_ShowTableAllProjectsMembersWithARole (const struct Prj_Project *Prj, static void Prj_ShowTableAllProjectsMembersWithARole (const struct Prj_Project *Prj,
Prj_RoleInProject_t RoleInPrj) Prj_RoleInProject_t RoleInPrj)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
MYSQL_ROW row; MYSQL_ROW row;
unsigned NumUsr; unsigned NumUsr;
@ -2254,14 +2253,15 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Prj_Project *
const char *ClassData; const char *ClassData;
/***** Set CSS classes *****/ /***** Set CSS classes *****/
ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] : ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
The_ClassDat[Gbl.Prefs.Theme]; "DAT";
/***** Get users in project from database *****/ /***** Get users in project from database *****/
NumUsrs = Prj_DB_GetUsrsInPrj (&mysql_res,Prj->PrjCod,RoleInPrj); NumUsrs = Prj_DB_GetUsrsInPrj (&mysql_res,Prj->PrjCod,RoleInPrj);
/***** Begin column with list of all members with this role *****/ /***** Begin column with list of all members with this role *****/
HTM_TD_Begin ("class=\"LT %s %s\"",ClassData,The_GetColorRows ()); HTM_TD_Begin ("class=\"LT %s_%s %s\"",
ClassData,The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
if (NumUsrs) if (NumUsrs)
{ {

4
swad_report.c
View File

@ -229,7 +229,7 @@ static void Rep_CreateMyUsageReport (struct Rep_Report *Report)
static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report) static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
{ {
extern const char *Hlp_ANALYTICS_Report; extern const char *Hlp_ANALYTICS_Report;
extern const char *The_ClassDatLight[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Report_of_use_of_PLATFORM; extern const char *Txt_Report_of_use_of_PLATFORM;
extern const char *Txt_Report; extern const char *Txt_Report;
extern const char *Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists; extern const char *Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists;
@ -255,7 +255,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
HTM_DIV_Begin ("class=\"%s\"",The_ClassDatLight[Gbl.Prefs.Theme]); HTM_DIV_Begin ("class=\"DAT_LIGHT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists); HTM_Txt (Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists);
HTM_DIV_End (); HTM_DIV_End ();

9
swad_survey.c
View File

@ -424,8 +424,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
long SvyCod,bool ShowOnlyThisSvyComplete) long SvyCod,bool ShowOnlyThisSvyComplete)
{ {
extern const char *Hlp_ASSESSMENT_Surveys; extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Survey; extern const char *Txt_Survey;
extern const char *Txt_View_survey; extern const char *Txt_View_survey;
extern const char *Txt_Number_of_questions; extern const char *Txt_Number_of_questions;
@ -675,8 +674,10 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML
ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
HTM_DIV_Begin ("class=\"PAR %s\"",Svy.Status.Visible ? The_ClassDat[Gbl.Prefs.Theme] : HTM_DIV_Begin ("class=\"PAR %s_%s\"",
The_ClassDatLight[Gbl.Prefs.Theme]); Svy.Status.Visible ? "DAT" :
"DAT_LIGHT",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_DIV_End (); HTM_DIV_End ();
HTM_TD_End (); HTM_TD_End ();

42
swad_test_print.c
View File

@ -1857,8 +1857,7 @@ static void TstPrn_ShowHeaderPrints (Usr_MeOrOther_t MeOrOther)
static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat) static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
{ {
extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_View_test; extern const char *Txt_View_test;
MYSQL_RES *mysql_res; MYSQL_RES *mysql_res;
unsigned NumPrints; unsigned NumPrints;
@ -1900,8 +1899,8 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
/* Get print data */ /* Get print data */
TstPrn_GetPrintDataByPrnCod (&Print); TstPrn_GetPrintDataByPrnCod (&Print);
ClassDat = Print.AllowTeachers ? The_ClassDat[Gbl.Prefs.Theme] : ClassDat = Print.AllowTeachers ? "DAT" :
The_ClassDatLight[Gbl.Prefs.Theme]; "DAT_LIGHT";
/* Get if I can see print result and score */ /* Get if I can see print result and score */
TstRes_CheckIfICanSeePrintResult (&Print,UsrDat->UsrCod,&ICanView); TstRes_CheckIfICanSeePrintResult (&Print,UsrDat->UsrCod,&ICanView);
@ -1917,8 +1916,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
{ {
if (asprintf (&Id,"tst_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0) if (asprintf (&Id,"tst_date_%u_%u",(unsigned) StartEndTime,UniqueId) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id=\"%s\" class=\"%s LT %s\"", HTM_TD_Begin ("id=\"%s\" class=\"LT %s_%s %s\"",
Id,ClassDat,The_GetColorRows ()); Id,ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Dat_WriteLocalDateHMSFromUTC (Id,Print.TimeUTC[StartEndTime], Dat_WriteLocalDateHMSFromUTC (Id,Print.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK, Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK,
true,true,false,0x7); true,true,false,0x7);
@ -1935,8 +1935,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
} }
/* Write number of questions */ /* Write number of questions */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"", HTM_TD_Begin ("class=\"RT %s_%s LINE_LEFT %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Result) if (ICanView.Result)
HTM_Unsigned (Print.NumQsts.All); HTM_Unsigned (Print.NumQsts.All);
else else
@ -1944,8 +1945,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
/* Write number of non-blank answers */ /* Write number of non-blank answers */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"", HTM_TD_Begin ("class=\"RT %s_%s LINE_LEFT %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Result) if (ICanView.Result)
{ {
if (Print.NumQsts.NotBlank) if (Print.NumQsts.NotBlank)
@ -1958,8 +1960,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
/* Write number of blank answers */ /* Write number of blank answers */
HTM_TD_Begin ("class=\"%s RT %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Result) if (ICanView.Result)
{ {
NumQstsBlank = Print.NumQsts.All - Print.NumQsts.NotBlank; NumQstsBlank = Print.NumQsts.All - Print.NumQsts.NotBlank;
@ -1973,8 +1976,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
/* Write score */ /* Write score */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"", HTM_TD_Begin ("class=\"RT %s_%s LINE_LEFT %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score) if (ICanView.Score)
{ {
HTM_Double2Decimals (Print.Score); HTM_Double2Decimals (Print.Score);
@ -1986,8 +1990,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
/* Write average score per question */ /* Write average score per question */
HTM_TD_Begin ("class=\"%s RT %s\"", HTM_TD_Begin ("class=\"RT %s_%s %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score) if (ICanView.Score)
HTM_Double2Decimals (Print.NumQsts.All ? Print.Score / HTM_Double2Decimals (Print.NumQsts.All ? Print.Score /
(double) Print.NumQsts.All : (double) Print.NumQsts.All :
@ -1997,8 +2002,9 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
HTM_TD_End (); HTM_TD_End ();
/* Write grade */ /* Write grade */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"", HTM_TD_Begin ("class=\"RT %s_%s LINE_LEFT %s\"",
ClassDat,The_GetColorRows ()); ClassDat,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score) if (ICanView.Score)
TstPrn_ComputeAndShowGrade (Print.NumQsts.All,Print.Score,Tst_SCORE_MAX); TstPrn_ComputeAndShowGrade (Print.NumQsts.All,Print.Score,Tst_SCORE_MAX);
else else

11
swad_theme.c
View File

@ -210,17 +210,6 @@ const char *The_ClassDatStrong[The_NUM_THEMES] =
[The_THEME_DARK ] = "DAT_STRONG_DARK", [The_THEME_DARK ] = "DAT_STRONG_DARK",
}; };
const char *The_ClassDatLight[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "DAT_LIGHT_WHITE",
[The_THEME_GREY ] = "DAT_LIGHT_GREY",
[The_THEME_PURPLE] = "DAT_LIGHT_PURPLE",
[The_THEME_BLUE ] = "DAT_LIGHT_BLUE",
[The_THEME_YELLOW] = "DAT_LIGHT_YELLOW",
[The_THEME_PINK ] = "DAT_LIGHT_PINK",
[The_THEME_DARK ] = "DAT_LIGHT_DARK",
};
const char *The_ClassInput[The_NUM_THEMES] = const char *The_ClassInput[The_NUM_THEMES] =
{ {
[The_THEME_WHITE ] = "INPUT_WHITE", [The_THEME_WHITE ] = "INPUT_WHITE",

6
swad_timeline.c
View File

@ -519,15 +519,15 @@ static void Tml_PutHiddenList (const char *Id)
void Tml_WriteDateTime (time_t TimeUTC) void Tml_WriteDateTime (time_t TimeUTC)
{ {
extern const char *The_ClassDatLight[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
char IdDateTime[Frm_MAX_BYTES_ID + 1]; char IdDateTime[Frm_MAX_BYTES_ID + 1];
/***** Create unique Id *****/ /***** Create unique Id *****/
Frm_SetUniqueId (IdDateTime); Frm_SetUniqueId (IdDateTime);
/***** Container where the date-time is written *****/ /***** Container where the date-time is written *****/
HTM_DIV_Begin ("id=\"%s\" class=\"Tml_RIGHT_TIME %s\"", HTM_DIV_Begin ("id=\"%s\" class=\"Tml_RIGHT_TIME DAT_LIGHT_%s\"",
IdDateTime,The_ClassDatLight[Gbl.Prefs.Theme]); IdDateTime,The_Colors[Gbl.Prefs.Theme]);
HTM_DIV_End (); HTM_DIV_End ();
/***** Script to write date and time in browser local time *****/ /***** Script to write date and time in browser local time *****/