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

This commit is contained in:
acanas 2022-03-30 14:08:48 +02:00
parent 308085eba0
commit cf60978e07
42 changed files with 163 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_account.c
View File

@ -146,7 +146,6 @@ void Acc_ShowFormMyAccount (void)
static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
{ {
extern const char *Hlp_PROFILE_SignUp; extern const char *Hlp_PROFILE_SignUp;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_If_you_think_you_may_have_been_registered_; extern const char *Txt_If_you_think_you_may_have_been_registered_;
extern const char *Txt_ID; extern const char *Txt_ID;
@ -163,7 +162,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
/***** Form to request user's ID for possible account already created *****/ /***** Form to request user's ID for possible account already created *****/
Frm_BeginForm (ActChkUsrAcc); Frm_BeginForm (ActChkUsrAcc);
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_ID); HTM_TxtColonNBSP (Txt_ID);
HTM_INPUT_TEXT ("ID",ID_MAX_CHARS_USR_ID,"", HTM_INPUT_TEXT ("ID",ID_MAX_CHARS_USR_ID,"",
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
@ -365,7 +364,6 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutAr
const char *NewEmail) const char *NewEmail)
{ {
extern const char *Hlp_PROFILE_SignUp; extern const char *Hlp_PROFILE_SignUp;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Create_account; extern const char *Txt_Create_account;
extern const char *Txt_Nickname; extern const char *Txt_Nickname;

4
swad_announcement.c
View File

@ -336,7 +336,6 @@ static long Ann_GetParamAnnCod (void)
void Ann_ShowFormAnnouncement (void) void Ann_ShowFormAnnouncement (void)
{ {
extern const char *Hlp_COMMUNICATION_Announcements; extern const char *Hlp_COMMUNICATION_Announcements;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_announcement; extern const char *Txt_New_announcement;
extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Subject;
@ -359,7 +358,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Users' roles who can view the announcement *****/ /***** Users' roles who can view the announcement *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Users); HTM_TxtColonNBSP (Txt_Users);
HTM_TD_End (); HTM_TD_End ();
@ -393,7 +392,6 @@ void Ann_ShowFormAnnouncement (void)
static void Ann_PutSubjectMessage (const char *Field,const char *Label, static void Ann_PutSubjectMessage (const char *Field,const char *Label,
unsigned Rows) unsigned Rows)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
/***** Subject or content *****/ /***** Subject or content *****/

3
swad_assignment.c
View File

@ -1247,7 +1247,6 @@ void Asg_RequestCreatOrEditAsg (void)
static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{ {
extern const char *Hlp_USERS_Groups; extern const char *Hlp_USERS_Groups;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
@ -1261,7 +1260,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
/***** Begin box and table *****/ /***** Begin box and table *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Groups); HTM_TxtColon (Txt_Groups);
HTM_TD_End (); HTM_TD_End ();

3
swad_attendance.c
View File

@ -1137,7 +1137,6 @@ void Att_RequestCreatOrEditAttEvent (void)
static void Att_ShowLstGrpsToEditAttEvent (long AttCod) static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
@ -1151,7 +1150,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
/***** Begin box and table *****/ /***** Begin box and table *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Groups); HTM_TxtColon (Txt_Groups);
HTM_TD_End (); HTM_TD_End ();

7
swad_browser.c
View File

@ -6870,7 +6870,6 @@ void Brw_ShowFormFileBrowser (void)
static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Create_folder; extern const char *Txt_Create_folder;
extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X; extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X;
@ -6890,7 +6889,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
FileNameToShow); FileNameToShow);
/* Folder */ /* Folder */
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Folder); HTM_TxtColonNBSP (Txt_Folder);
HTM_INPUT_TEXT ("NewFolderName",Brw_MAX_CHARS_FOLDER,"", HTM_INPUT_TEXT ("NewFolderName",Brw_MAX_CHARS_FOLDER,"",
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
@ -7045,7 +7044,6 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
static void Brw_PutFormToCreateALink (const char *FileNameToShow) static void Brw_PutFormToCreateALink (const char *FileNameToShow)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Create_link; extern const char *Txt_Create_link;
extern const char *Txt_or_you_can_create_a_new_link_inside_the_folder_X; extern const char *Txt_or_you_can_create_a_new_link_inside_the_folder_X;
@ -10214,7 +10212,6 @@ static void Brw_PutLinkToAskRemOldFiles (void)
void Brw_AskRemoveOldFiles (void) void Brw_AskRemoveOldFiles (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Remove_old_files; extern const char *Txt_Remove_old_files;
extern const char *Txt_Remove_files_older_than_PART_1_OF_2; extern const char *Txt_Remove_files_older_than_PART_1_OF_2;
@ -10235,7 +10232,7 @@ void Brw_AskRemoveOldFiles (void)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
/***** Form to request number of months (to remove files older) *****/ /***** Form to request number of months (to remove files older) *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s ",Txt_Remove_files_older_than_PART_1_OF_2); HTM_TxtF ("%s ",Txt_Remove_files_older_than_PART_1_OF_2);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"Months\" class=\"INPUT_%s\"", "name=\"Months\" class=\"INPUT_%s\"",

4
swad_center_config.c
View File

@ -842,7 +842,7 @@ void CtrCfg_RemoveLogo (void)
void CtrCfg_RequestPhoto (void) void CtrCfg_RequestPhoto (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Photo; extern const char *Txt_Photo;
extern const char *Txt_Recommended_aspect_ratio; extern const char *Txt_Recommended_aspect_ratio;
extern const char *Txt_Recommended_resolution; extern const char *Txt_Recommended_resolution;
@ -868,7 +868,7 @@ void CtrCfg_RequestPhoto (void)
Txt_XxY_pixels_or_higher); Txt_XxY_pixels_or_higher);
/***** Upload photo *****/ /***** Upload photo *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_File_with_the_photo); HTM_TxtColonNBSP (Txt_File_with_the_photo);
HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*", HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*",
HTM_SUBMIT_ON_CHANGE, HTM_SUBMIT_ON_CHANGE,

3
swad_changelog.h
View File

@ -606,10 +606,11 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia. TODO: Attach pdf files in multimedia.
*/ */
#define Log_PLATFORM_VERSION "SWAD 21.87 (2022-03-30)" #define Log_PLATFORM_VERSION "SWAD 21.87.1 (2022-03-30)"
#define CSS_FILE "swad21.86.7.css" #define CSS_FILE "swad21.86.7.css"
#define JS_FILE "swad21.78.2.js" #define JS_FILE "swad21.78.2.js"
/* /*
Version 21.87.1: Mar 30, 2022 Working on design of dark theme. (323786 lines)
Version 21.87: Mar 30, 2022 Working on design of dark theme. (323833 lines) Version 21.87: Mar 30, 2022 Working on design of dark theme. (323833 lines)
Version 21.86.8: Mar 29, 2022 Working on design of dark theme. (323834 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.7: Mar 28, 2022 Working on design of dark theme. (323823 lines)

3
swad_course.c
View File

@ -2555,7 +2555,6 @@ void Crs_PutLinkToRemoveOldCrss (void)
void Crs_AskRemoveOldCrss (void) void Crs_AskRemoveOldCrss (void)
{ {
extern const char *Hlp_SYSTEM_Maintenance_eliminate_old_courses; extern const char *Hlp_SYSTEM_Maintenance_eliminate_old_courses;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Eliminate_old_courses; extern const char *Txt_Eliminate_old_courses;
extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2;
@ -2573,7 +2572,7 @@ void Crs_AskRemoveOldCrss (void)
Hlp_SYSTEM_Maintenance_eliminate_old_courses,Box_NOT_CLOSABLE); Hlp_SYSTEM_Maintenance_eliminate_old_courses,Box_NOT_CLOSABLE);
/***** Form to request number of months without clicks *****/ /***** Form to request number of months without clicks *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s ",Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2); HTM_TxtF ("%s ",Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"Months\" class=\"INPUT_%s\"", "name=\"Months\" class=\"INPUT_%s\"",

19
swad_enrolment.c
View File

@ -330,7 +330,6 @@ static void Enr_NotifyAfterEnrolment (const struct UsrData *UsrDat,
void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) (void)) void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) (void))
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_nick_email_or_ID; extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Continue; extern const char *Txt_Continue;
@ -341,8 +340,8 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams)
FuncParams (); FuncParams ();
/***** Label *****/ /***** Label *****/
HTM_LABEL_Begin ("for=\"OtherUsrIDNickOrEMail\" class=\"%s RM\"", HTM_LABEL_Begin ("for=\"OtherUsrIDNickOrEMail\" class=\"RM FORM_IN_%s\"",
The_ClassFormInBox[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_nick_email_or_ID); HTM_TxtColonNBSP (Txt_nick_email_or_ID);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -656,7 +655,6 @@ void Enr_PutLinkToRemOldUsrs (void)
void Enr_AskRemoveOldUsrs (void) void Enr_AskRemoveOldUsrs (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Eliminate_old_users; extern const char *Txt_Eliminate_old_users;
extern const char *Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2; extern const char *Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2;
@ -673,7 +671,7 @@ void Enr_AskRemoveOldUsrs (void)
NULL,Box_NOT_CLOSABLE); NULL,Box_NOT_CLOSABLE);
/***** Form to request number of months without clicks *****/ /***** Form to request number of months without clicks *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s ",Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2); HTM_TxtF ("%s ",Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"Months\" class=\"INPUT_%s\"", "name=\"Months\" class=\"INPUT_%s\"",
@ -771,7 +769,6 @@ void Enr_RemoveOldUsrs (void)
static void Enr_PutAreaToEnterUsrsIDs (void) static void Enr_PutAreaToEnterUsrsIDs (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_List_of_nicks_emails_or_IDs; extern const char *Txt_List_of_nicks_emails_or_IDs;
@ -801,7 +798,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
static void Enr_PutActionsRegRemSeveralUsrs (void) static void Enr_PutActionsRegRemSeveralUsrs (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Register_the_users_indicated_in_step_1; extern const char *Txt_Register_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_indicated_in_step_1; extern const char *Txt_Remove_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_not_indicated_in_step_1; extern const char *Txt_Remove_the_users_not_indicated_in_step_1;
@ -809,7 +806,7 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
extern const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1; extern const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1;
/***** Begin list of options *****/ /***** Begin list of options *****/
HTM_UL_Begin ("class=\"LIST_LEFT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_UL_Begin ("class=\"LIST_LEFT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
/***** Register / remove users listed or not listed *****/ /***** Register / remove users listed or not listed *****/
if (Gbl.Hierarchy.Level == HieLvl_CRS) // Course selected if (Gbl.Hierarchy.Level == HieLvl_CRS) // Course selected
@ -1313,7 +1310,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe) bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
bool OptionsShown = false; bool OptionsShown = false;
bool UsrBelongsToCrs = false; bool UsrBelongsToCrs = false;
bool UsrIsDegAdmin = false; bool UsrIsDegAdmin = false;
@ -1348,8 +1345,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
} }
/***** Begin list of options *****/ /***** Begin list of options *****/
HTM_UL_Begin ("class=\"LIST_LEFT %s\"", HTM_UL_Begin ("class=\"LIST_LEFT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Register user in course / Modify user's data *****/ /***** Register user in course / Modify user's data *****/
if (Gbl.Hierarchy.Level == HieLvl_CRS && Gbl.Usrs.Me.Role.Logged >= Rol_STD) if (Gbl.Hierarchy.Level == HieLvl_CRS && Gbl.Usrs.Me.Role.Logged >= Rol_STD)
@ -2071,7 +2067,6 @@ void Enr_UpdateEnrolmentRequests (void)
static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
{ {
extern const char *Hlp_USERS_Requests; extern const char *Hlp_USERS_Requests;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Enrolment_requests; extern const char *Txt_Enrolment_requests;
extern const char *Txt_Scope; extern const char *Txt_Scope;

5
swad_exam.c
View File

@ -1332,7 +1332,6 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
{ {
extern const char *Hlp_ASSESSMENT_Exams_new_exam; extern const char *Hlp_ASSESSMENT_Exams_new_exam;
extern const char *Hlp_ASSESSMENT_Exams_edit_exam; extern const char *Hlp_ASSESSMENT_Exams_edit_exam;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_exam; extern const char *Txt_New_exam;
extern const char *Txt_Edit_exam; extern const char *Txt_Edit_exam;
@ -1382,7 +1381,7 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
/***** Maximum grade *****/ /***** Maximum grade *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Maximum_grade); HTM_TxtColon (Txt_Maximum_grade);
HTM_TD_End (); HTM_TD_End ();
@ -1397,7 +1396,7 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
/***** Visibility of results *****/ /***** Visibility of results *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT %s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Result_visibility); HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End (); HTM_TD_End ();

3
swad_exam_session.c
View File

@ -1063,7 +1063,6 @@ static void ExaSes_PutFormSession (const struct ExaSes_Session *Session)
static void ExaSes_ShowLstGrpsToCreateSession (long SesCod) static void ExaSes_ShowLstGrpsToCreateSession (long SesCod)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
@ -1077,7 +1076,7 @@ static void ExaSes_ShowLstGrpsToCreateSession (long SesCod)
/***** Begin box and table *****/ /***** Begin box and table *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Groups); HTM_TxtColon (Txt_Groups);
HTM_TD_End (); HTM_TD_End ();

5
swad_figure.c
View File

@ -75,7 +75,6 @@ void Fig_ReqShowFigures (void)
static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType) static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType)
{ {
extern const char *Hlp_ANALYTICS_Figures; extern const char *Hlp_ANALYTICS_Figures;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Figures; extern const char *Txt_Figures;
extern const char *Txt_Scope; extern const char *Txt_Scope;
@ -94,7 +93,7 @@ static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType)
Hlp_ANALYTICS_Figures,Box_NOT_CLOSABLE); Hlp_ANALYTICS_Figures,Box_NOT_CLOSABLE);
/***** Compute stats for anywhere, degree or course? *****/ /***** Compute stats for anywhere, degree or course? *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Gbl.Scope.Allowed = 1 << HieLvl_SYS | Gbl.Scope.Allowed = 1 << HieLvl_SYS |
1 << HieLvl_CTY | 1 << HieLvl_CTY |
@ -110,7 +109,7 @@ static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType)
HTM_BR (); HTM_BR ();
/***** Type of statistic *****/ /***** Type of statistic *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Statistic); HTM_TxtColonNBSP (Txt_Statistic);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"FigureType\" class=\"INPUT_%s\"", "name=\"FigureType\" class=\"INPUT_%s\"",

9
swad_form.c
View File

@ -294,7 +294,6 @@ void Frm_FreeAnchorStr (char *Anchor)
void Frm_LabelColumn (const char *TDClass,const char *Id,const char *Label) void Frm_LabelColumn (const char *TDClass,const char *Id,const char *Label)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
/***** Column/cell begin *****/ /***** Column/cell begin *****/
@ -307,11 +306,11 @@ void Frm_LabelColumn (const char *TDClass,const char *Id,const char *Label)
if (Id) if (Id)
{ {
if (Id[0]) if (Id[0])
HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", HTM_LABEL_Begin ("for=\"%s\" class=\"FORM_IN_%s\"",
Id,The_ClassFormInBox[Gbl.Prefs.Theme]); Id,The_Colors[Gbl.Prefs.Theme]);
else else
HTM_LABEL_Begin ("class=\"%s\"", HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_ClassFormInBox[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
} }
else else
HTM_LABEL_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);

7
swad_forum.c
View File

@ -2160,7 +2160,7 @@ static void For_ListForumThrs (struct For_Forums *Forums,
long ThrCodHighlighted, long ThrCodHighlighted,
struct Pagination *PaginationThrs) struct Pagination *PaginationThrs)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES]; extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Thread_with_posts_from_you; extern const char *Txt_Thread_with_posts_from_you;
extern const char *Txt_There_are_new_posts; extern const char *Txt_There_are_new_posts;
@ -2270,8 +2270,8 @@ static void For_ListForumThrs (struct For_Forums *Forums,
Forums,Thr.ThrCod, Forums,Thr.ThrCod,
Thr.Enabled[Dat_STR_TIME], Thr.Enabled[Dat_STR_TIME],
Thr.Subject, Thr.Subject,
Thr.NumUnreadPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] : Thr.NumUnreadPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] : // !!!!!!!!!!!!!!!!!!!!!!
The_ClassFormInBox[Gbl.Prefs.Theme], "FORM_IN",
true); true);
HTM_TD_End (); HTM_TD_End ();
@ -2689,7 +2689,6 @@ static void For_WriteFormForumPst (struct For_Forums *Forums,
{ {
extern const char *Hlp_COMMUNICATION_Forums_new_post; extern const char *Hlp_COMMUNICATION_Forums_new_post;
extern const char *Hlp_COMMUNICATION_Forums_new_thread; extern const char *Hlp_COMMUNICATION_Forums_new_thread;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_post; extern const char *Txt_New_post;
extern const char *Txt_New_thread; extern const char *Txt_New_thread;

5
swad_game.c
View File

@ -1309,7 +1309,6 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games,
{ {
extern const char *Hlp_ASSESSMENT_Games_new_game; extern const char *Hlp_ASSESSMENT_Games_new_game;
extern const char *Hlp_ASSESSMENT_Games_edit_game; extern const char *Hlp_ASSESSMENT_Games_edit_game;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_game; extern const char *Txt_New_game;
extern const char *Txt_Edit_game; extern const char *Txt_Edit_game;
@ -1359,7 +1358,7 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games,
/***** Maximum grade *****/ /***** Maximum grade *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Maximum_grade); HTM_TxtColon (Txt_Maximum_grade);
HTM_TD_End (); HTM_TD_End ();
@ -1374,7 +1373,7 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games,
/***** Visibility of results *****/ /***** Visibility of results *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Result_visibility); HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End (); HTM_TD_End ();

4
swad_group.c
View File

@ -430,7 +430,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void *Args),void *Ar
static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNETs) static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNETs)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_All_groups; extern const char *Txt_All_groups;
bool ICanSelUnselGroup; bool ICanSelUnselGroup;
@ -453,7 +453,7 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE
} }
HTM_DIV_Begin ("class=\"CONTEXT_OPT\""); HTM_DIV_Begin ("class=\"CONTEXT_OPT\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AllGroups",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AllGroups",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s", "value=\"Y\"%s",
ICanSelUnselGroup ? (Gbl.Usrs.ClassPhoto.AllGroups ? " checked=\"checked\"" ICanSelUnselGroup ? (Gbl.Usrs.ClassPhoto.AllGroups ? " checked=\"checked\""

3
swad_indicator.c
View File

@ -94,7 +94,6 @@ static unsigned Ind_GetAndUpdateNumIndicatorsCrs (long CrsCod);
void Ind_ReqIndicatorsCourses (void) void Ind_ReqIndicatorsCourses (void)
{ {
extern const char *Hlp_ANALYTICS_Indicators; extern const char *Hlp_ANALYTICS_Indicators;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_Types_of_degree; extern const char *Txt_Types_of_degree;
@ -190,7 +189,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Selection of the number of indicators */ /* Selection of the number of indicators */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT %s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Number_of_indicators); HTM_TxtColon (Txt_Number_of_indicators);
HTM_TD_End (); HTM_TD_End ();

12
swad_info.c
View File

@ -886,7 +886,6 @@ void Inf_SetInfoSrc (void)
void Inf_FormsToSelSendInfo (void) void Inf_FormsToSelSendInfo (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Source_of_information; extern const char *Txt_Source_of_information;
extern const char *Txt_INFO_SRC_FULL_TEXT[Inf_NUM_SOURCES]; extern const char *Txt_INFO_SRC_FULL_TEXT[Inf_NUM_SOURCES];
@ -969,8 +968,8 @@ void Inf_FormsToSelSendInfo (void)
HTM_TD_Begin ("class=\"LT%s\"", HTM_TD_Begin ("class=\"LT%s\"",
InfoSrc == FromDB.Src ? " BG_HIGHLIGHT" : InfoSrc == FromDB.Src ? " BG_HIGHLIGHT" :
""); "");
HTM_LABEL_Begin ("for=\"InfoSrc%u\" class=\"%s\"", HTM_LABEL_Begin ("for=\"InfoSrc%u\" class=\"FORM_IN_%s\"",
(unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme]); (unsigned) InfoSrc,The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Txt_INFO_SRC_FULL_TEXT[InfoSrc]); HTM_Txt (Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
HTM_LABEL_End (); HTM_LABEL_End ();
if (Txt_INFO_SRC_HELP[InfoSrc]) if (Txt_INFO_SRC_HELP[InfoSrc])
@ -1078,7 +1077,7 @@ void Inf_FormToEnterRichTextEditor (Inf_Src_t InfoSrc)
void Inf_FormToSendPage (Inf_Src_t InfoSrc) void Inf_FormToSendPage (Inf_Src_t InfoSrc)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_File; extern const char *Txt_File;
extern const char *Txt_Upload_file; extern const char *Txt_Upload_file;
@ -1087,7 +1086,7 @@ void Inf_FormToSendPage (Inf_Src_t InfoSrc)
/***** File *****/ /***** File *****/
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_File); HTM_TxtColonNBSP (Txt_File);
HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".htm,.html,.pdf,.zip", HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".htm,.html,.pdf,.zip",
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
@ -1108,7 +1107,6 @@ void Inf_FormToSendPage (Inf_Src_t InfoSrc)
void Inf_FormToSendURL (Inf_Src_t InfoSrc) void Inf_FormToSendURL (Inf_Src_t InfoSrc)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_URL; extern const char *Txt_URL;
extern const char *Txt_Send_URL; extern const char *Txt_Send_URL;
@ -1133,7 +1131,7 @@ void Inf_FormToSendURL (Inf_Src_t InfoSrc)
Gbl.Crs.Info.URL[0] = '\0'; Gbl.Crs.Info.URL[0] = '\0';
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_URL); HTM_TxtColonNBSP (Txt_URL);
HTM_INPUT_URL ("InfoSrcURL",Gbl.Crs.Info.URL,HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_URL ("InfoSrcURL",Gbl.Crs.Info.URL,HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"50\" class=\"INPUT_%s\"", "size=\"50\" class=\"INPUT_%s\"",

8
swad_institution.c
View File

@ -2274,7 +2274,6 @@ static void Ins_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
const char *TxtFigure) const char *TxtFigure)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institution; extern const char *Txt_Institution;
unsigned NumIns; unsigned NumIns;
@ -2305,7 +2304,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
NumberThisRow = Ins_GetInsAndStat (&Ins,*mysql_res); NumberThisRow = Ins_GetInsAndStat (&Ins,*mysql_res);
/***** Write link to institution *****/ /***** Write link to institution *****/
HTM_TD_Begin ("class=\"%s CM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"CM FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
Ins_DrawInstitutionLogoWithLink (&Ins,40); Ins_DrawInstitutionLogoWithLink (&Ins,40);
HTM_BR (); HTM_BR ();
HTM_Unsigned (NumberThisRow); HTM_Unsigned (NumberThisRow);
@ -2347,8 +2347,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
HTM_TD_End (); HTM_TD_End ();
/***** Write link to institution *****/ /***** Write link to institution *****/
HTM_TD_Begin ("class=\"%s LM\"", HTM_TD_Begin ("class=\"LM FORM_IN_%s\"",
The_ClassFormInBox[Gbl.Prefs.Theme]); The_Colors[Gbl.Prefs.Theme]);
/* Icon and name of this institution */ /* Icon and name of this institution */
Frm_BeginForm (ActSeeInsInf); Frm_BeginForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod); Ins_PutParamInsCod (Ins.InsCod);

4
swad_logo.c
View File

@ -247,7 +247,7 @@ void Lgo_PutIconToChangeLogo (HieLvl_Level_t Scope)
void Lgo_RequestLogo (HieLvl_Level_t Scope) void Lgo_RequestLogo (HieLvl_Level_t Scope)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Logo; extern const char *Txt_Logo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y; extern const char *Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y;
extern const char *Txt_File_with_the_logo; extern const char *Txt_File_with_the_logo;
@ -304,7 +304,7 @@ void Lgo_RequestLogo (HieLvl_Level_t Scope)
64,64); 64,64);
/***** Upload logo *****/ /***** Upload logo *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_File_with_the_logo); HTM_TxtColonNBSP (Txt_File_with_the_logo);
HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/png", HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/png",
HTM_SUBMIT_ON_CHANGE, HTM_SUBMIT_ON_CHANGE,

3
swad_match.c
View File

@ -1336,7 +1336,6 @@ static void Mch_PutFormNewMatch (const struct Gam_Game *Game)
static void Mch_ShowLstGrpsToEditMatch (long MchCod) static void Mch_ShowLstGrpsToEditMatch (long MchCod)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
@ -1350,7 +1349,7 @@ static void Mch_ShowLstGrpsToEditMatch (long MchCod)
/***** Begin box and table *****/ /***** Begin box and table *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Groups); HTM_TxtColon (Txt_Groups);
HTM_TD_End (); HTM_TD_End ();

16
swad_message.c
View File

@ -218,7 +218,6 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages,
char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
{ {
extern const char *Hlp_COMMUNICATION_Messages_write; extern const char *Hlp_COMMUNICATION_Messages_write;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Reply_message; extern const char *Txt_Reply_message;
extern const char *Txt_New_message; extern const char *Txt_New_message;
@ -337,7 +336,7 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages,
/***** "To:" section (recipients) *****/ /***** "To:" section (recipients) *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_MSG_To); HTM_TxtColon (Txt_MSG_To);
HTM_TD_End (); HTM_TD_End ();
@ -581,7 +580,6 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messages, static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messages,
char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Content; extern const char *Txt_MSG_Content;
@ -1811,7 +1809,6 @@ void Msg_PutHiddenParamsMsgsFilters (void *Messages)
static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Messages) static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Messages)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Messages_received_from_A_COURSE; extern const char *Txt_Messages_received_from_A_COURSE;
extern const char *Txt_Messages_sent_from_A_COURSE; extern const char *Txt_Messages_sent_from_A_COURSE;
@ -1839,7 +1836,7 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me
NumCrss = GetDistinctCrssInMyRcvMsgs[Messages->TypeOfMessages] (&mysql_res); NumCrss = GetDistinctCrssInMyRcvMsgs[Messages->TypeOfMessages] (&mysql_res);
/***** Course selection *****/ /***** Course selection *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;",*TxtSelector[Messages->TypeOfMessages]); HTM_TxtF ("%s&nbsp;",*TxtSelector[Messages->TypeOfMessages]);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"FilterCrsCod\" class=\"INPUT_%s\"", "name=\"FilterCrsCod\" class=\"INPUT_%s\"",
@ -1877,7 +1874,6 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me
static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages) static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_MSG_From; extern const char *Txt_MSG_From;
extern const char *Txt_MSG_To; extern const char *Txt_MSG_To;
@ -1896,7 +1892,7 @@ static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages)
/***** Filter authors/recipients *****/ /***** Filter authors/recipients *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (*TxtFromTo[Messages->TypeOfMessages]); HTM_TxtColonNBSP (*TxtFromTo[Messages->TypeOfMessages]);
HTM_INPUT_SEARCH ("FilterFromTo",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3, HTM_INPUT_SEARCH ("FilterFromTo",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3,
Messages->FilterFromTo, Messages->FilterFromTo,
@ -1907,7 +1903,7 @@ static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages)
/***** Filter message content *****/ /***** Filter message content *****/
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_MSG_Content); HTM_TxtColonNBSP (Txt_MSG_Content);
HTM_INPUT_SEARCH ("FilterContent",Msg_MAX_CHARS_FILTER_CONTENT, HTM_INPUT_SEARCH ("FilterContent",Msg_MAX_CHARS_FILTER_CONTENT,
Messages->FilterContent, Messages->FilterContent,
@ -1928,11 +1924,11 @@ static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages)
static void Msg_ShowFormToShowOnlyUnreadMessages (const struct Msg_Messages *Messages) static void Msg_ShowFormToShowOnlyUnreadMessages (const struct Msg_Messages *Messages)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_only_unread_messages; extern const char *Txt_only_unread_messages;
/***** Put checkbox to select whether to show only unread (received) messages *****/ /***** Put checkbox to select whether to show only unread (received) messages *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("OnlyUnreadMsgs",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("OnlyUnreadMsgs",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s", "value=\"Y\"%s",
Messages->ShowOnlyUnreadMsgs ? " checked=\"checked\"" : Messages->ShowOnlyUnreadMsgs ? " checked=\"checked\"" :

5
swad_network.c
View File

@ -192,7 +192,6 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
void Net_ShowFormMyWebsAndSocialNets (void) void Net_ShowFormMyWebsAndSocialNets (void)
{ {
extern const char *Hlp_PROFILE_Webs; extern const char *Hlp_PROFILE_Webs;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Webs_social_networks; extern const char *Txt_Webs_social_networks;
extern const char *Txt_Save_changes; extern const char *Txt_Save_changes;
@ -229,8 +228,8 @@ void Net_ShowFormMyWebsAndSocialNets (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT LM\""); HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", HTM_LABEL_Begin ("for=\"%s\" class=\"FORM_IN_%s\"",
StrName,The_ClassFormInBox[Gbl.Prefs.Theme]); StrName,The_Colors[Gbl.Prefs.Theme]);
Ico_PutIcon (Net_WebsAndSocialNetworksIcons[NumURL],Ico_BLACK, Ico_PutIcon (Net_WebsAndSocialNetworksIcons[NumURL],Ico_BLACK,
Net_WebsAndSocialNetworksTitle[NumURL], Net_WebsAndSocialNetworksTitle[NumURL],
"CONTEXT_OPT CONTEXT_ICO16x16"); "CONTEXT_OPT CONTEXT_ICO16x16");

5
swad_notification.c
View File

@ -1503,7 +1503,7 @@ void Ntf_MarkAllNotifAsSeen (void)
void Ntf_PutFormChangeNotifSentByEMail (void) void Ntf_PutFormChangeNotifSentByEMail (void)
{ {
extern const char *Hlp_PROFILE_Settings_notifications; extern const char *Hlp_PROFILE_Settings_notifications;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Save_changes; extern const char *Txt_Save_changes;
extern const char *Txt_Notifications; extern const char *Txt_Notifications;
extern const char *Txt_Create_BR_notification; extern const char *Txt_Create_BR_notification;
@ -1543,7 +1543,8 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
{ {
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]); HTM_TxtColon (Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]);
HTM_TD_End (); HTM_TD_End ();

6
swad_pagination.c
View File

@ -143,7 +143,7 @@ void Pag_WriteLinksToPagesCentered (Pag_WhatPaginate_t WhatPaginate,
{ {
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Pag_WriteLinksToPages (WhatPaginate,Pagination,Context,Cod, Pag_WriteLinksToPages (WhatPaginate,Pagination,Context,Cod,
true,NULL,"PAG_TXT",false); true,NULL,"PAG_TXT",false); // !!!!!!!!!!!!!!!!!!!!!!!!!!
HTM_DIV_End (); HTM_DIV_End ();
} }
} }
@ -159,6 +159,7 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
const char *Subject,const char *ClassTxt, const char *Subject,const char *ClassTxt,
bool LinkToPagCurrent) bool LinkToPagCurrent)
{ {
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Page_X_of_Y; extern const char *Txt_Page_X_of_Y;
extern const char *Txt_FORUM_Post_banned; extern const char *Txt_FORUM_Post_banned;
Grp_WhichGroups_t WhichGroups; Grp_WhichGroups_t WhichGroups;
@ -266,7 +267,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
default: default:
break; break;
} }
if (asprintf (&ClassLink,"BT_LINK LT %s",ClassTxt) < 0) if (asprintf (&ClassLink,"BT_LINK LT %s_%s",
ClassTxt,The_Colors[Gbl.Prefs.Theme]) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();
if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0) if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();

11
swad_password.c
View File

@ -251,7 +251,6 @@ static void Pwd_PutLinkToSendNewPasswdParams (void *UsrIdLogin)
void Pwd_ShowFormSendNewPwd (void) void Pwd_ShowFormSendNewPwd (void)
{ {
extern const char *Hlp_PROFILE_Password; extern const char *Hlp_PROFILE_Password;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_If_you_have_forgotten_your_password_; extern const char *Txt_If_you_have_forgotten_your_password_;
extern const char *Txt_Forgotten_password; extern const char *Txt_Forgotten_password;
@ -270,7 +269,7 @@ void Pwd_ShowFormSendNewPwd (void)
Ale_ShowAlert (Ale_INFO,Txt_If_you_have_forgotten_your_password_); Ale_ShowAlert (Ale_INFO,Txt_If_you_have_forgotten_your_password_);
/***** User's ID/nickname *****/ /***** User's ID/nickname *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_nick_email_or_ID); HTM_TxtColonNBSP (Txt_nick_email_or_ID);
HTM_INPUT_TEXT ("UsrId",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin, HTM_INPUT_TEXT ("UsrId",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin,
HTM_DONT_SUBMIT_ON_CHANGE, HTM_DONT_SUBMIT_ON_CHANGE,
@ -581,7 +580,6 @@ bool Pwd_FastCheckIfPasswordSeemsGood (const char *PlainPassword)
void Pwd_ShowFormChgMyPwd (void) void Pwd_ShowFormChgMyPwd (void)
{ {
extern const char *Hlp_PROFILE_Password; extern const char *Hlp_PROFILE_Password;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Before_going_to_any_other_option_you_must_create_your_password; extern const char *Txt_Before_going_to_any_other_option_you_must_create_your_password;
extern const char *Txt_Your_password_is_not_secure_enough; extern const char *Txt_Your_password_is_not_secure_enough;
@ -667,7 +665,6 @@ void Pwd_ShowFormChgMyPwd (void)
void Pwd_PutFormToGetNewPasswordOnce (void) void Pwd_PutFormToGetNewPasswordOnce (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Password; extern const char *Txt_Password;
extern const char *Txt_HELP_password; extern const char *Txt_HELP_password;
@ -694,7 +691,6 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
void Pwd_PutFormToGetNewPasswordTwice (void) void Pwd_PutFormToGetNewPasswordTwice (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_password; extern const char *Txt_New_password;
extern const char *Txt_Retype_new_password; extern const char *Txt_Retype_new_password;
@ -792,7 +788,6 @@ void Pwd_ShowFormChgOtherUsrPwd (void)
void Pwd_AskForConfirmationOnDangerousAction (void) void Pwd_AskForConfirmationOnDangerousAction (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_I_understand_that_this_action_can_not_be_undone; extern const char *Txt_I_understand_that_this_action_can_not_be_undone;
extern const char *Txt_For_security_enter_your_password; extern const char *Txt_For_security_enter_your_password;
@ -800,7 +795,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
HTM_DIV_Begin ("class=\"CM\" style=\"margin:12px;\""); HTM_DIV_Begin ("class=\"CM\" style=\"margin:12px;\"");
/***** Checkbox *****/ /***** Checkbox *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("Consent",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("Consent",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\""); "value=\"Y\"");
HTM_Txt (Txt_I_understand_that_this_action_can_not_be_undone); HTM_Txt (Txt_I_understand_that_this_action_can_not_be_undone);
@ -809,7 +804,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
HTM_BR (); HTM_BR ();
/***** Password *****/ /***** Password *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_For_security_enter_your_password); HTM_TxtColonNBSP (Txt_For_security_enter_your_password);
HTM_INPUT_PASSWORD ("OthUsrPwd",NULL,"off",true, HTM_INPUT_PASSWORD ("OthUsrPwd",NULL,"off",true,
"class=\"INPUT_%s\"", "class=\"INPUT_%s\"",

7
swad_photo.c
View File

@ -293,7 +293,7 @@ static void Pho_ReqOtherUsrPhoto (void)
static void Pho_ReqPhoto (const struct UsrData *UsrDat) static void Pho_ReqPhoto (const struct UsrData *UsrDat)
{ {
extern const char *Hlp_PROFILE_Photo; extern const char *Hlp_PROFILE_Photo;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Photo; extern const char *Txt_Photo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_JPEG_format_; extern const char *Txt_You_can_send_a_file_with_an_image_in_JPEG_format_;
extern const char *Txt_File_with_the_photo; extern const char *Txt_File_with_the_photo;
@ -332,7 +332,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat)
Ale_ShowAlert (Ale_INFO,Txt_You_can_send_a_file_with_an_image_in_JPEG_format_); Ale_ShowAlert (Ale_INFO,Txt_You_can_send_a_file_with_an_image_in_JPEG_format_);
/***** Form to upload photo *****/ /***** Form to upload photo *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_File_with_the_photo); HTM_TxtColonNBSP (Txt_File_with_the_photo);
HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*", HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*",
HTM_SUBMIT_ON_CHANGE,NULL); HTM_SUBMIT_ON_CHANGE,NULL);
@ -1783,7 +1783,6 @@ static void Pho_PutParamsDegPhoto (void *DegPhotos)
static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos) static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Average_type; extern const char *Txt_Average_type;
extern const char *Txt_AVERAGE_PHOTO_TYPES[Pho_NUM_AVERAGE_PHOTO_TYPES]; extern const char *Txt_AVERAGE_PHOTO_TYPES[Pho_NUM_AVERAGE_PHOTO_TYPES];
@ -1850,7 +1849,6 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void)
static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *DegPhotos) static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *DegPhotos)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Size_of_photos; extern const char *Txt_Size_of_photos;
extern const char *Txt_STAT_DEGREE_PHOTO_SIZE[Pho_NUM_HOW_COMPUTE_PHOTO_SIZES]; extern const char *Txt_STAT_DEGREE_PHOTO_SIZE[Pho_NUM_HOW_COMPUTE_PHOTO_SIZES];
@ -1917,7 +1915,6 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void)
static void Pho_PutSelectorForHowOrderDegrees (const struct Pho_DegPhotos *DegPhotos) static void Pho_PutSelectorForHowOrderDegrees (const struct Pho_DegPhotos *DegPhotos)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Sort_degrees_by; extern const char *Txt_Sort_degrees_by;
extern const char *Txt_STAT_DEGREE_PHOTO_ORDER[Pho_NUM_HOW_ORDER_DEGREES]; extern const char *Txt_STAT_DEGREE_PHOTO_ORDER[Pho_NUM_HOW_ORDER_DEGREES];

3
swad_privacy.c
View File

@ -161,7 +161,6 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
Pri_Visibility_t CurrentVisibilityInDB, Pri_Visibility_t CurrentVisibilityInDB,
unsigned MaskAllowedVisibility) unsigned MaskAllowedVisibility)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY]; extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY];
Pri_Visibility_t Visibility; Pri_Visibility_t Visibility;
@ -169,7 +168,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Select visibility *****/ /***** Select visibility *****/
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (TxtLabel); HTM_TxtColon (TxtLabel);
HTM_TD_End (); HTM_TD_End ();

3
swad_profile.c
View File

@ -175,7 +175,6 @@ void Prf_RequestUserProfile (void)
{ {
extern const char *Hlp_START_Profiles_view_public_profile; extern const char *Hlp_START_Profiles_view_public_profile;
extern const char *Txt_Another_user_s_profile; extern const char *Txt_Another_user_s_profile;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Nickname; extern const char *Txt_Nickname;
extern const char *Txt_Continue; extern const char *Txt_Continue;
@ -201,7 +200,7 @@ void Prf_RequestUserProfile (void)
/***** Form to request user's @nickname *****/ /***** Form to request user's @nickname *****/
/* By default, the nickname is filled with my nickname /* By default, the nickname is filled with my nickname
If no user logged ==> the nickname is empty */ If no user logged ==> the nickname is empty */
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Nickname); HTM_TxtColonNBSP (Txt_Nickname);
snprintf (NickWithArr,sizeof (NickWithArr),"@%s", snprintf (NickWithArr,sizeof (NickWithArr),"@%s",

15
swad_project.c
View File

@ -1666,12 +1666,12 @@ static void Prj_PutWarningIcon (void)
static void Prj_PutIconToToggleProject (unsigned UniqueId, static void Prj_PutIconToToggleProject (unsigned UniqueId,
const char *Icon,const char *Text) const char *Icon,const char *Text)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
/***** Link to toggle on/off some fields of project *****/ /***** Link to toggle on/off some fields of project *****/
HTM_A_Begin ("href=\"\" title=\"%s\" class=\"%s\"" HTM_A_Begin ("href=\"\" title=\"%s\" class=\"FORM_IN_%s\""
" onclick=\"toggleProject('%u');return false;\"", " onclick=\"toggleProject('%u');return false;\"",
Text,The_ClassFormInBox[Gbl.Prefs.Theme], Text,The_Colors[Gbl.Prefs.Theme],
UniqueId); UniqueId);
Ico_PutIconTextLink (Icon,Ico_BLACK,Text); Ico_PutIconTextLink (Icon,Ico_BLACK,Text);
HTM_A_End (); HTM_A_End ();
@ -3297,7 +3297,6 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
{ {
extern const char *Hlp_ASSESSMENT_Projects_new_project; extern const char *Hlp_ASSESSMENT_Projects_new_project;
extern const char *Hlp_ASSESSMENT_Projects_edit_project; extern const char *Hlp_ASSESSMENT_Projects_edit_project;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_project; extern const char *Txt_New_project;
extern const char *Txt_Edit_project; extern const char *Txt_Edit_project;
@ -3408,7 +3407,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
/* Assigned? */ /* Assigned? */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Assigned_QUESTION); HTM_TxtColon (Txt_Assigned_QUESTION);
HTM_TD_End (); HTM_TD_End ();
@ -3428,7 +3427,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
/* Number of students */ /* Number of students */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Number_of_students); HTM_TxtColon (Txt_Number_of_students);
HTM_TD_End (); HTM_TD_End ();
@ -3444,7 +3443,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects,
/* Proposal */ /* Proposal */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Proposal); HTM_TxtColon (Txt_Proposal);
HTM_TD_End (); HTM_TD_End ();
@ -3518,7 +3517,6 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
const char *Label,char *TxtField, const char *Label,char *TxtField,
unsigned NumRows,bool Required) unsigned NumRows,bool Required)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
/***** Description *****/ /***** Description *****/
@ -3751,7 +3749,6 @@ static bool Prj_CheckIfICanConfigAllProjects (void)
void Prj_ShowFormConfig (void) void Prj_ShowFormConfig (void)
{ {
extern const char *Hlp_ASSESSMENT_Projects; extern const char *Hlp_ASSESSMENT_Projects;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Configure_projects; extern const char *Txt_Configure_projects;
extern const char *Txt_Editable; extern const char *Txt_Editable;
extern const char *Txt_Editable_by_non_editing_teachers; extern const char *Txt_Editable_by_non_editing_teachers;

49
swad_question.c
View File

@ -194,7 +194,6 @@ void Qst_ShowFormRequestEditQsts (struct Qst_Questions *Questions)
void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes) void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Types_of_answers; extern const char *Txt_Types_of_answers;
extern const char *Txt_All_types_of_answers; extern const char *Txt_All_types_of_answers;
@ -207,7 +206,7 @@ void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Label *****/ /***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Types_of_answers); HTM_TxtColon (Txt_Types_of_answers);
HTM_TD_End (); HTM_TD_End ();
@ -218,7 +217,8 @@ void Qst_ShowFormAnswerTypes (const struct Qst_AnswerTypes *AnswerTypes)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AllAnsTypes",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AllAnsTypes",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s onclick=\"togglecheckChildren(this,'AnswerType');\"", "value=\"Y\"%s onclick=\"togglecheckChildren(this,'AnswerType');\"",
AnswerTypes->All ? " checked=\"checked\"" : AnswerTypes->All ? " checked=\"checked\"" :
@ -648,7 +648,6 @@ void Qst_WriteQstStem (const char *Stem,const char *ClassStem,bool Visible)
void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia, void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia,
bool OptionsDisabled) bool OptionsDisabled)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_No_image_video; extern const char *Txt_No_image_video;
extern const char *Txt_Current_image_video; extern const char *Txt_Current_image_video;
@ -666,7 +665,7 @@ void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia,
HTM_DIV_Begin ("class=\"Tst_MED_EDIT_FORM\""); HTM_DIV_Begin ("class=\"Tst_MED_EDIT_FORM\"");
/***** Choice 1: No media *****/ /***** Choice 1: No media *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO (ParamUploadMedia.Action,false, HTM_INPUT_RADIO (ParamUploadMedia.Action,false,
"value=\"%u\"%s", "value=\"%u\"%s",
(unsigned) Med_ACTION_NO_MEDIA, (unsigned) Med_ACTION_NO_MEDIA,
@ -676,7 +675,7 @@ void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia,
HTM_BR (); HTM_BR ();
/***** Choice 2: Current media *****/ /***** Choice 2: Current media *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO (ParamUploadMedia.Action,false, HTM_INPUT_RADIO (ParamUploadMedia.Action,false,
"value=\"%u\"%s checked=\"checked\"", "value=\"%u\"%s checked=\"checked\"",
(unsigned) Med_ACTION_KEEP_MEDIA, (unsigned) Med_ACTION_KEEP_MEDIA,
@ -689,7 +688,7 @@ void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia,
/***** Choice 3: Change media *****/ /***** Choice 3: Change media *****/
UniqueId++; UniqueId++;
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO (ParamUploadMedia.Action,false, HTM_INPUT_RADIO (ParamUploadMedia.Action,false,
"id=\"chg_img_%u\" value=\"%u\"%s", "id=\"chg_img_%u\" value=\"%u\"%s",
UniqueId, UniqueId,
@ -1270,11 +1269,11 @@ void Qst_ListOneOrMoreQstsForSelectionForGame (struct Gam_Games *Games,
void Qst_PutCheckboxToSelectAllQuestions (void) void Qst_PutCheckboxToSelectAllQuestions (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_All_questions; extern const char *Txt_All_questions;
/***** Checkbox to select all listed questions *****/ /***** Checkbox to select all listed questions *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AllQsts",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AllQsts",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\" onclick=\"togglecheckChildren(this,'QstCods');\""); "value=\"Y\" onclick=\"togglecheckChildren(this,'QstCods');\"");
HTM_TxtF ("&nbsp;%s",Txt_All_questions); HTM_TxtF ("&nbsp;%s",Txt_All_questions);
@ -1868,7 +1867,6 @@ void Qst_ShowFormEditOneQst (void)
void Qst_PutFormEditOneQst (struct Qst_Question *Question) void Qst_PutFormEditOneQst (struct Qst_Question *Question)
{ {
extern const char *Hlp_ASSESSMENT_Questions_writing_a_question; extern const char *Hlp_ASSESSMENT_Questions_writing_a_question;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Question_code_X; extern const char *Txt_Question_code_X;
extern const char *Txt_New_question; extern const char *Txt_New_question;
@ -1939,7 +1937,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/***** Write the tags *****/ /***** Write the tags *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Tags); HTM_TxtColon (Txt_Tags);
HTM_TD_End (); HTM_TD_End ();
@ -2038,7 +2036,8 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
false); false);
/***** Feedback *****/ /***** Feedback *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional); HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional);
HTM_BR (); HTM_BR ();
HTM_TEXTAREA_Begin ("name=\"Feedback\" rows=\"2\"" HTM_TEXTAREA_Begin ("name=\"Feedback\" rows=\"2\""
@ -2055,11 +2054,11 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/***** Type of answer *****/ /***** Type of answer *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Type); HTM_TxtColon (Txt_Type);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
for (AnsType = (Qst_AnswerType_t) 0; for (AnsType = (Qst_AnswerType_t) 0;
AnsType <= (Qst_AnswerType_t) (Qst_NUM_ANS_TYPES - 1); AnsType <= (Qst_AnswerType_t) (Qst_NUM_ANS_TYPES - 1);
AnsType++) AnsType++)
@ -2082,12 +2081,14 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/* Integer answer */ /* Integer answer */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Answers); HTM_TxtColon (Txt_Answers);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"LT\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Integer_number); HTM_TxtColonNBSP (Txt_Integer_number);
snprintf (StrInteger,sizeof (StrInteger),"%ld",Question->Answer.Integer); snprintf (StrInteger,sizeof (StrInteger),"%ld",Question->Answer.Integer);
HTM_INPUT_TEXT ("AnsInt",Cns_MAX_DECIMAL_DIGITS_LONG,StrInteger, HTM_INPUT_TEXT ("AnsInt",Cns_MAX_DECIMAL_DIGITS_LONG,StrInteger,
@ -2128,7 +2129,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_TD_Empty (1); HTM_TD_Empty (1);
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"LT\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("Shuffle",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("Shuffle",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s%s", "value=\"Y\"%s%s",
Question->Answer.Shuffle ? " checked=\"checked\"" : Question->Answer.Shuffle ? " checked=\"checked\"" :
@ -2192,8 +2193,8 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_TD_End (); HTM_TD_End ();
/***** Center column: letter of the answer and expand / contract icon *****/ /***** Center column: letter of the answer and expand / contract icon *****/
HTM_TD_Begin ("class=\"%s Tst_EDI_ANS_CENTER_COL %s\"", HTM_TD_Begin ("class=\"FORM_IN_%s Tst_EDI_ANS_CENTER_COL %s\"",
The_ClassFormInBox[Gbl.Prefs.Theme], The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_TxtF ("%c)",'a' + (char) NumOpt); HTM_TxtF ("%c)",'a' + (char) NumOpt);
@ -2250,7 +2251,8 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
OptionsDisabled); OptionsDisabled);
/* Feedback */ /* Feedback */
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional); HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional);
HTM_BR (); HTM_BR ();
HTM_TEXTAREA_Begin ("name=\"FbStr%u\" rows=\"2\"" HTM_TEXTAREA_Begin ("name=\"FbStr%u\" rows=\"2\""
@ -2299,11 +2301,10 @@ void Qst_PutFloatInputField (const char *Label,const char *Field,
const struct Qst_Question *Question, const struct Qst_Question *Question,
unsigned Index) unsigned Index)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
char StrDouble[32]; char StrDouble[32];
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;",Label); HTM_TxtF ("%s&nbsp;",Label);
snprintf (StrDouble,sizeof (StrDouble),"%.15lg", snprintf (StrDouble,sizeof (StrDouble),"%.15lg",
Question->Answer.FloatingPoint[Index]); Question->Answer.FloatingPoint[Index]);
@ -2323,9 +2324,9 @@ void Qst_PutFloatInputField (const char *Label,const char *Field,
void Qst_PutTFInputField (const struct Qst_Question *Question, void Qst_PutTFInputField (const struct Qst_Question *Question,
const char *Label,char Value) const char *Label,char Value)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO ("AnsTF",false, HTM_INPUT_RADIO ("AnsTF",false,
"value=\"%c\"%s%s required=\"required\"", "value=\"%c\"%s%s required=\"required\"",
Value, Value,

4
swad_question_import.c
View File

@ -136,7 +136,7 @@ void QstImp_PutIconToImportQuestions (void)
void QstImp_ShowFormImpQstsFromXML (void) void QstImp_ShowFormImpQstsFromXML (void)
{ {
extern const char *Hlp_ASSESSMENT_Tests; extern const char *Hlp_ASSESSMENT_Tests;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Import_questions; extern const char *Txt_Import_questions;
extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions; extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions;
extern const char *Txt_XML_file; extern const char *Txt_XML_file;
@ -151,7 +151,7 @@ void QstImp_ShowFormImpQstsFromXML (void)
/***** Write a form to import questions *****/ /***** Write a form to import questions *****/
Frm_BeginForm (ActImpTstQst); Frm_BeginForm (ActImpTstQst);
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_XML_file); HTM_TxtColonNBSP (Txt_XML_file);
HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".xml", HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".xml",
HTM_SUBMIT_ON_CHANGE, HTM_SUBMIT_ON_CHANGE,

13
swad_record.c
View File

@ -1401,7 +1401,7 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
static void Rec_ShowLinkToPrintPreviewOfRecords (void) static void Rec_ShowLinkToPrintPreviewOfRecords (void)
{ {
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES]; extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Print; extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page; extern const char *Txt_record_cards_per_page;
unsigned i; unsigned i;
@ -1412,7 +1412,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print); Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_Txt ("("); HTM_Txt ("(");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"RecsPerPag\""); "name=\"RecsPerPag\"");
@ -1577,7 +1577,6 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
struct UsrData *UsrDat,const char *Anchor) struct UsrData *UsrDat,const char *Anchor)
{ {
extern const char *Hlp_USERS_Students_course_record_card; extern const char *Hlp_USERS_Students_course_record_card;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY]; extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY];
extern const char *Txt_Save_changes; extern const char *Txt_Save_changes;
@ -1718,9 +1717,10 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/* Name of the field */ /* Name of the field */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT %s RT %s\"", HTM_TD_Begin ("class=\"REC_C1_BOT %s_%s RT %s\"",
ICanEditThisField ? The_ClassFormInBox[Gbl.Prefs.Theme] : ICanEditThisField ? "FORM_IN" :
"REC_DAT_SMALL", "REC_DAT_SMALL", // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ()); The_GetColorRows ());
HTM_TxtColon (Gbl.Crs.Records.LstFields.Lst[NumField].Name); HTM_TxtColon (Gbl.Crs.Records.LstFields.Lst[NumField].Name);
if (TypeOfView == Rec_CRS_LIST_ONE_RECORD || if (TypeOfView == Rec_CRS_LIST_ONE_RECORD ||
@ -3800,7 +3800,6 @@ void Rec_ShowMySharedRecordAndMore (void)
static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
{ {
extern const char *Hlp_PROFILE_Institution; extern const char *Hlp_PROFILE_Institution;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Institution_center_and_department; extern const char *Txt_Institution_center_and_department;
extern const char *Txt_Institution; extern const char *Txt_Institution;

5
swad_search.c
View File

@ -99,7 +99,6 @@ void Sch_ReqSysSearch (void)
static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,HieLvl_Level_t DefaultScope) static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,HieLvl_Level_t DefaultScope)
{ {
extern const char *Hlp_START_Search; extern const char *Hlp_START_Search;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_SEARCH_X_in_Y; extern const char *Txt_SEARCH_X_in_Y;
@ -149,7 +148,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
/***** Scope (whole platform, current country, current institution, /***** Scope (whole platform, current country, current institution,
current center, current degree or current course) *****/ current center, current degree or current course) *****/
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Gbl.Scope.Allowed = 1 << HieLvl_SYS | Gbl.Scope.Allowed = 1 << HieLvl_SYS |
1 << HieLvl_CTY | 1 << HieLvl_CTY |
@ -167,7 +166,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
Sch_PutInputStringToSearch (""); Sch_PutInputStringToSearch ("");
/***** What to search? *****/ /***** What to search? *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF (" %s&nbsp;",Txt_SEARCH_X_in_Y); HTM_TxtF (" %s&nbsp;",Txt_SEARCH_X_in_Y);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"WhatToSearch\"" "name=\"WhatToSearch\""

22
swad_statistic.c
View File

@ -221,7 +221,6 @@ void Sta_AskShowCrsHits (void)
static void Sta_PutFormCrsHits (struct Sta_Stats *Stats) static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
{ {
extern const char *Hlp_ANALYTICS_Visits_visits_to_course; extern const char *Hlp_ANALYTICS_Visits_visits_to_course;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Statistics_of_visits_to_the_course_X; extern const char *Txt_Statistics_of_visits_to_the_course_X;
extern const char *Txt_Users; extern const char *Txt_Users;
@ -315,11 +314,13 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Users); HTM_TxtColon (Txt_Users);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TABLE_Begin (NULL); HTM_TABLE_Begin (NULL);
Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected); Usr_ListUsersToSelect (Rol_TCH,&Gbl.Usrs.Selected);
Usr_ListUsersToSelect (Rol_NET,&Gbl.Usrs.Selected); Usr_ListUsersToSelect (Rol_NET,&Gbl.Usrs.Selected);
@ -348,7 +349,8 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
/***** Option a) Listing of clicks distributed by some metric *****/ /***** Option a) Listing of clicks distributed by some metric *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Show); HTM_TxtColon (Txt_Show);
HTM_TD_End (); HTM_TD_End ();
@ -368,7 +370,8 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
/* Selection of count type (number of pages generated, accesses per user, etc.) */ /* Selection of count type (number of pages generated, accesses per user, etc.) */
Sta_WriteSelectorCountType (Stats); Sta_WriteSelectorCountType (Stats);
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("&nbsp;%s&nbsp;",Txt_distributed_by); HTM_TxtF ("&nbsp;%s&nbsp;",Txt_distributed_by);
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"GroupedBy\" name=\"GroupedBy\"" "id=\"GroupedBy\" name=\"GroupedBy\""
@ -472,7 +475,6 @@ void Sta_AskShowGblHits (void)
static void Sta_PutFormGblHits (struct Sta_Stats *Stats) static void Sta_PutFormGblHits (struct Sta_Stats *Stats)
{ {
extern const char *Hlp_ANALYTICS_Visits_global_visits; extern const char *Hlp_ANALYTICS_Visits_global_visits;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Statistics_of_all_visits; extern const char *Txt_Statistics_of_all_visits;
extern const char *Txt_Users; extern const char *Txt_Users;
@ -570,7 +572,8 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats)
Sta_WriteSelectorCountType (Stats); Sta_WriteSelectorCountType (Stats);
/***** Type of statistic *****/ /***** Type of statistic *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("&nbsp;%s&nbsp;",Txt_distributed_by); HTM_TxtF ("&nbsp;%s&nbsp;",Txt_distributed_by);
if (Stats->ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAY || if (Stats->ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAY ||
@ -679,7 +682,6 @@ static void Sta_WriteSelectorCountType (const struct Sta_Stats *Stats)
static void Sta_WriteSelectorAction (const struct Sta_Stats *Stats) static void Sta_WriteSelectorAction (const struct Sta_Stats *Stats)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Action; extern const char *Txt_Action;
extern const char *Txt_Any_action; extern const char *Txt_Any_action;
@ -1559,7 +1561,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
unsigned NumHits, unsigned NumHits,
MYSQL_RES *mysql_res) MYSQL_RES *mysql_res)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Color_of_the_graphic; extern const char *Txt_Color_of_the_graphic;
extern const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES]; extern const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES];
extern const char *Txt_Date; extern const char *Txt_Date;
@ -1606,7 +1608,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats,
Sta_PutHiddenParamScopeSta (); Sta_PutHiddenParamScopeSta ();
} }
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Color_of_the_graphic); HTM_TxtColonNBSP (Txt_Color_of_the_graphic);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"name=\"ColorType\""); "name=\"ColorType\"");

15
swad_survey.c
View File

@ -1646,7 +1646,6 @@ void Svy_RequestCreatOrEditSvy (void)
{ {
extern const char *Hlp_ASSESSMENT_Surveys_new_survey; extern const char *Hlp_ASSESSMENT_Surveys_new_survey;
extern const char *Hlp_ASSESSMENT_Surveys_edit_survey; extern const char *Hlp_ASSESSMENT_Surveys_edit_survey;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_New_survey; extern const char *Txt_New_survey;
extern const char *Txt_Scope; extern const char *Txt_Scope;
@ -1790,7 +1789,7 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Users' roles who can answer the survey *****/ /***** Users' roles who can answer the survey *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Users); HTM_TxtColon (Txt_Users);
HTM_TD_End (); HTM_TD_End ();
@ -1909,7 +1908,6 @@ static void Svy_SetDefaultAndAllowedScope (struct Svy_Survey *Svy)
static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups; extern const char *Txt_Groups;
extern const char *Txt_The_whole_course; extern const char *Txt_The_whole_course;
@ -1923,7 +1921,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
/***** Begin box and table *****/ /***** Begin box and table *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Groups); HTM_TxtColon (Txt_Groups);
HTM_TD_End (); HTM_TD_End ();
@ -2303,7 +2301,6 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
char Stem[Cns_MAX_BYTES_TEXT + 1]) char Stem[Cns_MAX_BYTES_TEXT + 1])
{ {
extern const char *Hlp_ASSESSMENT_Surveys_questions; extern const char *Hlp_ASSESSMENT_Surveys_questions;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Question; extern const char *Txt_Question;
extern const char *Txt_New_question; extern const char *Txt_New_question;
@ -2405,11 +2402,11 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
/***** Type of answer *****/ /***** Type of answer *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Type); HTM_TxtColon (Txt_Type);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0; for (AnsType = (Svy_AnswerType_t) 0;
AnsType <= (Svy_AnswerType_t) (Svy_NUM_ANS_TYPES - 1); AnsType <= (Svy_AnswerType_t) (Svy_NUM_ANS_TYPES - 1);
AnsType++) AnsType++)
@ -2443,8 +2440,8 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys,
/* Label with the number of the answer */ /* Label with the number of the answer */
HTM_TD_Begin ("class=\"RT\""); HTM_TD_Begin ("class=\"RT\"");
HTM_LABEL_Begin ("for=\"AnsStr%u\" class=\"%s\"", HTM_LABEL_Begin ("for=\"AnsStr%u\" class=\"FORM_IN_%s\"",
NumAns,The_ClassFormInBox[Gbl.Prefs.Theme]); NumAns,The_Colors[Gbl.Prefs.Theme]);
HTM_TxtF ("%u)",NumAns + 1); HTM_TxtF ("%u)",NumAns + 1);
HTM_LABEL_End (); HTM_LABEL_End ();
HTM_TD_End (); HTM_TD_End ();

6
swad_tag.c
View File

@ -292,7 +292,6 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
MYSQL_RES *mysql_res, MYSQL_RES *mysql_res,
bool ShowOnlyEnabledTags) bool ShowOnlyEnabledTags)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Tags; extern const char *Txt_Tags;
extern const char *Txt_All_tags; extern const char *Txt_All_tags;
@ -312,7 +311,7 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/***** Label *****/ /***** Label *****/
HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Tags); HTM_TxtColon (Txt_Tags);
HTM_TD_End (); HTM_TD_End ();
@ -327,7 +326,8 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
HTM_TD_Empty (1); HTM_TD_Empty (1);
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AllTags",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AllTags",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s onclick=\"togglecheckChildren(this,'ChkTag');\"", "value=\"Y\"%s onclick=\"togglecheckChildren(this,'ChkTag');\"",
Tags->All ? " checked=\"checked\"" : Tags->All ? " checked=\"checked\"" :

10
swad_test_config.c
View File

@ -142,7 +142,6 @@ bool TstCfg_CheckIfPluggableIsUnknownAndCrsHasTests (void)
static void TstCfg_ShowFormConfig (void) static void TstCfg_ShowFormConfig (void)
{ {
extern const char *Hlp_ASSESSMENT_Tests_configuring_tests; extern const char *Hlp_ASSESSMENT_Tests_configuring_tests;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Configure_tests; extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins; extern const char *Txt_Plugins;
@ -176,7 +175,8 @@ static void TstCfg_ShowFormConfig (void)
HTM_TABLE_BeginCenterPadding (2); HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Plugins); HTM_TxtColon (Txt_Plugins);
HTM_TD_End (); HTM_TD_End ();
@ -203,7 +203,8 @@ static void TstCfg_ShowFormConfig (void)
/***** Number of questions *****/ /***** Number of questions *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Number_of_questions); HTM_TxtColon (Txt_Number_of_questions);
HTM_TD_End (); HTM_TD_End ();
@ -244,7 +245,8 @@ static void TstCfg_ShowFormConfig (void)
/***** Visibility of test prints *****/ /***** Visibility of test prints *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Result_visibility); HTM_TxtColon (Txt_Result_visibility);
HTM_TD_End (); HTM_TD_End ();

4
swad_test_print.c
View File

@ -511,12 +511,12 @@ static void TstPrn_WriteTxtAnsToFill (const struct TstPrn_PrintedQuestion *Print
static void TstPrn_PutCheckBoxAllowTeachers (bool AllowTeachers) static void TstPrn_PutCheckBoxAllowTeachers (bool AllowTeachers)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Allow_teachers_to_consult_this_test; extern const char *Txt_Allow_teachers_to_consult_this_test;
/***** Test exam will be available for teachers? *****/ /***** Test exam will be available for teachers? *****/
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("AllowTchs",HTM_DONT_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("AllowTchs",HTM_DONT_SUBMIT_ON_CHANGE,
"value=\"Y\"%s", "value=\"Y\"%s",
AllowTeachers ? " checked=\"checked\"" : // Teachers can see test exam AllowTeachers ? " checked=\"checked\"" : // Teachers can see test exam

11
swad_theme.c
View File

@ -89,17 +89,6 @@ const char *The_ClassFormLinkInBox[The_NUM_THEMES] =
[The_THEME_DARK ] = "BT_LINK FORM_IN_DARK", [The_THEME_DARK ] = "BT_LINK FORM_IN_DARK",
}; };
const char *The_ClassFormInBox[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "FORM_IN_WHITE",
[The_THEME_GREY ] = "FORM_IN_GREY",
[The_THEME_PURPLE] = "FORM_IN_PURPLE",
[The_THEME_BLUE ] = "FORM_IN_BLUE",
[The_THEME_YELLOW] = "FORM_IN_YELLOW",
[The_THEME_PINK ] = "FORM_IN_PINK",
[The_THEME_DARK ] = "FORM_IN_DARK",
};
const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] = const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] =
{ {
[The_THEME_WHITE ] = "BT_LINK FORM_IN_WHITE BOLD", [The_THEME_WHITE ] = "BT_LINK FORM_IN_WHITE BOLD",

41
swad_user.c
View File

@ -2043,7 +2043,6 @@ static void Usr_SetMyPrefsAndRoles (void)
void Usr_ShowFormsLogoutAndRole (void) void Usr_ShowFormsLogoutAndRole (void)
{ {
extern const char *Hlp_PROFILE_Session_role; extern const char *Hlp_PROFILE_Session_role;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Session; extern const char *Txt_Session;
extern const char *Txt_Role; extern const char *Txt_Role;
@ -2078,7 +2077,7 @@ void Usr_ShowFormsLogoutAndRole (void)
} }
else else
{ {
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Role); HTM_TxtColonNBSP (Txt_Role);
if (asprintf (&ClassSelect,"INPUT_%s", if (asprintf (&ClassSelect,"INPUT_%s",
The_Colors[Gbl.Prefs.Theme]) < 0) The_Colors[Gbl.Prefs.Theme]) < 0)
@ -3700,7 +3699,7 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
const char *TxtButton, const char *TxtButton,
bool PutFormDateRange) bool PutFormDateRange)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Select_users; extern const char *Txt_Select_users;
extern const char *Txt_Users; extern const char *Txt_Users;
unsigned NumTotalUsrs; unsigned NumTotalUsrs;
@ -3774,11 +3773,13 @@ void Usr_PutFormToSelectUsrsToGoToAct (struct SelectedUsrs *SelectedUsrs,
/* Put list of users to select some of them */ /* Put list of users to select some of them */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Users); HTM_TxtColon (Txt_Users);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"LT FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TABLE_BeginCenterPadding (2); HTM_TABLE_BeginCenterPadding (2);
Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs); Usr_ListUsersToSelect (Rol_TCH,SelectedUsrs);
Usr_ListUsersToSelect (Rol_NET,SelectedUsrs); Usr_ListUsersToSelect (Rol_NET,SelectedUsrs);
@ -3987,13 +3988,13 @@ static void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,
static void Usr_PutCheckboxListWithPhotos (void) static void Usr_PutCheckboxListWithPhotos (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Display_photos; extern const char *Txt_Display_photos;
Par_PutHiddenParamChar ("WithPhotosExists",'Y'); Par_PutHiddenParamChar ("WithPhotosExists",'Y');
/***** Put checkbox to select whether list users with photos *****/ /***** Put checkbox to select whether list users with photos *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_INPUT_CHECKBOX ("WithPhotos",HTM_SUBMIT_ON_CHANGE, HTM_INPUT_CHECKBOX ("WithPhotos",HTM_SUBMIT_ON_CHANGE,
"value=\"Y\"%s", "value=\"Y\"%s",
Gbl.Usrs.Listing.WithPhotos ? " checked=\"checked\"" : Gbl.Usrs.Listing.WithPhotos ? " checked=\"checked\"" :
@ -4856,7 +4857,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
void Usr_ListDataAdms (void) void Usr_ListDataAdms (void)
{ {
extern const char *Hlp_USERS_Administrators; extern const char *Hlp_USERS_Administrators;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_No_INDEX; extern const char *Txt_No_INDEX;
@ -4931,7 +4932,7 @@ void Usr_ListDataAdms (void)
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActLstOth); Frm_BeginForm (ActLstOth);
Set_PutParamListWithPhotos (); Set_PutParamListWithPhotos ();
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE); Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -5036,7 +5037,7 @@ static void Usr_PutLinkToSeeGuests (void)
void Usr_SeeGuests (void) void Usr_SeeGuests (void)
{ {
extern const char *Hlp_USERS_Guests; extern const char *Hlp_USERS_Guests;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Scope; extern const char *Txt_Scope;
bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS]; bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS];
@ -5073,7 +5074,8 @@ void Usr_SeeGuests (void)
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActLstGst); Frm_BeginForm (ActLstGst);
Set_PutParamsPrefsAboutUsrList (); Set_PutParamsPrefsAboutUsrList ();
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE); Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -5159,7 +5161,7 @@ void Usr_SeeGuests (void)
void Usr_SeeStudents (void) void Usr_SeeStudents (void)
{ {
extern const char *Hlp_USERS_Students; extern const char *Hlp_USERS_Students;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Scope; extern const char *Txt_Scope;
bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS]; bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS];
@ -5220,7 +5222,8 @@ void Usr_SeeStudents (void)
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActLstStd); Frm_BeginForm (ActLstStd);
Set_PutParamsPrefsAboutUsrList (); Set_PutParamsPrefsAboutUsrList ();
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE); Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -5325,7 +5328,7 @@ void Usr_SeeStudents (void)
void Usr_SeeTeachers (void) void Usr_SeeTeachers (void)
{ {
extern const char *Hlp_USERS_Teachers; extern const char *Hlp_USERS_Teachers;
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Scope; extern const char *Txt_Scope;
unsigned NumUsrs; unsigned NumUsrs;
@ -5401,7 +5404,8 @@ void Usr_SeeTeachers (void)
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
Frm_BeginForm (ActLstTch); Frm_BeginForm (ActLstTch);
Set_PutParamsPrefsAboutUsrList (); Set_PutParamsPrefsAboutUsrList ();
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Scope); HTM_TxtColonNBSP (Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE); Sco_PutSelectorScope ("ScopeUsr",HTM_SUBMIT_ON_CHANGE);
HTM_LABEL_End (); HTM_LABEL_End ();
@ -5586,7 +5590,7 @@ static bool Usr_SetOptionsListUsrsAllowed (Rol_Role_t UsrsRole,
static void Usr_PutOptionsListUsrs (const bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS]) static void Usr_PutOptionsListUsrs (const bool ICanChooseOption[Usr_LIST_USRS_NUM_OPTIONS])
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_View_records; extern const char *Txt_View_records;
extern const char *Txt_View_homework; extern const char *Txt_View_homework;
extern const char *Txt_View_attendance; extern const char *Txt_View_attendance;
@ -5613,7 +5617,7 @@ static void Usr_PutOptionsListUsrs (const bool ICanChooseOption[Usr_LIST_USRS_NU
/***** Write list of options *****/ /***** Write list of options *****/
/* Begin list of options */ /* Begin list of options */
HTM_UL_Begin ("class=\"LIST_LEFT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_UL_Begin ("class=\"LIST_LEFT FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
/* Show option items */ /* Show option items */
for (Opt = (Usr_ListUsrsOption_t) 1; // Skip unknown option for (Opt = (Usr_ListUsrsOption_t) 1; // Skip unknown option
@ -6250,13 +6254,12 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
void Usr_PutSelectorNumColsClassPhoto (void) void Usr_PutSelectorNumColsClassPhoto (void)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_columns; extern const char *Txt_columns;
unsigned Cols; unsigned Cols;
/***** Begin label *****/ /***** Begin label *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_LABEL_Begin ("class=\"FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
/***** Begin selector *****/ /***** Begin selector *****/
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,

5
swad_zip.c
View File

@ -521,7 +521,6 @@ static unsigned long long ZIP_CloneDir (const char *Path,const char *PathClone,c
static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
off_t FileSize,unsigned long long UncompressedSize) off_t FileSize,unsigned long long UncompressedSize)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES]; extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_ZIP_file; extern const char *Txt_ZIP_file;
extern const char *Txt_Download; extern const char *Txt_Download;
@ -551,7 +550,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
/***** Filename *****/ /***** Filename *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Filename); HTM_TxtColon (Txt_Filename);
HTM_TD_End (); HTM_TD_End ();
@ -569,7 +568,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
Fil_WriteFileSizeFull ((double) FileSize,FileSizeStr); Fil_WriteFileSizeFull ((double) FileSize,FileSizeStr);
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TD_Begin ("class=\"RM FORM_IN_%s\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_File_size); HTM_TxtColon (Txt_File_size);
HTM_TD_End (); HTM_TD_End ();