mirror of https://github.com/acanas/swad-core.git
Version19.61.5
This commit is contained in:
parent
40ab81467e
commit
a08ce37965
|
@ -1520,6 +1520,12 @@ void HTM_TxtColon (const char *Txt)
|
|||
HTM_Txt (":");
|
||||
}
|
||||
|
||||
void HTM_NBSPTxt (const char *Txt)
|
||||
{
|
||||
HTM_NBSP ();
|
||||
HTM_Txt (Txt);
|
||||
}
|
||||
|
||||
void HTM_NBSP (void)
|
||||
{
|
||||
HTM_Txt (" ");
|
||||
|
|
|
@ -151,6 +151,7 @@ void HTM_BR (void);
|
|||
|
||||
void HTM_Txt (const char *Txt);
|
||||
void HTM_TxtColon (const char *Txt);
|
||||
void HTM_NBSPTxt (const char *Txt);
|
||||
void HTM_NBSP (void);
|
||||
void HTM_Unsigned (unsigned Num);
|
||||
void HTM_Long (long Num);
|
||||
|
|
|
@ -253,7 +253,7 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
|
|||
|
||||
/***** Centre logo and name *****/
|
||||
Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo,true);
|
||||
fprintf (Gbl.F.Out," %s",Ctr->FullName);
|
||||
HTM_NBSPTxt (Ctr->FullName);
|
||||
|
||||
/***** End link *****/
|
||||
Frm_LinkFormEnd ();
|
||||
|
|
|
@ -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.61.4 (2019-11-10)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.61.5 (2019-11-10)"
|
||||
#define CSS_FILE "swad19.47.css"
|
||||
#define JS_FILE "swad19.39.js"
|
||||
/*
|
||||
|
@ -495,7 +495,8 @@ 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.61.4: Nov 10, 2019 Code refactoring in HTML long printing. (246303 lines)
|
||||
Version 19.61.5: Nov 10, 2019 Code refactoring in HTML text printing. (246308 lines)
|
||||
Version 19.61.4: Nov 10, 2019 Code refactoring in HTML text printing. (246303 lines)
|
||||
Version 19.61.3: Nov 10, 2019 Code refactoring in HTML long printing. (246297 lines)
|
||||
Version 19.61.2: Nov 10, 2019 Code refactoring in HTML unsigned printing. (246291 lines)
|
||||
Version 19.61.1: Nov 10, 2019 Code refactoring in HTML text printing. (246291 lines)
|
||||
|
|
|
@ -571,7 +571,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
ClassNormal,
|
||||
NULL);
|
||||
Ico_PutIcon ("sitemap.svg",Txt_System,"ICO16x16");
|
||||
fprintf (Gbl.F.Out," %s",Txt_System);
|
||||
HTM_NBSPTxt (Txt_System);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
|
@ -603,7 +603,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
Highlight ? ClassHighlight :
|
||||
ClassNormal,NULL);
|
||||
Cty_DrawCountryMap (&Cty,"ICO16x16");
|
||||
fprintf (Gbl.F.Out," %s",Cty.Name[Gbl.Prefs.Language]);
|
||||
HTM_NBSPTxt (Cty.Name[Gbl.Prefs.Language]);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
|
@ -636,7 +636,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
Highlight ? ClassHighlight :
|
||||
ClassNormal,NULL);
|
||||
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,16,NULL,true);
|
||||
fprintf (Gbl.F.Out," %s",Ins.FullName);
|
||||
HTM_NBSPTxt (Ins.FullName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
|
@ -669,7 +669,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
Highlight ? ClassHighlight :
|
||||
ClassNormal,NULL);
|
||||
Log_DrawLogo (Hie_CTR,Ctr.CtrCod,Ctr.ShrtName,16,NULL,true);
|
||||
fprintf (Gbl.F.Out," %s",Ctr.FullName);
|
||||
HTM_NBSPTxt (Ctr.FullName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
|
@ -702,7 +702,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
Highlight ? ClassHighlight :
|
||||
ClassNormal,NULL);
|
||||
Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,16,NULL,true);
|
||||
fprintf (Gbl.F.Out," %s",Deg.FullName);
|
||||
HTM_NBSPTxt (Deg.FullName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
|
@ -738,7 +738,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
Highlight ? ClassHighlight :
|
||||
ClassNormal,NULL);
|
||||
Ico_PutIcon ("list-ol.svg",Crs.FullName,"ICO16x16");
|
||||
fprintf (Gbl.F.Out," %s",Crs.FullName);
|
||||
HTM_NBSPTxt (Crs.FullName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
|
||||
|
|
|
@ -257,7 +257,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Degree *Deg,Act_Action_t Action,
|
|||
|
||||
/***** Degree logo and name *****/
|
||||
Log_DrawLogo (Hie_DEG,Deg->DegCod,Deg->ShrtName,16,ClassLogo,true);
|
||||
fprintf (Gbl.F.Out," %s",Deg->FullName);
|
||||
HTM_NBSPTxt (Deg->FullName);
|
||||
|
||||
/***** End link *****/
|
||||
Frm_LinkFormEnd ();
|
||||
|
@ -2472,7 +2472,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
|
|||
{
|
||||
case Hie_SYS: // System
|
||||
Ico_PutIcon ("swad64x64.png",Txt_all_degrees,"ICO16x16");
|
||||
fprintf (Gbl.F.Out," %s",Txt_all_degrees);
|
||||
HTM_NBSPTxt (Txt_all_degrees);
|
||||
break;
|
||||
case Hie_INS: // Institution
|
||||
Ins.InsCod = Str_ConvertStrCodToLongCod (row[1]);
|
||||
|
|
|
@ -6433,7 +6433,7 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
|
|||
FileSizeStr[0] = '\0';
|
||||
HTM_TD_Begin ("class=\"%s RM COLOR%u\"",
|
||||
Gbl.FileBrowser.TxtStyle,Gbl.RowEvenOdd);
|
||||
fprintf (Gbl.F.Out," %s",FileSizeStr);
|
||||
HTM_NBSPTxt (FileSizeStr);
|
||||
HTM_TD_End ();
|
||||
|
||||
/***** Write the date *****/
|
||||
|
@ -11920,7 +11920,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
|
|||
InsShortName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
|
||||
Log_DrawLogo (Hie_INS,InsCod,InsShortName,20,"CT",true);
|
||||
fprintf (Gbl.F.Out," %s",InsShortName);
|
||||
HTM_NBSPTxt (InsShortName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -11937,7 +11937,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
|
|||
CtrShortName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
|
||||
Log_DrawLogo (Hie_CTR,CtrCod,CtrShortName,20,"CT",true);
|
||||
fprintf (Gbl.F.Out," %s",CtrShortName);
|
||||
HTM_NBSPTxt (CtrShortName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -11954,7 +11954,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
|
|||
DegShortName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
|
||||
Log_DrawLogo (Hie_DEG,DegCod,DegShortName,20,"CT",true);
|
||||
fprintf (Gbl.F.Out," %s",DegShortName);
|
||||
HTM_NBSPTxt (DegShortName);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -12078,7 +12078,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
|
|||
else
|
||||
/* Icon with file type or link */
|
||||
Brw_PutIconFile (16,FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name);
|
||||
fprintf (Gbl.F.Out," %s",FileNameToShow);
|
||||
HTM_NBSPTxt (FileNameToShow);
|
||||
Frm_LinkFormEnd ();
|
||||
|
||||
/* End form */
|
||||
|
|
|
@ -2102,7 +2102,7 @@ static void For_WriteLinkToForum (struct Forum *Forum,
|
|||
default:
|
||||
break;
|
||||
}
|
||||
fprintf (Gbl.F.Out," %s",ForumName);
|
||||
HTM_NBSPTxt (ForumName);
|
||||
|
||||
/***** Write total number of threads and posts in this forum *****/
|
||||
if (ShowNumOfPosts)
|
||||
|
|
|
@ -461,7 +461,7 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE
|
|||
" onclick=\"togglecheckChildren(this,'GrpCods')\"" :
|
||||
" onclick=\"togglecheckChildren(this,'GrpCods')\"") :
|
||||
" disabled=\"disabled\"");
|
||||
fprintf (Gbl.F.Out," %s",Txt_All_groups);
|
||||
HTM_NBSPTxt (Txt_All_groups);
|
||||
HTM_LABEL_End ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
|
@ -160,7 +160,7 @@ void Hld_SeeHolidays (void)
|
|||
|
||||
Dat_ConvDateToDateStr (&Gbl.Hlds.Lst[NumHld].StartDate,StrDate);
|
||||
HTM_TD_Begin ("class=\"DAT LM\"");
|
||||
fprintf (Gbl.F.Out," %s",StrDate);
|
||||
HTM_NBSPTxt (StrDate);
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"DAT LM\"");
|
||||
|
@ -177,7 +177,7 @@ void Hld_SeeHolidays (void)
|
|||
HTM_TD_End ();
|
||||
|
||||
HTM_TD_Begin ("class=\"DAT LM\"");
|
||||
fprintf (Gbl.F.Out," %s",Gbl.Hlds.Lst[NumHld].Name);
|
||||
HTM_NBSPTxt (Gbl.Hlds.Lst[NumHld].Name);
|
||||
HTM_TD_End ();
|
||||
|
||||
HTM_TR_End ();
|
||||
|
|
|
@ -375,7 +375,7 @@ void Ico_PutIconTextLink (const char *Icon,const char *Text)
|
|||
/***** Print icon and optional text *****/
|
||||
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
|
||||
Ico_PutIcon (Icon,Text,"CONTEXT_ICO_x16");
|
||||
fprintf (Gbl.F.Out," %s",Text);
|
||||
HTM_NBSPTxt (Text);
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
||||
|
@ -444,7 +444,7 @@ void Ico_PutCalculateIconWithText (const char *Text)
|
|||
"class=\"ICO20x20\" style=\"display:none;\"" // Animated icon hidden
|
||||
" id=\"updating_%d\"",Gbl.Form.Num);
|
||||
|
||||
fprintf (Gbl.F.Out," %s",Text);
|
||||
HTM_NBSPTxt (Text);
|
||||
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
|
@ -267,7 +267,7 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Instit *Ins,Act_Action_t Act
|
|||
|
||||
/***** Institution logo and name *****/
|
||||
Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,16,ClassLogo,true);
|
||||
fprintf (Gbl.F.Out," %s",Ins->FullName);
|
||||
HTM_NBSPTxt (Ins->FullName);
|
||||
|
||||
/***** End link *****/
|
||||
Frm_LinkFormEnd ();
|
||||
|
|
|
@ -1277,8 +1277,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
|
|||
/***** Text *****/
|
||||
if (Text)
|
||||
if (Text[0])
|
||||
fprintf (Gbl.F.Out," %s",
|
||||
Text);
|
||||
HTM_NBSPTxt (Text);
|
||||
|
||||
/***** End label and container *****/
|
||||
HTM_LABEL_End ();
|
||||
|
|
|
@ -2068,9 +2068,8 @@ void Ntf_WriteNumberOfNewNtfs (void)
|
|||
"class=\"ICO16x16\"");
|
||||
fprintf (Gbl.F.Out," %u",NumNewNtfs);
|
||||
HTM_SPAN_Begin ("id=\"notif_new\"");
|
||||
fprintf (Gbl.F.Out," %s",
|
||||
NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR :
|
||||
Txt_NOTIF_new_PLURAL);
|
||||
HTM_NBSPTxt (NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR :
|
||||
Txt_NOTIF_new_PLURAL);
|
||||
HTM_SPAN_End ();
|
||||
}
|
||||
|
||||
|
|
|
@ -1266,7 +1266,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
|
|||
HTM_SPAN_End ();
|
||||
|
||||
HTM_SPAN_Begin ("class=\"DAT_SMALL\"");
|
||||
fprintf (Gbl.F.Out," %s",Txt_Followers);
|
||||
HTM_NBSPTxt (Txt_Followers);
|
||||
HTM_SPAN_End ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -2273,7 +2273,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
|
|||
else // Pho_DEGREES_PRINT
|
||||
{
|
||||
Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
|
||||
fprintf (Gbl.F.Out," %s",Deg.FullName);
|
||||
HTM_NBSPTxt (Deg.FullName);
|
||||
}
|
||||
HTM_TD_End ();
|
||||
|
||||
|
|
|
@ -3531,7 +3531,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
|
|||
"class=\"LT\" style=\"width:%upx; height:20px;\"",BarWidth);
|
||||
|
||||
/***** Write the number of users *****/
|
||||
fprintf (Gbl.F.Out," %s",Gbl.Title);
|
||||
HTM_NBSPTxt (Gbl.Title);
|
||||
|
||||
HTM_TD_End ();
|
||||
}
|
||||
|
|
10
swad_test.c
10
swad_test.c
|
@ -471,7 +471,7 @@ void Tst_ShowNewTest (void)
|
|||
HTM_INPUT_CHECKBOX ("Save",false,
|
||||
"value=\"Y\"%s",
|
||||
Gbl.Test.AllowTeachers ? " checked=\"checked\"" : "");
|
||||
fprintf (Gbl.F.Out," %s",Txt_Allow_teachers_to_consult_this_test);
|
||||
HTM_NBSPTxt (Txt_Allow_teachers_to_consult_this_test);
|
||||
HTM_LABEL_End ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
|
@ -1699,7 +1699,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
|
|||
HTM_INPUT_CHECKBOX ("AllTags",false,
|
||||
"value=\"Y\"%s onclick=\"togglecheckChildren(this,'ChkTag');\"",
|
||||
Gbl.Test.Tags.All ? " checked=\"checked\"" : "");
|
||||
fprintf (Gbl.F.Out," %s",Txt_All_tags);
|
||||
HTM_NBSPTxt (Txt_All_tags);
|
||||
HTM_LABEL_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -1747,7 +1747,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
|
|||
"value=\"%s\"%s onclick=\"checkParent(this,'AllTags');\"",
|
||||
row[1],
|
||||
Checked ? " checked=\"checked\"" : "");
|
||||
fprintf (Gbl.F.Out," %s",row[1]);
|
||||
HTM_NBSPTxt (row[1]);
|
||||
HTM_LABEL_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -2330,7 +2330,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
|
|||
HTM_INPUT_CHECKBOX ("AllAnsTypes",false,
|
||||
"value=\"Y\"%s onclick=\"togglecheckChildren(this,'AnswerType');\"",
|
||||
Gbl.Test.AllAnsTypes ? " checked=\"checked\"" : "");
|
||||
fprintf (Gbl.F.Out," %s",Txt_All_types_of_answers);
|
||||
HTM_NBSPTxt (Txt_All_types_of_answers);
|
||||
HTM_LABEL_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -2360,7 +2360,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
|
|||
"value=\"%u\"%s onclick=\"checkParent(this,'AllAnsTypes');\"",
|
||||
(unsigned) AnsType,
|
||||
Checked ? " checked=\"checked\"" : "");
|
||||
fprintf (Gbl.F.Out," %s",Txt_TST_STR_ANSWER_TYPES[AnsType]);
|
||||
HTM_NBSPTxt (Txt_TST_STR_ANSWER_TYPES[AnsType]);
|
||||
HTM_LABEL_End ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
|
|
@ -1434,7 +1434,7 @@ static void TL_PutLinkToViewOldPublications (void)
|
|||
"class=\"ICO20x20\" style=\"display:none;\" id=\"getting_old_timeline\""); // Animated icon hidden
|
||||
HTM_IMG (Cfg_URL_ICON_PUBLIC,"recycle16x16.gif","Txt_See_more",
|
||||
"class=\"ICO20x20\" style=\"display:none;\" id=\"get_old_timeline\"");
|
||||
fprintf (Gbl.F.Out," %s",Txt_See_more);
|
||||
HTM_NBSPTxt (Txt_See_more);
|
||||
HTM_A_End ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
@ -2029,7 +2029,7 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot)
|
|||
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
|
||||
Frm_LinkFormSubmitUnique (Txt_TIMELINE_NOTE[SocNot->NoteType],Class);
|
||||
Ico_PutIcon (TL_Icons[SocNot->NoteType],Txt_TIMELINE_NOTE[SocNot->NoteType],"CONTEXT_ICO_x16");
|
||||
fprintf (Gbl.F.Out," %s",Txt_TIMELINE_NOTE[SocNot->NoteType]);
|
||||
HTM_NBSPTxt (Txt_TIMELINE_NOTE[SocNot->NoteType]);
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
|
||||
|
|
|
@ -2823,7 +2823,7 @@ void Usr_WriteLoggedUsrHead (void)
|
|||
|
||||
/***** User's name *****/
|
||||
if (Gbl.Usrs.Me.UsrDat.FirstName[0])
|
||||
fprintf (Gbl.F.Out," %s",Gbl.Usrs.Me.UsrDat.FirstName);
|
||||
HTM_NBSPTxt (Gbl.Usrs.Me.UsrDat.FirstName);
|
||||
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue