From 44682df7ac5b58a8cb95f800964a3ea1b8d00c00 Mon Sep 17 00:00:00 2001 From: acanas Date: Fri, 17 Dec 2021 00:17:35 +0100 Subject: [PATCH] Version 21.70.3: Dec 17, 2021 Working on design of dark theme. --- swad_HTML.c | 8 +++-- swad_agenda.c | 14 +++++---- swad_announcement.c | 7 +++-- swad_assignment.c | 7 +++-- swad_attendance.c | 11 +++++-- swad_changelog.h | 3 +- swad_date.c | 73 ++++++++++++++++++++++++++++++++------------- swad_enrolment.c | 6 +++- swad_exam.c | 4 ++- swad_exam_session.c | 5 +++- swad_forum.c | 8 +++-- swad_game.c | 4 ++- swad_message.c | 26 +++++++++++----- swad_notice.c | 5 +++- swad_program.c | 4 ++- swad_record.c | 20 ++++++++----- swad_role.c | 4 ++- swad_statistic.c | 26 +++++++++++----- swad_survey.c | 10 +++++-- 19 files changed, 178 insertions(+), 67 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index 0a3bf159..c09cc1fe 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1167,8 +1167,12 @@ void HTM_INPUT_FILE (const char *Name,const char *Accept, void HTM_INPUT_BUTTON (const char *Name,const char *Value,const char *Attr) { - HTM_TxtF ("", - Name,Value,Attr); + extern const char *The_ClassInput[The_NUM_THEMES]; + + HTM_TxtF ("", + Name,Value, + The_ClassInput[Gbl.Prefs.Theme], + Attr); } void HTM_INPUT_IMAGE (const char *URL,const char *Icon,const char *Title,const char *Class) diff --git a/swad_agenda.c b/swad_agenda.c index 43ef9650..62e4eaa6 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1381,6 +1381,7 @@ void Agd_RequestCreatOrEditEvent (void) { extern const char *Hlp_PROFILE_Agenda_new_event; extern const char *Hlp_PROFILE_Agenda_edit_event; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_event; extern const char *Txt_Edit_event; extern const char *Txt_Location; @@ -1462,8 +1463,9 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Event",Agd_MAX_CHARS_EVENT,AgdEvent.Event, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Event\" required=\"required\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + "id=\"Event\" class=\"TITLE_DESCRIPTION_WIDTH %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); /* End table row */ @@ -1480,8 +1482,9 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Location",Agd_MAX_CHARS_LOCATION,AgdEvent.Location, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Location\" required=\"required\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + "id=\"Location\" class=\"TITLE_DESCRIPTION_WIDTH %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); /* End table row */ @@ -1502,7 +1505,8 @@ void Agd_RequestCreatOrEditEvent (void) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); if (!ItsANewEvent) HTM_Txt (Txt); HTM_TEXTAREA_End (); diff --git a/swad_announcement.c b/swad_announcement.c index bcf645a5..324089f6 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -406,6 +406,7 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label, unsigned Rows) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; /***** Subject or content *****/ HTM_TR_Begin (NULL); @@ -415,8 +416,10 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label, /* Data */ HTM_TD_Begin ("class=\"LT\""); - HTM_TEXTAREA_Begin ("id=\"%s\" name=\"%s\" cols=\"75\" rows=\"%u\"", - Field,Field,Rows); + HTM_TEXTAREA_Begin ("id=\"%s\" name=\"%s\" cols=\"75\" rows=\"%u\"" + " class=\"%s\"", + Field,Field,Rows, + The_ClassInput[Gbl.Prefs.Theme]); HTM_TEXTAREA_End (); HTM_TD_End (); diff --git a/swad_assignment.c b/swad_assignment.c index e679c2db..e53f3395 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1070,6 +1070,7 @@ void Asg_RequestCreatOrEditAsg (void) extern const char *Hlp_ASSESSMENT_Assignments_new_assignment; extern const char *Hlp_ASSESSMENT_Assignments_edit_assignment; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_assignment; extern const char *Txt_Edit_assignment; extern const char *Txt_Title; @@ -1163,7 +1164,8 @@ void Asg_RequestCreatOrEditAsg (void) HTM_INPUT_TEXT ("Title",Asg_MAX_CHARS_ASSIGNMENT_TITLE,Asg.Title, HTM_DONT_SUBMIT_ON_CHANGE, "id=\"Title\" required=\"required\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); @@ -1201,7 +1203,8 @@ void Asg_RequestCreatOrEditAsg (void) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"10\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); if (!ItsANewAssignment) HTM_Txt (Txt); HTM_TEXTAREA_End (); diff --git a/swad_attendance.c b/swad_attendance.c index 45cd20b5..24e02a6f 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -967,6 +967,7 @@ void Att_RequestCreatOrEditAttEvent (void) { extern const char *Hlp_USERS_Attendance_new_event; extern const char *Hlp_USERS_Attendance_edit_event; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_event; extern const char *Txt_Edit_event; extern const char *Txt_Teachers_comment; @@ -1058,7 +1059,8 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_INPUT_TEXT ("Title",Att_MAX_CHARS_ATTENDANCE_EVENT_TITLE,Event.Title, HTM_DONT_SUBMIT_ON_CHANGE, "id=\"Title\" required=\"required\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); @@ -1077,7 +1079,9 @@ void Att_RequestCreatOrEditAttEvent (void) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"ComTchVisible\" name=\"ComTchVisible\""); + "id=\"ComTchVisible\" name=\"ComTchVisible\"" + " class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"N",!Event.CommentTchVisible,false, "%s",Txt_Hidden_MALE_PLURAL); HTM_OPTION (HTM_Type_STRING,"Y",Event.CommentTchVisible,false, @@ -1096,7 +1100,8 @@ void Att_RequestCreatOrEditAttEvent (void) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); if (!ItsANewAttEvent) HTM_Txt (Description); HTM_TEXTAREA_End (); diff --git a/swad_changelog.h b/swad_changelog.h index 9f142f46..181edc19 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,12 +602,13 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.70.2 (2021-12-15)" +#define Log_PLATFORM_VERSION "SWAD 21.70.3 (2021-12-17)" #define CSS_FILE "swad21.70.1.css" #define JS_FILE "swad21.67.4.js" /* // TODO: al ver los resultados de un juego como profesor, el rol del estudiante sale como desconocido y no se puede ver el DNI + Version 21.70.3: Dec 17, 2021 Working on design of dark theme. (321559 lines) Version 21.70.2: Dec 15, 2021 Working on design of dark theme. (321449 lines) Version 21.70.1: Dec 15, 2021 Working on design of dark theme. (321305 lines) Version 21.70: Dec 15, 2021 Working on design of dark theme. (321252 lines) diff --git a/swad_date.c b/swad_date.c index 47857f42..97257b73 100644 --- a/swad_date.c +++ b/swad_date.c @@ -551,6 +551,7 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, Dat_SetHMS SetHMS, bool SubmitFormOnChange) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_MONTHS_SMALL[12]; unsigned Day; unsigned Month; @@ -581,20 +582,26 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sYear\" name=\"%sYear\"" + " class=\"%s\"" " onchange=\"" "adjustDateForm('%s');" "setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id,Id, + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Id, Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sYear\" name=\"%sYear\"" + " class=\"%s\"" " onchange=\"" "adjustDateForm('%s');" "setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id,Id); - for (Year = FirstYear; + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Id); + for (Year = FirstYear; Year <= LastYear; Year++) HTM_OPTION (HTM_Type_UNSIGNED,&Year,false,false, @@ -607,19 +614,25 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sMonth\" name=\"%sMonth\"" + " class=\"%s\"" " onchange=\"" "adjustDateForm('%s');" "setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id,Id, + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Id, Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sMonth\" name=\"%sMonth\"" + " class=\"%s\"" " onchange=\"" "adjustDateForm('%s');" "setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id,Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Id); for (Month = 1; Month <= 12; Month++) @@ -633,16 +646,21 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sDay\" name=\"%sDay\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id, - Gbl.Form.Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sDay\" name=\"%sDay\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id); - for (Day = 1; + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id); + for (Day = 1; Day <= 31; Day++) HTM_OPTION (HTM_Type_UNSIGNED,&Day,false,false, @@ -655,16 +673,21 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sHour\" name=\"%sHour\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id, - Gbl.Form.Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sHour\" name=\"%sHour\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id); - for (Hour = 0; + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id); + for (Hour = 0; Hour <= 23; Hour++) HTM_OPTION (HTM_Type_UNSIGNED,&Hour,false,false, @@ -677,15 +700,20 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sMinute\" name=\"%sMinute\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id, - Gbl.Form.Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sMinute\" name=\"%sMinute\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id); for (Minute = 0; Minute < 60; Minute += MinutesIInterval[FormSeconds]) @@ -701,16 +729,21 @@ void Dat_WriteFormClientLocalDateTimeFromTimeUTC (const char *Id, if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sSecond\" name=\"%sSecond\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');" "document.getElementById('%s').submit();return false;\"", - Id,ParamName,Id, - Gbl.Form.Id); + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id,Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"%sSecond\" name=\"%sSecond\"" + " class=\"%s\"" " onchange=\"setUTCFromLocalDateTimeForm('%s');\"", - Id,ParamName,Id); - for (Second = 0; + Id,ParamName, + The_ClassInput[Gbl.Prefs.Theme], + Id); + for (Second = 0; Second <= 59; Second++) HTM_OPTION (HTM_Type_UNSIGNED,&Second,false,false, diff --git a/swad_enrolment.c b/swad_enrolment.c index b39713cb..4354c93b 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -331,6 +331,7 @@ static void Enr_NotifyAfterEnrolment (const struct UsrData *UsrDat, void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_nick_email_or_ID; extern const char *Txt_Continue; @@ -348,7 +349,10 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) /***** Input box to enter user *****/ HTM_INPUT_TEXT ("OtherUsrIDNickOrEMail",Cns_MAX_CHARS_EMAIL_ADDRESS,"", HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"OtherUsrIDNickOrEMail\" size=\"18\" required=\"required\""); + "id=\"OtherUsrIDNickOrEMail\" size=\"18\"" + " class=\"%s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); /***** Send button*****/ Btn_PutConfirmButton (Txt_Continue); diff --git a/swad_exam.c b/swad_exam.c index 0bf5e145..95bc475c 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1324,6 +1324,7 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams, extern const char *Hlp_ASSESSMENT_Exams_new_exam; extern const char *Hlp_ASSESSMENT_Exams_edit_exam; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_exam; extern const char *Txt_Edit_exam; extern const char *Txt_Title; @@ -1403,7 +1404,8 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams, /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_Txt (Txt); HTM_TEXTAREA_End (); HTM_TD_End (); diff --git a/swad_exam_session.c b/swad_exam_session.c index aca0cc0b..b8e050c5 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -990,6 +990,7 @@ long ExaSes_GetParamSesCod (void) static void ExaSes_PutFormSession (const struct ExaSes_Session *Session) { extern const char *Hlp_ASSESSMENT_Exams_sessions; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_session; extern const char *Txt_Title; extern const char *Txt_Create_session; @@ -1027,7 +1028,9 @@ static void ExaSes_PutFormSession (const struct ExaSes_Session *Session) HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",ExaSes_MAX_CHARS_TITLE,Session->Title, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Title\" size=\"45\" required=\"required\""); + "id=\"Title\" size=\"45\" class=\"%s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_forum.c b/swad_forum.c index feff56e6..3f77034a 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2709,7 +2709,9 @@ static void For_WriteFormForumPst (struct For_Forums *Forums, IsReply ? Subject : "", HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Subject\" class=\"MSG_SUBJECT\" required=\"required\""); + "id=\"Subject\" class=\"MSG_SUBJECT %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); @@ -2722,7 +2724,9 @@ static void For_WriteFormForumPst (struct For_Forums *Forums, /* Data */ HTM_TD_Begin ("class=\"LT\""); - HTM_TEXTAREA_Begin ("id=\"Content\" name=\"Content\" class=\"MSG_CONTENT\" rows=\"10\""); + HTM_TEXTAREA_Begin ("id=\"Content\" name=\"Content\"" + " class=\"MSG_CONTENT %s\" rows=\"10\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TEXTAREA_End (); HTM_TD_End (); diff --git a/swad_game.c b/swad_game.c index 8947bfe1..8454ac8b 100644 --- a/swad_game.c +++ b/swad_game.c @@ -1301,6 +1301,7 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games, extern const char *Hlp_ASSESSMENT_Games_new_game; extern const char *Hlp_ASSESSMENT_Games_edit_game; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_game; extern const char *Txt_Edit_game; extern const char *Txt_Title; @@ -1339,7 +1340,8 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games, HTM_INPUT_TEXT ("Title",Gam_MAX_CHARS_TITLE,Game->Title, HTM_DONT_SUBMIT_ON_CHANGE, "id=\"Title\" required=\"required\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_message.c b/swad_message.c index 8454ec95..19a7e96e 100644 --- a/swad_message.c +++ b/swad_message.c @@ -520,6 +520,7 @@ static void Msg_ShowOneUniqueRecipient (void) static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) { extern const char *The_ClassBgHighlight[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Other_recipients; extern const char *Txt_Recipients; extern const char *Txt_nicks_emails_or_IDs_separated_by_commas; @@ -550,7 +551,9 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"%u\" class=\"LM\"",ColSpan); HTM_TEXTAREA_Begin ("id=\"OtherRecipients\" name=\"OtherRecipients\"" - " class=\"MSG_RECIPIENTS\" rows=\"2\" placeholder=\"%s\"", + " class=\"MSG_RECIPIENTS %s\" rows=\"2\"" + " placeholder=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme], Txt_nicks_emails_or_IDs_separated_by_commas); if (Gbl.Usrs.ListOtherRecipients[0]) HTM_Txt (Gbl.Usrs.ListOtherRecipients); @@ -575,6 +578,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messag char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Content; extern const char *Txt_Original_message; @@ -595,7 +599,8 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messag /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgSubject\" name=\"Subject\"" - " class=\"MSG_SUBJECT\" rows=\"2\""); + " class=\"MSG_SUBJECT %s\" rows=\"2\"", + The_ClassInput[Gbl.Prefs.Theme]); /* If message is a reply ==> get original message */ if (MsgCod > 0) // It's a reply @@ -634,7 +639,8 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messag /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgContent\" name=\"Content\"" - " class=\"MSG_CONTENT\" rows=\"20\""); + " class=\"MSG_CONTENT %s\" rows=\"20\"", + The_ClassInput[Gbl.Prefs.Theme]); /* Begin textarea with a '\n', that will be not visible in textarea. When Content is "\nLorem ipsum" (a white line before "Lorem ipsum"), @@ -668,7 +674,8 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messag /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgContent\" name=\"Content\"" - " class=\"MSG_CONTENT\" rows=\"20\""); + " class=\"MSG_CONTENT %s\" rows=\"20\"", + The_ClassInput[Gbl.Prefs.Theme]); /* Begin textarea with a '\n', that will be not visible in textarea. When Content is "\nLorem ipsum" (a white line before "Lorem ipsum"), @@ -1801,6 +1808,7 @@ void Msg_PutHiddenParamsMsgsFilters (void *Messages) static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Messages) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Messages_received_from_A_COURSE; extern const char *Txt_Messages_sent_from_A_COURSE; extern const char *Txt_any_course; @@ -1830,7 +1838,8 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF ("%s ",*TxtSelector[Messages->TypeOfMessages]); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "name=\"FilterCrsCod\""); + "name=\"FilterCrsCod\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); /* Write a first option to select any course */ HTM_OPTION (HTM_Type_STRING,"", @@ -1865,6 +1874,7 @@ static void Msg_ShowFormSelectCourseSentOrRecMsgs (const struct Msg_Messages *Me static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_MSG_From; extern const char *Txt_MSG_To; extern const char *Txt_MSG_Content; @@ -1886,7 +1896,8 @@ static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages) HTM_TxtColonNBSP (*TxtFromTo[Messages->TypeOfMessages]); HTM_INPUT_SEARCH ("FilterFromTo",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3, Messages->FilterFromTo, - "size=\"20\""); + "size=\"20\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_LABEL_End (); HTM_TD_End (); @@ -1896,7 +1907,8 @@ static void Msg_ShowFormToFilterMsgs (const struct Msg_Messages *Messages) HTM_TxtColonNBSP (Txt_MSG_Content); HTM_INPUT_SEARCH ("FilterContent",Msg_MAX_CHARS_FILTER_CONTENT, Messages->FilterContent, - "size=\"20\""); + "size=\"20\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_notice.c b/swad_notice.c index 30a7b8d8..de38b5da 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -100,6 +100,7 @@ static long Not_GetParamNotCod (void); void Not_ShowFormNotice (void) { extern const char *Hlp_COMMUNICATION_Notices; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_The_notice_will_appear_as_a_yellow_note_; extern const char *Txt_New_notice; extern const char *Txt_Create_notice; @@ -118,7 +119,9 @@ void Not_ShowFormNotice (void) /***** Message body *****/ HTM_TEXTAREA_Begin ("name=\"Content\" cols=\"30\" rows=\"10\"" - " autofocus=\"autofocus\" required=\"required\""); + " class=\"%s\"" + " autofocus=\"autofocus\" required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TEXTAREA_End (); /***** Send button and end box *****/ diff --git a/swad_program.c b/swad_program.c index 5e70bd3a..23fb66b0 100644 --- a/swad_program.c +++ b/swad_program.c @@ -1748,6 +1748,7 @@ static void Prg_ShowFormItem (const struct Prg_Item *Item, const Dat_SetHMS SetHMS[Dat_NUM_START_END_TIME], const char *Txt) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Title; extern const char *Txt_Description; @@ -1781,7 +1782,8 @@ static void Prg_ShowFormItem (const struct Prg_Item *Item, /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"25\"" - " class=\"PRG_TITLE_DESCRIPTION_WIDTH\""); + " class=\"PRG_TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); if (Txt) if (Txt[0]) HTM_Txt (Txt); diff --git a/swad_record.c b/swad_record.c index 09344fd4..e8f4cb08 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2777,6 +2777,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, { extern const char *Usr_StringsSexIcons[Usr_NUM_SEXS]; extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Role; extern const char *Txt_Sex; extern const char *Txt_SEX_SINGULAR_Abc[Usr_NUM_SEXS]; @@ -2817,8 +2818,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat, /***** Selector of role *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\""); - for (Role = Rol_STD; + "id=\"Role\" name=\"Role\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); + for (Role = Rol_STD; Role <= Rol_TCH; Role++) { @@ -2879,7 +2881,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, /***** Selector of role *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\""); + "id=\"Role\" name=\"Role\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); switch (Gbl.Usrs.Me.Role.Logged) { case Rol_GST: @@ -2920,7 +2923,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, /***** Selector of role *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\""); + "id=\"Role\" name=\"Role\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); RoleUnsigned = (unsigned) DefaultRoleInForm; HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned,true,true, "%s",Txt_ROLES_SINGUL_Abc[DefaultRoleInForm][UsrDat->Sex]); @@ -2955,8 +2959,9 @@ static void Rec_ShowRole (struct UsrData *UsrDat, /***** Selector of role *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\""); - for (Role = Rol_STD; + "id=\"Role\" name=\"Role\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); + for (Role = Rol_STD; Role <= Rol_TCH; Role++) { @@ -2976,7 +2981,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat, case Rol_SYS_ADM: /***** Selector of role *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\""); + "id=\"Role\" name=\"Role\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); RoleUnsigned = (unsigned) Rol_GST; HTM_OPTION (HTM_Type_UNSIGNED,&RoleUnsigned, true,false, diff --git a/swad_role.c b/swad_role.c index 2b283551..666b8f5a 100644 --- a/swad_role.c +++ b/swad_role.c @@ -544,6 +544,7 @@ void Rol_ChangeMyRole (void) void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected, bool Disabled,HTM_SubmitOnChange_t SubmitOnChange) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; Rol_Role_t Role; @@ -554,8 +555,9 @@ void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected, { HTM_LABEL_Begin (NULL); HTM_INPUT_CHECKBOX ("Role",SubmitOnChange, - "id=\"Role\" value=\"%u\"%s%s", + "id=\"Role\" value=\"%u\" class=\"%s\"%s%s", (unsigned) Role, + The_ClassInput[Gbl.Prefs.Theme], (RolesSelected & (1 << Role)) ? " checked=\"checked\"" : "", Disabled ? " disabled=\"disabled\"" : diff --git a/swad_statistic.c b/swad_statistic.c index 6e23e97b..842d6c90 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -222,6 +222,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats) { extern const char *Hlp_ANALYTICS_Visits_visits_to_course; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Statistics_of_visits_to_the_course_X; extern const char *Txt_Users; extern const char *Txt_Show; @@ -368,8 +369,10 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats) HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF (" %s ",Txt_distributed_by); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"GroupedBy\" name=\"GroupedBy\""); - for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR; + "id=\"GroupedBy\" name=\"GroupedBy\"" + " class=\%s\"", + The_ClassInput[Gbl.Prefs.Theme]); + for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR; ClicksGroupedBy <= Sta_CLICKS_CRS_PER_ACTION; ClicksGroupedBy++) { @@ -468,6 +471,7 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats) { extern const char *Hlp_ANALYTICS_Visits_global_visits; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Statistics_of_all_visits; extern const char *Txt_Users; extern const char *Txt_ROLE_STATS[Sta_NUM_ROLES_STAT]; @@ -512,7 +516,9 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Role\" name=\"Role\" class=\"STAT_SEL\""); + "id=\"Role\" name=\"Role\"" + " class=\"STAT_SEL %s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (RoleStat = (Sta_Role_t) 0; RoleStat <= (Sta_Role_t) (Sta_NUM_ROLES_STAT - 1); RoleStat++) @@ -570,8 +576,9 @@ static void Sta_PutFormGblHits (struct Sta_Stats *Stats) Stats->ClicksGroupedBy = Sta_CLICKS_GBL_PER_DAY; HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "name=\"GroupedBy\""); - for (ClicksGroupedBy = Sta_CLICKS_GBL_PER_DAY; + "name=\"GroupedBy\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); + for (ClicksGroupedBy = Sta_CLICKS_GBL_PER_DAY; ClicksGroupedBy <= Sta_CLICKS_GBL_PER_COURSE; ClicksGroupedBy++) { @@ -643,13 +650,15 @@ void Sta_PutLinkToGlobalHits (void) static void Sta_WriteSelectorCountType (const struct Sta_Stats *Stats) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_STAT_TYPE_COUNT_SMALL[Sta_NUM_COUNT_TYPES]; Sta_CountType_t StatCountType; unsigned StatCountTypeUnsigned; /**** Count type *****/ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"CountType\" name=\"CountType\""); + "id=\"CountType\" name=\"CountType\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (StatCountType = (Sta_CountType_t) 0; StatCountType <= (Sta_CountType_t) (Sta_NUM_COUNT_TYPES - 1); StatCountType++) @@ -669,6 +678,7 @@ static void Sta_WriteSelectorCountType (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_ClassInput[The_NUM_THEMES]; extern const char *Txt_Action; extern const char *Txt_Any_action; extern const char *Txt_TABS_TXT[Tab_NUM_TABS]; @@ -684,7 +694,9 @@ static void Sta_WriteSelectorAction (const struct Sta_Stats *Stats) HTM_TD_Begin ("class=\"LT\""); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"StatAct\" name=\"StatAct\" class=\"STAT_SEL\""); + "id=\"StatAct\" name=\"StatAct\"" + " class=\"STAT_SEL %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"0",Stats->NumAction == 0,false, "%s",Txt_Any_action); for (Action = (Act_Action_t) 1; diff --git a/swad_survey.c b/swad_survey.c index 89a3ec85..d04f21f5 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -1645,6 +1645,7 @@ void Svy_RequestCreatOrEditSvy (void) extern const char *Hlp_ASSESSMENT_Surveys_edit_survey; extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_survey; extern const char *Txt_Scope; extern const char *Txt_Edit_survey; @@ -1773,7 +1774,8 @@ void Svy_RequestCreatOrEditSvy (void) /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" - " class=\"TITLE_DESCRIPTION_WIDTH\""); + " class=\"TITLE_DESCRIPTION_WIDTH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); if (!ItsANewSurvey) HTM_Txt (Txt); HTM_TEXTAREA_End (); @@ -2298,6 +2300,7 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys, { extern const char *Hlp_ASSESSMENT_Surveys_questions; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Question; extern const char *Txt_New_question; extern const char *Txt_Wording; @@ -2385,7 +2388,10 @@ static void Svy_ShowFormEditOneQst (struct Svy_Surveys *Surveys, /* Data */ HTM_TD_Begin ("class=\"LT\""); - HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" cols=\"60\" rows=\"4\""); + HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\"" + " cols=\"60\" rows=\"4\"" + " class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_Txt (Stem); HTM_TEXTAREA_End (); HTM_TD_End ();