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.70.5: Dec 19, 2021 Working on design of dark theme.

This commit is contained in:
acanas 2021-12-19 20:16:58 +01:00
parent 663ab8a32d
commit 857fe5b3b4
15 changed files with 227 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
swad_call_for_exam.c
View File

@ -886,6 +886,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
{
extern const char *Hlp_ASSESSMENT_Calls_for_exam_new_call;
extern const char *Hlp_ASSESSMENT_Announcements_edit_announcement;
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_CALL_FOR_EXAM;
extern const char *Txt_CALL_FOR_EXAM_Course;
@ -1040,7 +1041,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_FORM_VIEW)
HTM_INPUT_TEXT ("CrsName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,CallsForExams->CallForExam.CrsFullName,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"CrsName\" size=\"30\"");
"id=\"CrsName\" size=\"30\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
{
HTM_STRONG_Begin ();
@ -1065,8 +1067,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"Year\" name=\"Year\"");
for (Year = 0;
"id=\"Year\" name=\"Year\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (Year = 0;
Year <= Deg_MAX_YEARS_PER_DEGREE;
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
@ -1094,7 +1097,8 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_FORM_VIEW)
HTM_INPUT_TEXT ("ExamSession",Cfe_MAX_CHARS_SESSION,CallsForExams->CallForExam.Session,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"ExamSession\" size=\"30\"");
"id=\"ExamSession\" size=\"30\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
HTM_Txt (CallsForExams->CallForExam.Session);
HTM_TD_End ();
@ -1145,11 +1149,13 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"ExamHour\" name=\"ExamHour\"");
"id=\"ExamHour\" name=\"ExamHour\""
" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"0",
CallsForExams->CallForExam.StartTime.Hour == 0,false,
"-");
for (Hour = 7;
for (Hour = 7;
Hour <= 22;
Hour++)
HTM_OPTION (HTM_Type_UNSIGNED,&Hour,
@ -1158,8 +1164,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_SELECT_End ();
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"ExamMinute\"");
for (Minute = 0;
"name=\"ExamMinute\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (Minute = 0;
Minute <= 59;
Minute++)
HTM_OPTION (HTM_Type_UNSIGNED,&Minute,
@ -1188,8 +1195,10 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"DurationHour\" name=\"DurationHour\"");
for (Hour = 0;
"id=\"DurationHour\" name=\"DurationHour\""
" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (Hour = 0;
Hour <= 8;
Hour++)
HTM_OPTION (HTM_Type_UNSIGNED,&Hour,
@ -1198,8 +1207,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_SELECT_End ();
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"DurationMinute\"");
for (Minute = 0;
"name=\"DurationMinute\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (Minute = 0;
Minute <= 59;
Minute++)
HTM_OPTION (HTM_Type_UNSIGNED,&Minute,
@ -1245,7 +1255,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"Place\" name=\"Place\" cols=\"40\" rows=\"4\"");
HTM_TEXTAREA_Begin ("id=\"Place\" name=\"Place\""
" cols=\"30\" rows=\"4\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.Place);
HTM_TEXTAREA_End ();
}
@ -1273,7 +1285,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"ExamMode\" name=\"ExamMode\" cols=\"40\" rows=\"2\"");
HTM_TEXTAREA_Begin ("id=\"ExamMode\" name=\"ExamMode\""
" cols=\"30\" rows=\"2\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.Mode);
HTM_TEXTAREA_End ();
}
@ -1291,28 +1305,30 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
/***** Structure of the exam *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",
TypeViewCallForExam == Cfe_FORM_VIEW ? "Structure" :
NULL,
Txt_CALL_FOR_EXAM_Structure_of_the_exam);
/* Label */
Frm_LabelColumn ("RT",
TypeViewCallForExam == Cfe_FORM_VIEW ? "Structure" :
NULL,
Txt_CALL_FOR_EXAM_Structure_of_the_exam);
/* Data */
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"Structure\" name=\"Structure\" cols=\"40\" rows=\"8\"");
/* Data */
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"Structure\" name=\"Structure\""
" cols=\"30\" rows=\"8\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.Structure);
HTM_TEXTAREA_End ();
}
else
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
CallsForExams->CallForExam.Structure,
Cns_MAX_BYTES_TEXT,false);
HTM_Txt (CallsForExams->CallForExam.Structure);
HTM_TEXTAREA_End ();
}
else
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
CallsForExams->CallForExam.Structure,
Cns_MAX_BYTES_TEXT,false);
HTM_Txt (CallsForExams->CallForExam.Structure);
}
HTM_TD_End ();
}
HTM_TD_End ();
HTM_TR_End ();
@ -1329,7 +1345,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"DocRequired\" name=\"DocRequired\" cols=\"40\" rows=\"2\"");
HTM_TEXTAREA_Begin ("id=\"DocRequired\" name=\"DocRequired\""
" cols=\"30\" rows=\"2\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.DocRequired);
HTM_TEXTAREA_End ();
}
@ -1347,28 +1365,30 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
/***** Material required *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("RT",
TypeViewCallForExam == Cfe_FORM_VIEW ? "MatRequired" :
NULL,
Txt_CALL_FOR_EXAM_Material_required);
/* Label */
Frm_LabelColumn ("RT",
TypeViewCallForExam == Cfe_FORM_VIEW ? "MatRequired" :
NULL,
Txt_CALL_FOR_EXAM_Material_required);
/* Data */
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"MatRequired\" name=\"MatRequired\" cols=\"40\" rows=\"4\"");
/* Data */
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"MatRequired\" name=\"MatRequired\""
" cols=\"30\" rows=\"4\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.MatRequired);
HTM_TEXTAREA_End ();
}
else
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
CallsForExams->CallForExam.MatRequired,
Cns_MAX_BYTES_TEXT,false);
HTM_Txt (CallsForExams->CallForExam.MatRequired);
HTM_TEXTAREA_End ();
}
else
{
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
CallsForExams->CallForExam.MatRequired,
Cns_MAX_BYTES_TEXT,false);
HTM_Txt (CallsForExams->CallForExam.MatRequired);
}
HTM_TD_End ();
}
HTM_TD_End ();
HTM_TR_End ();
@ -1385,7 +1405,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"MatAllowed\" name=\"MatAllowed\" cols=\"40\" rows=\"4\"");
HTM_TEXTAREA_Begin ("id=\"MatAllowed\" name=\"MatAllowed\""
" cols=\"30\" rows=\"4\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.MatAllowed);
HTM_TEXTAREA_End ();
}
@ -1413,7 +1435,9 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
HTM_TD_Begin ("class=\"EXAM LB\"");
if (TypeViewCallForExam == Cfe_FORM_VIEW)
{
HTM_TEXTAREA_Begin ("id=\"OtherInfo\" name=\"OtherInfo\" cols=\"40\" rows=\"5\"");
HTM_TEXTAREA_Begin ("id=\"OtherInfo\" name=\"OtherInfo\""
" cols=\"30\" rows=\"5\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (CallsForExams->CallForExam.OtherInfo);
HTM_TEXTAREA_End ();
}

9
swad_center.c
View File

@ -690,6 +690,7 @@ void Ctr_FreeListCenters (void)
void Ctr_WriteSelectorOfCenter (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Center;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -703,11 +704,13 @@ void Ctr_WriteSelectorOfCenter (void)
/***** Begin selector *****/
if (Gbl.Hierarchy.Ins.InsCod > 0)
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"ctr\" name=\"ctr\" class=\"HIE_SEL\"");
"id=\"ctr\" name=\"ctr\" class=\"HIE_SEL %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"ctr\" name=\"ctr\" class=\"HIE_SEL\""
" disabled=\"disabled\"");
"id=\"ctr\" name=\"ctr\" class=\"HIE_SEL %s\""
" disabled=\"disabled\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Ctr.CtrCod < 0,true,
"[%s]",Txt_Center);

1
swad_changelog.h
View File

@ -608,6 +608,7 @@ TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta q
/*
// 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.5: Dec 19, 2021 Working on design of dark theme. (321748 lines)
Version 21.70.4: Dec 18, 2021 Working on design of dark theme. (321634 lines)
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)

27
swad_country.c
View File

@ -865,6 +865,7 @@ void Cty_GetFullListOfCountries (void)
void Cty_WriteSelectorOfCountry (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Country;
unsigned NumCty;
@ -876,7 +877,8 @@ void Cty_WriteSelectorOfCountry (void)
/***** Begin selector of country *****/
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"cty\" name=\"cty\" class=\"HIE_SEL\"");
"id=\"cty\" name=\"cty\" class=\"HIE_SEL %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
/***** Initial disabled option *****/
HTM_OPTION (HTM_Type_STRING,"",Gbl.Hierarchy.Cty.CtyCod < 0,true,
@ -1051,6 +1053,7 @@ void Cty_FreeListCountries (void)
static void Cty_ListCountriesForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES];
unsigned NumCty;
struct Cty_Countr *Cty;
@ -1139,7 +1142,8 @@ static void Cty_ListCountriesForEdition (void)
Par_PutHiddenParamUnsigned (NULL,"Lan",(unsigned) Lan);
HTM_INPUT_TEXT ("Name",Cty_MAX_CHARS_NAME,Cty->Name[Lan],
HTM_SUBMIT_ON_CHANGE,
"size=\"15\"");
"size=\"15\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
Frm_EndForm ();
HTM_TD_End ();
@ -1149,7 +1153,9 @@ static void Cty_ListCountriesForEdition (void)
Cty_PutParamOtherCtyCod (&Cty->CtyCod);
Par_PutHiddenParamUnsigned (NULL,"Lan",(unsigned) Lan);
HTM_INPUT_URL ("WWW",Cty->WWW[Lan],HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW\" required=\"required\"");
"class=\"INPUT_WWW_NARROW %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
Frm_EndForm ();
HTM_TD_End ();
@ -1433,6 +1439,7 @@ static void Cty_PutFormToCreateCountry (void)
{
extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_country;
extern const char *Txt_STR_LANG_NAME[1 + Lan_NUM_LANGUAGES];
extern const char *Txt_Create_country;
@ -1464,13 +1471,15 @@ static void Cty_PutFormToCreateCountry (void)
else
StrCtyCod[0] = '\0';
HTM_INPUT_TEXT ("OthCtyCod",3,StrCtyCod,HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"3\" required=\"required\"");
"size=\"3\" class=\"%s\" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
/***** Alphabetic country code with 2 letters (ISO 3166-1) *****/
HTM_TD_Begin ("rowspan=\"%u\" class=\"RT\"",1 + Lan_NUM_LANGUAGES);
HTM_INPUT_TEXT ("Alpha2",2,Cty_EditingCty->Alpha2,HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"2\" required=\"required\"");
"size=\"2\" class=\"%s\" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TD_Empty (3);
@ -1506,14 +1515,18 @@ static void Cty_PutFormToCreateCountry (void)
snprintf (StrName,sizeof (StrName),"Name_%s",Lan_STR_LANG_ID[Lan]);
HTM_INPUT_TEXT (StrName,Cty_MAX_CHARS_NAME,Cty_EditingCty->Name[Lan],
HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"15\" required=\"required\"");
"size=\"15\" class=\"%s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
/* WWW */
HTM_TD_Begin ("class=\"LM\"");
snprintf (StrName,sizeof (StrName),"WWW_%s",Lan_STR_LANG_ID[Lan]);
HTM_INPUT_URL (StrName,Cty_EditingCty->WWW[Lan],HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW\" required=\"required\"");
"class=\"INPUT_WWW_NARROW %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();

31
swad_course.c
View File

@ -629,6 +629,7 @@ unsigned Crs_GetCachedNumCrssWithUsrs (Rol_Role_t Role)
void Crs_WriteSelectorOfCourse (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Course;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -642,11 +643,13 @@ void Crs_WriteSelectorOfCourse (void)
/***** Begin selector of course *****/
if (Gbl.Hierarchy.Deg.DegCod > 0)
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"crs\" name=\"crs\" class=\"HIE_SEL\"");
"id=\"crs\" name=\"crs\" class=\"HIE_SEL %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"crs\" name=\"crs\" class=\"HIE_SEL\""
" disabled=\"disabled\"");
"id=\"crs\" name=\"crs\" class=\"HIE_SEL %s\""
" disabled=\"disabled\"",
The_ClassInput[Gbl.Prefs.Theme]);
/***** Initial disabled option *****/
HTM_OPTION (HTM_Type_STRING,"",Gbl.Hierarchy.Crs.CrsCod < 0,true,
@ -1149,6 +1152,7 @@ static void Crs_ListCoursesForEdition (void)
static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_COURSE_STATUS[Hie_NUM_STATUS_TXT];
struct Crs_Course *Crs;
@ -1218,8 +1222,10 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
Frm_BeginForm (ActChgCrsYea);
Hie_PutParamOtherHieCod (&Crs->CrsCod);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"name=\"OthCrsYear\" class=\"HIE_SEL_NARROW\"");
for (YearAux = 0;
"name=\"OthCrsYear\""
" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (YearAux = 0;
YearAux <= Deg_MAX_YEARS_PER_DEGREE;
YearAux++) // All the years are permitted
// because it's possible to move this course
@ -1242,7 +1248,8 @@ static void Crs_ListCoursesOfAYearForEdition (unsigned Year)
Hie_PutParamOtherHieCod (&Crs->CrsCod);
HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Crs->ShrtName,
HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_SHORT_NAME\"");
"class=\"INPUT_SHORT_NAME %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
Frm_EndForm ();
}
else
@ -1316,6 +1323,7 @@ static bool Crs_CheckIfICanEdit (struct Crs_Course *Crs)
static void Crs_PutFormToCreateCourse (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_course;
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *Txt_Create_course;
@ -1358,7 +1366,8 @@ static void Crs_PutFormToCreateCourse (void)
/***** Year *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"OthCrsYear\" class=\"HIE_SEL_NARROW\"");
"name=\"OthCrsYear\" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (Year = 0;
Year <= Deg_MAX_YEARS_PER_DEGREE;
Year++)
@ -1372,14 +1381,18 @@ static void Crs_PutFormToCreateCourse (void)
HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_TEXT ("ShortName",Cns_HIERARCHY_MAX_CHARS_SHRT_NAME,Crs_EditingCrs->ShrtName,
HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_SHORT_NAME\" required=\"required\"");
"class=\"INPUT_SHORT_NAME %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
/***** Course full name *****/
HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_TEXT ("FullName",Cns_HIERARCHY_MAX_CHARS_FULL_NAME,Crs_EditingCrs->FullName,
HTM_DONT_SUBMIT_ON_CHANGE,
"class=\"INPUT_FULL_NAME\" required=\"required\"");
"class=\"INPUT_FULL_NAME %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
/***** Current number of teachers in this course *****/

23
swad_degree.c
View File

@ -218,6 +218,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Acti
void Deg_WriteSelectorOfDegree (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Degree;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -231,11 +232,13 @@ void Deg_WriteSelectorOfDegree (void)
/***** Begin selector of degree *****/
if (Gbl.Hierarchy.Ctr.CtrCod > 0)
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"deg\" name=\"deg\" class=\"HIE_SEL\"");
"id=\"deg\" name=\"deg\" class=\"HIE_SEL %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"deg\" name=\"deg\" class=\"HIE_SEL\""
" disabled=\"disabled\"");
"id=\"deg\" name=\"deg\" class=\"HIE_SEL %s\""
" disabled=\"disabled\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Deg.DegCod < 0,true,
"[%s]",Txt_Degree);
@ -307,6 +310,7 @@ void Deg_ShowDegsOfCurrentCtr (void)
static void Deg_ListDegreesForEdition (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_DEGREE_STATUS[Hie_NUM_STATUS_TXT];
unsigned NumDeg;
struct DegreeType *DegTyp;
@ -401,7 +405,9 @@ static void Deg_ListDegreesForEdition (void)
Frm_BeginForm (ActChgDegTyp);
Hie_PutParamOtherHieCod (&Deg->DegCod);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"name=\"OthDegTypCod\" class=\"HIE_SEL_NARROW\"");
"name=\"OthDegTypCod\""
" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (NumDegTyp = 0;
NumDegTyp < Gbl.DegTypes.Num;
NumDegTyp++)
@ -430,7 +436,9 @@ static void Deg_ListDegreesForEdition (void)
Frm_BeginForm (ActChgDegWWW);
Hie_PutParamOtherHieCod (&Deg->DegCod);
HTM_INPUT_URL ("WWW",Deg->WWW,HTM_SUBMIT_ON_CHANGE,
"class=\"INPUT_WWW_NARROW\" required=\"required\"");
"class=\"INPUT_WWW_NARROW %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
Frm_EndForm ();
}
else
@ -500,6 +508,7 @@ static bool Deg_CheckIfICanEditADegree (struct Deg_Degree *Deg)
static void Deg_PutFormToCreateDegree (void)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_degree;
extern const char *Txt_Create_degree;
struct DegreeType *DegTyp;
@ -553,7 +562,9 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree type *****/
HTM_TD_Begin ("class=\"LM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"OthDegTypCod\" class=\"HIE_SEL_NARROW\"");
"name=\"OthDegTypCod\""
" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (NumDegTyp = 0;
NumDegTyp < Gbl.DegTypes.Num;
NumDegTyp++)

10
swad_department.c
View File

@ -440,6 +440,7 @@ void Dpt_FreeListDepartments (struct Dpt_Departments *Departments)
static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departments)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Another_institution;
unsigned NumDpt;
struct Dpt_Department *Dpt;
@ -484,7 +485,9 @@ static void Dpt_ListDepartmentsForEdition (const struct Dpt_Departments *Departm
Frm_BeginForm (ActChgDptIns);
Dpt_PutParamDptCod (&Dpt->DptCod);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"name=\"OthInsCod\" class=\"HIE_SEL_NARROW\"");
"name=\"OthInsCod\""
" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"0",Dpt->InsCod == 0,false,
"%s",Txt_Another_institution);
for (NumIns = 0;
@ -791,6 +794,7 @@ void Dpt_ContEditAfterChgDpt (void)
static void Dpt_PutFormToCreateDepartment (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_New_department;
extern const char *Txt_Institution;
extern const char *Txt_Short_name;
@ -823,7 +827,9 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Institution *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"OthInsCod\" class=\"HIE_SEL_NARROW\"");
"name=\"OthInsCod\""
" class=\"HIE_SEL_NARROW %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"0",Dpt_EditingDpt->InsCod == 0,false,
"%s",Txt_Another_institution);
for (NumIns = 0;

3
swad_exam.c
View File

@ -1379,7 +1379,8 @@ void Exa_PutFormEditionExam (struct Exa_Exams *Exams,
HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_FLOAT ("MaxGrade",0.0,DBL_MAX,0.01,Exam->MaxGrade,false,
"required=\"required\"");
" class=\"%s\" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();

6
swad_game.c
View File

@ -1356,7 +1356,8 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games,
HTM_TD_Begin ("class=\"LM\"");
HTM_INPUT_FLOAT ("MaxGrade",0.0,DBL_MAX,0.01,Game->MaxGrade,false,
"required=\"required\"");
" class=\"%s\" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();
@ -1383,7 +1384,8 @@ static void Gam_PutFormsEditionGame (struct Gam_Games *Games,
/* 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 ();

12
swad_info.c
View File

@ -1113,6 +1113,7 @@ void Inf_FormToSendPage (Inf_Src_t InfoSrc)
void Inf_FormToSendURL (Inf_Src_t InfoSrc)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_URL;
extern const char *Txt_Send_URL;
char PathFile[PATH_MAX + 1];
@ -1139,7 +1140,8 @@ void Inf_FormToSendURL (Inf_Src_t InfoSrc)
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_URL);
HTM_INPUT_URL ("InfoSrcURL",Gbl.Crs.Info.URL,HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"50\"");
"size=\"50\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_LABEL_End ();
HTM_DIV_End ();
@ -1677,6 +1679,7 @@ static bool Inf_CheckAndShowRichTxt (void)
void Inf_EditPlainTxtInfo (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES];
extern const char *Txt_Save_changes;
struct Syl_Syllabus Syllabus;
@ -1716,7 +1719,8 @@ void Inf_EditPlainTxtInfo (void)
/***** Edition area *****/
HTM_DIV_Begin ("class=\"CM\"");
Lay_HelpPlainEditor ();
HTM_TEXTAREA_Begin ("name=\"Txt\" cols=\"80\" rows=\"20\"");
HTM_TEXTAREA_Begin ("name=\"Txt\" cols=\"80\" rows=\"20\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (TxtHTML);
HTM_TEXTAREA_End ();
HTM_DIV_End ();
@ -1732,6 +1736,7 @@ void Inf_EditPlainTxtInfo (void)
void Inf_EditRichTxtInfo (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES];
extern const char *Txt_Save_changes;
struct Syl_Syllabus Syllabus;
@ -1771,7 +1776,8 @@ void Inf_EditRichTxtInfo (void)
/***** Edition area *****/
HTM_DIV_Begin ("class=\"CM\"");
Lay_HelpRichEditor ();
HTM_TEXTAREA_Begin ("name=\"Txt\" cols=\"80\" rows=\"20\"");
HTM_TEXTAREA_Begin ("name=\"Txt\" cols=\"80\" rows=\"20\" class=\"%s\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (TxtHTML);
HTM_TEXTAREA_End ();
HTM_DIV_End ();

9
swad_institution.c
View File

@ -857,6 +857,7 @@ void Ins_FreeListInstitutions (void)
void Ins_WriteSelectorOfInstitution (void)
{
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Institution;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -870,11 +871,13 @@ void Ins_WriteSelectorOfInstitution (void)
/***** Begin selector *****/
if (Gbl.Hierarchy.Cty.CtyCod > 0)
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"ins\" name=\"ins\" class=\"HIE_SEL\"");
"id=\"ins\" name=\"ins\" class=\"HIE_SEL %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
else
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"ins\" name=\"ins\" class=\"HIE_SEL\""
" disabled=\"disabled\"");
"id=\"ins\" name=\"ins\" class=\"HIE_SEL %s\""
" disabled=\"disabled\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_OPTION (HTM_Type_STRING,"",
Gbl.Hierarchy.Ins.InsCod < 0,true,

4
swad_institution_config.c
View File

@ -303,6 +303,7 @@ static void InsCfg_Map (void)
static void InsCfg_Country (bool PrintView,bool PutForm)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Country;
unsigned NumCty;
@ -325,7 +326,8 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
Frm_BeginForm (ActChgInsCtyCfg);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,
"id=\"OthCtyCod\" name=\"OthCtyCod\""
" class=\"INPUT_SHORT_NAME\"");
" class=\"INPUT_SHORT_NAME %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
for (NumCty = 0;
NumCty < Gbl.Hierarchy.Ctys.Num;
NumCty++)

47
swad_question.c
View File

@ -1828,6 +1828,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
{
extern const char *Hlp_ASSESSMENT_Questions_writing_a_question;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Question_code_X;
extern const char *Txt_New_question;
extern const char *Txt_Tags;
@ -1913,8 +1914,11 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_TD_Begin ("class=\"LM\"");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"SelTag%u\" name=\"SelTag%u\""
" class=\"TAG_SEL\" onchange=\"changeTxtTag('%u')\"",
IndTag,IndTag,IndTag);
" class=\"TAG_SEL %s\""
" onchange=\"changeTxtTag('%u')\"",
IndTag,IndTag,
The_ClassInput[Gbl.Prefs.Theme],
IndTag);
HTM_OPTION (HTM_Type_STRING,"",false,false,"&nbsp;");
mysql_data_seek (mysql_res,0);
TagFound = false;
@ -1955,8 +1959,11 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
snprintf (StrTagTxt,sizeof (StrTagTxt),"TagTxt%u",IndTag);
HTM_INPUT_TEXT (StrTagTxt,Tag_MAX_CHARS_TAG,Question->Tags.Txt[IndTag],
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%s\" class=\"TAG_TXT\" onchange=\"changeSelTag('%u')\"",
StrTagTxt,IndTag);
"id=\"%s\" class=\"TAG_TXT %s\""
" onchange=\"changeSelTag('%u')\"",
StrTagTxt,
The_ClassInput[Gbl.Prefs.Theme],
IndTag);
HTM_TD_End ();
HTM_TR_End ();
@ -1978,8 +1985,10 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/* Data */
HTM_TD_Begin ("class=\"LT\"");
HTM_TEXTAREA_Begin ("id=\"Stem\" name=\"Stem\" class=\"STEM_TEXTAREA\""
" rows=\"5\" required=\"required\"");
HTM_TEXTAREA_Begin ("id=\"Stem\" name=\"Stem\" rows=\"5\""
" class=\"STEM_TEXTAREA %s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_Txt (Question->Stem);
HTM_TEXTAREA_End ();
HTM_BR ();
@ -1990,7 +1999,9 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional);
HTM_BR ();
HTM_TEXTAREA_Begin ("name=\"Feedback\" class=\"STEM_TEXTAREA\" rows=\"2\"");
HTM_TEXTAREA_Begin ("name=\"Feedback\" rows=\"2\""
" class=\"STEM_TEXTAREA %s\"",
The_ClassInput[Gbl.Prefs.Theme]);
if (Question->Feedback[0])
HTM_Txt (Question->Feedback);
HTM_TEXTAREA_End ();
@ -2039,7 +2050,9 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
snprintf (StrInteger,sizeof (StrInteger),"%ld",Question->Answer.Integer);
HTM_INPUT_TEXT ("AnsInt",Cns_MAX_DECIMAL_DIGITS_LONG,StrInteger,
HTM_DONT_SUBMIT_ON_CHANGE,
"size=\"11\" required=\"required\"%s",
"size=\"11\" class=\"%s\""
" required=\"required\"%s",
The_ClassInput[Gbl.Prefs.Theme],
Question->Answer.Type == Qst_ANS_INT ? "" :
" disabled=\"disabled\"");
HTM_LABEL_End ();
@ -2178,9 +2191,12 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
" style=\"display:none;\""); // Answer does not have content ==> Hide column
/* Answer text */
HTM_TEXTAREA_Begin ("name=\"AnsStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"5\"%s",
NumOpt,OptionsDisabled ? " disabled=\"disabled\"" :
"");
HTM_TEXTAREA_Begin ("name=\"AnsStr%u\" rows=\"5\""
" class=\"ANSWER_TEXTAREA %s\"%s",
NumOpt,
The_ClassInput[Gbl.Prefs.Theme],
OptionsDisabled ? " disabled=\"disabled\"" :
"");
if (AnswerHasContent)
HTM_Txt (Question->Answer.Options[NumOpt].Text);
HTM_TEXTAREA_End ();
@ -2194,9 +2210,12 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
HTM_TxtF ("%s&nbsp;(%s):",Txt_Feedback,Txt_optional);
HTM_BR ();
HTM_TEXTAREA_Begin ("name=\"FbStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"2\"%s",
NumOpt,OptionsDisabled ? " disabled=\"disabled\"" :
"");
HTM_TEXTAREA_Begin ("name=\"FbStr%u\" rows=\"2\""
" class=\"ANSWER_TEXTAREA %s\"%s",
NumOpt,
The_ClassInput[Gbl.Prefs.Theme],
OptionsDisabled ? " disabled=\"disabled\"" :
"");
if (Question->Answer.Options[NumOpt].Feedback)
if (Question->Answer.Options[NumOpt].Feedback[0])
HTM_Txt (Question->Answer.Options[NumOpt].Feedback);

9
swad_tag.c
View File

@ -397,6 +397,7 @@ void Tag_ShowFormSelTags (const struct Tag_Tags *Tags,
void Tag_ShowFormEditTags (void)
{
extern const char *Hlp_ASSESSMENT_Questions_editing_tags;
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_No_test_questions;
extern const char *Txt_Tags;
MYSQL_RES *mysql_res;
@ -441,7 +442,9 @@ void Tag_ShowFormEditTags (void)
Par_PutHiddenParamString (NULL,"OldTagTxt",row[1]);
HTM_INPUT_TEXT ("NewTagTxt",Tag_MAX_CHARS_TAG,row[1],
HTM_SUBMIT_ON_CHANGE,
"size=\"36\" required=\"required\"");
"size=\"36\" class=\"%s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
Frm_EndForm ();
HTM_TD_End ();
@ -471,7 +474,7 @@ static void Tag_PutIconEnable (long TagCod,const char *TagTxt)
Par_PutHiddenParamLong (NULL,"TagCod",TagCod);
Ico_PutIconLink ("eye-slash-red.svg",
Str_BuildString (Txt_Tag_X_not_allowed_Click_to_allow_it,
TagTxt));
TagTxt));
Str_FreeStrings ();
Frm_EndForm ();
HTM_TD_End ();
@ -490,7 +493,7 @@ static void Tag_PutIconDisable (long TagCod,const char *TagTxt)
Par_PutHiddenParamLong (NULL,"TagCod",TagCod);
Ico_PutIconLink ("eye-green.svg",
Str_BuildString (Txt_Tag_X_allowed_Click_to_disable_it,
TagTxt));
TagTxt));
Str_FreeStrings ();
Frm_EndForm ();
HTM_TD_End ();

11
swad_test_config.c
View File

@ -144,6 +144,7 @@ static void TstCfg_ShowFormConfig (void)
extern const char *Hlp_ASSESSMENT_Tests_configuring_tests;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins;
extern const char *Txt_TST_PLUGGABLE[TstCfg_NUM_OPTIONS_PLUGGABLE];
@ -232,7 +233,10 @@ static void TstCfg_ShowFormConfig (void)
TstCfg_GetConfigMinTimeNxtTstPerQst ());
HTM_INPUT_TEXT ("MinTimeNxtTstPerQst",Cns_MAX_DECIMAL_DIGITS_ULONG,StrMinTimeNxtTstPerQst,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"MinTimeNxtTstPerQst\" size=\"7\" required=\"required\"");
"id=\"MinTimeNxtTstPerQst\" size=\"7\""
" class=\"%s\""
" required=\"required\"",
The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();
@ -273,6 +277,7 @@ static void TstCfg_PutInputFieldNumQsts (const char *Field,const char *Label,
unsigned Value)
{
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_ClassInput[The_NUM_THEMES];
char StrValue[Cns_MAX_DECIMAL_DIGITS_UINT + 1];
HTM_TR_Begin (NULL);
@ -288,7 +293,9 @@ static void TstCfg_PutInputFieldNumQsts (const char *Field,const char *Label,
snprintf (StrValue,sizeof (StrValue),"%u",Value);
HTM_INPUT_TEXT (Field,Cns_MAX_DECIMAL_DIGITS_UINT,StrValue,
HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%s\" size=\"3\" required=\"required\"",Field);
"id=\"%s\" size=\"3\" class=\"%s\""
" required=\"required\"",
Field,The_ClassInput[Gbl.Prefs.Theme]);
HTM_TD_End ();
HTM_TR_End ();