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.60.1

This commit is contained in:
Antonio Cañas Vargas 2019-11-09 21:03:02 +01:00
parent c24732c40d
commit 65a017cfe8
26 changed files with 176 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_account.c
View File

@ -283,10 +283,9 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD
/***** Write user's ID and name *****/
HTM_TD_Begin ("class=\"DAT_N LT COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"%s: %s<br />"
"%s: ",
Txt_ID,ID,
Txt_Name);
fprintf (Gbl.F.Out,"%s: %s",Txt_ID,ID);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s: ",Txt_Name);
if (UsrDat->FullName[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FullName);
else

3
swad_attendance.c
View File

@ -3579,7 +3579,8 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat)
HTM_TD_Begin ("class=\"DAT LT COLOR%u\"",Gbl.RowEvenOdd);
HTM_SPAN_Begin ("id=\"%s\"",Id);
HTM_SPAN_End ();
fprintf (Gbl.F.Out,"<br />%s",Gbl.AttEvents.Lst[NumAttEvent].Title);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.AttEvents.Lst[NumAttEvent].Title);
Dat_WriteLocalDateHMSFromUTC (Id,Gbl.AttEvents.Lst[NumAttEvent].TimeUTC[Att_START_TIME],
Gbl.Prefs.DateFormat,Dat_SEPARATOR_COMMA,
true,true,true,0x7);

15
swad_centre.c
View File

@ -345,7 +345,8 @@ static void Ctr_Configuration (bool PrintView)
Gbl.Hierarchy.Ctr.FullName);
Log_DrawLogo (Hie_CTR,Gbl.Hierarchy.Ctr.CtrCod,
Gbl.Hierarchy.Ctr.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ctr.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.FullName);
if (PutLink)
HTM_A_End ();
HTM_DIV_End ();
@ -2605,9 +2606,9 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
HTM_TH_End ();
HTM_TH_Empty (1);
@ -2642,9 +2643,9 @@ static void Ctr_PutHeadCentresForEdition (void)
HTM_TH (1,1,"RM",Txt_Users);
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
HTM_TH_End ();
HTM_TH (1,1,"LM",Txt_Requester);
HTM_TH_Empty (1);

3
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.60 (2019-11-09)"
#define Log_PLATFORM_VERSION "SWAD 19.60.1 (2019-11-09)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.39.js"
/*
@ -495,6 +495,7 @@ 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.60.1: Nov 09, 2019 Code refactoring in HTML break line. (246281 lines)
Version 19.60: Nov 09, 2019 Code refactoring in HTML options. (246203 lines)
Version 19.59: Nov 09, 2019 Code refactoring in HTML params. (246187 lines)
Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines)

6
swad_connected.c
View File

@ -206,11 +206,13 @@ static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal)
extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
if (UsrsTotal)
fprintf (Gbl.F.Out,"<br />"
"%u %s",
{
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%u %s",
UsrsTotal,
(UsrsTotal == 1) ? Txt_ROLES_SINGUL_abc[Role][Usr_SEX_UNKNOWN] :
Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]);
}
}
/*****************************************************************************/

6
swad_country.c
View File

@ -688,9 +688,9 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s+<br />%s",
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
HTM_TH_End ();
HTM_TR_End ();

3
swad_course.c
View File

@ -227,7 +227,8 @@ static void Crs_Configuration (bool PrintView)
Gbl.Hierarchy.Deg.ShrtName,64,NULL,true);
if (PutLink)
HTM_A_End ();
fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Crs.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Crs.FullName);
HTM_DIV_End ();
/***** Begin table *****/

4
swad_degree.c
View File

@ -329,8 +329,8 @@ static void Deg_Configuration (bool PrintView)
Gbl.Hierarchy.Deg.FullName);
Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod,
Gbl.Hierarchy.Deg.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",
Gbl.Hierarchy.Deg.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName);
if (PutLink)
HTM_A_End ();
HTM_DIV_End ();

7
swad_duplicate.c
View File

@ -198,9 +198,10 @@ void Dup_ListDuplicateUsrs (void)
if (sscanf (row[1],"%u",&NumInformants) != 1)
Lay_ShowErrorAndExit ("Wrong number of informants.");
if (NumInformants > 1)
fprintf (Gbl.F.Out,"%s: %u<br />",
Txt_Informants,
NumInformants);
{
fprintf (Gbl.F.Out,"%s: %u",Txt_Informants,NumInformants);
fprintf (Gbl.F.Out,"<br />");
}
/* Button to view users similar to this */
Dup_PutButtonToViewSimilarUsrs (&UsrDat);

10
swad_exam.c
View File

@ -1052,8 +1052,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
Ins.WWW,StyleTitle);
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.FullName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",
Ins.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Ins.FullName);
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
HTM_SPAN_End ();
else
@ -1076,9 +1076,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
/***** Title *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleNormal);
fprintf (Gbl.F.Out,"&nbsp;<br />"
"<strong>%s</strong>",
Txt_EXAM_ANNOUNCEMENT);
fprintf (Gbl.F.Out,"&nbsp;");
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<strong>%s</strong>",Txt_EXAM_ANNOUNCEMENT);
HTM_TD_End ();
HTM_TR_End ();

48
swad_figure.c
View File

@ -596,27 +596,32 @@ static void Fig_WriteHeadHierarchy (void)
HTM_TH_Begin (1,1,"RM");
Ico_PutIcon ("globe.svg",Txt_Countries,"CONTEXT_ICO_x16");
fprintf (Gbl.F.Out,"<br />%s",Txt_Countries);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_Countries);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
Ico_PutIcon ("university.svg",Txt_Institutions,"CONTEXT_ICO_x16");
fprintf (Gbl.F.Out,"<br />%s",Txt_Institutions);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_Institutions);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
Ico_PutIcon ("building.svg",Txt_Centres,"CONTEXT_ICO_x16");
fprintf (Gbl.F.Out,"<br />%s",Txt_Centres);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_Centres);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
Ico_PutIcon ("graduation-cap.svg",Txt_Degrees,"CONTEXT_ICO_x16");
fprintf (Gbl.F.Out,"<br />%s",Txt_Degrees);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_Degrees);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
Ico_PutIcon ("list-ol.svg",Txt_Courses,"CONTEXT_ICO_x16");
fprintf (Gbl.F.Out,"<br />%s",Txt_Courses);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_Courses);
HTM_TH_End ();
HTM_TR_End ();
@ -1420,7 +1425,8 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Write link to institution *****/
HTM_TD_Begin ("class=\"%s CM\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
Ins_DrawInstitutionLogoWithLink (&Ins,40);
fprintf (Gbl.F.Out,"<br />%u",NumberThisRow);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%u",NumberThisRow);
HTM_TD_End ();
/***** End user's cell *****/
@ -2490,14 +2496,23 @@ static void Fig_WriteStatsExpTreesTableHead2 (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,"LM",Txt_File_zones);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Folders,Txt_course);
fprintf (Gbl.F.Out,"%s/",Txt_Folders);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_course);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Files,Txt_course);
fprintf (Gbl.F.Out,"%s/",Txt_Files);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_course);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Size,Txt_course);
fprintf (Gbl.F.Out,"%s/",Txt_Size);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_course);
HTM_TH_End ();
HTM_TR_End ();
@ -2514,14 +2529,23 @@ static void Fig_WriteStatsExpTreesTableHead3 (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,"LM",Txt_File_zones);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Folders,Txt_user[Usr_SEX_UNKNOWN]);
fprintf (Gbl.F.Out,"%s/",Txt_Folders);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Files,Txt_user[Usr_SEX_UNKNOWN]);
fprintf (Gbl.F.Out,"%s/",Txt_Files);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s/<br />%s",Txt_Size,Txt_user[Usr_SEX_UNKNOWN]);
fprintf (Gbl.F.Out,"%s/",Txt_Size);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
HTM_TR_End ();

14
swad_group.c
View File

@ -1443,7 +1443,9 @@ static void Grp_WriteHeadingGroupTypes (void)
HTM_TH (1,1,"BM",NULL);
HTM_TH_Begin (1,1,"CM");
fprintf (Gbl.F.Out,"%s<br />(%s)",Txt_Type_of_group,Txt_eg_Lectures_Practicals);
fprintf (Gbl.F.Out,"%s",Txt_Type_of_group);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"(%s)",Txt_eg_Lectures_Practicals);
HTM_TH_End ();
HTM_TH (1,1,"CM",Txt_Mandatory_enrolment);
HTM_TH (1,1,"CM",Txt_Multiple_enrolment);
@ -1646,7 +1648,9 @@ static void Grp_WriteHeadingGroups (void)
HTM_TH (1,1,"BM",NULL);
HTM_TH (1,1,"CM",Txt_Type_BR_of_group);
HTM_TH_Begin (1,1,"CM");
fprintf (Gbl.F.Out,"%s<br />(%s)",Txt_Group_name,Txt_eg_A_B);
fprintf (Gbl.F.Out,"%s",Txt_Group_name);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"(%s)",Txt_eg_A_B);
HTM_TH_End ();
HTM_TH (1,1,"CM",Txt_Classroom);
for (Role = Rol_TCH;
@ -2327,13 +2331,15 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp)
/***** Name of group type *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"9\" class=\"GRP_TITLE LM\"");
fprintf (Gbl.F.Out,"<br />%s",GrpTyp->GrpTypName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",GrpTyp->GrpTypName);
if (GrpTyp->MustBeOpened)
{
UniqueId++;
if (asprintf (&Id,"open_time_%u",UniqueId) < 0)
Lay_NotEnoughMemoryExit ();
fprintf (Gbl.F.Out,"<br />%s: ",Txt_Opening_of_groups);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s: ",Txt_Opening_of_groups);
HTM_SPAN_Begin ("id=\"%s\"",Id);
HTM_SPAN_End ();
Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC,

3
swad_info.c
View File

@ -1168,7 +1168,8 @@ void Inf_FormsToSelSendInfo (void)
if (Txt_INFO_SRC_HELP[InfoSrc])
{
HTM_SPAN_Begin ("class=\"DAT\"");
fprintf (Gbl.F.Out,"<br />(%s)",Txt_INFO_SRC_HELP[InfoSrc]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"(%s)",Txt_INFO_SRC_HELP[InfoSrc]);
HTM_SPAN_End ();
}
if (Inf_FormsForEditionTypes[InfoSrc])

13
swad_institution.c
View File

@ -342,7 +342,8 @@ static void Ins_Configuration (bool PrintView)
Gbl.Hierarchy.Ins.FullName);
Log_DrawLogo (Hie_INS,Gbl.Hierarchy.Ins.InsCod,
Gbl.Hierarchy.Ins.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ins.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ins.FullName);
if (PutLink)
HTM_A_End ();
HTM_DIV_End ();
@ -879,8 +880,9 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Departments_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s+<br />%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
HTM_TH_End ();
HTM_TH_Empty (1);
@ -2277,8 +2279,9 @@ static void Ins_PutHeadInstitutionsForEdition (void)
HTM_TH (1,1,"RM",Txt_Users);
HTM_TH (1,1,"RM",Txt_Centres_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"%s+<br />%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],
Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
fprintf (Gbl.F.Out,"%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
HTM_TH_End ();
HTM_TH (1,1,"LM",Txt_Requester);
HTM_TH_Empty (1);

4
swad_layout.c
View File

@ -1662,7 +1662,9 @@ void Lay_AdvertisementMobile (void)
HTM_TD_Begin ("class=\"DAT CM\"");
HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"DAT\"");
fprintf (Gbl.F.Out,"%s<br /><br />",Txt_Stay_connected_with_SWADroid);
fprintf (Gbl.F.Out,"%s",Txt_Stay_connected_with_SWADroid);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<br />");
HTM_IMG (Cfg_URL_ICON_PUBLIC,"SWADroid200x300.png",Txt_Stay_connected_with_SWADroid,
"style=\"width:250px; height:375px;\"");
HTM_A_End ();

6
swad_match.c
View File

@ -2160,9 +2160,9 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match)
NumAnswerersQst = Mch_GetNumUsrsWhoHaveAnswerQst (Match->MchCod,
Match->Status.QstInd);
HTM_DIV_Begin ("class=\"MCH_NUM_ANSWERERS\"");
fprintf (Gbl.F.Out,"%s<br />"
"<strong>",
Txt_MATCH_respond);
fprintf (Gbl.F.Out,"%s",Txt_MATCH_respond);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<strong>");
if (Match->Status.QstInd > 0 &&
Match->Status.QstInd < Mch_AFTER_LAST_QUESTION)
fprintf (Gbl.F.Out,"%u",NumAnswerersQst);

6
swad_match_result.c
View File

@ -339,7 +339,11 @@ static void McR_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther)
HTM_TH (1,1,"RT",Txt_Total_BR_score);
HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
HTM_TH_Begin (1,1,"RT");
fprintf (Gbl.F.Out,"%s<br />%s<br />%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX);
fprintf (Gbl.F.Out,"%s",Txt_Score);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s<br />",Txt_out_of_PART_OF_A_SCORE);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX);
HTM_TH_End ();
HTM_TH_Empty (1);

3
swad_notification.c
View File

@ -2054,10 +2054,11 @@ void Ntf_WriteNumberOfNewNtfs (void)
/***** Number of unseen notifications *****/
HTM_SPAN_Begin ("id=\"notif_all\"");
fprintf (Gbl.F.Out,"%u&nbsp;%s<br />",
fprintf (Gbl.F.Out,"%u&nbsp;%s",
NumUnseenNtfs,
NumUnseenNtfs == 1 ? Txt_notification :
Txt_notifications);
fprintf (Gbl.F.Out,"<br />");
HTM_SPAN_End ();
/***** Icon and number of new notifications *****/

17
swad_photo.c
View File

@ -903,7 +903,8 @@ static void Pho_UpdatePhoto2 (void)
"style=\"width:%upx;height:%upx;\"",
Pho_PHOTO_REAL_WIDTH,Pho_PHOTO_REAL_HEIGHT);
free (Img);
fprintf (Gbl.F.Out,"<br />%s",Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]);
HTM_TD_End ();
}
HTM_TR_End ();
@ -2540,13 +2541,13 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
/***** Caption *****/
HTM_DIV_Begin ("class=\"CLASSPHOTO_CAPTION\"");
fprintf (Gbl.F.Out,"%s<br />"
"%d&nbsp;%s<br />"
"%d&nbsp;%s<br />"
"(%d%%)",
Deg->ShrtName,
NumStds,Txt_students_ABBREVIATION,
NumStdsWithPhoto,Txt_photos,
fprintf (Gbl.F.Out,"%s",Deg->ShrtName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%d&nbsp;%s",NumStds,Txt_students_ABBREVIATION);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%d&nbsp;%s",NumStdsWithPhoto,Txt_photos);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"(%d%%)",
NumStds > 0 ? (int) (((NumStdsWithPhoto * 100.0) / NumStds) + 0.5) :
0);
HTM_DIV_End ();

14
swad_record.c
View File

@ -1756,9 +1756,11 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
HTM_TD_End ();
HTM_TD_Begin ("class=\"REC_HEAD CM\"");
fprintf (Gbl.F.Out,"%s<br />%s<br />%s",
Gbl.Hierarchy.Deg.FullName,Gbl.Hierarchy.Crs.FullName,
UsrDat->FullName);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Crs.FullName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
HTM_TD_End ();
HTM_TR_End ();
@ -2756,10 +2758,12 @@ static void Rec_ShowFullName (struct UsrData *UsrDat)
HTM_DIV_Begin ("class=\"REC_NAME\"");
/***** First name *****/
fprintf (Gbl.F.Out,"%s<br />",UsrDat->FirstName);
fprintf (Gbl.F.Out,"%s",UsrDat->FirstName);
fprintf (Gbl.F.Out,"<br />");
/***** Surname 1 *****/
fprintf (Gbl.F.Out,"%s<br />",UsrDat->Surname1);
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
fprintf (Gbl.F.Out,"<br />");
/***** Surname 2 *****/
fprintf (Gbl.F.Out,"%s",UsrDat->Surname2);

12
swad_report.c
View File

@ -279,7 +279,8 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
Report->Permalink,
Txt_Report);
Ico_PutIcon ("file-alt.svg",Txt_Report,"ICO64x64");
fprintf (Gbl.F.Out,"<br />%s",Report->FilenameReport);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Report->FilenameReport);
HTM_A_End ();
HTM_DIV_End ();
@ -313,8 +314,8 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
/***** Report date *****/
if (CurrentTimeUTC)
{
fprintf (Gbl.F.Out,"<br />"
"%s: ",Txt_Date);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s: ",Txt_Date);
HTM_SPAN_Begin ("class=\"DAT_N\"");
fprintf (Gbl.F.Out,"%s %s UTC",CurrentTimeUTC->StrDate,
CurrentTimeUTC->StrTime);
@ -844,9 +845,12 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
/***** Draw bar for the rest of the clicks *****/
if ((unsigned long) Report->UsrFigures.NumClicks > NumClicks)
fprintf (Gbl.F.Rep,"%ld&nbsp;%s<br />",
{
fprintf (Gbl.F.Rep,"%ld&nbsp;%s",
Report->UsrFigures.NumClicks - NumClicks,
Txt_Other_actions);
fprintf (Gbl.F.Out,"<br />");
}
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);

15
swad_statistic.c
View File

@ -2852,9 +2852,9 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co
/* Draw bar with a height porportional to the number of clicks */
if (Hits->Num > 0.0)
{
fprintf (Gbl.F.Out,"%u%%<br />",
(unsigned) (((Hits->Num * 100.0) /
Hits->Total) + 0.5));
fprintf (Gbl.F.Out,"%u%%",(unsigned) (((Hits->Num * 100.0) /
Hits->Total) + 0.5));
fprintf (Gbl.F.Out,"<br />");
Str_WriteFloatNumToFile (Gbl.F.Out,Hits->Num);
fprintf (Gbl.F.Out,"<br />");
BarHeight = (unsigned) (((Hits->Num * 500.0) / Hits->Max) + 0.5);
@ -2864,10 +2864,15 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co
"style=\"width:10px;height:%upx;\"",BarHeight);
}
else
fprintf (Gbl.F.Out,"0%%<br />0");
{
fprintf (Gbl.F.Out,"0%%");
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"0");
}
/* Write the hour */
fprintf (Gbl.F.Out,"<br />%uh",Hour);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%uh",Hour);
HTM_TD_End ();
}

3
swad_survey.c
View File

@ -643,7 +643,8 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/* Users' roles who can answer the survey */
HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" :
"ASG_GRP_LIGHT");
fprintf (Gbl.F.Out,"%s:<br />",Txt_Users);
fprintf (Gbl.F.Out,"%s:",Txt_Users);
fprintf (Gbl.F.Out,"<br />");
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
1 << Rol_TCH,

12
swad_test.c
View File

@ -5219,7 +5219,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/***** Feedback *****/
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s (%s):<br />",Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"%s (%s):",Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"<br />");
HTM_TEXTAREA_Begin ("name=\"Feedback\" class=\"STEM_TEXTAREA\" rows=\"2\"");
if (Feedback)
if (Feedback[0])
@ -5416,7 +5417,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/* Feedback */
HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s (%s):<br />",Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"%s (%s):",Txt_Feedback,Txt_optional);
fprintf (Gbl.F.Out,"<br />");
HTM_TEXTAREA_Begin ("name=\"FbStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"2\"%s",
NumOpt,OptionsDisabled ? " disabled=\"disabled\"" :
"");
@ -7706,7 +7708,11 @@ static void Tst_ShowHeaderTestResults (void)
HTM_TH (1,1,"RT",Txt_Total_BR_score);
HTM_TH (1,1,"RT",Txt_Average_BR_score_BR_per_question_BR_from_0_to_1);
HTM_TH_Begin (1,1,"RT");
fprintf (Gbl.F.Out,"%s<br />%s<br />%u",Txt_Score,Txt_out_of_PART_OF_A_SCORE,Tst_SCORE_MAX);
fprintf (Gbl.F.Out,"%s",Txt_Score);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",Txt_out_of_PART_OF_A_SCORE);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%u",Tst_SCORE_MAX);
HTM_TH_End ();
HTM_TH_Empty (1);

21
swad_timetable.c
View File

@ -1551,9 +1551,12 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
Crs_GetDataOfCourseByCod (&Crs);
if (ClassType == TT_LECTURE ||
ClassType == TT_PRACTICAL)
fprintf (Gbl.F.Out,"%s<br />",
{
fprintf (Gbl.F.Out,"%s",
Crs.ShrtName[0] ? Crs.ShrtName :
Txt_unknown_removed_course);
fprintf (Gbl.F.Out,"<br />");
}
}
/***** Type of class and duration *****/
@ -1567,18 +1570,24 @@ static void TT_TimeTableDrawCell (unsigned Weekday,unsigned Interval,unsigned Co
if (Gbl.TimeTable.View == TT_CRS_VIEW &&
GrpCod > 0)
{
fprintf (Gbl.F.Out,"<br />%s"
"<br />%s",
GrpDat.GrpTypName,GrpDat.GrpName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",GrpDat.GrpTypName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",GrpDat.GrpName);
if (GrpDat.Classroom.ClaCod > 0)
fprintf (Gbl.F.Out,"<br />(%s)",
GrpDat.Classroom.ShrtName);
{
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"(%s)",GrpDat.Classroom.ShrtName);
}
}
/***** Info *****/
if (Info)
if (Info[0])
{
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<br />%s",Info);
}
/***** End cell *****/
HTM_DIV_End ();

13
swad_user.c
View File

@ -894,7 +894,9 @@ void Usr_BuildFullName (struct UsrData *UsrDat)
void Usr_WriteFirstNameBRSurnames (const struct UsrData *UsrDat)
{
/***** Write first name and surname 1 *****/
fprintf (Gbl.F.Out,"%s<br />%s",UsrDat->FirstName,UsrDat->Surname1);
fprintf (Gbl.F.Out,"%s",UsrDat->FirstName);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
/***** Write surname2 if exists *****/
if (UsrDat->Surname2[0])
@ -9710,11 +9712,16 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
ID_WriteUsrIDs (UsrDat,NULL);
/***** Show user's name *****/
fprintf (Gbl.F.Out,"<br />%s",UsrDat->Surname1);
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
if (UsrDat->FirstName[0])
fprintf (Gbl.F.Out,",<br />%s",UsrDat->FirstName);
{
fprintf (Gbl.F.Out,",");
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"%s",UsrDat->FirstName);
}
/***** End form *****/
Frm_EndForm ();