Version19.51.4

This commit is contained in:
Antonio Cañas Vargas 2019-11-03 10:41:31 +01:00
parent 9453fb5c5c
commit b7d3b75bfb
19 changed files with 31 additions and 27 deletions

View File

@ -150,11 +150,10 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
/***** Form to request user's ID for possible account already created *****/
Frm_StartForm (ActChkUsrAcc);
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s: "
"<input type=\"text\" name=\"ID\""
fprintf (Gbl.F.Out,"%s:&nbsp;",Txt_ID);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ID\""
" size=\"18\" maxlength=\"%u\" value=\"\""
" required=\"required\" />",
Txt_ID,
ID_MAX_CHARS_USR_ID);
HTM_LABEL_End ();
Btn_PutCreateButtonInline (Txt_Check);

View File

@ -1269,7 +1269,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"WholeCrs\""
" name=\"WholeCrs\" value=\"Y\"");
if (!Asg_CheckIfAsgIsAssociatedToGrps (AsgCod))

View File

@ -1215,7 +1215,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"WholeCrs\""
" name=\"WholeCrs\" value=\"Y\"");
if (!Att_CheckIfAttEventIsAssociatedToGrps (AttCod))

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.3 (2019-11-02)"
#define Log_PLATFORM_VERSION "SWAD 19.51.4 (2019-11-03)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js"
/*
@ -495,8 +495,9 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
Version 19.51.4: Nov 02, 2019 Code refactoring in HTML labels. (? lines)
Version 19.51.3: Nov 02, 2019 Changes in form of exam announcement. (246127 lines)
Version 19.51.2: Nov 02, 2019 Code refactoring in HTML labels. (246127 lines)
Version 19.51.2: Nov 02, 2019 Code refactoring in HTML labels. Not finished. (246127 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)

View File

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

View File

@ -120,7 +120,7 @@ void Dat_PutBoxToSelectDateFormat (void)
{
HTM_LI_Begin ("class=\%s\"",(Format == Gbl.Prefs.DateFormat) ? "DAT_N LIGHT_BLUE" :
"DAT");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"DateFormat\" value=\"%u\"",
(unsigned) Format);
if (Format == Gbl.Prefs.DateFormat)

View File

@ -3265,7 +3265,7 @@ 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>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"GrpCod\" value=\"-1\"");
if (IsCourseZone)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -3297,7 +3297,7 @@ static void Brw_FormToChangeCrsGrpZone (void)
"subend20x20.gif",
NULL,
"class=\"ICO25x25\" style=\"margin-left:6px;\"");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
GrpDat.GrpCod);
if (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod)

View File

@ -1754,7 +1754,7 @@ static void For_PutFormWhichForums (void)
ForumSet++)
{
HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"ForumSet\""
" value=\"%u\"",
(unsigned) ForumSet);

View File

@ -1266,7 +1266,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
"CHECKBOX_UNCHECKED",
The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
Title);
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
/****** Checkbox and text *****/
fprintf (Gbl.F.Out,"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",

View File

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

View File

@ -1264,7 +1264,7 @@ 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>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\""
" checked=\"checked\""

View File

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

View File

@ -3762,7 +3762,7 @@ void Prj_ShowFormConfig (void)
HTM_TD_End ();
HTM_TD_Begin ("class=\"LT\"");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"checkbox\" id=\"Editable\""
" name=\"Editable\" value=\"Y\"");
if (Gbl.Prjs.Config.Editable)

View File

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

View File

@ -435,10 +435,12 @@ void Sta_AskShowCrsHits (void)
}
fprintf (Gbl.F.Out,"</select>");
HTM_LABEL_End ();
/***** Separator *****/
fprintf (Gbl.F.Out,"<br />");
/***** Option b) Listing of detailed clicks to this course *****/
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\""
" name=\"GroupedOrDetailed\" value=\"%u\"",
(unsigned) Sta_CLICKS_DETAILED);
@ -449,10 +451,12 @@ void Sta_AskShowCrsHits (void)
Txt_STAT_CLICKS_GROUPED_BY[Sta_CLICKS_CRS_DETAILED_LIST]);
HTM_LABEL_End ();
/* Separator */
fprintf (Gbl.F.Out," ");
/* Number of rows per page */
// To use getElementById in Firefox, it's necessary to have the id attribute
fprintf (Gbl.F.Out," ");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"(%s: <select id=\"RowsPage\" name=\"RowsPage\"",
Txt_results_per_page);
if (Gbl.Stat.ClicksGroupedBy != Sta_CLICKS_CRS_DETAILED_LIST)

View File

@ -2092,7 +2092,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"7\" class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" id=\"WholeCrs\" name=\"WholeCrs\" value=\"Y\"");
if (!Svy_CheckIfSvyIsAssociatedToGrps (SvyCod))
@ -2750,7 +2750,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
AnsType < Svy_NUM_ANS_TYPES;
AnsType++)
{
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"",
(unsigned) AnsType);
if (AnsType == SvyQst->AnswerType)

View File

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

View File

@ -5179,7 +5179,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
AnsType < Tst_NUM_ANS_TYPES;
AnsType++)
{
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AnswerType\" value=\"%u\"",
(unsigned) AnsType);
if (AnsType == Gbl.Test.AnswerType)

View File

@ -6296,7 +6296,7 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role)
HTM_TH_Begin (1,Usr_GetColumnsForSelectUsrs (),"LM LIGHT_BLUE");
fprintf (Gbl.F.Out,"<label>");
HTM_LABEL_Begin (NULL);
if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role])
fprintf (Gbl.F.Out,"<input type=\"checkbox\""
" name=\"%s\" value=\"\""