diff --git a/css/swad21.70.1.css b/css/swad21.70.1.css index 303cfce5..7866d72e 100644 --- a/css/swad21.70.1.css +++ b/css/swad21.70.1.css @@ -50,6 +50,14 @@ textarea font-size:13pt; font-family:"Helvetica Neue",Helvetica,Arial,sans-serif; } +.INPUT_WHITE {} +.INPUT_GREY {} +.INPUT_PURPLE {} +.INPUT_BLUE {} +.INPUT_YELLOW {} +.INPUT_PINK {} +.INPUT_DARK {background-color:#1f1f1f;color:white;} + table { box-sizing:border-box; @@ -248,13 +256,13 @@ a:hover /* Default ==> underlined */ text-overflow:ellipsis; } } -.USR_WHITE {color:#b0b0b0; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_GREY {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_PURPLE {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_BLUE {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_YELLOW {color:#b3b0b3; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_PINK {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} -.USR_DARK {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_WHITE {color:#b0b0b0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_GREY {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_PURPLE {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_BLUE {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_YELLOW {color:#b3b0b3; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_PINK {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} +.USR_DARK {color:#e0e0e0; font-size:15pt; font-weight:bold; white-space:nowrap;} #head_row_1_right { diff --git a/swad_ID.c b/swad_ID.c index 261bbd68..a1b4e107 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -500,6 +500,7 @@ static void ID_ShowFormChangeUsrID (bool ItsMe,bool IShouldFillInID) { extern const char *Hlp_PROFILE_Account; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Please_fill_in_your_ID; extern const char *Txt_ID_X_confirmed; extern const char *Txt_ID_X_not_confirmed; @@ -627,7 +628,8 @@ static void ID_ShowFormChangeUsrID (bool ItsMe,bool IShouldFillInID) UsrDat->IDs.Num ? UsrDat->IDs.List[UsrDat->IDs.Num - 1].ID : "", // Show the most recent ID HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"NewID\" size=\"18\""); + "id=\"NewID\" class=\"%s\" size=\"18\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_BR (); Btn_PutCreateButtonInline (Txt_Add_this_ID); Frm_EndForm (); diff --git a/swad_changelog.h b/swad_changelog.h index b27b846c..9f142f46 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.1 (2021-12-15)" +#define Log_PLATFORM_VERSION "SWAD 21.70.2 (2021-12-15)" #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.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) Version 21.69: Dec 15, 2021 Working on design of dark theme. (321089 lines) diff --git a/swad_course.c b/swad_course.c index abe99f83..8804f607 100644 --- a/swad_course.c +++ b/swad_course.c @@ -767,6 +767,7 @@ void Crs_FreeListCoursesInCurrentDegree (void) void Crs_WriteSelectorMyCoursesInBreadcrumb (void) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Course; unsigned NumMyCrs; long CrsCod; @@ -785,7 +786,8 @@ void Crs_WriteSelectorMyCoursesInBreadcrumb (void) /***** Begin selector of courses *****/ HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"my_courses\" name=\"crs\""); + "id=\"my_courses\" name=\"crs\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); /***** Write an option when no course selected *****/ if (Gbl.Hierarchy.Crs.CrsCod <= 0) // No course selected diff --git a/swad_course_config.c b/swad_course_config.c index 404f8c82..db08bc86 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -208,6 +208,7 @@ static void CrsCfg_Title (bool PutLink) static void CrsCfg_Degree (bool PrintView,bool PutForm) { extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Degree; unsigned NumDeg; @@ -230,7 +231,8 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm) Frm_BeginForm (ActChgCrsDegCfg); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, "id=\"OthDegCod\" name=\"OthDegCod\"" - " class=\"INPUT_SHORT_NAME\""); + " class=\"INPUT_SHORT_NAME %s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (NumDeg = 0; NumDeg < Gbl.Hierarchy.Degs.Num; NumDeg++) @@ -297,6 +299,7 @@ static void CrsCfg_ShrtName (bool PutForm) static void CrsCfg_Year (bool PutForm) { extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Year_OF_A_DEGREE; extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE]; extern const char *Txt_Not_applicable; @@ -316,7 +319,9 @@ static void CrsCfg_Year (bool PutForm) { Frm_BeginForm (ActChgCrsYeaCfg); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"OthCrsYear\" name=\"OthCrsYear\""); + "id=\"OthCrsYear\" name=\"OthCrsYear\"" + " class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (Year = 0; Year <= Deg_MAX_YEARS_PER_DEGREE; Year++) @@ -341,6 +346,7 @@ static void CrsCfg_Year (bool PutForm) static void CrsCfg_InstitutionalCode (bool PutForm) { extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Institutional_code; /***** Institutional course code *****/ @@ -359,8 +365,10 @@ static void CrsCfg_InstitutionalCode (bool PutForm) HTM_INPUT_TEXT ("InsCrsCod",Crs_MAX_CHARS_INSTITUTIONAL_CRS_COD, Gbl.Hierarchy.Crs.InstitutionalCrsCod, HTM_SUBMIT_ON_CHANGE, - "id=\"InsCrsCod\" size=\"%u\" class=\"INPUT_INS_CODE\"", - Crs_MAX_CHARS_INSTITUTIONAL_CRS_COD); + "id=\"InsCrsCod\" size=\"%u\"" + " class=\"INPUT_INS_CODE %s\"", + Crs_MAX_CHARS_INSTITUTIONAL_CRS_COD, + The_ClassInput[Gbl.Prefs.Theme]); Frm_EndForm (); } else diff --git a/swad_date.c b/swad_date.c index f8359231..47857f42 100644 --- a/swad_date.c +++ b/swad_date.c @@ -855,6 +855,7 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, struct Dat_Date *DateSelected, bool SubmitFormOnChange,bool Disabled) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_MONTHS_SMALL[12]; unsigned Year; unsigned Month; @@ -869,23 +870,29 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, HTM_TD_Begin ("class=\"CM\""); if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%sYear\" name=\"%sYear\"%s" + "id=\"%sYear\" name=\"%sYear\"" + " class=\"%s\"" + "%s" " onchange=\"adjustDateForm('%s');" "document.getElementById('%s').submit();return false;\"", Id,Id, + The_ClassInput[Gbl.Prefs.Theme], Disabled ? " disabled=\"disabled\"" : "", Id, Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%sYear\" name=\"%sYear\"%s" + "id=\"%sYear\" name=\"%sYear\"" + " class=\"%s\"" + "%s" " onchange=\"adjustDateForm('%s');\"", Id,Id, + The_ClassInput[Gbl.Prefs.Theme], Disabled ? " disabled=\"disabled\"" : "", Id); HTM_OPTION (HTM_Type_STRING,"0",false,false, "-"); - for (Year = FirstYear; + for (Year = FirstYear; Year <= LastYear; Year++) HTM_OPTION (HTM_Type_UNSIGNED,&Year, @@ -898,18 +905,24 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, HTM_TD_Begin ("class=\"CM\""); if (SubmitFormOnChange) HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%sMonth\" name=\"%sMonth\"%s" + "id=\"%sMonth\" name=\"%sMonth\"" + " class=\"%s\"" + "%s" " onchange=\"adjustDateForm('%s');" "document.getElementById('%s').submit();return false;\"", Id,Id, + The_ClassInput[Gbl.Prefs.Theme], Disabled ? " disabled=\"disabled\"" : "", Id, Gbl.Form.Id); else HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%sMonth\" name=\"%sMonth\"%s" + "id=\"%sMonth\" name=\"%sMonth\"" + " class=\"%s\"" + "%s" " onchange=\"adjustDateForm('%s');\"", Id,Id, + The_ClassInput[Gbl.Prefs.Theme], Disabled ? " disabled=\"disabled\"" : "", Id); HTM_OPTION (HTM_Type_STRING,"0",false,false, @@ -926,20 +939,23 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear, /***** Day *****/ HTM_TD_Begin ("class=\"CM\""); HTM_SELECT_Begin (SubmitFormOnChange, - "id=\"%sDay\" name=\"%sDay\"%s", + "id=\"%sDay\" name=\"%sDay\"" + " class=\"%s\"" + "%s", Id,Id, + The_ClassInput[Gbl.Prefs.Theme], Disabled ? " disabled=\"disabled\"" : ""); - HTM_OPTION (HTM_Type_STRING,"0",false,false, - "-"); - NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 : - ((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) : - Dat_NumDaysMonth[DateSelected->Month]); - for (Day = 1; - Day <= NumDaysSelectedMonth; - Day++) - HTM_OPTION (HTM_Type_UNSIGNED,&Day, - Day == DateSelected->Day,false, - "%u",Day); + HTM_OPTION (HTM_Type_STRING,"0",false,false, + "-"); + NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 : + ((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) : + Dat_NumDaysMonth[DateSelected->Month]); + for (Day = 1; + Day <= NumDaysSelectedMonth; + Day++) + HTM_OPTION (HTM_Type_UNSIGNED,&Day, + Day == DateSelected->Day,false, + "%u",Day); HTM_SELECT_End (); HTM_TD_End (); diff --git a/swad_degree_type.c b/swad_degree_type.c index c4d1ebad..4700d20b 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -98,6 +98,7 @@ static void DegTyp_EditingDegreeTypeDestructor (void); void DegTyp_WriteSelectorDegreeTypes (long SelectedDegTypCod) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Any_type_of_degree; unsigned NumDegTyp; @@ -107,7 +108,8 @@ void DegTyp_WriteSelectorDegreeTypes (long SelectedDegTypCod) /* List degree types */ HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"OthDegTypCod\" name=\"OthDegTypCod\""); + "id=\"OthDegTypCod\" name=\"OthDegTypCod\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"-1", SelectedDegTypCod == -1L,false, "%s",Txt_Any_type_of_degree); diff --git a/swad_figure.c b/swad_figure.c index 3d642368..649c8460 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -226,6 +226,7 @@ static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType) { extern const char *Hlp_ANALYTICS_Figures; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Figures; extern const char *Txt_Scope; extern const char *Txt_Statistic; @@ -262,7 +263,8 @@ static void Fig_ReqShowFigure (Fig_FigureType_t SelectedFigureType) HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtColonNBSP (Txt_Statistic); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "name=\"FigureType\""); + "name=\"FigureType\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (FigType = (Fig_FigureType_t) 0; FigType <= (Fig_FigureType_t) (Fig_NUM_FIGURES - 1); FigType++) diff --git a/swad_forum.c b/swad_forum.c index 25161d38..feff56e6 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2662,6 +2662,7 @@ static void For_WriteFormForumPst (struct For_Forums *Forums, extern const char *Hlp_COMMUNICATION_Forums_new_post; extern const char *Hlp_COMMUNICATION_Forums_new_thread; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_post; extern const char *Txt_New_thread; extern const char *Txt_MSG_Subject; @@ -2733,7 +2734,9 @@ static void For_WriteFormForumPst (struct For_Forums *Forums, Lay_HelpPlainEditor (); /***** Attached image (optional) *****/ - Med_PutMediaUploader (-1,"FOR_MED_INPUT"); + Med_PutMediaUploader (-1,Str_BuildString ("FOR_MED_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); /***** Send button *****/ Btn_PutCreateButton (Txt_Send); diff --git a/swad_indicator.c b/swad_indicator.c index a60f728e..e3153869 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -94,6 +94,7 @@ void Ind_ReqIndicatorsCourses (void) extern const char *Hlp_ANALYTICS_Indicators; extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Scope; extern const char *Txt_Types_of_degree; extern const char *Txt_only_if_the_scope_is_X; @@ -161,10 +162,12 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"LT\""); Dpt_WriteSelectorDepartment (Gbl.Hierarchy.Ins.InsCod, // Departments in current insitution Indicators.DptCod, // Selected department - "INDICATORS_INPUT", // Selector class + Str_BuildString ("INDICATORS_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme]), // Selector class -1L, // First option Txt_Any_department, // Text when no department selected true); // Submit on change + Str_FreeStrings (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_language.c b/swad_language.c index f945f08d..29e42391 100644 --- a/swad_language.c +++ b/swad_language.c @@ -113,13 +113,16 @@ static void Lan_PutIconsLanguage (__attribute__((unused)) void *Args) void Lan_PutSelectorToSelectLanguage (void) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES]; Lan_Language_t Lan; unsigned LanUnsigned; Frm_BeginForm (ActReqChgLan); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "name=\"Lan\" style=\"width:112px; margin:0;\""); + "name=\"Lan\" class=\"%s\"" + " style=\"width:112px; margin:0;\"", + The_ClassInput[Gbl.Prefs.Theme]); for (Lan = (Lan_Language_t) 1; Lan <= (Lan_Language_t) Lan_NUM_LANGUAGES; Lan++) diff --git a/swad_mail.c b/swad_mail.c index 6e916a37..d5affaa2 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1051,6 +1051,7 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe, bool IShouldConfirmEmail) { extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Before_going_to_any_other_option_you_must_fill_in_your_email_address; extern const char *Txt_Please_confirm_your_email_address; extern const char *Txt_Current_email; @@ -1199,7 +1200,8 @@ static void Mai_ShowFormChangeUsrEmail (bool ItsMe, Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); } HTM_INPUT_EMAIL ("NewEmail",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrDat.Email, - "id=\"NewEmail\" size=\"18\""); + "id=\"NewEmail\" class=\"%s\" size=\"18\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_BR (); Btn_PutCreateButtonInline (NumEmails ? Txt_Change_email : // User already has an email address Txt_Save_changes); // User has no email address yet diff --git a/swad_message.c b/swad_message.c index 16b9705f..8454ec95 100644 --- a/swad_message.c +++ b/swad_message.c @@ -219,6 +219,7 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages, { extern const char *Hlp_COMMUNICATION_Messages_write; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Reply_message; extern const char *Txt_New_message; extern const char *Txt_MSG_To; @@ -370,7 +371,9 @@ static void Msg_PutFormMsgUsrs (struct Msg_Messages *Messages, Lay_HelpPlainEditor (); /***** Attached image (optional) *****/ - Med_PutMediaUploader (-1,"MSG_MED_INPUT"); + Med_PutMediaUploader (-1,Str_BuildString ("MSG_MED_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); /***** Send button *****/ Btn_PutCreateButton (Txt_Send_message); diff --git a/swad_network.c b/swad_network.c index 1dcebdc1..a0919707 100644 --- a/swad_network.c +++ b/swad_network.c @@ -193,6 +193,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) { extern const char *Hlp_PROFILE_Webs; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Webs_social_networks; extern const char *Txt_Save_changes; Net_WebsAndSocialNetworks_t NumURL; @@ -241,7 +242,8 @@ void Net_ShowFormMyWebsAndSocialNets (void) HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_URL (StrName,URL,HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%s\" class=\"REC_C2_BOT_INPUT\"",StrName); + "id=\"%s\" class=\"REC_C2_BOT_INPUT %s\"", + StrName,The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_nickname.c b/swad_nickname.c index 2c348714..c1bfad87 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -151,6 +151,7 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe, { extern const char *Hlp_PROFILE_Account; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Nickname; extern const char *Txt_Before_going_to_any_other_option_you_must_fill_your_nickname; extern const char *Txt_Current_nickname; @@ -307,7 +308,8 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe, Gbl.Usrs.Me.UsrDat.Nickname); HTM_INPUT_TEXT ("NewNick",1 + Nck_MAX_CHARS_NICK_WITHOUT_ARROBA, NickWithArr,HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"NewNick\" size=\"18\""); + "id=\"NewNick\" class=\"%s\" size=\"18\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_BR (); Btn_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname Txt_Save_changes); // I have no nickname yet); diff --git a/swad_password.c b/swad_password.c index 552c3243..c6c99de2 100644 --- a/swad_password.c +++ b/swad_password.c @@ -252,6 +252,7 @@ void Pwd_ShowFormSendNewPwd (void) { extern const char *Hlp_PROFILE_Password; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_If_you_have_forgotten_your_password_; extern const char *Txt_Forgotten_password; extern const char *Txt_nick_email_or_ID; @@ -273,7 +274,8 @@ void Pwd_ShowFormSendNewPwd (void) HTM_TxtColonNBSP (Txt_nick_email_or_ID); HTM_INPUT_TEXT ("UsrId",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin, HTM_DONT_SUBMIT_ON_CHANGE, - "size=\"8\" required=\"required\""); + "size=\"8\" class=\"%s\" required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_LABEL_End (); /***** Send button and end box *****/ @@ -580,6 +582,7 @@ void Pwd_ShowFormChgMyPwd (void) { extern const char *Hlp_PROFILE_Password; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; 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_must_be_at_least_X_characters_and_can_not_contain_spaces_; @@ -628,7 +631,8 @@ void Pwd_ShowFormChgMyPwd (void) /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("UsrPwd",NULL,"off",true, - "id=\"UsrPwd\""); + "id=\"UsrPwd\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); @@ -689,6 +693,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void) void Pwd_PutFormToGetNewPasswordTwice (void) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_password; extern const char *Txt_Retype_new_password; extern const char *Txt_HELP_password; @@ -702,7 +707,8 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("Paswd1",Txt_HELP_password,NULL,true, - "id=\"Paswd1\""); + "id=\"Paswd1\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); @@ -716,7 +722,8 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("Paswd2",Txt_HELP_password,NULL,true, - "id=\"Paswd2\""); + "id=\"Paswd2\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_photo.c b/swad_photo.c index 79418747..4c11a346 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1777,6 +1777,7 @@ static void Pho_PutParamsDegPhoto (void *DegPhotos) static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Average_type; extern const char *Txt_AVERAGE_PHOTO_TYPES[Pho_NUM_AVERAGE_PHOTO_TYPES]; Pho_AvgPhotoTypeOfAverage_t TypeOfAvg; @@ -1795,7 +1796,8 @@ static void Pho_PutSelectorForTypeOfAvg (const struct Pho_DegPhotos *DegPhotos) Pho_PutHiddenParamOrderDegrees (DegPhotos->HowOrderDegrees); Set_PutParamsPrefsAboutUsrList (); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"AvgType\" name=\"AvgType\""); + "id=\"AvgType\" name=\"AvgType\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (TypeOfAvg = (Pho_AvgPhotoTypeOfAverage_t) 0; TypeOfAvg <= (Pho_AvgPhotoTypeOfAverage_t) (Pho_NUM_AVERAGE_PHOTO_TYPES - 1); TypeOfAvg++) @@ -1841,6 +1843,7 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void) static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *DegPhotos) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Size_of_photos; extern const char *Txt_STAT_DEGREE_PHOTO_SIZE[Pho_NUM_HOW_COMPUTE_PHOTO_SIZES]; Pho_HowComputePhotoSize_t PhoSi; @@ -1859,7 +1862,8 @@ static void Pho_PutSelectorForHowComputePhotoSize (const struct Pho_DegPhotos *D Pho_PutHiddenParamOrderDegrees (DegPhotos->HowOrderDegrees); Set_PutParamsPrefsAboutUsrList (); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"PhotoSize\" name=\"PhotoSize\""); + "id=\"PhotoSize\" name=\"PhotoSize\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (PhoSi = (Pho_HowComputePhotoSize_t) 0; PhoSi <= (Pho_HowComputePhotoSize_t) (Pho_NUM_HOW_COMPUTE_PHOTO_SIZES - 1); PhoSi++) @@ -1905,6 +1909,7 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void) static void Pho_PutSelectorForHowOrderDegrees (const struct Pho_DegPhotos *DegPhotos) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Sort_degrees_by; extern const char *Txt_STAT_DEGREE_PHOTO_ORDER[Pho_NUM_HOW_ORDER_DEGREES]; Pho_HowOrderDegrees_t Order; @@ -1923,7 +1928,8 @@ static void Pho_PutSelectorForHowOrderDegrees (const struct Pho_DegPhotos *DegPh Pho_PutHiddenParamPhotoSize (DegPhotos->HowComputePhotoSize); Set_PutParamsPrefsAboutUsrList (); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "id=\"Order\" name=\"Order\""); + "id=\"Order\" name=\"Order\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (Order = (Pho_HowOrderDegrees_t) 0; Order <= (Pho_HowOrderDegrees_t) (Pho_NUM_HOW_ORDER_DEGREES - 1); Order++) @@ -1987,6 +1993,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void *DegPhotos) static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPhotos) { extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X; extern const char *Txt_unknown_TIME; extern const char *Txt_time; @@ -2024,7 +2031,8 @@ static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPh /* Selector with all degrees with students */ HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "name=\"OthDegCod\""); + "name=\"OthDegCod\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (NumDeg = 0; NumDeg < Degs.Num; NumDeg++) diff --git a/swad_project.c b/swad_project.c index eb7dbbce..873fce33 100644 --- a/swad_project.c +++ b/swad_project.c @@ -731,6 +731,7 @@ static void Prj_ShowFormToFilterByWarning (const struct Prj_Projects *Projects) static void Prj_ShowFormToFilterByDpt (const struct Prj_Projects *Projects) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Any_department; struct Prj_Filter Filter; @@ -750,10 +751,12 @@ static void Prj_ShowFormToFilterByDpt (const struct Prj_Projects *Projects) /***** Write selector with departments *****/ Dpt_WriteSelectorDepartment (Gbl.Hierarchy.Ins.InsCod, // Departments in current insitution Projects->Filter.DptCod, // Selected department - "TITLE_DESCRIPTION_WIDTH", // Selector class + Str_BuildString ("TITLE_DESCRIPTION_WIDTH %s", + The_ClassInput[Gbl.Prefs.Theme]), // Selector class -1L, // First option Txt_Any_department, // Text when no department selected true); // Submit on change + Str_FreeStrings (); /***** End form *****/ Frm_EndForm (); @@ -3275,6 +3278,7 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects, extern const char *Hlp_ASSESSMENT_Projects_edit_project; extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassDat[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_project; extern const char *Txt_Edit_project; extern const char *Txt_Data; @@ -3366,10 +3370,12 @@ static void Prj_PutFormProject (struct Prj_Projects *Projects, HTM_TD_Begin ("class=\"LT\""); Dpt_WriteSelectorDepartment (Gbl.Hierarchy.Ins.InsCod, // Departments in current institution Prj->DptCod, // Selected department - "TITLE_DESCRIPTION_WIDTH", // Selector class + Str_BuildString ("TITLE_DESCRIPTION_WIDTH %s", + The_ClassInput[Gbl.Prefs.Theme]), // Selector class 0, // First option Txt_Another_department, // Text when no department selected false); // Don't submit on change + Str_FreeStrings (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_question.c b/swad_question.c index cf5fc5f3..c9f1bee2 100644 --- a/swad_question.c +++ b/swad_question.c @@ -642,6 +642,7 @@ void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia, bool OptionsDisabled) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_No_image_video; extern const char *Txt_Current_image_video; extern const char *Txt_Change_image_video; @@ -688,14 +689,20 @@ void Qst_PutFormToEditQstMedia (const struct Med_Media *Media,int NumMedia, OptionsDisabled ? " disabled=\"disabled\"" : ""); HTM_TxtColonNBSP (Txt_Change_image_video); HTM_LABEL_End (); - Med_PutMediaUploader (NumMedia,"TEST_MED_INPUT"); + Med_PutMediaUploader (NumMedia,Str_BuildString ("TEST_MED_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); /***** End container *****/ HTM_DIV_End (); } else // No current image + { /***** Attached media *****/ - Med_PutMediaUploader (NumMedia,"TEST_MED_INPUT"); + Med_PutMediaUploader (NumMedia,Str_BuildString ("TEST_MED_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); + } } /*****************************************************************************/ diff --git a/swad_record.c b/swad_record.c index 2ad389b9..09344fd4 100644 --- a/swad_record.c +++ b/swad_record.c @@ -3038,6 +3038,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Surname_1; HTM_TR_Begin (NULL); @@ -3057,8 +3058,9 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) if (PutForm) HTM_INPUT_TEXT ("Surname1",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME,UsrDat->Surname1, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Surname1\" class=\"REC_C2_BOT_INPUT\"" - " required=\"required\""); + "id=\"Surname1\" class=\"REC_C2_BOT_INPUT %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); else if (UsrDat->Surname1[0]) { HTM_STRONG_Begin (); @@ -3077,6 +3079,7 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Surname_2; HTM_TR_Begin (NULL); @@ -3092,7 +3095,8 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) HTM_INPUT_TEXT ("Surname2",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME, UsrDat->Surname2, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"Surname2\" class=\"REC_C2_BOT_INPUT\""); + "id=\"Surname2\" class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); else if (UsrDat->Surname2[0]) { HTM_STRONG_Begin (); @@ -3111,6 +3115,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_First_name; HTM_TR_Begin (NULL); @@ -3132,8 +3137,9 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm) HTM_INPUT_TEXT ("FirstName",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME, UsrDat->FrstName, HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"FirstName\" class=\"REC_C2_BOT_INPUT\"" - " required=\"required\""); + "id=\"FirstName\" class=\"REC_C2_BOT_INPUT %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); else if (UsrDat->FrstName[0]) { HTM_STRONG_Begin (); @@ -3151,6 +3157,7 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm) static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Country; extern const char *Txt_Another_country; unsigned NumCty; @@ -3175,7 +3182,9 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm) HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT LM\""); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, "id=\"OthCtyCod\" name=\"OthCtyCod\"" - " class=\"REC_C2_BOT_INPUT\" required=\"required\""); + " class=\"REC_C2_BOT_INPUT %s\"" + " required=\"required\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"",false,false, "%s",Txt_Country); HTM_OPTION (HTM_Type_STRING,"0",UsrDat->CtyCod == 0,false, @@ -3238,6 +3247,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, unsigned NumPhone) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Phone; char *Name; char *Label; @@ -3265,7 +3275,8 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, if (PutForm) HTM_INPUT_TEL (Name,UsrDat->Phone[NumPhone], HTM_DONT_SUBMIT_ON_CHANGE, - "id=\"%s\" class=\"REC_C2_BOT_INPUT\"",Name); + "id=\"%s\" class=\"REC_C2_BOT_INPUT %s\"", + Name,The_ClassInput[Gbl.Prefs.Theme]); else if (UsrDat->Phone[NumPhone][0]) { HTM_A_Begin ("href=\"tel:%s\" class=\"%s\"", @@ -3292,6 +3303,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm, static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_USER_comments; /***** Comments *****/ @@ -3309,7 +3321,8 @@ static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm) if (PutForm) { HTM_TEXTAREA_Begin ("id=\"Comments\" name=\"Comments\"" - " rows=\"4\" class=\"REC_C2_BOT_INPUT\""); + " rows=\"4\" class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_Txt (UsrDat->Comments); HTM_TEXTAREA_End (); } @@ -3741,6 +3754,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) { extern const char *Hlp_PROFILE_Institution; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Institution_center_and_department; extern const char *Txt_Institution; extern const char *Txt_Country; @@ -3784,7 +3798,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgCtyMyIns,Rec_MY_INS_CTR_DPT_ID); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, "id=\"InsCtyCod\" name=\"OthCtyCod\"" - " class=\"REC_C2_BOT_INPUT\""); + " class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"-1", Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0,true, NULL); @@ -3821,7 +3836,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgMyIns,Rec_MY_INS_CTR_DPT_ID); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, "id=\"OthInsCod\" name=\"OthInsCod\"" - " class=\"REC_C2_BOT_INPUT\""); + " class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"-1", Gbl.Usrs.Me.UsrDat.InsCod < 0,true, NULL); @@ -3862,7 +3878,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgMyCtr,Rec_MY_INS_CTR_DPT_ID); HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, "id=\"OthCtrCod\" name=\"OthCtrCod\"" - " class=\"REC_C2_BOT_INPUT\""); + " class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_OPTION (HTM_Type_STRING,"-1", Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0,true, NULL); @@ -3894,10 +3911,12 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgMyDpt,Rec_MY_INS_CTR_DPT_ID); Dpt_WriteSelectorDepartment (Gbl.Usrs.Me.UsrDat.InsCod, // Departments in my institution Gbl.Usrs.Me.UsrDat.Tch.DptCod, // Selected department - "REC_C2_BOT_INPUT", // Selector class + Str_BuildString ("REC_C2_BOT_INPUT %s", + The_ClassInput[Gbl.Prefs.Theme]), // Selector class -1L, // First option "", // Text when no department selected true); // Submit on change + Str_FreeStrings (); Frm_EndForm (); HTM_TD_End (); @@ -3914,7 +3933,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgMyOff,Rec_MY_INS_CTR_DPT_ID); HTM_INPUT_TEXT ("Office",Usr_MAX_CHARS_ADDRESS,Gbl.Usrs.Me.UsrDat.Tch.Office, HTM_SUBMIT_ON_CHANGE, - "id=\"Office\" class=\"REC_C2_BOT_INPUT\""); + "id=\"Office\" class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); Frm_EndForm (); HTM_TD_End (); @@ -3931,7 +3951,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) Frm_BeginFormAnchor (ActChgMyOffPho,Rec_MY_INS_CTR_DPT_ID); HTM_INPUT_TEL ("OfficePhone",Gbl.Usrs.Me.UsrDat.Tch.OfficePhone, HTM_SUBMIT_ON_CHANGE, - "id=\"OfficePhone\" class=\"REC_C2_BOT_INPUT\""); + "id=\"OfficePhone\" class=\"REC_C2_BOT_INPUT %s\"", + The_ClassInput[Gbl.Prefs.Theme]); Frm_EndForm (); HTM_TD_End (); diff --git a/swad_scope.c b/swad_scope.c index ce4225d5..9ba58baf 100644 --- a/swad_scope.c +++ b/swad_scope.c @@ -46,6 +46,7 @@ extern struct Globals Gbl; void Sco_PutSelectorScope (const char *ParamName,HTM_SubmitOnChange_t SubmitOnChange) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_System; extern const char *Txt_Country; extern const char *Txt_Institution; @@ -57,7 +58,8 @@ void Sco_PutSelectorScope (const char *ParamName,HTM_SubmitOnChange_t SubmitOnCh bool WriteScope; HTM_SELECT_Begin (SubmitOnChange, - "id=\"%s\" name=\"%s\"",ParamName,ParamName); + "id=\"%s\" name=\"%s\" class=\"%s\"", + ParamName,ParamName,The_ClassInput[Gbl.Prefs.Theme]); for (Scope = (HieLvl_Level_t) 0; Scope <= (HieLvl_Level_t) (HieLvl_NUM_LEVELS - 1); diff --git a/swad_search.c b/swad_search.c index 82b40819..2ed981a4 100644 --- a/swad_search.c +++ b/swad_search.c @@ -100,6 +100,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie { extern const char *Hlp_START_Search; extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Scope; extern const char *Txt_SEARCH_X_in_Y; extern const char *Txt_all; @@ -169,7 +170,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtF (" %s ",Txt_SEARCH_X_in_Y); HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE, - "name=\"WhatToSearch\" class=\"WHAT_TO_SEARCH\""); + "name=\"WhatToSearch\" class=\"WHAT_TO_SEARCH %s\"", + The_ClassInput[Gbl.Prefs.Theme]); for (WhatToSearch = (Sch_WhatToSearch_t) 0; WhatToSearch <= (Sch_WhatToSearch_t) (Sch_NUM_WHAT_TO_SEARCH - 1); WhatToSearch++) @@ -250,13 +252,16 @@ void Sch_PutFormToSearchInPageTopHeading (void) void Sch_PutInputStringToSearch (const char *IdInputText) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Search; /***** String to find *****/ // Input field not required, because it can be hidden (display:none) HTM_INPUT_SEARCH ("Search",Sch_MAX_CHARS_STRING_TO_FIND,Gbl.Search.Str, - "id=\"%s\" size=\"18\" placeholder=\"%s…\"", - IdInputText,Txt_Search); + "id=\"%s\" size=\"18\" class=\"%s\" placeholder=\"%s…\"", + IdInputText, + The_ClassInput[Gbl.Prefs.Theme], + Txt_Search); } /*****************************************************************************/ diff --git a/swad_theme.c b/swad_theme.c index 6a21aaed..dca09965 100644 --- a/swad_theme.c +++ b/swad_theme.c @@ -371,6 +371,17 @@ const char *The_ClassPrefOn[The_NUM_THEMES] = [The_THEME_DARK ] = "PREF_ON_DARK", }; +const char *The_ClassInput[The_NUM_THEMES] = + { + [The_THEME_WHITE ] = "INPUT_WHITE", + [The_THEME_GREY ] = "INPUT_GREY", + [The_THEME_PURPLE] = "INPUT_PURPLE", + [The_THEME_BLUE ] = "INPUT_BLUE", + [The_THEME_YELLOW] = "INPUT_YELLOW", + [The_THEME_PINK ] = "INPUT_PINK", + [The_THEME_DARK ] = "INPUT_DARK", + }; + /*****************************************************************************/ /****************************** Private prototypes ***************************/ /*****************************************************************************/ diff --git a/swad_timeline_comment.c b/swad_timeline_comment.c index 826ccd47..b9947dbd 100644 --- a/swad_timeline_comment.c +++ b/swad_timeline_comment.c @@ -212,6 +212,7 @@ static void Tml_Com_ShowAuthorPhoto (struct UsrData *UsrDat) static void Tml_Com_PutFormToWriteNewComm (const struct Tml_Timeline *Timeline, long NotCod) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_TIMELINE_comment; /***** Begin container *****/ @@ -223,7 +224,9 @@ static void Tml_Com_PutFormToWriteNewComm (const struct Tml_Timeline *Timeline, /***** Textarea and button *****/ Tml_Pst_PutTextarea (Txt_New_TIMELINE_comment, - "Tml_COM_TEXTAREA Tml_COMM_WIDTH"); + Str_BuildString ("Tml_COM_TEXTAREA Tml_COMM_WIDTH %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); /***** End form *****/ Tml_Frm_EndForm (); diff --git a/swad_timeline_post.c b/swad_timeline_post.c index 9a1131cc..e53f5851 100644 --- a/swad_timeline_post.c +++ b/swad_timeline_post.c @@ -166,6 +166,7 @@ void Tml_Pst_PutPhotoAndFormToWriteNewPost (struct Tml_Timeline *Timeline) static void Tml_Pst_PutFormToWriteNewPost (struct Tml_Timeline *Timeline) { extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_New_TIMELINE_post; /***** Begin container *****/ @@ -184,7 +185,9 @@ static void Tml_Pst_PutFormToWriteNewPost (struct Tml_Timeline *Timeline) /* Form with textarea */ Tml_Frm_BeginForm (Timeline,Tml_Frm_RECEIVE_POST); Tml_Pst_PutTextarea (Txt_New_TIMELINE_post, - "Tml_PST_TEXTAREA Tml_RIGHT_WIDTH"); + Str_BuildString ("Tml_COM_TEXTAREA Tml_COMM_WIDTH %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); Tml_Frm_EndForm (); /* End container */ @@ -200,6 +203,7 @@ static void Tml_Pst_PutFormToWriteNewPost (struct Tml_Timeline *Timeline) void Tml_Pst_PutTextarea (const char *Placeholder,const char *ClassTextArea) { + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Post; char IdDivImgButton[Frm_MAX_BYTES_ID + 1]; @@ -222,7 +226,9 @@ void Tml_Pst_PutTextarea (const char *Placeholder,const char *ClassTextArea) Lay_HelpPlainEditor (); /***** Attached image (optional) *****/ - Med_PutMediaUploader (-1,"Tml_MED_INPUT_WIDTH"); + Med_PutMediaUploader (-1,Str_BuildString ("Tml_MED_INPUT_WIDTH %s", + The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); /***** Submit button *****/ HTM_BUTTON_SUBMIT_Begin (NULL,"BT_SUBMIT_INLINE BT_CREATE",NULL); diff --git a/swad_user.c b/swad_user.c index 0d6f48dd..7ba6aee8 100644 --- a/swad_user.c +++ b/swad_user.c @@ -1129,6 +1129,7 @@ void Usr_PutLinkToLogin (void) void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)) { extern const char *Hlp_PROFILE_LogIn; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Log_in; extern const char *Txt_User[Usr_NUM_SEXS]; extern const char *Txt_nick_email_or_ID; @@ -1162,8 +1163,10 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)) HTM_INPUT_TEXT ("UsrId",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin, HTM_DONT_SUBMIT_ON_CHANGE, "id=\"UsrId\" size=\"18\" placeholder=\"%s\"" - " autofocus=\"autofocus\" required=\"required\"", - Txt_nick_email_or_ID); + " class=\"%s\" autofocus=\"autofocus\"" + " required=\"required\"", + Txt_nick_email_or_ID, + The_ClassInput[Gbl.Prefs.Theme]); HTM_DIV_End (); /***** User's password *****/ @@ -1172,7 +1175,8 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void)) Ico_PutIcon ("key.svg",Txt_Password,"CONTEXT_ICO_16x16"); HTM_LABEL_End (); HTM_INPUT_PASSWORD ("UsrPwd",Txt_password,NULL,false, - "id=\"UsrPwd\""); + "id=\"UsrPwd\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); HTM_DIV_End (); /***** End table, send button and end box *****/ @@ -1338,6 +1342,7 @@ void Usr_PutFormLogIn (void) void Usr_WriteLoggedUsrHead (void) { extern const char *The_ClassUsr[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Role; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; static const char *ClassPhoto[Pho_NUM_SHAPES] = @@ -1367,7 +1372,10 @@ void Usr_WriteLoggedUsrHead (void) HTM_Colon (); } else - Rol_PutFormToChangeMyRole ("SEL_ROLE"); + { + Rol_PutFormToChangeMyRole (Str_BuildString ("SEL_ROLE %s",The_ClassInput[Gbl.Prefs.Theme])); + Str_FreeStrings (); + } HTM_NBSP (); /***** Show my photo *****/ @@ -2033,6 +2041,7 @@ void Usr_ShowFormsLogoutAndRole (void) extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *The_ClassDatStrong[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_Session; extern const char *Txt_Role; extern const char *Txt_You_are_now_LOGGED_IN_as_X; @@ -2066,7 +2075,7 @@ void Usr_ShowFormsLogoutAndRole (void) { HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_TxtColonNBSP (Txt_Role); - Rol_PutFormToChangeMyRole (NULL); + Rol_PutFormToChangeMyRole (The_ClassInput[Gbl.Prefs.Theme]); HTM_LABEL_End (); } @@ -6246,6 +6255,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType, void Usr_PutSelectorNumColsClassPhoto (void) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassInput[The_NUM_THEMES]; extern const char *Txt_columns; unsigned Cols; @@ -6254,7 +6264,8 @@ void Usr_PutSelectorNumColsClassPhoto (void) /***** Begin selector *****/ HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE, - "name=\"ColsClassPhoto\""); + "name=\"ColsClassPhoto\" class=\"%s\"", + The_ClassInput[Gbl.Prefs.Theme]); /***** Put a row in selector for every number of columns *****/ for (Cols = 1;