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.8: Mar 29, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-03-29 00:58:40 +02:00
parent e24ac85083
commit 7b2504f6e4
49 changed files with 418 additions and 408 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swad_ID.c
View File

@ -502,7 +502,7 @@ void ID_ShowFormChangeOtherUsrID (void)
static void ID_ShowFormChangeUsrID (bool ItsMe,bool IShouldFillInID)
{
extern const char *Hlp_PROFILE_Account;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Please_fill_in_your_ID;
extern const char *Txt_ID_X_confirmed;
@ -605,8 +605,8 @@ static void ID_ShowFormChangeUsrID (bool ItsMe,bool IShouldFillInID)
/***** Write help text *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("colspan=\"2\" class=\"CM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
Ale_ShowAlert (Ale_INFO,Txt_The_ID_is_used_in_order_to_facilitate_);
HTM_TD_End ();
@ -621,8 +621,8 @@ static void ID_ShowFormChangeUsrID (bool ItsMe,bool IShouldFillInID)
Txt_ID); // The first user's ID
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (ItsMe)
Frm_BeginFormAnchor (ActChgMyID,ID_ID_SECTION_ID);
else

5
swad_changelog.h
View File

@ -606,11 +606,12 @@ 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.86.7 (2022-03-28)"
#define Log_PLATFORM_VERSION "SWAD 21.86.8 (2022-03-29)"
#define CSS_FILE "swad21.86.7.css"
#define JS_FILE "swad21.78.2.js"
/*
Version 21.86.7: Mar 26, 2022 Working on design of dark theme. (323823 lines)
Version 21.86.8: Mar 29, 2022 Working on design of dark theme. (323834 lines)
Version 21.86.7: Mar 28, 2022 Working on design of dark theme. (323823 lines)
Version 21.86.6: Mar 26, 2022 Working on design of dark theme. (323751 lines)
Version 21.86.5: Mar 26, 2022 Working on design of dark theme. (323750 lines)
Version 21.86.4: Mar 26, 2022 Working on design of dark theme. (323737 lines)

8
swad_exam.c
View File

@ -1590,7 +1590,7 @@ bool Exa_CheckIfEditable (const struct Exa_Exam *Exam)
void Exa_GetAndShowExamsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_exams;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_exams;
extern const char *Txt_Number_of_BR_courses_with_BR_exams;
@ -1619,15 +1619,15 @@ void Exa_GetAndShowExamsStats (void)
/***** Write number of exams *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumExams);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithExams);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumExamsPerCourse);
HTM_TD_End ();

60
swad_exam_result.c
View File

@ -580,7 +580,7 @@ static void ExaRes_ShowResultsEnd (void)
static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Exams;
extern const char *Txt_Exam;
extern const char *Txt_Update_results;
@ -624,8 +624,8 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
/* Write a row for this session */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s CT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_INPUT_CHECKBOX ("ExaCod",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Gam%u\" value=\"%ld\"%s",
@ -634,16 +634,16 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
"");
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_LABEL_Begin ("for=\"Gam%u\"",NumExam);
HTM_TxtF ("%u:",NumExam + 1);
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Exam.Title);
HTM_TD_End ();
@ -773,7 +773,7 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
long ExaCod, // <= 0 ==> any
const char *ExamsSelectedCommas)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Result;
MYSQL_RES *mysql_res;
struct UsrData *UsrDat;
@ -851,8 +851,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
UniqueId++;
if (asprintf (&Id,"exa_res_time_%u_%u",(unsigned) StartEndTime,UniqueId) < 0)
Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id =\"%s\" class=\"%s LT %s\"",
Id,The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("id =\"%s\" class=\"LT DAT_%s %s\"",
Id,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Dat_WriteLocalDateHMSFromUTC (Id,Print.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK,
@ -862,8 +862,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
}
/* Write session title */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Session.Title);
HTM_TD_End ();
@ -887,8 +887,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
}
/* Write total number of questions */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
HTM_Unsigned (Print.NumQsts.All);
@ -926,8 +926,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write number of correct questions */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -941,8 +941,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write number of wrong questions */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -955,8 +955,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
Ico_PutIconNotVisible ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -969,8 +969,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
Ico_PutIconNotVisible ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -984,8 +984,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write number of blank questions */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -999,8 +999,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write score valid (taking into account only valid questions) */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -1013,8 +1013,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write average score per question (taking into account only valid questions) */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
HTM_Double2Decimals (Print.NumQsts.Valid.Total ? Print.Score.Valid /
@ -1025,8 +1025,8 @@ static void ExaRes_ShowResults (struct Exa_Exams *Exams,
HTM_TD_End ();
/* Write grade over maximum grade (taking into account only valid questions) */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{

12
swad_exam_session.c
View File

@ -609,7 +609,7 @@ static void ExaSes_GetAndWriteNamesOfGrpsAssociatedToSession (const struct ExaSe
static void ExaSes_ListOneOrMoreSessionsResult (struct Exa_Exams *Exams,
const struct ExaSes_Session *Session)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
static void (*Function[Rol_NUM_ROLES]) (struct Exa_Exams *Exams,
const struct ExaSes_Session *Session) =
{
@ -619,8 +619,8 @@ static void ExaSes_ListOneOrMoreSessionsResult (struct Exa_Exams *Exams,
[Rol_SYS_ADM] = ExaSes_ListOneOrMoreSessionsResultTch,
};
HTM_TD_Begin ("class=\"%s CT %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
if (Function[Gbl.Usrs.Me.Role.Logged])
Function[Gbl.Usrs.Me.Role.Logged] (Exams,Session);
@ -1064,7 +1064,7 @@ static void ExaSes_PutFormSession (const struct ExaSes_Session *Session)
static void ExaSes_ShowLstGrpsToCreateSession (long SesCod)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1089,8 +1089,8 @@ static void ExaSes_ShowLstGrpsToCreateSession (long SesCod)
/***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("colspan=\"7\" class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"WholeCrs\" value=\"Y\"%s"

18
swad_follow.c
View File

@ -605,7 +605,7 @@ static void Fol_ListFollowersUsr (struct UsrData *UsrDat)
static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Another_user_s_profile;
static const char *ClassPhoto[PhoSha_NUM_SHAPES] =
{
@ -632,8 +632,8 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
/* Put form to go to public profile */
Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME %s LT\"", // Limited width
The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"LT FOLLOW_USR_NAME DAT_%s\"", // Limited width
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
"BT_LINK LT",NULL);
Usr_WriteFirstNameBRSurnames (UsrDat);
@ -1201,7 +1201,7 @@ void Fol_RemoveUsrFromUsrFollow (long UsrCod)
void Fol_GetAndShowFollowStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_followed_followers;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Users;
extern const char *Txt_Number_of_users;
@ -1239,16 +1239,16 @@ void Fol_GetAndShowFollowStats (void)
/***** Write number of followed / followers *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Fol == 0 ? Txt_Followed :
Txt_Followers);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs * 100.0 /
(double) NumUsrsTotal :
0.0);
@ -1267,11 +1267,11 @@ void Fol_GetAndShowFollowStats (void)
/***** Write number of followed per follower *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_FollowPerFollow[Fol]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (Average);
HTM_TD_End ();

4
swad_form.c
View File

@ -295,7 +295,7 @@ void Frm_FreeAnchorStr (char *Anchor)
void Frm_LabelColumn (const char *TDClass,const char *Id,const char *Label)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
/***** Column/cell begin *****/
if (TDClass)
@ -314,7 +314,7 @@ void Frm_LabelColumn (const char *TDClass,const char *Id,const char *Label)
The_ClassFormInBox[Gbl.Prefs.Theme]);
}
else
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Label);
HTM_LABEL_End ();

18
swad_forum.c
View File

@ -3364,7 +3364,7 @@ static void For_WriteForumTitleAndStats (For_ForumType_t ForumType,
const char *Icon,struct For_FiguresForum *FiguresForum,
const char *ForumName1,const char *ForumName2)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
unsigned NumForums;
unsigned NumThreads;
unsigned NumPosts;
@ -3404,36 +3404,36 @@ static void For_WriteForumTitleAndStats (For_ForumType_t ForumType,
free (ForumName);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (ForumName1);
HTM_Txt (ForumName2);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumForums);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumThreads);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumPosts);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsToBeNotifiedByEMail);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumThrsPerForum);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumPostsPerThread);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumPostsPerForum);
HTM_TD_End ();

8
swad_game.c
View File

@ -2323,7 +2323,7 @@ void Gam_GetScoreRange (long GamCod,double *MinScore,double *MaxScore)
void Gam_GetAndShowGamesStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_games;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_games;
extern const char *Txt_Number_of_BR_courses_with_BR_games;
@ -2352,15 +2352,15 @@ void Gam_GetAndShowGamesStats (void)
/***** Write number of games *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumGames);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithGames);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumGamesPerCourse);
HTM_TD_End ();

60
swad_group.c
View File

@ -1226,7 +1226,7 @@ static void Grp_RemoveUsrFromGroup (long UsrCod,long GrpCod)
static void Grp_ListGroupTypesForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_It_is_optional_to_choose_a_group;
extern const char *Txt_It_is_mandatory_to_choose_a_group;
@ -1341,7 +1341,7 @@ static void Grp_ListGroupTypesForEdition (void)
HTM_TD_End ();
/* Number of groups of this type */
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps);
HTM_TD_End ();
@ -1416,7 +1416,7 @@ static void Grp_WriteHeadingGroupTypes (void)
static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Group_X_open_click_to_close_it;
extern const char *Txt_Group_X_closed_click_to_open_it;
@ -1574,7 +1574,7 @@ static void Grp_ListGroupsForEdition (const struct Roo_Rooms *Rooms)
Role >= Rol_STD;
Role--)
{
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Int (Grp->NumUsrs[Role]);
HTM_TD_End ();
}
@ -2133,7 +2133,7 @@ static void Grp_ListGrpsToAddOrRemUsrs (struct GroupType *GrpTyp,long UsrCod)
static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
Grp_WhichGroups_t GroupsSelectableByStdsOrNETs)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_users_with_no_group;
unsigned NumGrpThisType;
unsigned NumGrpSel;
@ -2258,14 +2258,14 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
HTM_TD_End ();
/* Group name = students with no group */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("for=\"Grp%ld\"",-GrpTyp->GrpTypCod);
HTM_Txt (Txt_users_with_no_group);
HTM_LABEL_End ();
HTM_TD_End ();
/* Room */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End ();
/* Number of students who don't belong to any group of this type */
@ -2273,7 +2273,7 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
Role >= Rol_STD;
Role--)
{
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Grp_DB_CountNumUsrsInNoGrpsOfType (Role,GrpTyp->GrpTypCod));
HTM_TD_End ();
}
@ -2344,7 +2344,7 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Group_X_open;
extern const char *Txt_Group_X_closed;
char *Title;
@ -2370,16 +2370,17 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
/***** Group name *****/
HTM_TD_Begin (Highlight ? "class=\"LM BG_HIGHLIGHT\"" :
"class=\"LM\"");
HTM_LABEL_Begin ("for=\"Grp%ld\" class=\"%s\"",
Grp->GrpCod,The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("for=\"Grp%ld\" class=\"DAT_%s\"",
Grp->GrpCod,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Grp->GrpName);
HTM_LABEL_End ();
HTM_TD_End ();
/***** Room *****/
HTM_TD_Begin ("class=\"LM %s%s\"",The_ClassDat[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_TD_Begin ("class=\"LM DAT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_Txt (Grp->Room.ShrtName);
HTM_TD_End ();
@ -2388,25 +2389,28 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
Role >= Rol_STD;
Role--)
{
HTM_TD_Begin ("class=\"CM %s%s\"",The_ClassDat[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_TD_Begin ("class=\"CM DAT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_Int (Grp->NumUsrs[Role]);
HTM_TD_End ();
}
/***** Max. number of students in this group *****/
HTM_TD_Begin ("class=\"CM %s%s\"",The_ClassDat[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_TD_Begin ("class=\"CM DAT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
Grp_WriteMaxStds (StrMaxStudents,Grp->MaxStudents);
HTM_TxtF ("%s&nbsp;",StrMaxStudents);
HTM_TD_End ();
/***** Vacants in this group *****/
HTM_TD_Begin ("class=\"CM %s%s\"",The_ClassDat[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
HTM_TD_Begin ("class=\"CM DAT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
Highlight ? " BG_HIGHLIGHT" :
"");
if (Grp->MaxStudents <= Grp_MAX_STUDENTS_IN_A_GROUP)
{
Vacant = (int) Grp->MaxStudents - (int) Grp->NumUsrs[Rol_STD];
@ -2422,7 +2426,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
static void Grp_PutFormToCreateGroupType (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_type_of_group;
extern const char *Txt_It_is_optional_to_choose_a_group;
@ -2522,7 +2526,8 @@ static void Grp_PutFormToCreateGroupType (void)
HTM_TD_End ();
/***** Number of groups of this type *****/
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0); // It's a new group type ==> 0 groups
HTM_TD_End ();
@ -2544,7 +2549,7 @@ static void Grp_PutFormToCreateGroupType (void)
static void Grp_PutFormToCreateGroup (const struct Roo_Rooms *Rooms)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_group;
extern const char *Txt_Group_closed;
@ -2650,7 +2655,8 @@ static void Grp_PutFormToCreateGroup (const struct Roo_Rooms *Rooms)
Role >= Rol_STD;
Role--)
{
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0);
HTM_TD_End ();
}

4
swad_help.c
View File

@ -268,12 +268,12 @@ static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description,
Btn_Button_t Button,
const char *TxtButton)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
HTM_TR_Begin (NULL);
/***** Description *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Description);
HTM_TD_End ();

9
swad_hierarchy.c
View File

@ -768,12 +768,12 @@ void Hie_WriteStatusCellEditable (bool ICanEdit,Hie_Status_t Status,
Act_Action_t NextAction,long HieCod,
const char *Txt[Hie_NUM_STATUS_TXT])
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
Hie_StatusTxt_t StatusTxt = Hie_GetStatusTxtFromStatusBits (Status);
unsigned StatusUnsigned;
/***** Begin cell *****/
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit && StatusTxt == Hie_STATUS_PENDING)
{
/* Begin form */
@ -984,7 +984,6 @@ static void Hie_WriteHeadHierarchy (void)
static void Hie_GetAndShowHierarchyWithInss (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_With_;
extern const char *Txt_institutions;
unsigned NumCtysWithInss = 1;
@ -1022,7 +1021,6 @@ static void Hie_GetAndShowHierarchyWithInss (void)
static void Hie_GetAndShowHierarchyWithCtrs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_With_;
extern const char *Txt_centers;
unsigned NumCtysWithCtrs = 1;
@ -1064,7 +1062,6 @@ static void Hie_GetAndShowHierarchyWithCtrs (void)
static void Hie_GetAndShowHierarchyWithDegs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_With_;
extern const char *Txt_degrees;
unsigned NumCtysWithDegs = 1;
@ -1111,7 +1108,6 @@ static void Hie_GetAndShowHierarchyWithDegs (void)
static void Hie_GetAndShowHierarchyWithCrss (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_With_;
extern const char *Txt_courses;
unsigned NumCtysWithCrss = 1;
@ -1161,7 +1157,6 @@ static void Hie_GetAndShowHierarchyWithCrss (void)
static void Hie_GetAndShowHierarchyWithUsrs (Rol_Role_t Role)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_With_;
extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
unsigned NumCtysWithUsrs;

38
swad_hierarchy_config.c
View File

@ -163,7 +163,7 @@ void HieCfg_ShrtName (bool PutForm,Act_Action_t NextAction,
void HieCfg_WWW (bool PrintView,bool PutForm,Act_Action_t NextAction,
const char WWW[Cns_MAX_BYTES_WWW + 1])
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Web;
@ -176,7 +176,7 @@ void HieCfg_WWW (bool PrintView,bool PutForm,Act_Action_t NextAction,
Txt_Web);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm)
{
/* Form to change web */
@ -191,8 +191,9 @@ void HieCfg_WWW (bool PrintView,bool PutForm,Act_Action_t NextAction,
{
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\"");
if (!PrintView)
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
WWW,The_ClassDat[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"DAT_%s\"",
WWW,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (WWW);
if (!PrintView)
HTM_A_End ();
@ -209,7 +210,7 @@ void HieCfg_WWW (bool PrintView,bool PutForm,Act_Action_t NextAction,
void HieCfg_Shortcut (bool PrintView,const char *ParamName,long HieCod)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Shortcut;
/***** Short cut *****/
@ -219,18 +220,19 @@ void HieCfg_Shortcut (bool PrintView,const char *ParamName,long HieCod)
Frm_LabelColumn ("RT",NULL,Txt_Shortcut);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (!PrintView)
{
if (ParamName)
HTM_A_Begin ("href=\"%s/?%s=%ld\" class=\"%s\" target=\"_blank\"",
HTM_A_Begin ("href=\"%s/?%s=%ld\" target=\"_blank\""
" class=\"DAT_%s\"",
Cfg_URL_SWAD_CGI,
ParamName,HieCod,
The_ClassDat[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
else
HTM_A_Begin ("href=\"%s/\" class=\"%s\" target=\"_blank\"",
HTM_A_Begin ("href=\"%s/\" target=\"_blank\" class=\"DAT_%s\"",
Cfg_URL_SWAD_CGI,
The_ClassDat[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
}
if (ParamName)
HTM_TxtF ("%s/?%s=%ld",
@ -252,7 +254,7 @@ void HieCfg_Shortcut (bool PrintView,const char *ParamName,long HieCod)
void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Centers;
extern const char *Txt_Centers_of_INSTITUTION_X;
char *Title;
@ -264,7 +266,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
Frm_LabelColumn ("RT",NULL,Txt_Centers);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm)
{
Frm_BeginFormGoTo (ActSeeCtr);
@ -292,7 +294,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
void HieCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Centers_with_map;
/***** Number of centers with map *****/
@ -302,7 +304,7 @@ void HieCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap)
Frm_LabelColumn ("RT",NULL,Txt_Centers_with_map);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%u (%.1lf%%)",
NumCtrsWithMap,
NumCtrs ? (double) NumCtrsWithMap * 100.0 /
@ -319,7 +321,7 @@ void HieCfg_NumCtrsWithMap (unsigned NumCtrs,unsigned NumCtrsWithMap)
void HieCfg_QR (const char *ParamName,long HieCod)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_QR_code;
/***** QR *****/
@ -329,7 +331,7 @@ void HieCfg_QR (const char *ParamName,long HieCod)
Frm_LabelColumn ("RT",NULL,Txt_QR_code);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
QR_LinkTo (250,ParamName,HieCod);
HTM_TD_End ();
@ -342,7 +344,7 @@ void HieCfg_QR (const char *ParamName,long HieCod)
void HieCfg_NumUsrsInCrss (HieLvl_Level_t Scope,long Cod,Rol_Role_t Role)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Users_in_courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -355,7 +357,7 @@ void HieCfg_NumUsrsInCrss (HieLvl_Level_t Scope,long Cod,Rol_Role_t Role)
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Enr_GetCachedNumUsrsInCrss (Scope,Cod,
Role == Rol_UNK ? (1 << Rol_STD) |
(1 << Rol_NET) |

21
swad_holiday.c
View File

@ -95,7 +95,7 @@ void Hld_ResetHolidays (struct Hld_Holidays *Holidays)
void Hld_SeeHolidays (void)
{
extern const char *Hlp_INSTITUTION_Holidays;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Holidays;
extern const char *Txt_HOLIDAYS_HELP_ORDER[2];
extern const char *Txt_HOLIDAYS_ORDER[2];
@ -163,20 +163,21 @@ void Hld_SeeHolidays (void)
/* Write data of this holiday */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Holidays.Lst[NumHld].PlcCod <= 0 ? Txt_All_places :
Holidays.Lst[NumHld].PlaceFullName);
HTM_TD_End ();
Dat_ConvDateToDateStr (&Holidays.Lst[NumHld].StartDate,StrDate);
HTM_TD_Begin ("class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("&nbsp;%s",StrDate);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_NBSP ();
switch (Holidays.Lst[NumHld].HldTyp)
{
@ -189,8 +190,8 @@ void Hld_SeeHolidays (void)
}
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("&nbsp;%s",Holidays.Lst[NumHld].Name);
HTM_TD_End ();
@ -506,7 +507,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
const struct Plc_Places *Places)
{
extern const char *Hlp_INSTITUTION_Holidays_edit;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Holidays;
extern const char *Txt_All_places;
@ -541,7 +542,7 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays,
HTM_TD_End ();
/* Holiday code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%ld&nbsp;",Hld->HldCod);
HTM_TD_End ();

6
swad_icon.c
View File

@ -560,7 +560,7 @@ void Ico_PutIconNotVisible (void)
void Ico_GetAndShowNumUsrsPerIconSet (void)
{
extern const char *Hlp_ANALYTICS_Figures_icons;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Icons;
extern const char *Txt_Number_of_users;
@ -633,11 +633,11 @@ void Ico_GetAndShowNumUsrsPerIconSet (void)
free (URL);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[IconSet]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[IconSet] * 100.0 /
(double) NumUsrsTotal :
0.0);

4
swad_indicator.c
View File

@ -95,7 +95,7 @@ void Ind_ReqIndicatorsCourses (void)
{
extern const char *Hlp_ANALYTICS_Indicators;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Types_of_degree;
@ -146,7 +146,7 @@ void Ind_ReqIndicatorsCourses (void)
Frm_LabelColumn ("RT","OthDegTypCod",Txt_Types_of_degree);
/* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
DegTyp_WriteSelectorDegreeTypes (Indicators.DegTypCod);
HTM_Txt (" (");
HTM_TxtF (Txt_only_if_the_scope_is_X,Cfg_PLATFORM_SHORT_NAME);

13
swad_info.c
View File

@ -887,7 +887,7 @@ void Inf_SetInfoSrc (void)
void Inf_FormsToSelSendInfo (void)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Source_of_information;
extern const char *Txt_INFO_SRC_FULL_TEXT[Inf_NUM_SOURCES];
extern const char *Txt_INFO_SRC_HELP[Inf_NUM_SOURCES];
@ -948,8 +948,8 @@ void Inf_FormsToSelSendInfo (void)
HTM_TR_Begin (NULL);
/* Select info source */
HTM_TD_Begin ("class=\"LT %s%s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
InfoSrc == FromDB.Src ? " BG_HIGHLIGHT" :
"");
Frm_BeginForm (Inf_ActionsSelecInfoSrc[Gbl.Crs.Info.Type]);
@ -975,7 +975,8 @@ void Inf_FormsToSelSendInfo (void)
HTM_LABEL_End ();
if (Txt_INFO_SRC_HELP[InfoSrc])
{
HTM_SPAN_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_SPAN_Begin ("class=\"DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BR ();
HTM_TxtF ("(%s)",Txt_INFO_SRC_HELP[InfoSrc]);
HTM_SPAN_End ();
@ -1461,7 +1462,7 @@ static bool Inf_CheckPlainTxt (long CrsCod,Inf_Type_t InfoType)
static bool Inf_CheckAndShowPlainTxt (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES];
char TxtHTML[Cns_MAX_BYTES_LONG_TEXT + 1];
bool ICanEdit = (Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
@ -1498,7 +1499,7 @@ static bool Inf_CheckAndShowPlainTxt (void)
Gbl.Crs.Info.Type == Inf_TEACHING_GUIDE)
Lay_WriteHeaderClassPhoto (false,false,Gbl.Hierarchy.Ins.InsCod,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Crs.CrsCod);
HTM_DIV_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
/***** Convert to respectful HTML and insert links *****/
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,

55
swad_institution.c
View File

@ -117,7 +117,7 @@ static unsigned Ins_GetInsAndStat (struct Ins_Instit *Ins,MYSQL_RES *mysql_res);
void Ins_SeeInsWithPendingCtrs (void)
{
extern const char *Hlp_SYSTEM_Pending;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institutions_with_pending_centers;
extern const char *Txt_Institution;
extern const char *Txt_Centers_ABBREVIATION;
@ -174,15 +174,15 @@ void Ins_SeeInsWithPendingCtrs (void)
Ins_GetDataOfInstitByCod (&Ins);
/* Institution logo and name */
HTM_TR_Begin ("%s",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TR_Begin ("DAT_%s",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"NOWRAP LM %s\"",BgColor);
Ins_DrawInstitLogoAndNameWithLink (&Ins,ActSeeCtr,"CM");
HTM_TD_End ();
/* Number of pending centers (row[1]) */
HTM_TD_Begin ("class=\"%s RM %s\"",
The_ClassDat[Gbl.Prefs.Theme],BgColor);
HTM_TD_Begin ("class=\"RM DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],BgColor);
HTM_Txt (row[1]);
HTM_TD_End ();
@ -934,7 +934,7 @@ void Ins_WriteSelectorOfInstitution (void)
static void Ins_ListInstitutionsForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_INSTITUTION_STATUS[Hie_NUM_STATUS_TXT];
unsigned NumIns;
@ -986,7 +986,7 @@ static void Ins_ListInstitutionsForEdition (void)
HTM_TD_End ();
/* Institution code */
HTM_TD_Begin ("class=\"%s CODE\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"DAT_%s CODE\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Ins->InsCod);
HTM_TD_End ();
@ -996,7 +996,7 @@ static void Ins_ListInstitutionsForEdition (void)
HTM_TD_End ();
/* Institution short name */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit)
{
Frm_BeginForm (ActRenInsSho);
@ -1012,7 +1012,7 @@ static void Ins_ListInstitutionsForEdition (void)
HTM_TD_End ();
/* Institution full name */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit)
{
Frm_BeginForm (ActRenInsFul);
@ -1028,7 +1028,7 @@ static void Ins_ListInstitutionsForEdition (void)
HTM_TD_End ();
/* Institution WWW */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (ICanEdit)
{
Frm_BeginForm (ActChgInsWWW);
@ -1043,9 +1043,10 @@ static void Ins_ListInstitutionsForEdition (void)
{
Str_Copy (WWW,Ins->WWW,sizeof (WWW) - 1);
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\"");
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\" title=\"%s\"",
HTM_A_Begin ("href=\"%s\" target=\"_blank\" title=\"%s\""
" class=\"DAT_%s\"",
Ins->WWW,
The_ClassDat[Gbl.Prefs.Theme],
The_Colors[Gbl.Prefs.Theme],
Ins->WWW);
HTM_Txt (WWW);
HTM_A_End ();
@ -1054,23 +1055,23 @@ static void Ins_ListInstitutionsForEdition (void)
HTM_TD_End ();
/* Number of users who claim to belong to this institution */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsIns);
HTM_TD_End ();
/* Number of centers */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCtrs);
HTM_TD_End ();
/* Number of users in courses of this institution */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrsInCrssOfIns);
HTM_TD_End ();
/* Institution requester */
HTM_TD_Begin ("class=\"%s INPUT_REQUESTER LT\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s INPUT_REQUESTER\"",
The_Colors[Gbl.Prefs.Theme]);
UsrDat.UsrCod = Ins->RequesterUsrCod;
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat,
Usr_DONT_GET_PREFS,
@ -1450,7 +1451,7 @@ static void Ins_PutParamGoToIns (void *InsCod)
static void Ins_PutFormToCreateInstitution (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_institution;
extern const char *Txt_Create_institution;
@ -1513,28 +1514,28 @@ static void Ins_PutFormToCreateInstitution (void)
HTM_TD_End ();
/***** Number of users who claim to belong to this institution ****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0);
HTM_TD_End ();
/***** Number of centers *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0);
HTM_TD_End ();
/***** Number of users in courses of this institution ****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0);
HTM_TD_End ();
/***** Institution requester *****/
HTM_TD_Begin ("class=\"%s INPUT_REQUESTER LT\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s INPUT_REQUESTER\"",
The_Colors[Gbl.Prefs.Theme]);
Msg_WriteMsgAuthor (&Gbl.Usrs.Me.UsrDat,true,NULL);
HTM_TD_End ();
/***** Institution status *****/
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();
@ -2276,7 +2277,7 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
const char *TxtFigure)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institution;
unsigned NumIns;
unsigned NumOrder;
@ -2342,7 +2343,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Number of order *****/
if (NumberThisRow != NumberLastRow)
NumOrder = NumIns;
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumOrder);
HTM_TD_End ();
@ -2365,7 +2367,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
HTM_TD_End ();
/***** Write statistic *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumberThisRow);
HTM_TD_End ();

20
swad_institution_config.c
View File

@ -302,7 +302,7 @@ static void InsCfg_Map (void)
static void InsCfg_Country (bool PrintView,bool PutForm)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Country;
unsigned NumCty;
@ -319,7 +319,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
Txt_Country);
/* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
if (PutForm)
{
/* Put form to select country */
@ -417,7 +417,7 @@ static void InsCfg_QR (void)
static void InsCfg_NumUsrs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Users_of_the_institution;
/***** Number of users *****/
@ -427,7 +427,7 @@ static void InsCfg_NumUsrs (void)
Frm_LabelColumn ("RT",NULL,Txt_Users_of_the_institution);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ins_GetCachedNumUsrsWhoClaimToBelongToIns (&Gbl.Hierarchy.Ins));
HTM_TD_End ();
@ -440,7 +440,7 @@ static void InsCfg_NumUsrs (void)
static void InsCfg_NumDegs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Degrees;
/***** Number of degrees *****/
@ -450,7 +450,7 @@ static void InsCfg_NumDegs (void)
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Deg_GetCachedNumDegsInIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -463,7 +463,7 @@ static void InsCfg_NumDegs (void)
static void InsCfg_NumCrss (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Courses;
/***** Number of courses *****/
@ -473,7 +473,7 @@ static void InsCfg_NumCrss (void)
Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Crs_GetCachedNumCrssInIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();
@ -486,7 +486,7 @@ static void InsCfg_NumCrss (void)
static void InsCfg_NumDpts (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Departments;
/***** Number of departments *****/
@ -496,7 +496,7 @@ static void InsCfg_NumDpts (void)
Frm_LabelColumn ("RT",NULL,Txt_Departments);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Dpt_GetNumDptsInIns (Gbl.Hierarchy.Ins.InsCod));
HTM_TD_End ();

8
swad_language.c
View File

@ -249,7 +249,7 @@ Lan_Language_t Lan_GetLanguageFromStr (const char *Str)
void Lan_GetAndShowNumUsrsPerLanguage (void)
{
extern const char *Hlp_ANALYTICS_Figures_language;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Language;
extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES];
@ -296,15 +296,15 @@ void Lan_GetAndShowNumUsrsPerLanguage (void)
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_STR_LANG_NAME[Lan]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[Lan]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Lan] * 100.0 /
(double) NumUsrsTotal :
0);

12
swad_layout.c
View File

@ -1561,7 +1561,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
void Lay_AdvertisementMobile (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Stay_connected_with_SWADroid;
if (!(rand () % Lay_SHOW_ADVERTISEMENT_ONE_TIME_OF_X))
@ -1575,9 +1575,9 @@ void Lay_AdvertisementMobile (void)
/***** Show advertisement *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
" class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Stay_connected_with_SWADroid);
HTM_BR ();
HTM_BR ();
@ -1687,7 +1687,7 @@ void Lay_BeginHTMLFile (FILE *File,const char *Title)
void Lay_GetAndShowNumUsrsPerSideColumns (void)
{
extern const char *Hlp_ANALYTICS_Figures_columns;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Columns;
extern const char *Txt_Number_of_users;
@ -1743,11 +1743,11 @@ void Lay_GetAndShowNumUsrsPerSideColumns (void)
free (Icon);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[SideCols]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[SideCols] * 100.0 /
(double) NumUsrsTotal :
0.0);

4
swad_link.c
View File

@ -380,7 +380,7 @@ void Lnk_FreeListLinks (void)
static void Lnk_ListLinksForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumLnk;
struct Lnk_Link *Lnk;
@ -407,7 +407,7 @@ static void Lnk_ListLinksForEdition (void)
HTM_TD_End ();
/* Link code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Lnk->LnkCod);
HTM_TD_End ();

28
swad_mail.c
View File

@ -103,7 +103,7 @@ static void Mai_EditingMailDomainDestructor (void);
void Mai_SeeMailDomains (void)
{
extern const char *Hlp_START_Domains;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Email_domains_allowed_for_notifications;
extern const char *Txt_EMAIL_DOMAIN_HELP_ORDER[3];
extern const char *Txt_EMAIL_DOMAIN_ORDER[3];
@ -158,15 +158,15 @@ void Mai_SeeMailDomains (void)
/* Write data of this mail domain */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Gbl.Mails.Lst[NumMai].Domain);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Gbl.Mails.Lst[NumMai].Info);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Gbl.Mails.Lst[NumMai].NumUsrs);
HTM_TD_End ();
@ -405,7 +405,7 @@ void Mai_FreeListMailDomains (void)
static void Mai_ListMailDomainsForEdition (void)
{
extern const char *Hlp_START_Domains_edit;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Email_domains_allowed_for_notifications;
unsigned NumMai;
@ -435,7 +435,7 @@ static void Mai_ListMailDomainsForEdition (void)
HTM_TD_End ();
/* Mail code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Mai->MaiCod);
HTM_TD_End ();
@ -462,7 +462,7 @@ static void Mai_ListMailDomainsForEdition (void)
HTM_TD_End ();
/* Number of users */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Mai->NumUsrs);
HTM_TD_End ();
@ -804,7 +804,6 @@ static void Mai_ListEmails (__attribute__((unused)) void *Args)
extern const char *Hlp_COMMUNICATION_Email;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_Email_addresses;
extern const char *Txt_X_users_who_have_email;
extern const char *Txt_X_users_who_have_accepted_and_who_have_email;
@ -878,12 +877,12 @@ static void Mai_ListEmails (__attribute__((unused)) void *Args)
HTM_DIV_End ();
/***** Show a message with the number of users with email ****/
HTM_DIV_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF (Txt_X_users_who_have_email,NumUsrsWithEmail);
HTM_DIV_End ();
/***** Show a message with the number of users who have accepted and have email ****/
HTM_DIV_Begin ("class=\"%s CM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"CM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF (Txt_X_users_who_have_accepted_and_who_have_email,
NumAcceptedUsrsWithEmail);
HTM_DIV_End ();
@ -1060,7 +1059,7 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe,
bool IMustFillInEmail,
bool IShouldConfirmEmail)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Before_going_to_any_other_option_you_must_fill_in_your_email_address;
extern const char *Txt_Please_confirm_your_email_address;
@ -1142,8 +1141,8 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe,
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_emails);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
}
/* Form to remove email */
@ -1202,7 +1201,8 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe,
Txt_Email); // The first email
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (ItsMe)
Frm_BeginFormAnchor (ActChgMyMai,Mai_EMAIL_SECTION_ID);
else

31
swad_match.c
View File

@ -716,11 +716,11 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Mch_Match
void Mch_ListOneOrMoreMatchesNumPlayers (const struct Mch_Match *Match)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
/***** Number of players who have answered any question in the match ******/
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_Unsigned (Mch_DB_GetNumUsrsWhoHavePlayedMch (Match->MchCod));
HTM_TD_End ();
}
@ -731,17 +731,17 @@ void Mch_ListOneOrMoreMatchesNumPlayers (const struct Mch_Match *Match)
static void Mch_ListOneOrMoreMatchesStatus (struct Mch_Match *Match,unsigned NumQsts)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Play;
extern const char *Txt_Resume;
HTM_TD_Begin ("class=\"%s CT %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
if (Match->Status.Showing != Mch_END) // Match not over
{
/* Current question index / total of questions */
HTM_DIV_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%u/%u",Match->Status.QstInd,NumQsts);
HTM_DIV_End ();
}
@ -766,7 +766,7 @@ static void Mch_ListOneOrMoreMatchesStatus (struct Mch_Match *Match,unsigned Num
static void Mch_ListOneOrMoreMatchesResult (struct Gam_Games *Games,
const struct Mch_Match *Match)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
static void (*Function[Rol_NUM_ROLES]) (struct Gam_Games *Games,
const struct Mch_Match *Match) =
{
@ -776,8 +776,8 @@ static void Mch_ListOneOrMoreMatchesResult (struct Gam_Games *Games,
[Rol_SYS_ADM] = Mch_ListOneOrMoreMatchesResultTch,
};
HTM_TD_Begin ("class=\"%s CT %s\"",
The_ClassDat[Gbl.Prefs.Theme],The_GetColorRows ());
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],The_GetColorRows ());
if (Function[Gbl.Usrs.Me.Role.Logged])
Function[Gbl.Usrs.Me.Role.Logged] (Games,Match);
@ -1337,7 +1337,7 @@ static void Mch_PutFormNewMatch (const struct Gam_Game *Game)
static void Mch_ShowLstGrpsToEditMatch (long MchCod)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1363,8 +1363,8 @@ static void Mch_ShowLstGrpsToEditMatch (long MchCod)
/***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("colspan=\"7\" class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"WholeCrs\" value=\"Y\"%s"
@ -2688,11 +2688,12 @@ static void Mch_PutParamNumCols (unsigned NumCols) // Number of columns
static void Mch_PutCheckboxResult (const struct Mch_Match *Match)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_View_results;
/***** Begin container *****/
HTM_DIV_Begin ("class=\"MCH_SHOW_RESULTS %s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"MCH_SHOW_RESULTS DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
/***** Begin form *****/
Frm_BeginForm (ActChgVisResMchQst);

48
swad_match_result.c
View File

@ -537,7 +537,7 @@ static void MchRes_ShowResultsEnd (void)
static void MchRes_ListGamesToSelect (struct Gam_Games *Games)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Games;
extern const char *Txt_Game;
extern const char *Txt_Update_results;
@ -580,8 +580,8 @@ static void MchRes_ListGamesToSelect (struct Gam_Games *Games)
/* Write a row for this event */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s CT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"CT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_INPUT_CHECKBOX ("GamCod",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Gam%u\" value=\"%ld\"%s",
@ -590,16 +590,16 @@ static void MchRes_ListGamesToSelect (struct Gam_Games *Games)
"");
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_LABEL_Begin ("for=\"Gam%u\"",NumGame);
HTM_TxtF ("%u:",NumGame + 1);
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Game.Title);
HTM_TD_End ();
@ -718,7 +718,7 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
long GamCod, // <= 0 ==> any
const char *GamesSelectedCommas)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Result;
MYSQL_RES *mysql_res;
struct UsrData *UsrDat;
@ -791,8 +791,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
if (asprintf (&Id,"mch_res_time_%u_%u",
(unsigned) StartEndTime,UniqueId) < 0)
Err_NotEnoughMemoryExit ();
HTM_TD_Begin ("id =\"%s\" class=\"%s LT %s\"",
Id,The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("id =\"%s\" class=\"LT DAT_%s %s\"",
Id,The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Dat_WriteLocalDateHMSFromUTC (Id,Print.TimeUTC[StartEndTime],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_BREAK,
@ -802,8 +802,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
}
/* Write match title */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Match.Title);
HTM_TD_End ();
@ -817,8 +817,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
}
/* Write number of questions */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
HTM_Unsigned (Print.NumQsts.All);
@ -827,8 +827,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
HTM_TD_End ();
/* Write number of non-blank answers */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -842,8 +842,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
HTM_TD_End ();
/* Write number of blank answers */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
NumQstsBlank = Print.NumQsts.All - Print.NumQsts.NotBlank;
if (ICanView.Score)
@ -858,8 +858,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
HTM_TD_End ();
/* Write score */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{
@ -872,8 +872,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
HTM_TD_End ();
/* Write average score per question */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
HTM_Double2Decimals (Print.NumQsts.All ? Print.Score /
@ -884,8 +884,8 @@ static void MchRes_ShowMchResults (struct Gam_Games *Games,
HTM_TD_End ();
/* Write grade over maximum grade */
HTM_TD_Begin ("class=\"%s RT LINE_LEFT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s LINE_LEFT %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (ICanView.Score)
{

6
swad_menu.c
View File

@ -416,7 +416,7 @@ void Mnu_GetAndShowNumUsrsPerMenu (void)
{
extern const char *Hlp_ANALYTICS_Figures_menu;
extern const char *Mnu_MenuIcons[Mnu_NUM_MENUS];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Menu;
extern const char *Txt_Number_of_users;
@ -467,11 +467,11 @@ void Mnu_GetAndShowNumUsrsPerMenu (void)
Txt_MENU_NAMES[Menu],"ICOx20");
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[Menu]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Menu] * 100.0 /
(double) NumUsrsTotal :
0.0);

5
swad_message.c
View File

@ -2908,7 +2908,7 @@ static void Msg_UnbanSender (void)
void Msg_ListBannedUsrs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_You_have_not_banned_any_sender;
extern const char *Txt_Banned_users;
extern const char *Txt_Sender_banned_click_to_unban_him;
@ -2967,7 +2967,8 @@ void Msg_ListBannedUsrs (void)
HTM_TD_End ();
/* Write user's full name */
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (UsrDat.FullName);
HTM_TD_End ();

11
swad_network.c
View File

@ -323,7 +323,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_webs_social_networks;
extern const char *Net_DB_WebsAndSocialNetworks[Net_NUM_WEBS_AND_SOCIAL_NETWORKS];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Web_social_network;
extern const char *Txt_Number_of_users;
@ -378,17 +378,20 @@ void Net_ShowWebAndSocialNetworksStats (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon (Net_WebsAndSocialNetworksIcons[Web],Ico_BLACK,
Net_WebsAndSocialNetworksTitle[Web],"ICOx16");
HTM_TxtF ("&nbsp;%s",Net_WebsAndSocialNetworksTitle[Web]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? 100.0 * (double) NumUsrs /
(double) NumUsrsTotal :
0.0);

10
swad_nickname.c
View File

@ -150,7 +150,7 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe,
bool IMustFillNickname)
{
extern const char *Hlp_PROFILE_Account;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Nickname;
extern const char *Txt_Before_going_to_any_other_option_you_must_fill_your_nickname;
@ -237,8 +237,8 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe,
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_nicknames);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
}
/* Form to remove old nickname */
@ -295,8 +295,8 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe,
Txt_Nickname); // The first nickname
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (ItsMe)
Frm_BeginFormAnchor (ActChgMyNck,Nck_NICKNAME_SECTION_ID);
else

18
swad_photo.c
View File

@ -886,7 +886,7 @@ static void Pho_UpdatePhoto1 (struct UsrData *UsrDat)
static void Pho_UpdatePhoto2 (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_PHOTO_PROCESSING_CAPTIONS[3];
unsigned NumPhoto;
char *Img;
@ -901,8 +901,8 @@ static void Pho_UpdatePhoto2 (void)
NumPhoto < 3;
NumPhoto++)
{
HTM_TD_Begin ("class=\"%s CT\" style=\"width:33%%;\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"CT DAT_%s\" style=\"width:33%%;\"",
The_Colors[Gbl.Prefs.Theme]);
if (asprintf (&Img,"%s_paso%u.jpg",Gbl.Usrs.FileNamePhoto,NumPhoto + 1) < 0)
Err_NotEnoughMemoryExit ();
HTM_IMG (Cfg_URL_PHOTO_TMP_PUBLIC,Img,Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto],
@ -2202,7 +2202,6 @@ static void Pho_ShowOrPrintClassPhotoDegrees (struct Pho_DegPhotos *DegPhotos,
static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_No_INDEX;
extern const char *Txt_Degree;
@ -2254,15 +2253,15 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
HTM_TR_Begin (NULL);
/***** Show logo and name of this degree *****/
HTM_TD_Begin ("class=\"%s RM %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RM DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Unsigned (++NumDegsNotEmpty);
HTM_TD_End ();
/***** Show logo and name of this degree *****/
HTM_TD_Begin ("class=\"%s LM %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LM DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
if (SeeOrPrint == Pho_DEGREES_SEE)
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT");
@ -2340,11 +2339,10 @@ static void Pho_GetNumStdsInDegree (long DegCod,Usr_Sex_t Sex,
static void Pho_ShowDegreeStat (int NumStds,int NumStdsWithPhoto)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_photos;
HTM_SPAN_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_SPAN_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%d&nbsp;",NumStds);
HTM_SPAN_End ();

6
swad_photo_shape.c
View File

@ -162,7 +162,7 @@ void PhoSha_GetAndShowNumUsrsPerPhotoShape (void)
{
extern const char *Hlp_ANALYTICS_Figures_user_photos;
extern const char *Ico_ClassColor[Ico_NUM_COLORS][The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_User_photos;
extern const char *Txt_Number_of_users;
@ -222,11 +222,11 @@ void PhoSha_GetAndShowNumUsrsPerPhotoShape (void)
Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[Shape]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Shape] * 100.0 /
(double) NumUsrsTotal :
0.0);

32
swad_place.c
View File

@ -94,7 +94,7 @@ void Plc_ResetPlaces (struct Plc_Places *Places)
void Plc_SeePlaces (void)
{
extern const char *Hlp_INSTITUTION_Places;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Places;
extern const char *Txt_PLACES_HELP_ORDER[2];
extern const char *Txt_PLACES_ORDER[2];
@ -154,11 +154,13 @@ void Plc_SeePlaces (void)
/* Write data of this place */
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Places.Lst[NumPlc].FullName);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Places.Lst[NumPlc].NumCtrs);
HTM_TD_End ();
@ -168,8 +170,8 @@ void Plc_SeePlaces (void)
/***** Separation row *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("colspan=\"2\" class=\"DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_NBSP ();
HTM_TD_End ();
HTM_TR_End ();
@ -178,11 +180,13 @@ void Plc_SeePlaces (void)
NumCtrsInOtherPlcs = Ctr_DB_GetNumCtrsInPlc (0);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Other_places);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCtrsInOtherPlcs);
HTM_TD_End ();
@ -192,11 +196,11 @@ void Plc_SeePlaces (void)
/***** Write centers (of the current institution) with no place *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Place_unspecified);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod) -
NumCtrsWithPlc);
HTM_TD_End ();
@ -458,7 +462,7 @@ void Plc_FreeListPlaces (struct Plc_Places *Places)
static void Plc_ListPlacesForEdition (const struct Plc_Places *Places)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumPlc;
struct Plc_Place *Plc;
@ -488,7 +492,7 @@ static void Plc_ListPlacesForEdition (const struct Plc_Places *Places)
HTM_TD_End ();
/* Place code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Plc->PlcCod);
HTM_TD_End ();
@ -515,7 +519,7 @@ static void Plc_ListPlacesForEdition (const struct Plc_Places *Places)
HTM_TD_End ();
/* Number of centers */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Plc->NumCtrs);
HTM_TD_End ();
@ -706,7 +710,7 @@ void Plc_ContEditAfterChgPlc (void)
static void Plc_PutFormToCreatePlace (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_place;
extern const char *Txt_Create_place;
@ -751,7 +755,7 @@ static void Plc_PutFormToCreatePlace (void)
HTM_TD_End ();
/***** Number of centers *****/
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (0);
HTM_TD_End ();

22
swad_plugin.c
View File

@ -84,7 +84,7 @@ static void Plg_EditingPluginDestructor (void);
void Plg_ListPlugins (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Option_under_development;
extern const char *Txt_Plugins;
extern const char *Txt_Plugin;
@ -128,10 +128,11 @@ void Plg_ListPlugins (void)
// TODO: Change plugin icons to 32x32
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\" style=\"width:45px;\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"%s\" target=\"_blank\"",
URL,Plg->Name,The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\" style=\"width:45px;\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" title=\"%s\" target=\"_blank\""
" class=\"DAT_%s\"",
URL,Plg->Name,The_Colors[Gbl.Prefs.Theme]);
if (asprintf (&Icon,"%s24x24.gif",Gbl.Plugins.Lst[NumPlg].Logo) < 0)
Err_NotEnoughMemoryExit ();
HTM_IMG (Cfg_URL_ICON_PLUGINS_PUBLIC,Icon,Plg->Name,
@ -140,9 +141,10 @@ void Plg_ListPlugins (void)
HTM_A_End ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"%s\" target=\"_blank\"",
URL,Plg->Name,The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" title=\"%s\" target=\"_blank\""
" class=\"DAT_%s\"",
URL,Plg->Name,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Plg->Name);
HTM_A_End ();
HTM_TD_End ();
@ -326,7 +328,7 @@ void Plg_FreeListPlugins (void)
static void Plg_ListPluginsForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumPlg;
struct Plugin *Plg;
@ -355,7 +357,7 @@ static void Plg_ListPluginsForEdition (void)
HTM_TD_End ();
/* Plugin code */
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Long (Plg->PlgCod);
HTM_TD_End ();

8
swad_privacy.c
View File

@ -326,7 +326,7 @@ static void Pri_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject,
unsigned MaskAllowedVisibility)
{
extern const char *Pri_VisibilityDB[Pri_NUM_OPTIONS_PRIVACY];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Number_of_users;
extern const char *Txt_PERCENT_of_users;
extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY];
@ -367,15 +367,15 @@ static void Pri_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject,
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_PRIVACY_OPTIONS[Visibility]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[Visibility]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Visibility] * 100.0 /
(double) NumUsrsTotal :
0.0);

8
swad_program.c
View File

@ -1972,7 +1972,7 @@ static void Prg_InsertItem (const struct Prg_Item *ParentItem,
void Prg_GetAndShowCourseProgramStats (void) // TODO: Change function from assignments to course program items
{
extern const char *Hlp_ANALYTICS_Figures_course_programs;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_program_items;
extern const char *Txt_Number_of_BR_courses_with_BR_program_items;
@ -2002,15 +2002,15 @@ void Prg_GetAndShowCourseProgramStats (void) // TODO: Change function from assig
/***** Write number of assignments *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumItems);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithItems);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumItemsPerCourse);
HTM_TD_End ();

12
swad_project.c
View File

@ -3298,7 +3298,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
extern const char *Hlp_ASSESSMENT_Projects_new_project;
extern const char *Hlp_ASSESSMENT_Projects_edit_project;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_project;
extern const char *Txt_Edit_project;
@ -3490,7 +3490,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
Frm_LabelColumn ("RT","WWW",Txt_URL);
/* Data */
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_URL ("URL",Prj->URL,HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"TITLE_DESCRIPTION_WIDTH %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
@ -4221,7 +4221,7 @@ void Prj_RemoveUsrFromProjects (long UsrCod)
void Prj_GetAndShowProjectsStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_projects;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_projects;
extern const char *Txt_Number_of_BR_courses_with_BR_projects;
@ -4251,15 +4251,15 @@ void Prj_GetAndShowProjectsStats (void)
/***** Write number of projects *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumProjects);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithProjects);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumProjectsPerCourse);
HTM_TD_End ();

5
swad_question.c
View File

@ -195,7 +195,7 @@ void Qst_ShowFormRequestEditQsts (struct Qst_Questions *Questions)
void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Types_of_answers;
extern const char *Txt_All_types_of_answers;
extern const char *Txt_TST_STR_ANSWER_TYPES[Qst_NUM_ANS_TYPES];
@ -248,7 +248,8 @@ void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
}
}
HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("class=\"DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AnswerType",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"%u\"%s onclick=\"checkParent(this,'AllAnsTypes');\"",
(unsigned) AnsType,

34
swad_room.c
View File

@ -145,7 +145,7 @@ void Roo_ResetRooms (struct Roo_Rooms *Rooms)
void Roo_SeeRooms (void)
{
extern const char *Hlp_CENTER_Rooms;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Rooms;
extern const char *Txt_ROOMS_HELP_ORDER[Roo_NUM_ORDERS];
extern const char *Txt_ROOMS_ORDER[Roo_NUM_ORDERS];
@ -219,44 +219,44 @@ void Roo_SeeRooms (void)
HTM_TR_Begin (NULL);
/* Building short name */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Rooms.Lst[NumRoom].BldShrtName);
HTM_TD_End ();
/* Floor */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Int (Rooms.Lst[NumRoom].Floor);
HTM_TD_End ();
/* Type */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Ico_PutIconOn (Roo_TypesIcons[Rooms.Lst[NumRoom].Type],Ico_BLACK,
Txt_ROOM_TYPES[Rooms.Lst[NumRoom].Type]);
HTM_TD_End ();
/* Short name */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Rooms.Lst[NumRoom].ShrtName);
HTM_TD_End ();
/* Full name */
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
HTM_Txt (Rooms.Lst[NumRoom].FullName);
HTM_TD_End ();
/* Capacity */
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Roo_WriteCapacity (StrCapacity,Rooms.Lst[NumRoom].Capacity);
HTM_Txt (StrCapacity);
@ -268,8 +268,8 @@ void Roo_SeeRooms (void)
case Rol_CTR_ADM:
case Rol_INS_ADM:
case Rol_SYS_ADM:
HTM_TD_Begin ("class=\"%s LT %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Roo_GetAndListMACAddresses (Rooms.Lst[NumRoom].RooCod);
HTM_TD_End ();
@ -663,7 +663,7 @@ void Roo_FreeListRooms (struct Roo_Rooms *Rooms)
static void Roo_ListRoomsForEdition (const struct Bld_Buildings *Buildings,
const struct Roo_Rooms *Rooms)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
unsigned NumRoom;
struct Roo_Room *Room;
@ -694,7 +694,7 @@ static void Roo_ListRoomsForEdition (const struct Bld_Buildings *Buildings,
HTM_TD_End ();
/* Room code */
HTM_TD_Begin ("class=\"%s RT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_ARTICLE_Begin (Anchor);
HTM_Long (Room->RooCod);
HTM_ARTICLE_End ();

7
swad_statistic.c
View File

@ -2796,7 +2796,7 @@ static void Sta_ShowNumHitsPerBanner (Sta_CountType_t CountType,
unsigned NumHits,
MYSQL_RES *mysql_res)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Banner;
extern const char *Txt_STAT_TYPE_COUNT_CAPS[Sta_NUM_COUNT_TYPES];
unsigned NumHit;
@ -2841,10 +2841,11 @@ static void Sta_ShowNumHitsPerBanner (Sta_CountType_t CountType,
Err_WrongBannerExit ();
Ban_GetDataOfBannerByCod (&Ban);
HTM_TD_Begin ("class=\"LOG LT\"");
HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"%s\" target=\"_blank\"",
HTM_A_Begin ("href=\"%s\" title=\"%s\" target=\"_blank\""
" class=\"DAT_%s\"",
Ban.WWW,
Ban.FullName,
The_ClassDat[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
HTM_IMG (Cfg_URL_BANNER_PUBLIC,Ban.Img,Ban.FullName,
"style=\"margin:0 10px 5px 0;\"");
HTM_A_End ();

43
swad_survey.c
View File

@ -1647,7 +1647,7 @@ void Svy_RequestCreatOrEditSvy (void)
extern const char *Hlp_ASSESSMENT_Surveys_new_survey;
extern const char *Hlp_ASSESSMENT_Surveys_edit_survey;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
@ -1795,7 +1795,7 @@ void Svy_RequestCreatOrEditSvy (void)
HTM_TxtColon (Txt_Users);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
1 << Rol_TCH,
@ -1911,7 +1911,7 @@ static void Svy_SetDefaultAndAllowedScope (struct Svy_Survey *Svy)
static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1936,8 +1936,8 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
/***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"%s LM\"",
The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("colspan=\"7\" class=\"LM DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL);
HTM_INPUT_CHECKBOX ("WholeCrs",HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"WholeCrs\" value=\"Y\"%s onclick=\"uncheckChildren(this,'GrpCods')\"",
@ -2747,7 +2747,6 @@ static void Svy_ListSvyQuestions (struct Svy_Surveys *Surveys,
struct Svy_Survey *Svy)
{
extern const char *Hlp_ASSESSMENT_Surveys_questions;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Questions;
extern const char *Txt_No_INDEX;
@ -2847,8 +2846,8 @@ static void Svy_ListSvyQuestions (struct Svy_Surveys *Surveys,
HTM_TD_End ();
/* Write the stem and the answers of this question */
HTM_TD_Begin ("class=\"LT %s %s\"",
The_ClassDat[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"LT DAT_%s %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Svy_WriteQstStem (Stem);
Svy_WriteAnswersOfAQst (Svy,&SvyQst,PutFormAnswerSurvey);
@ -2979,7 +2978,7 @@ static void Svy_WriteAnswersOfAQst (struct Svy_Survey *Svy,
struct Svy_Question *SvyQst,
bool PutFormAnswerSurvey)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
unsigned NumAnswers;
unsigned NumAns;
MYSQL_RES *mysql_res;
@ -3045,18 +3044,18 @@ static void Svy_WriteAnswersOfAQst (struct Svy_Survey *Svy,
/* Write the number of option */
HTM_TD_Begin ("class=\"SVY_OPT LT\"");
HTM_LABEL_Begin ("for=\"Ans%010u_%010u\" class=\"%s\"",
HTM_LABEL_Begin ("for=\"Ans%010u_%010u\" class=\"DAT_%s\"",
(unsigned) SvyQst->QstCod,NumAns,
The_ClassDat[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%u)",NumAns + 1);
HTM_LABEL_End ();
HTM_TD_End ();
/* Write the text of the answer */
HTM_TD_Begin ("class=\"LT\"");
HTM_LABEL_Begin ("for=\"Ans%010u_%010u\" class=\"%s\"",
HTM_LABEL_Begin ("for=\"Ans%010u_%010u\" class=\"DAT_%s\"",
(unsigned) SvyQst->QstCod,NumAns,
The_ClassDat[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (SvyQst->AnsChoice[NumAns].Text);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3086,7 +3085,7 @@ static void Svy_WriteAnswersOfAQst (struct Svy_Survey *Svy,
static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_of_PART_OF_A_TOTAL;
unsigned BarWidth = 0;
char *Title;
@ -3107,8 +3106,8 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
Err_NotEnoughMemoryExit ();
}
HTM_TD_Begin ("class=\"%s LT\" style=\"width:%upx;\"",
The_ClassDat[Gbl.Prefs.Theme],Svy_MAX_BAR_WIDTH + 125);
HTM_TD_Begin ("class=\"LT DAT_%s\" style=\"width:%upx;\"",
The_Colors[Gbl.Prefs.Theme],Svy_MAX_BAR_WIDTH + 125);
/***** Draw bar with a with proportional to the number of clicks *****/
if (NumUsrs && MaxUsrs)
@ -3375,7 +3374,7 @@ unsigned Svy_GetNumCrsSurveys (HieLvl_Level_t Scope,unsigned *NumNotif)
void Svy_GetAndShowSurveysStats (void)
{
extern const char *Hlp_ANALYTICS_Figures_surveys;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Number_of_BR_surveys;
extern const char *Txt_Number_of_BR_courses_with_BR_surveys;
@ -3414,23 +3413,23 @@ void Svy_GetAndShowSurveysStats (void)
/***** Write number of surveys *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumSurveys);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumCoursesWithSurveys);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumSurveysPerCourse);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Double2Decimals (NumQstsPerSurvey);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumNotif);
HTM_TD_End ();

4
swad_syllabus.c
View File

@ -155,7 +155,7 @@ Syl_WhichSyllabus_t Syl_GetParamWhichSyllabus (void)
void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_SYLLABUS_WHICH_SYLLABUS[Syl_NUM_WHICH_SYLLABUS];
Syl_WhichSyllabus_t WhichSyl;
@ -168,7 +168,7 @@ void Syl_PutFormWhichSyllabus (Syl_WhichSyllabus_t SyllabusSelected)
WhichSyl <= (Syl_WhichSyllabus_t) (For_NUM_FORUM_SETS - 1);
WhichSyl++)
{
HTM_LI_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LI_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL);
HTM_INPUT_RADIO ("WhichSyllabus",true,
"value=\"%u\"%s",

16
swad_system_config.c
View File

@ -299,7 +299,7 @@ static void SysCfg_QR (void)
static void SysCfg_NumCtys (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Countries;
/***** Number of countries ******/
@ -309,7 +309,7 @@ static void SysCfg_NumCtys (void)
Frm_LabelColumn ("RT",NULL,Txt_Countries);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_OnSubmit_Begin (Txt_Countries,"BT_LINK",NULL);
HTM_Unsigned (Cty_GetCachedNumCtysInSys ());
@ -326,7 +326,7 @@ static void SysCfg_NumCtys (void)
static void SysCfg_NumInss (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institutions;
/***** Number of institutions ******/
@ -336,7 +336,7 @@ static void SysCfg_NumInss (void)
Frm_LabelColumn ("RT",NULL,Txt_Institutions);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Ins_GetCachedNumInssInSys ());
HTM_TD_End ();
@ -349,7 +349,7 @@ static void SysCfg_NumInss (void)
static void SysCfg_NumDegs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Degrees;
/***** Number of degrees *****/
@ -359,7 +359,7 @@ static void SysCfg_NumDegs (void)
Frm_LabelColumn ("RT",NULL,Txt_Degrees);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Deg_GetCachedNumDegsInSys ());
HTM_TD_End ();
@ -372,7 +372,7 @@ static void SysCfg_NumDegs (void)
static void SysCfg_NumCrss (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Courses;
/***** Number of courses *****/
@ -382,7 +382,7 @@ static void SysCfg_NumCrss (void)
Frm_LabelColumn ("RT",NULL,Txt_Courses);
/* Data */
HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (Crs_GetCachedNumCrssInSys ());
HTM_TD_End ();

5
swad_tag.c
View File

@ -293,7 +293,7 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
bool ShowOnlyEnabledTags)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Tags;
extern const char *Txt_All_tags;
extern const char *Txt_Tag_not_allowed;
@ -373,7 +373,8 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
}
HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("class=\"DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("ChkTag",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"%s\"%s onclick=\"checkParent(this,'AllTags');\"",
row[1],

11
swad_test_config.c
View File

@ -143,7 +143,7 @@ static void TstCfg_ShowFormConfig (void)
{
extern const char *Hlp_ASSESSMENT_Tests_configuring_tests;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins;
@ -186,7 +186,8 @@ static void TstCfg_ShowFormConfig (void)
Pluggable <= TstCfg_PLUGGABLE_YES;
Pluggable++)
{
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("class=\"DAT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO ("Pluggable",false,
"value=\"%u\"%s",
(unsigned) Pluggable,
@ -276,15 +277,15 @@ static void TstCfg_ShowFormConfig (void)
static void TstCfg_PutInputFieldNumQsts (const char *Field,const char *Label,
unsigned Value)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
char StrValue[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"",
Field,The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("for=\"%s\" class=\"DAT_%s\"",
Field,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Label);
HTM_LABEL_End ();
HTM_TD_End ();

4
swad_test_visibility.c
View File

@ -85,7 +85,7 @@ void TstVis_ShowVisibilityIcons (unsigned SelectedVisibility,bool Hidden)
void TstVis_PutVisibilityCheckboxes (unsigned SelectedVisibility)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_TST_STR_VISIBILITY[TstVis_NUM_ITEMS_VISIBILITY];
static const char *Icons[TstVis_NUM_ITEMS_VISIBILITY] =
{
@ -104,7 +104,7 @@ void TstVis_PutVisibilityCheckboxes (unsigned SelectedVisibility)
Visibility++)
{
/* Begin label */
HTM_LABEL_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
/* Checkbox with icon and text */
ItemVisible = (SelectedVisibility & (1 << Visibility)) != 0;

16
swad_theme.c
View File

@ -188,17 +188,6 @@ const char *The_ClassFormOutBoxBold[The_NUM_THEMES] =
[The_THEME_DARK ] = "FORM_OUT_DARK BOLD",
};
const char *The_ClassDat[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "DAT_WHITE",
[The_THEME_GREY ] = "DAT_GREY",
[The_THEME_PURPLE] = "DAT_PURPLE",
[The_THEME_BLUE ] = "DAT_BLUE",
[The_THEME_YELLOW] = "DAT_YELLOW",
[The_THEME_PINK ] = "DAT_PINK",
[The_THEME_DARK ] = "DAT_DARK",
};
const char *The_ClassInput[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "INPUT_WHITE",
@ -379,7 +368,6 @@ void The_GetAndShowNumUsrsPerTheme (void)
extern const char *Hlp_ANALYTICS_Figures_theme;
extern const char *The_ThemeId[The_NUM_THEMES];
extern const char *The_ThemeNames[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Theme_SKIN;
extern const char *Txt_Number_of_users;
@ -434,11 +422,11 @@ void The_GetAndShowNumUsrsPerTheme (void)
free (URL);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Unsigned (NumUsrs[Theme]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s RM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Percentage (NumUsrsTotal ? (double) NumUsrs[Theme] * 100.0 /
(double) NumUsrsTotal :
0.0);

6
swad_timeline_comment.c
View File

@ -620,7 +620,7 @@ static void TmlCom_WriteAuthorTimeAndContent (struct TmlCom_Comment *Com,
static void TmlCom_WriteAuthorName (const struct UsrData *UsrDat) // Author
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_My_public_profile;
extern const char *Txt_Another_user_s_profile;
char *Class;
@ -631,8 +631,8 @@ static void TmlCom_WriteAuthorName (const struct UsrData *UsrDat) // Author
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
/* Author's name */
if (asprintf (&Class,"Tml_COM_AUTHOR Tml_COM_AUTHOR_WIDTH BT_LINK %s BOLD",
The_ClassDat[Gbl.Prefs.Theme]) < 0)
if (asprintf (&Class,"Tml_COM_AUTHOR Tml_COM_AUTHOR_WIDTH BT_LINK DAT_%s BOLD",
The_Colors[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,

20
swad_user.c
View File

@ -6651,11 +6651,11 @@ static void Usr_GetAndShowNumUsrsInCrss (Rol_Role_t Role)
static void Usr_GetAndShowNumUsrsNotBelongingToAnyCrs (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
char *Class;
if (asprintf (&Class,"%s RB",The_ClassDat[Gbl.Prefs.Theme]) < 0)
if (asprintf (&Class,"RB DAT_%s",The_Colors[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit ();
/***** Write the total number of users not belonging to any course *****/
@ -6689,7 +6689,7 @@ static void Usr_GetAndShowNumUsrsNotBelongingToAnyCrs (void)
void Usr_GetAndShowUsersRanking (void)
{
extern const char *Hlp_ANALYTICS_Figures_ranking;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_FIGURE_TYPES[Fig_NUM_FIGURES];
extern const char *Txt_Clicks;
extern const char *Txt_Clicks_per_day;
@ -6718,31 +6718,31 @@ void Usr_GetAndShowUsersRanking (void)
/***** Rankings *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"%s LT\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingClicks ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingClicksPerDay ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingTimelinePubs ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Fol_GetAndShowRankingFollowers ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingFileViews ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingForPsts ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LT DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Prf_GetAndShowRankingMsgsSnt ();
HTM_TD_End ();

13
swad_zip.c
View File

@ -522,7 +522,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
off_t FileSize,unsigned long long UncompressedSize)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ZIP_file;
extern const char *Txt_Download;
extern const char *Txt_Filename;
@ -555,9 +555,10 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
HTM_TxtColon (Txt_Filename);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" class=\"%s\" title=\"%s\" target=\"_blank\"",
URL,The_ClassDat[Gbl.Prefs.Theme],FileName);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" title=\"%s\" target=\"_blank\""
" class=\"DAT_%s\"",
URL,FileName,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (FileName);
HTM_A_End ();
HTM_TD_End ();
@ -568,11 +569,11 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
Fil_WriteFileSizeFull ((double) FileSize,FileSizeStr);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"RM %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_File_size);
HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LM\"",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (FileSizeStr);
if (UncompressedSize)
{