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

Version19.51.1

This commit is contained in:
Antonio Cañas Vargas 2019-11-02 23:12:57 +01:00
parent a897bd234c
commit 52d0f9cbb2
44 changed files with 550 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swad_ID.c
View File

@ -606,9 +606,9 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"UsrID\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID);
fprintf (Gbl.F.Out,"<label for=\"UsrID\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_ID);
HTM_LABEL_End ();
HTM_TD_End ();
@ -687,8 +687,9 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"NewID\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
fprintf (Gbl.F.Out,"<label for=\"NewID\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",
UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID
Txt_ID); // The first user's ID
HTM_LABEL_End ();

18
swad_account.c
View File

@ -149,12 +149,12 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
/***** Form to request user's ID for possible account already created *****/
Frm_StartForm (ActChkUsrAcc);
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"text\" name=\"ID\""
" size=\"18\" maxlength=\"%u\" value=\"\""
" required=\"required\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID,
Txt_ID,
ID_MAX_CHARS_USR_ID);
HTM_LABEL_End ();
Btn_PutCreateButtonInline (Txt_Check);
@ -368,9 +368,9 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Nickname);
fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Nickname);
HTM_LABEL_End ();
HTM_TD_End ();
@ -390,9 +390,9 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Email);
fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Email);
HTM_LABEL_End ();
HTM_TD_End ();

18
swad_agenda.c
View File

@ -1500,9 +1500,9 @@ void Agd_RequestCreatOrEditEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Event\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Event);
fprintf (Gbl.F.Out,"<label for=\"Event\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Event);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1519,9 +1519,9 @@ void Agd_RequestCreatOrEditEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Location\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Location);
fprintf (Gbl.F.Out,"<label for=\"Location\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Location);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1542,9 +1542,9 @@ void Agd_RequestCreatOrEditEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Description);
HTM_LABEL_End ();
HTM_TD_End ();

5
swad_announcement.c
View File

@ -454,8 +454,9 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
Field,The_ClassFormInBox[Gbl.Prefs.Theme],Label);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">",
Field,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Label);
HTM_LABEL_End ();
HTM_TD_End ();

18
swad_assignment.c
View File

@ -1167,8 +1167,9 @@ void Asg_RequestCreatOrEditAsg (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1192,7 +1193,8 @@ void Asg_RequestCreatOrEditAsg (void)
HTM_TD_End ();
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"DAT\">%s:"
fprintf (Gbl.F.Out,"<label class=\"DAT\">");
fprintf (Gbl.F.Out,"%s:"
"<input type=\"text\" name=\"Folder\""
" size=\"30\" maxlength=\"%u\" value=\"%s\" />",
Txt_Folder,
@ -1206,8 +1208,9 @@ void Asg_RequestCreatOrEditAsg (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Description);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1268,8 +1271,9 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"WholeCrs\""
" name=\"WholeCrs\" value=\"Y\"");
if (!Asg_CheckIfAsgIsAssociatedToGrps (AsgCod))
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"uncheckChildren(this,'GrpCods')\" />"

29
swad_attendance.c
View File

@ -1104,8 +1104,9 @@ void Att_RequestCreatOrEditAttEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1125,8 +1126,9 @@ void Att_RequestCreatOrEditAttEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Teachers_comment);
fprintf (Gbl.F.Out,"<label for=\"ComTchVisible\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Teachers_comment);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1153,8 +1155,9 @@ void Att_RequestCreatOrEditAttEvent (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Description);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1215,8 +1218,9 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"WholeCrs\""
" name=\"WholeCrs\" value=\"Y\"");
if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod))
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"uncheckChildren(this,'GrpCods')\" />"
@ -3134,17 +3138,16 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">%u:",
NumAttEvent,NumAttEvent + 1);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">",NumAttEvent);
fprintf (Gbl.F.Out,"%u:",NumAttEvent + 1);
HTM_LABEL_End ();
HTM_TD_End ();
if (asprintf (&Id,"att_date_start_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">"
"<span id=\"%s\"></span>",
NumAttEvent,Id);
fprintf (Gbl.F.Out,"<label for=\"Att%u\">",NumAttEvent);
fprintf (Gbl.F.Out,"<span id=\"%s\"></span>",Id);
HTM_LABEL_End ();
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA,

29
swad_centre.c
View File

@ -413,9 +413,9 @@ static void Ctr_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution);
fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Institution);
HTM_LABEL_End ();
HTM_TD_End ();
@ -457,9 +457,9 @@ static void Ctr_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centre);
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Centre);
HTM_LABEL_End ();
HTM_TD_End ();
@ -490,9 +490,9 @@ static void Ctr_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Short_name);
HTM_LABEL_End ();
HTM_TD_End ();
@ -571,9 +571,9 @@ static void Ctr_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Web);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2335,11 +2335,10 @@ void Ctr_RequestPhoto (void)
Txt_XxY_pixels_or_higher);
/***** Upload photo *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"file\" name=\"%s\" accept=\"image/*\""
" onchange=\"document.getElementById('%s').submit();\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);

4
swad_changelog.h
View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.51 (2019-11-02)"
#define Log_PLATFORM_VERSION "SWAD 19.51.2 (2019-11-02)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js"
/*
@ -496,6 +496,8 @@ ps2pdf source.ps destination.pdf
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
// TODO: Buscar <label... y sustituir por HTM_LABEL_Begin ()
Version 19.51.2: Nov 02, 2019 Code refactoring in HTML labels. (? lines)
Version 19.51.1: Nov 02, 2019 Code refactoring in HTML labels. Not finished. (246198 lines)
Version 19.51: Nov 02, 2019 Code refactoring in HTML labels. Not finished. (246220 lines)
Version 19.50.4: Nov 02, 2019 Code refactoring related with writing of local date-time. (246072 lines)
Version 19.50.3: Nov 02, 2019 Code refactoring related with writing of local date-time. (246059 lines)

4
swad_cookie.c
View File

@ -80,8 +80,8 @@ void Coo_EditMyPrefsOnCookies (void)
(Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies) ? "DAT_N LIGHT_BLUE" :
"DAT");
/* Check box */
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\""
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" name=\"cookies\" value=\"Y\"");
if (Gbl.Usrs.Me.UsrDat.Prefs.AcceptThirdPartyCookies)
fprintf (Gbl.F.Out," checked=\"checked\"");

34
swad_course.c
View File

@ -237,9 +237,9 @@ static void Crs_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthDegCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degree);
fprintf (Gbl.F.Out,"<label for=\"OthDegCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Degree);
HTM_LABEL_End ();
HTM_TD_End ();
@ -283,9 +283,9 @@ static void Crs_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Course);
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Course);
HTM_LABEL_End ();
HTM_TD_End ();
@ -316,9 +316,9 @@ static void Crs_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Short_name);
HTM_LABEL_End ();
HTM_TD_End ();
@ -350,9 +350,9 @@ static void Crs_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCrsYear\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Year_OF_A_DEGREE);
fprintf (Gbl.F.Out,"<label for=\"OthCrsYear\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Year_OF_A_DEGREE);
HTM_LABEL_End ();
HTM_TD_End ();
@ -388,9 +388,9 @@ static void Crs_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"InsCrsCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institutional_code);
fprintf (Gbl.F.Out,"<label for=\"InsCrsCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Institutional_code);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3329,9 +3329,9 @@ void Crs_AskRemoveOldCrss (void)
Hlp_SYSTEM_Hierarchy_eliminate_old_courses,Box_NOT_CLOSABLE);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;"
"<select name=\"Months\">",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2);
for (i = Crs_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;
i <= Crs_MAX_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;

19
swad_date.c
View File

@ -120,8 +120,8 @@ void Dat_PutBoxToSelectDateFormat (void)
{
HTM_LI_Begin ("class=\%s\"",(Format == Gbl.Prefs.DateFormat) ? "DAT_N LIGHT_BLUE" :
"DAT");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"DateFormat\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"DateFormat\" value=\"%u\"",
(unsigned) Format);
if (Format == Gbl.Prefs.DateFormat)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -434,9 +434,8 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
/***** Start date-time *****/
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[Dat_START_TIME]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[Dat_START_TIME]);
HTM_LABEL_End ();
HTM_TD_End ();
@ -468,9 +467,8 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
/***** End date-time *****/
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[Dat_END_TIME]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[Dat_END_TIME]);
HTM_LABEL_End ();
HTM_TD_End ();
@ -514,9 +512,8 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2],
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[StartEndTime]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_START_END_TIME[StartEndTime]);
HTM_LABEL_End ();
HTM_TD_End ();

24
swad_degree.c
View File

@ -342,9 +342,9 @@ static void Deg_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centre);
fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Centre);
HTM_LABEL_End ();
HTM_TD_End ();
@ -385,9 +385,9 @@ static void Deg_Configuration (bool PrintView)
/***** Degree full name *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degree);
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Degree);
HTM_LABEL_End ();
HTM_TD_End ();
@ -418,9 +418,9 @@ static void Deg_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Short_name);
HTM_LABEL_End ();
HTM_TD_End ();
@ -451,9 +451,9 @@ static void Deg_Configuration (bool PrintView)
/***** Degree WWW *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Web);
HTM_LABEL_End ();
HTM_TD_End ();

84
swad_enrolment.c
View File

@ -377,11 +377,9 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams)
Frm_StartForm (NextAction);
if (FuncParams)
FuncParams ();
fprintf (Gbl.F.Out,"<label for=\"OtherUsrIDNickOrEMail\""
" class=\"%s RM\">"
"%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_nick_email_or_ID);
fprintf (Gbl.F.Out,"<label for=\"OtherUsrIDNickOrEMail\" class=\"%s RM\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_nick_email_or_ID);
HTM_LABEL_End ();
fprintf (Gbl.F.Out,"<input type=\"text\" id=\"OtherUsrIDNickOrEMail\""
" name=\"OtherUsrIDNickOrEMail\""
@ -806,8 +804,8 @@ void Enr_AskRemoveOldUsrs (void)
NULL,Box_NOT_CLOSABLE);
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;",
Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (Months = Usr_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS;
@ -923,9 +921,9 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"UsrsIDs\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_List_of_nicks_emails_or_IDs);
fprintf (Gbl.F.Out,"<label for=\"UsrsIDs\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_List_of_nicks_emails_or_IDs);
HTM_LABEL_End ();
HTM_TD_End ();
@ -959,48 +957,45 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
{
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
" name=\"RegRemAction\" value=\"%u\" checked=\"checked\" />"
"<label for=\"RegRemAction%u\">"
"%s",
" name=\"RegRemAction\" value=\"%u\" checked=\"checked\" />",
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS,
Txt_Register_the_users_indicated_in_step_1);
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS);
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS);
fprintf (Gbl.F.Out,"%s",Txt_Register_the_users_indicated_in_step_1);
HTM_LABEL_End ();
HTM_LI_End ();
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
" name=\"RegRemAction\" value=\"%u\" />"
"<label for=\"RegRemAction%u\">"
"%s",
" name=\"RegRemAction\" value=\"%u\" />",
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS,
Txt_Remove_the_users_indicated_in_step_1);
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS);
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS);
fprintf (Gbl.F.Out,"%s",Txt_Remove_the_users_indicated_in_step_1);
HTM_LABEL_End ();
HTM_LI_End ();
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
" name=\"RegRemAction\" value=\"%u\" />"
"<label for=\"RegRemAction%u\">"
"%s",
" name=\"RegRemAction\" value=\"%u\" />",
(unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
(unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
(unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS,
Txt_Remove_the_users_not_indicated_in_step_1);
(unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS);
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) Enr_REMOVE_NOT_SPECIFIED_USRS_FROM_CRS);
fprintf (Gbl.F.Out,"%s",Txt_Remove_the_users_not_indicated_in_step_1);
HTM_LABEL_End ();
HTM_LI_End ();
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<input id=\"RegRemAction%u\" type=\"radio\""
" name=\"RegRemAction\" value=\"%u\" />"
"<label for=\"RegRemAction%u\">"
"%s",
(unsigned) Enr_UPDATE_USRS_IN_CRS,
(unsigned) Enr_UPDATE_USRS_IN_CRS,
" name=\"RegRemAction\" value=\"%u\" />",
(unsigned) Enr_UPDATE_USRS_IN_CRS,
(unsigned) Enr_UPDATE_USRS_IN_CRS);
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) Enr_UPDATE_USRS_IN_CRS);
fprintf (Gbl.F.Out,"%s",
Txt_Register_the_users_indicated_in_step_1_and_remove_the_users_not_indicated);
HTM_LABEL_End ();
HTM_LI_End ();
@ -1011,12 +1006,12 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
{
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"RegRemAction%u\""
" name=\"RegRemAction\" value=\"%u\" />"
"<label for=\"RegRemAction%u\">"
"%s",
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
" name=\"RegRemAction\" value=\"%u\" />",
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM,
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM);
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM);
fprintf (Gbl.F.Out,"%s",
Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1);
HTM_LABEL_End ();
HTM_LI_End ();
@ -1775,8 +1770,8 @@ static void Enr_StartRegRemOneUsrAction (Enr_RegRemOneUsrAction_t RegRemOneUsrAc
fprintf (Gbl.F.Out," checked=\"checked\"");
*OptionChecked = true;
}
fprintf (Gbl.F.Out," />"
"<label for=\"RegRemAction%u\">",
fprintf (Gbl.F.Out," />");
fprintf (Gbl.F.Out,"<label for=\"RegRemAction%u\">",
(unsigned) RegRemOneUsrAction);
}
@ -2297,8 +2292,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ScopeEnr\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label for=\"ScopeEnr\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Scope);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2312,8 +2308,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Users);
HTM_LABEL_End ();
HTM_TD_End ();

40
swad_exam.c
View File

@ -1092,8 +1092,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RB\"");
fprintf (Gbl.F.Out,"<label for=\"CrsName\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Course);
fprintf (Gbl.F.Out,"<label for=\"CrsName\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Course);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1115,8 +1115,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RB\"");
fprintf (Gbl.F.Out,"<label for=\"Year\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Year_or_semester);
fprintf (Gbl.F.Out,"<label for=\"Year\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Year_or_semester);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1149,8 +1149,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RB\"");
fprintf (Gbl.F.Out,"<label for=\"ExamSession\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Session);
fprintf (Gbl.F.Out,"<label for=\"ExamSession\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Session);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1309,8 +1309,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Place\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Place_of_exam);
fprintf (Gbl.F.Out,"<label for=\"Place\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Place_of_exam);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1337,8 +1337,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"ExamMode\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Mode);
fprintf (Gbl.F.Out,"<label for=\"ExamMode\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Mode);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1364,8 +1364,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Structure\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam);
fprintf (Gbl.F.Out,"<label for=\"Structure\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1391,8 +1391,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"DocRequired\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Documentation_required);
fprintf (Gbl.F.Out,"<label for=\"DocRequired\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Documentation_required);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1418,8 +1418,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MatRequired\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_required);
fprintf (Gbl.F.Out,"<label for=\"MatRequired\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Material_required);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1445,8 +1445,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MatAllowed\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_allowed);
fprintf (Gbl.F.Out,"<label for=\"MatAllowed\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Material_allowed);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1472,8 +1472,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"OtherInfo\" class=\"%s\">%s:",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Other_information);
fprintf (Gbl.F.Out,"<label for=\"OtherInfo\" class=\"%s\">",StyleForm);
fprintf (Gbl.F.Out,"%s:",Txt_EXAM_ANNOUNCEMENT_Other_information);
HTM_LABEL_End ();
HTM_TD_End ();

9
swad_figure.c
View File

@ -205,8 +205,8 @@ void Fig_ReqShowFigures (void)
Hlp_ANALYTICS_Figures,Box_NOT_CLOSABLE);
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Gbl.Scope.Allowed = 1 << Hie_SYS |
1 << Hie_CTY |
1 << Hie_INS |
@ -220,9 +220,10 @@ void Fig_ReqShowFigures (void)
fprintf (Gbl.F.Out,"<br />");
/***** Type of statistic *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<select name=\"FigureType\">",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Statistic);
Txt_Statistic);
for (FigureType = (Fig_FigureType_t) 0;
FigureType < Fig_NUM_FIGURES;
FigureType++)

42
swad_file_browser.c
View File

@ -3265,8 +3265,8 @@ static void Brw_FormToChangeCrsGrpZone (void)
/***** Select the complete course, not a group *****/
HTM_LI_Begin ("class=\"%s\"",IsCourseZone ? "BROWSER_TITLE" :
"BROWSER_TITLE_LIGHT");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"-1\"");
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"GrpCod\" value=\"-1\"");
if (IsCourseZone)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
@ -3297,8 +3297,8 @@ static void Brw_FormToChangeCrsGrpZone (void)
"subend20x20.gif",
NULL,
"class=\"ICO25x25\" style=\"margin-left:6px;\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
GrpDat.GrpCod);
if (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -8344,12 +8344,12 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
FileNameToShow);
/***** Folder *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s: "
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s: "
"<input type=\"text\" name=\"NewFolderName\""
" size=\"30\" maxlength=\"%u\" value=\"\""
" required=\"required\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Folder,
Txt_Folder,
Brw_MAX_CHARS_FOLDER);
HTM_LABEL_End ();
@ -8512,9 +8512,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"NewLinkURL\" class=\"%s\">"
"%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_URL);
fprintf (Gbl.F.Out,"<label for=\"NewLinkURL\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_URL);
HTM_LABEL_End ();
HTM_TD_End ();
@ -8532,9 +8532,9 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"NewLinkName\" class=\"%s\">"
"%s&nbsp;(%s):&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional);
fprintf (Gbl.F.Out,"<label for=\"NewLinkName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;(%s):&nbsp;",Txt_Save_as,Txt_optional);
HTM_LABEL_End ();
HTM_TD_End ();
@ -9586,9 +9586,9 @@ void Brw_ShowFileMetadata (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"PublicFile\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Availability);
fprintf (Gbl.F.Out,"<label for=\"PublicFile\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Availability);
HTM_LABEL_End ();
HTM_TD_End ();
@ -9621,8 +9621,9 @@ void Brw_ShowFileMetadata (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"License\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_License);
fprintf (Gbl.F.Out,"<label for=\"License\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_License);
HTM_LABEL_End ();
HTM_TD_End ();
@ -12151,9 +12152,8 @@ void Brw_AskRemoveOldFiles (void)
NULL,Box_NOT_CLOSABLE);
/***** Form to request number of months (to remove files older) *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Remove_files_older_than_PART_1_OF_2);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;",Txt_Remove_files_older_than_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (Months = Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES;
Months <= Brw_MAX_MONTHS_IN_BRIEFCASE;

14
swad_forum.c
View File

@ -1754,8 +1754,8 @@ static void For_PutFormWhichForums (void)
ForumSet++)
{
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"ForumSet\""
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"ForumSet\""
" value=\"%u\"",
(unsigned) ForumSet);
if (ForumSet == Gbl.Forum.ForumSet)
@ -3905,8 +3905,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Subject\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Subject);
fprintf (Gbl.F.Out,"<label for=\"Subject\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_Subject);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3926,8 +3927,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Content\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
fprintf (Gbl.F.Out,"<label for=\"Content\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content);
HTM_LABEL_End ();
HTM_TD_End ();

12
swad_game.c
View File

@ -1139,9 +1139,9 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1158,9 +1158,9 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Description);
HTM_LABEL_End ();
HTM_TD_End ();

19
swad_group.c
View File

@ -464,11 +464,10 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE
}
else
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out," />"
"<label for=\"AllGroups\" class=\"%s\">"
"&nbsp;%s",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_All_groups);
fprintf (Gbl.F.Out," />");
fprintf (Gbl.F.Out,"<label for=\"AllGroups\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_All_groups);
HTM_LABEL_End ();
HTM_DIV_End ();
}
@ -2290,8 +2289,8 @@ static void Grp_ListGrpsForMultipleSelection (struct GroupType *GrpTyp,
/* Group name = students with no group */
HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label for=\"Grp%ld\">%s",
-(GrpTyp->GrpTypCod),Txt_users_with_no_group);
fprintf (Gbl.F.Out,"<label for=\"Grp%ld\">",-GrpTyp->GrpTypCod);
fprintf (Gbl.F.Out,"%s",Txt_users_with_no_group);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2398,10 +2397,8 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight)
HTM_TD_Begin ("class=\"LM LIGHT_BLUE\"");
else
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label for=\"Grp%ld\" class=\"DAT\">"
"%s",
Grp->GrpCod,
Grp->GrpName);
fprintf (Gbl.F.Out,"<label for=\"Grp%ld\" class=\"DAT\">",Grp->GrpCod);
fprintf (Gbl.F.Out,"%s",Grp->GrpName);
HTM_LABEL_End ();
HTM_TD_End ();

25
swad_hierarchy.c
View File

@ -103,8 +103,9 @@ void Hie_WriteMenuHierarchy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"cty\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Country);
fprintf (Gbl.F.Out,"<label for=\"cty\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Country);
HTM_LABEL_End ();
HTM_TD_End ();
@ -121,8 +122,9 @@ void Hie_WriteMenuHierarchy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ins\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Institution);
fprintf (Gbl.F.Out,"<label for=\"ins\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Institution);
HTM_LABEL_End ();
HTM_TD_End ();
@ -139,8 +141,9 @@ void Hie_WriteMenuHierarchy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ctr\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Centre);
fprintf (Gbl.F.Out,"<label for=\"ctr\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Centre);
HTM_LABEL_End ();
HTM_TD_End ();
@ -157,8 +160,9 @@ void Hie_WriteMenuHierarchy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"deg\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Degree);
fprintf (Gbl.F.Out,"<label for=\"deg\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Degree);
HTM_LABEL_End ();
HTM_TD_End ();
@ -175,8 +179,9 @@ void Hie_WriteMenuHierarchy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"crs\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Course);
fprintf (Gbl.F.Out,"<label for=\"crs\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Course);
HTM_LABEL_End ();
HTM_TD_End ();

19
swad_indicator.c
View File

@ -123,8 +123,9 @@ void Ind_ReqIndicatorsCourses (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ScopeInd\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label for=\"ScopeInd\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Scope);
HTM_LABEL_End ();
HTM_TD_End ();
@ -138,8 +139,9 @@ void Ind_ReqIndicatorsCourses (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthDegTypCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Types_of_degree);
fprintf (Gbl.F.Out,"<label for=\"OthDegTypCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Types_of_degree);
HTM_LABEL_End ();
HTM_TD_End ();
@ -157,9 +159,9 @@ void Ind_ReqIndicatorsCourses (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
Dpt_PARAM_DPT_COD_NAME,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">",
Dpt_PARAM_DPT_COD_NAME,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Department);
HTM_LABEL_End ();
HTM_TD_End ();
@ -678,7 +680,8 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1
}
HTM_TD_Begin ("class=\"%s\"",Class);
fprintf (Gbl.F.Out,"<label for=\"Indicators%u\">%u",Ind,Ind);
fprintf (Gbl.F.Out,"<label for=\"Indicators%u\">",Ind);
fprintf (Gbl.F.Out,"%u",Ind);
HTM_LABEL_End ();
HTM_TD_End ();

18
swad_info.c
View File

@ -1166,9 +1166,9 @@ void Inf_FormsToSelSendInfo (void)
HTM_TD_Begin ("class=\"LT LIGHT_BLUE\"");
else
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label for=\"InfoSrc%u\" class=\"%s\">%s",
(unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
fprintf (Gbl.F.Out,"<label for=\"InfoSrc%u\" class=\"%s\">",
(unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s",Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
HTM_LABEL_End ();
if (Txt_INFO_SRC_HELP[InfoSrc])
fprintf (Gbl.F.Out,"<span class=\"DAT\"><br />(%s)</span>",
@ -1275,10 +1275,10 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
/***** File *****/
HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"file\" name=\"%s\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_File,
Txt_File,
Fil_NAME_OF_PARAM_FILENAME_ORG);
HTM_LABEL_End ();
HTM_DIV_End ();
@ -1310,11 +1310,11 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
/***** Link *****/
HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"url\" name=\"InfoSrcURL\""
" size=\"50\" maxlength=\"256\" value=\"",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_URL);
Txt_URL);
if ((FileURL = fopen (PathFile,"rb")) == NULL)
fprintf (Gbl.F.Out,"http://");
else

24
swad_institution.c
View File

@ -354,9 +354,9 @@ static void Ins_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Country);
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Country);
HTM_LABEL_End ();
HTM_TD_End ();
@ -398,9 +398,9 @@ static void Ins_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution);
fprintf (Gbl.F.Out,"<label for=\"FullName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Institution);
HTM_LABEL_End ();
HTM_TD_End ();
@ -431,9 +431,9 @@ static void Ins_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
fprintf (Gbl.F.Out,"<label for=\"ShortName\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Short_name);
HTM_LABEL_End ();
HTM_TD_End ();
@ -464,9 +464,9 @@ static void Ins_Configuration (bool PrintView)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Web);
HTM_LABEL_End ();
HTM_TD_End ();

6
swad_logo.c
View File

@ -313,11 +313,11 @@ void Log_RequestLogo (Hie_Level_t Scope)
64,64);
/***** Upload logo *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"file\" name=\"%s\""
" onchange=\"document.getElementById('%s').submit();\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);

19
swad_mail.c
View File

@ -1272,10 +1272,9 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
{
/* The first mail is the current one */
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_email);
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Current_email);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1287,10 +1286,9 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
{
HTM_TD_Begin ("rowspan=\"%u\" class=\"REC_C1_BOT RT\"",
NumEmails - 1);
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out,"<label for=\"Email\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Other_emails);
HTM_LABEL_End ();
HTM_TD_End ();
}
@ -1376,8 +1374,9 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
fprintf (Gbl.F.Out,"<label for=\"NewEmail\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",
NumEmails ? Txt_New_email : // A new email
Txt_Email); // The first email
HTM_LABEL_End ();

6
swad_mark.c
View File

@ -127,7 +127,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowHeaGrp : // Group zone
ActChgNumRowHeaCrs); // Course zone
Brw_PutImplicitParamsFileBrowser ();
fprintf (Gbl.F.Out,"<label>&nbsp;%s: "
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"&nbsp;%s: "
"<input type=\"text\" name=\"%s\""
" size=\"1\" maxlength=\"5\" value=\"%u\""
" class=\"LST_EDIT_ROWS COLOR%u\""
@ -147,7 +148,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
Frm_StartForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowFooGrp : // Group zone
ActChgNumRowFooCrs); // Course zone
Brw_PutImplicitParamsFileBrowser ();
fprintf (Gbl.F.Out,"<label>&nbsp;%s: "
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"&nbsp;%s: "
"<input type=\"text\" name=\"%s\""
" size=\"1\" maxlength=\"5\" value=\"%u\""
" class=\"LST_EDIT_ROWS COLOR%u\""

9
swad_match.c
View File

@ -1199,8 +1199,9 @@ static void Mch_PutFormNewMatch (struct Game *Game)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1264,8 +1265,8 @@ static void Mch_ShowLstGrpsToCreateMatch (void)
/***** First row: checkbox to select the whole course *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\""
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""
" checked=\"checked\""
" onclick=\"uncheckChildren(this,'GrpCods')\" />"

48
swad_message.c
View File

@ -485,9 +485,9 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
HTM_TR_Begin (NULL);
HTM_TH_Begin (1,ColSpan,"LM LIGHT_BLUE");
fprintf (Gbl.F.Out,"<label for=\"OtherRecipients\">%s:",
StdsAndTchsWritten ? Txt_Other_recipients :
Txt_Recipients);
fprintf (Gbl.F.Out,"<label for=\"OtherRecipients\">");
fprintf (Gbl.F.Out,"%s:",StdsAndTchsWritten ? Txt_Other_recipients :
Txt_Recipients);
HTM_LABEL_End ();
HTM_TH_End ();
@ -536,10 +536,9 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MsgSubject\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Subject);
fprintf (Gbl.F.Out,"<label for=\"MsgSubject\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_Subject);
HTM_LABEL_End ();
HTM_TD_End ();
@ -589,9 +588,9 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content);
HTM_LABEL_End ();
HTM_TD_End ();
@ -625,10 +624,9 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Content);
fprintf (Gbl.F.Out,"<label for=\"MsgContent\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_MSG_Content);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2616,10 +2614,11 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
};
/***** Course selection *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;"
"<select name=\"FilterCrsCod\">"
"<option value=\"\"",
The_ClassFormInBox[Gbl.Prefs.Theme],
TxtSelector[Gbl.Msg.TypeOfMessages]);
if (Gbl.Msg.FilterCrsCod < 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2662,11 +2661,10 @@ void Msg_ShowFormToFilterMsgs (void)
/***** Filter authors/recipients *****/
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"search\" name=\"FilterFromTo\""
" size=\"20\" maxlength=\"%u\" value=\"%s\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
TxtFromTo[Gbl.Msg.TypeOfMessages],
Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3,Gbl.Msg.FilterFromTo);
HTM_LABEL_End ();
@ -2674,11 +2672,10 @@ void Msg_ShowFormToFilterMsgs (void)
/***** Filter message content *****/
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"search\" name=\"FilterContent\""
" size=\"20\" maxlength=\"%u\" value=\"%s\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Content,
Msg_MAX_CHARS_FILTER_CONTENT,Gbl.Msg.FilterContent);
HTM_LABEL_End ();
@ -2700,10 +2697,9 @@ static void Msg_ShowFormToShowOnlyUnreadMessages (void)
extern const char *Txt_only_unread_messages;
/***** Put checkbox to select whether to show only unread (received) messages *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\""
" value=\"Y\"",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\""
" value=\"Y\"");
if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"

20
swad_nickname.c
View File

@ -273,10 +273,9 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
{
/* The first nickname is the current one */
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_nickname);
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Current_nickname);
HTM_LABEL_End ();
HTM_TD_End ();
@ -288,10 +287,9 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
{
HTM_TD_Begin ("rowspan=\"%u\" class=\"REC_C1_BOT RT\"",
NumNicks - 1);
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"<label for=\"Nick\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Other_nicknames);
HTM_LABEL_End ();
HTM_TD_End ();
}
@ -372,9 +370,9 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
fprintf (Gbl.F.Out,"<label for=\"NewNick\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
HTM_LABEL_End ();

42
swad_password.c
View File

@ -282,12 +282,12 @@ void Pwd_ShowFormSendNewPwd (void)
Ale_ShowAlert (Ale_INFO,Txt_If_you_have_forgotten_your_password_);
/***** User's ID/nickname *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"text\" name=\"UsrId\""
" size=\"8\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
Txt_nick_email_or_ID,
Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
HTM_LABEL_End ();
@ -688,9 +688,9 @@ void Pwd_ShowFormChgMyPwd (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"UsrPwd\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_password);
fprintf (Gbl.F.Out,"<label for=\"UsrPwd\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Current_password);
HTM_LABEL_End ();
HTM_TD_End ();
@ -742,9 +742,9 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
/***** Begin form element ****/
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Passwd\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Password);
fprintf (Gbl.F.Out,"<label for=\"Passwd\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Password);
HTM_LABEL_End ();
HTM_TD_End ();
@ -780,9 +780,9 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Paswd1\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_New_password);
fprintf (Gbl.F.Out,"<label for=\"Paswd1\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_New_password);
HTM_LABEL_End ();
HTM_TD_End ();
@ -806,9 +806,9 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Paswd2\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Retype_new_password);
fprintf (Gbl.F.Out,"<label for=\"Paswd2\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Retype_new_password);
HTM_LABEL_End ();
HTM_TD_End ();
@ -893,19 +893,17 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
extern const char *Txt_For_security_enter_your_password;
HTM_DIV_Begin ("class=\"CM\" style=\"margin:12px;\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"Consent\" value=\"Y\" />"
"%s",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_I_understand_that_this_action_can_not_be_undone);
HTM_LABEL_End ();
fprintf (Gbl.F.Out,"<br />"
"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"password\" name=\"OthUsrPwd\""
" size=\"16\" maxlength=\"%u\""
" autocomplete=\"off\" required=\"required\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_For_security_enter_your_password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
HTM_LABEL_End ();

20
swad_photo.c
View File

@ -335,11 +335,10 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat)
Ale_ShowAlert (Ale_INFO,Txt_You_can_send_a_file_with_an_image_in_JPEG_format_);
/***** Form to upload photo *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"file\" name=\"%s\" accept=\"image/*\""
" onchange=\"document.getElementById('%s').submit();\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
@ -1791,8 +1790,9 @@ static void Pho_PutSelectorForTypeOfAvg (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"AvgType\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Average_type);
fprintf (Gbl.F.Out,"<label for=\"AvgType\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Average_type);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1856,8 +1856,9 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"PhotoSize\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Size_of_photos);
fprintf (Gbl.F.Out,"<label for=\"PhotoSize\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Size_of_photos);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1921,8 +1922,9 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Order\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
fprintf (Gbl.F.Out,"<label for=\"Order\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Sort_degrees_by);
HTM_LABEL_End ();
HTM_TD_End ();

4
swad_privacy.c
View File

@ -175,8 +175,8 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
HTM_LI_Begin ("class=\"%s\"",
(Visibility == CurrentVisibilityInDB) ? "DAT_N LIGHT_BLUE" :
"DAT");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"%s\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"%s\" value=\"%u\"",
ParamName,(unsigned) Visibility);
if (Visibility == CurrentVisibilityInDB)
fprintf (Gbl.F.Out," checked=\"checked\"");

5
swad_profile.c
View File

@ -204,11 +204,10 @@ void Prf_RequestUserProfile (void)
/***** Form to request user's @nickname *****/
/* By default, the nickname is filled with my nickname
If no user logged ==> the nickname is empty */
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"text\" name=\"usr\""
" size=\"18\" maxlength=\"%u\" value=\"@%s\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Nickname,
Nck_MAX_BYTES_NICKNAME_FROM_FORM,
Gbl.Usrs.Me.UsrDat.Nickname);

28
swad_project.c
View File

@ -3299,8 +3299,9 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3317,9 +3318,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
Dpt_PARAM_DPT_COD_NAME,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">",
Dpt_PARAM_DPT_COD_NAME,
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Department);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3417,9 +3419,9 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_URL);
fprintf (Gbl.F.Out,"<label for=\"WWW\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_URL);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3457,8 +3459,9 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s:",
Id,The_ClassFormInBox[Gbl.Prefs.Theme],Label);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">",
Id,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Label);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3762,8 +3765,9 @@ void Prj_ShowFormConfig (void)
HTM_TD_End ();
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\" id=\"Editable\" name=\"Editable\" value=\"Y\"");
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"Editable\""
" name=\"Editable\" value=\"Y\"");
if (Gbl.Prjs.Config.Editable)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"

88
swad_record.c
View File

@ -1495,9 +1495,8 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
Ico_PutIconTextLink ("print.svg",
Txt_Print);
Frm_LinkFormEnd ();
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"(<select name=\"RecsPerPag\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"(<select name=\"RecsPerPag\">");
for (i = Rec_MIN_RECORDS_PER_PAGE;
i <= Rec_MAX_RECORDS_PER_PAGE;
i++)
@ -2915,8 +2914,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Rol_GetRolesInAllCrssIfNotYetGot (UsrDat);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:",
ClassForm,Txt_Role);
fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Role);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3122,8 +3121,8 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Sex <= Usr_SEX_MALE;
Sex++)
{
fprintf (Gbl.F.Out,"<label class=\"REC_DAT_BOLD\">"
"<input type=\"radio\" name=\"Sex\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label class=\"REC_DAT_BOLD\">");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"Sex\" value=\"%u\"",
(unsigned) Sex);
if (Sex == Gbl.Usrs.Me.UsrDat.Sex)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -3164,9 +3163,8 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Surname1\" class=\"%s\">"
"%s",
ClassForm,Txt_Surname_1);
fprintf (Gbl.F.Out,"<label for=\"Surname1\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s",Txt_Surname_1);
if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":");
@ -3206,9 +3204,8 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Surname2\" class=\"%s\">"
"%s:",
ClassForm,Txt_Surname_2);
fprintf (Gbl.F.Out,"<label for=\"Surname2\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Surname_2);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3241,9 +3238,8 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"FirstName\" class=\"%s\">"
"%s",
ClassForm,Txt_First_name);
fprintf (Gbl.F.Out,"<label for=\"FirstName\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s",Txt_First_name);
if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":");
@ -3292,8 +3288,8 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s",
ClassForm,Txt_Country);
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s",Txt_Country);
if (TypeOfView == Rec_SHA_MY_RECORD_FORM)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,":");
@ -3341,9 +3337,8 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OriginPlace\" class=\"%s\">"
"%s:",
ClassForm,Txt_Place_of_origin);
fprintf (Gbl.F.Out,"<label for=\"OriginPlace\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Place_of_origin);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3411,9 +3406,8 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"LocalAddress\" class=\"%s\">"
"%s:",
ClassForm,Txt_Local_address);
fprintf (Gbl.F.Out,"<label for=\"LocalAddress\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Local_address);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3448,9 +3442,8 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"LocalPhone\" class=\"%s\">"
"%s:",
ClassForm,Txt_Phone);
fprintf (Gbl.F.Out,"<label for=\"LocalPhone\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Phone);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3489,9 +3482,8 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"FamilyAddress\" class=\"%s\">"
"%s:",
ClassForm,Txt_Family_address);
fprintf (Gbl.F.Out,"<label for=\"FamilyAddress\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Family_address);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3526,9 +3518,8 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"FamilyPhone\" class=\"%s\">"
"%s:",
ClassForm,Txt_Phone);
fprintf (Gbl.F.Out,"<label for=\"FamilyPhone\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Phone);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3567,8 +3558,8 @@ static void Rec_ShowComments (struct UsrData *UsrDat,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RT\"");
fprintf (Gbl.F.Out,"<label for=\"Comments\" class=\"%s\">%s:",
ClassForm,Txt_USER_comments);
fprintf (Gbl.F.Out,"<label for=\"Comments\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_USER_comments);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4047,8 +4038,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">%s*:",
ClassForm,Txt_Country);
fprintf (Gbl.F.Out,"<label for=\"OthCtyCod\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s*:",Txt_Country);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4092,8 +4083,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">%s*:",
ClassForm,Txt_Institution);
fprintf (Gbl.F.Out,"<label for=\"OthInsCod\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s*:",Txt_Institution);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4142,8 +4133,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">%s*:",
ClassForm,Txt_Centre);
fprintf (Gbl.F.Out,"<label for=\"OthCtrCod\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s*:",Txt_Centre);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4190,8 +4181,9 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">%s*:",
Dpt_PARAM_DPT_COD_NAME,ClassForm,Txt_Department);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"%s\">",
Dpt_PARAM_DPT_COD_NAME,ClassForm);
fprintf (Gbl.F.Out,"%s*:",Txt_Department);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4212,9 +4204,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"Office\" class=\"%s\">"
"%s:",
ClassForm,Txt_Office);
fprintf (Gbl.F.Out,"<label for=\"Office\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Office);
HTM_LABEL_End ();
HTM_TD_End ();
@ -4236,9 +4227,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT RM\"");
fprintf (Gbl.F.Out,"<label for=\"OfficePhone\" class=\"%s\">"
"%s:",
ClassForm,Txt_Phone);
fprintf (Gbl.F.Out,"<label for=\"OfficePhone\" class=\"%s\">",ClassForm);
fprintf (Gbl.F.Out,"%s:",Txt_Phone);
HTM_LABEL_End ();
HTM_TD_End ();

4
swad_role.c
View File

@ -546,8 +546,8 @@ void Rol_WriteSelectorRoles (unsigned RolesAllowed,unsigned RolesSelected,
Role++)
if ((RolesAllowed & (1 << Role)))
{
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\" name=\"Role\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"Role\" value=\"%u\"",
(unsigned) Role);
if ((RolesSelected & (1 << Role)))

9
swad_search.c
View File

@ -144,8 +144,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
/***** Scope (whole platform, current country, current institution,
current centre, current degree or current course) *****/
HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Gbl.Scope.Allowed = 1 << Hie_SYS |
1 << Hie_CTY |
1 << Hie_INS |
@ -162,9 +162,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie
Sch_PutInputStringToSearch (NULL);
/***** What to search? *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
" %s&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out," %s&nbsp;",Txt_SEARCH_X_in_Y);
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" class=\"WHAT_TO_SEARCH\">");
for (WhatToSearch = (Sch_WhatToSearch_t) 0;
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;

43
swad_statistic.c
View File

@ -419,9 +419,10 @@ void Sta_AskShowCrsHits (void)
/* Selection of count type (number of pages generated, accesses per user, etc.) */
Sta_WriteSelectorCountType ();
fprintf (Gbl.F.Out,"<label class=\"%s\">&nbsp;%s&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<select id=\"GroupedBy\" name=\"GroupedBy\">",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_distributed_by);
Txt_distributed_by);
for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR;
ClicksGroupedBy <= Sta_CLICKS_CRS_PER_ACTION;
ClicksGroupedBy++)
@ -437,8 +438,8 @@ void Sta_AskShowCrsHits (void)
fprintf (Gbl.F.Out,"<br />");
/***** Option b) Listing of detailed clicks to this course *****/
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\""
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\""
" name=\"GroupedOrDetailed\" value=\"%u\"",
(unsigned) Sta_CLICKS_DETAILED);
if (Gbl.Stat.ClicksGroupedBy == Sta_CLICKS_CRS_DETAILED_LIST)
@ -450,9 +451,9 @@ void Sta_AskShowCrsHits (void)
/* Number of rows per page */
// To use getElementById in Firefox, it's necessary to have the id attribute
fprintf (Gbl.F.Out," "
"<label>"
"(%s: <select id=\"RowsPage\" name=\"RowsPage\"",
fprintf (Gbl.F.Out," ");
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"(%s: <select id=\"RowsPage\" name=\"RowsPage\"",
Txt_results_per_page);
if (Gbl.Stat.ClicksGroupedBy != Sta_CLICKS_CRS_DETAILED_LIST)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -540,8 +541,9 @@ void Sta_AskShowGblHits (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
fprintf (Gbl.F.Out,"<label for=\"Role\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Users);
HTM_LABEL_End ();
HTM_TD_End ();
@ -568,8 +570,9 @@ void Sta_AskShowGblHits (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ScopeSta\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label for=\"ScopeSta\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Scope);
HTM_LABEL_End ();
HTM_TD_End ();
@ -591,8 +594,9 @@ void Sta_AskShowGblHits (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"CountType\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Show);
fprintf (Gbl.F.Out,"<label for=\"CountType\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Show);
HTM_LABEL_End ();
HTM_TD_End ();
@ -600,8 +604,8 @@ void Sta_AskShowGblHits (void)
Sta_WriteSelectorCountType ();
/***** Type of statistic *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">&nbsp;%s&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_distributed_by);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",Txt_distributed_by);
if (Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAY ||
Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_GBL_PER_COURSE)
@ -712,8 +716,9 @@ static void Sta_WriteSelectorAction (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"StatAct\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Action);
fprintf (Gbl.F.Out,"<label for=\"StatAct\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Action);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2074,10 +2079,10 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES
Sta_PutHiddenParamScopeSta ();
}
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<select name=\"ColorType\""
" onchange=\"document.getElementById('%s').submit();\">",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Color_of_the_graphic,
Gbl.Form.Id);
for (ColorType = (Sta_ColorType_t) 0;

49
swad_survey.c
View File

@ -1893,9 +1893,9 @@ void Svy_RequestCreatOrEditSvy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Scope);
fprintf (Gbl.F.Out,"<label for=\"ScopeSvy\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Scope);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1911,9 +1911,9 @@ void Svy_RequestCreatOrEditSvy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title);
fprintf (Gbl.F.Out,"<label for=\"Title\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Title);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1933,9 +1933,9 @@ void Svy_RequestCreatOrEditSvy (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Description);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2095,8 +2095,8 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"checkbox\""
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
if (!Svy_CheckIfSvyIsAssociatedToGrps (SvyCod))
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -2728,8 +2728,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Wording);
fprintf (Gbl.F.Out,"<label for=\"Txt\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Wording);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2753,9 +2754,8 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
AnsType < Svy_NUM_ANS_TYPES;
AnsType++)
{
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"AnswerType\""
" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"",
(unsigned) AnsType);
if (AnsType == SvyQst->AnswerType)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -2784,8 +2784,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
/* Label with the number of the answer */
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">%u)",
NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1);
fprintf (Gbl.F.Out,"<label for=\"AnsStr%u\" class=\"%s\">",
NumAns,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%u)",NumAns + 1);
HTM_LABEL_End ();
HTM_TD_End ();
@ -3468,17 +3469,17 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
/* Write the number of option */
HTM_TD_Begin ("class=\"SVY_OPT LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">"
"%u)",
(unsigned) SvyQst->QstCod,NumAns,NumAns + 1);
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">",
(unsigned) SvyQst->QstCod,NumAns);
fprintf (Gbl.F.Out,"%u)",NumAns + 1);
HTM_LABEL_End ();
HTM_TD_End ();
/* Write the text of the answer */
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">%s",
(unsigned) SvyQst->QstCod,NumAns,
SvyQst->AnsChoice[NumAns].Text);
fprintf (Gbl.F.Out,"<label for=\"Ans%010u_%010u\" class=\"DAT\">",
(unsigned) SvyQst->QstCod,NumAns);
fprintf (Gbl.F.Out,"%s",SvyQst->AnsChoice[NumAns].Text);
HTM_LABEL_End ();
HTM_TD_End ();

4
swad_syllabus.c
View File

@ -149,8 +149,8 @@ void Syl_PutFormWhichSyllabus (void)
WhichSyllabus++)
{
HTM_LI_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"WhichSyllabus\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"WhichSyllabus\" value=\"%u\"",
(unsigned) WhichSyllabus);
if (WhichSyllabus == Gbl.Syllabus.WhichSyllabus)
fprintf (Gbl.F.Out," checked=\"checked\"");

126
swad_test.c
View File

@ -354,9 +354,9 @@ void Tst_ShowFormAskTst (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"NumQst\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_No_of_questions);
fprintf (Gbl.F.Out,"<label for=\"NumQst\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_No_of_questions);
HTM_LABEL_End ();
HTM_TD_End ();
@ -472,10 +472,9 @@ void Tst_ShowNewTest (void)
/***** Test result will be saved? *****/
HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Save\""
" value=\"Y\"",
fprintf (Gbl.F.Out,"<label class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"Save\" value=\"Y\"");
if (Gbl.Test.AllowTeachers)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
@ -1139,9 +1138,8 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
HTM_DIV_Begin ("class=\"TEST_MED_EDIT_FORM\"");
/***** Choice 1: No media *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\"",
The_ClassFormInBox[Gbl.Prefs.Theme],
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"%s\" value=\"%u\"",
ParamUploadMedia.Action,Med_ACTION_NO_MEDIA);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -1152,10 +1150,9 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
fprintf (Gbl.F.Out,"<br />");
/***** Choice 2: Current media *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\""
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"%s\" value=\"%u\""
" checked=\"checked\"",
The_ClassFormInBox[Gbl.Prefs.Theme],
ParamUploadMedia.Action,Med_ACTION_KEEP_MEDIA);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -1169,10 +1166,9 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm,
/***** Choice 3: Change media *****/
UniqueId++;
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" id=\"chg_img_%u\" name=\"%s\""
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"radio\" id=\"chg_img_%u\" name=\"%s\""
" value=\"%u\"",
The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId,ParamUploadMedia.Action,
Med_ACTION_NEW_MEDIA); // Replace existing image by new image
if (OptionsDisabled)
@ -1712,9 +1708,8 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
HTM_TD_Empty (1);
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"");
if (Gbl.Test.Tags.All)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'ChkTag');\" />"
@ -1747,8 +1742,8 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
}
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"DAT\">"
"<input type=\"checkbox\" name=\"ChkTag\" value=\"%s\"",
fprintf (Gbl.F.Out,"<label class=\"DAT\">");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"ChkTag\" value=\"%s\"",
row[1]);
if (Gbl.Test.Tags.List)
{
@ -1924,8 +1919,8 @@ static void Tst_ShowFormConfigTst (void)
Pluggable <= Tst_PLUGGABLE_YES;
Pluggable++)
{
fprintf (Gbl.F.Out,"<label class=\"DAT\">"
"<input type=\"radio\" name=\"Pluggable\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label class=\"DAT\">");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"Pluggable\" value=\"%u\"",
(unsigned) Pluggable);
if (Pluggable == Gbl.Test.Config.Pluggable)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -1963,10 +1958,9 @@ static void Tst_ShowFormConfigTst (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"MinTimeNxtTstPerQst\" class=\"%s\">"
"%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Minimum_time_seconds_per_question_between_two_tests);
fprintf (Gbl.F.Out,"<label for=\"MinTimeNxtTstPerQst\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Minimum_time_seconds_per_question_between_two_tests);
HTM_LABEL_End ();
HTM_TD_End ();
@ -1992,8 +1986,8 @@ static void Tst_ShowFormConfigTst (void)
Feedback < Tst_NUM_TYPES_FEEDBACK;
Feedback++)
{
fprintf (Gbl.F.Out,"<label class=\"DAT\">"
"<input type=\"radio\" name=\"Feedback\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label class=\"DAT\">");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"Feedback\" value=\"%u\"",
(unsigned) Feedback);
if (Feedback == Gbl.Test.Config.Feedback)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -2028,8 +2022,8 @@ static void Tst_PutInputFieldNumQst (const char *Field,const char *Label,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RM\"");
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"DAT\">%s",
Field,Label);
fprintf (Gbl.F.Out,"<label for=\"%s\" class=\"DAT\">",Field);
fprintf (Gbl.F.Out,"%s",Label);
HTM_LABEL_End ();
HTM_TD_End ();
@ -2344,9 +2338,8 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"");
if (Gbl.Test.AllAnsTypes)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'AnswerType');\" />"
@ -2365,8 +2358,8 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label class=\"DAT\">"
"<input type=\"checkbox\" name=\"AnswerType\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label class=\"DAT\">");
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"AnswerType\" value=\"%u\"",
(unsigned) AnsType);
Ptr = Gbl.Test.ListAnsTypes;
while (*Ptr)
@ -3741,19 +3734,17 @@ static void Tst_WriteChoiceAnsViewTest (unsigned NumQst,long QstCod,bool Shuffle
HTM_TD_End ();
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">"
"%c)&nbsp;",
NumQst,NumOpt,
'a' + (char) NumOpt);
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">",
NumQst,NumOpt);
fprintf (Gbl.F.Out,"%c)&nbsp;",'a' + (char) NumOpt);
HTM_LABEL_End ();
HTM_TD_End ();
/***** Write the option text *****/
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">"
"%s",
NumQst,NumOpt,
Gbl.Test.Answer.Options[NumOpt].Text);
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"ANS_TXT\">",
NumQst,NumOpt);
fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[NumOpt].Text);
HTM_LABEL_End ();
Med_ShowMedia (&Gbl.Test.Answer.Options[NumOpt].Media,
"TEST_MED_SHOW_CONTAINER",
@ -4196,11 +4187,8 @@ void Tst_WriteChoiceAnsViewMatch (long MchCod,unsigned QstInd,long QstCod,
/***** Write the option text and the result *****/
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"%s\">"
"%s",
QstInd,NumOpt,
Class,
Gbl.Test.Answer.Options[Indexes[NumOpt]].Text);
fprintf (Gbl.F.Out,"<label for=\"Ans%06u_%u\" class=\"%s\">",QstInd,NumOpt,Class);
fprintf (Gbl.F.Out,"%s",Gbl.Test.Answer.Options[Indexes[NumOpt]].Text);
HTM_LABEL_End ();
Med_ShowMedia (&Gbl.Test.Answer.Options[Indexes[NumOpt]].Media,
"TEST_MED_SHOW_CONTAINER",
@ -5156,9 +5144,9 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"RT\"");
fprintf (Gbl.F.Out,"<label for=\"Stem\" class=\"%s\">%s:",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Wording);
fprintf (Gbl.F.Out,"<label for=\"Stem\" class=\"%s\">",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:",Txt_Wording);
HTM_LABEL_End ();
HTM_TD_End ();
@ -5172,10 +5160,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
false);
/***** Feedback *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s (%s):<br />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s (%s):<br />",Txt_Feedback,Txt_optional);
HTM_TEXTAREA_Begin ("name=\"Feedback\" class=\"STEM_TEXTAREA\" rows=\"2\"");
if (Feedback)
if (Feedback[0])
@ -5198,8 +5184,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
AnsType < Tst_NUM_ANS_TYPES;
AnsType++)
{
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"",
fprintf (Gbl.F.Out,"<label>");
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"",
(unsigned) AnsType);
if (AnsType == Gbl.Test.AnswerType)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -5222,11 +5208,11 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
HTM_TD_End ();
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"text\" name=\"AnsInt\""
" size=\"11\" maxlength=\"11\" value=\"%ld\"",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Integer_number,
Txt_Integer_number,
Gbl.Test.Answer.Integer);
if (Gbl.Test.AnswerType != Tst_ANS_INT)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -5262,9 +5248,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
HTM_TD_Empty (1);
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Shuffle\" value=\"Y\"",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"Shuffle\" value=\"Y\"");
if (Gbl.Test.Shuffle)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
@ -5382,8 +5367,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
OptionsDisabled);
/* Feedback */
fprintf (Gbl.F.Out,"<label class=\"%s\">%s (%s):<br />",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s (%s):<br />",Txt_Feedback,Txt_optional);
HTM_TEXTAREA_Begin ("name=\"FbStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"2\"%s",
NumOpt,OptionsDisabled ? " disabled=\"disabled\"" :
"");
@ -5428,12 +5413,12 @@ static void Tst_PutFloatInputField (const char *Label,const char *Field,
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s&nbsp;"
"<input type=\"text\" name=\"%s\""
" size=\"11\" maxlength=\"%u\""
" value=\"%lg\"",
The_ClassFormInBox[Gbl.Prefs.Theme],Label,
Field,
Label,Field,
Tst_MAX_BYTES_FLOAT_ANSWER,
Value);
if (Gbl.Test.AnswerType != Tst_ANS_FLOAT)
@ -5450,9 +5435,8 @@ static void Tst_PutTFInputField (const char *Label,char Value)
{
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" name=\"AnsTF\" value=\"%c\"",
The_ClassFormInBox[Gbl.Prefs.Theme],Value);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnsTF\" value=\"%c\"",Value);
if (Gbl.Test.Answer.TF == Value)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_TRUE_FALSE)

5
swad_test_import.c
View File

@ -141,11 +141,10 @@ void TsI_ShowFormImportQstsFromXML (void)
/***** Write a form to import questions *****/
Frm_StartForm (ActImpTstQst);
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;"
"<input type=\"file\" name=\"%s\" accept=\".xml\""
" onchange=\"document.getElementById('%s').submit();\" />",
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_XML_file,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);

25
swad_timetable.c
View File

@ -1661,11 +1661,9 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
if (Gbl.TimeTable.View == TT_CRS_EDIT)
{
/***** Group *****/
fprintf (Gbl.F.Out,"<br />"
"<label for=\"TTGrp%s\">"
"%s",
CellStr,
Txt_Group);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<label for=\"TTGrp%s\">",CellStr);
fprintf (Gbl.F.Out,"%s",Txt_Group);
HTM_LABEL_End ();
fprintf (Gbl.F.Out,"<select id=\"TTGrp%s\" name=\"TTGrp\""
" class=\"TT_GRP\""
@ -1703,11 +1701,9 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
fprintf (Gbl.F.Out,"</select>");
/***** Info *****/
fprintf (Gbl.F.Out,"<br />"
"<label for=\"TTInf%s\">"
"%s",
CellStr,
Txt_Info);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<label for=\"TTInf%s\">",CellStr);
fprintf (Gbl.F.Out,"%s",Txt_Info);
HTM_LABEL_End ();
fprintf (Gbl.F.Out,"<input id=\"TTInf%s\" name=\"TTInf\""
" type=\"text\" size=\"1\" maxlength=\"%u\""
@ -1722,11 +1718,10 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
else // TimeTableView == TT_TUT_EDIT
{
/***** Info *****/
fprintf (Gbl.F.Out,"<br />"
"<label for=\"TTInf%s\" class=\"DAT_SMALL\">"
"%s",
CellStr,
Txt_Info);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<label for=\"TTInf%s\" class=\"DAT_SMALL\">",
CellStr);
fprintf (Gbl.F.Out,"%s",Txt_Info);
HTM_LABEL_End ();
fprintf (Gbl.F.Out,"<input id=\"TTInf%s\" name=\"TTInf\""
" type=\"text\" size=\"12\" maxlength=\"%u\""

42
swad_user.c
View File

@ -3507,8 +3507,8 @@ void Usr_ShowFormsLogoutAndRole (void)
Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
else
{
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Role);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Role);
Rol_PutFormToChangeMyRole (NULL);
HTM_LABEL_End ();
}
@ -6398,10 +6398,9 @@ static void Usr_PutCheckboxListWithPhotos (void)
Par_PutHiddenParamChar ("WithPhotosExists",'Y');
/***** Put checkbox to select whether list users with photos *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"WithPhotos\""
" value=\"Y\"",
The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"WithPhotos\""
" value=\"Y\"");
if (Gbl.Usrs.Listing.WithPhotos)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
@ -7328,8 +7327,8 @@ void Usr_ListDataAdms (void)
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActLstOth);
Usr_PutParamListWithPhotos ();
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
HTM_LABEL_End ();
Frm_EndForm ();
@ -7795,8 +7794,8 @@ void Usr_SeeGuests (void)
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActLstGst);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
HTM_LABEL_End ();
Frm_EndForm ();
@ -7940,8 +7939,8 @@ void Usr_SeeStudents (void)
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActLstStd);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
HTM_LABEL_End ();
Frm_EndForm ();
@ -8113,8 +8112,8 @@ void Usr_SeeTeachers (void)
HTM_DIV_Begin ("class=\"CM\"");
Frm_StartForm (ActLstTch);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
HTM_LABEL_End ();
Frm_EndForm ();
@ -8355,11 +8354,9 @@ static void Usr_ShowOneListUsrsOption (Usr_ListUsrsOption_t ListUsrsAction,
(unsigned) ListUsrsAction);
if (ListUsrsAction == Gbl.Usrs.Selected.Option)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
"<label for=\"ListUsrsAction%u\">"
"%s",
(unsigned) ListUsrsAction,
Label);
fprintf (Gbl.F.Out," />");
fprintf (Gbl.F.Out,"<label for=\"ListUsrsAction%u\">",(unsigned) ListUsrsAction);
fprintf (Gbl.F.Out,"%s",Label);
HTM_LABEL_End ();
HTM_LI_End ();
@ -8957,10 +8954,9 @@ void Usr_PutSelectorNumColsClassPhoto (void)
unsigned Cols;
/***** Start selector *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<select name=\"ColsClassPhoto\""
" onchange=\"document.getElementById('%s').submit();\">",
The_ClassFormInBox[Gbl.Prefs.Theme],Gbl.Form.Id);
fprintf (Gbl.F.Out,"<label class=\"%s\">",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<select name=\"ColsClassPhoto\""
" onchange=\"document.getElementById('%s').submit();\">",Gbl.Form.Id);
/***** Put a row in selector for every number from 1 to Usr_CLASS_PHOTO_COLS_MAX *****/
for (Cols = 1;