From 68d5dfdcb60264820149508aea0e688e8282343b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 11 Nov 2019 10:59:24 +0100 Subject: [PATCH] Version19.63 --- swad_HTML.c | 80 ++++++++------------------------- swad_HTML.h | 16 +++---- swad_ID.c | 6 +-- swad_MFU.c | 6 +-- swad_account.c | 11 +++-- swad_agenda.c | 6 +-- swad_announcement.c | 8 ++-- swad_assignment.c | 20 ++++----- swad_attendance.c | 38 ++++++++-------- swad_centre.c | 28 ++++++------ swad_changelog.h | 17 ++----- swad_chat.c | 4 +- swad_connected.c | 31 +++++++------ swad_country.c | 26 +++++------ swad_course.c | 44 +++++++++--------- swad_date.c | 6 +-- swad_degree.c | 22 ++++----- swad_department.c | 2 +- swad_duplicate.c | 2 +- swad_enrolment.c | 12 ++--- swad_exam.c | 42 +++++++++--------- swad_figure.c | 10 ++--- swad_file_browser.c | 60 ++++++++++++------------- swad_forum.c | 29 ++++++------ swad_game.c | 9 ++-- swad_group.c | 21 +++++---- swad_help.c | 2 +- swad_hierarchy.c | 18 ++++---- swad_holiday.c | 8 ++-- swad_icon.c | 4 +- swad_indicator.c | 8 ++-- swad_info.c | 4 +- swad_institution.c | 30 ++++++------- swad_layout.c | 13 +++--- swad_link.c | 2 +- swad_logo.c | 2 +- swad_mail.c | 8 ++-- swad_match.c | 26 +++++------ swad_match_result.c | 18 ++++---- swad_message.c | 29 ++++++------ swad_network.c | 2 +- swad_nickname.c | 8 ++-- swad_notification.c | 35 +++++---------- swad_password.c | 12 ++--- swad_photo.c | 14 +++--- swad_place.c | 2 +- swad_privacy.c | 2 +- swad_profile.c | 54 +++++++++++----------- swad_project.c | 46 +++++++++---------- swad_record.c | 60 ++++++++++++------------- swad_report.c | 4 +- swad_search.c | 2 +- swad_statistic.c | 106 ++++++++++++++++++++++---------------------- swad_survey.c | 44 +++++++++--------- swad_syllabus.c | 8 ++-- swad_test.c | 78 ++++++++++++++++---------------- swad_test_import.c | 8 ++-- swad_timeline.c | 23 ++++------ swad_user.c | 52 +++++++++++----------- swad_zip.c | 6 +-- 60 files changed, 603 insertions(+), 691 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index 6e5b04c9..92a742aa 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -1656,83 +1656,39 @@ void HTM_Txt (const char *Txt) fputs (Txt,Gbl.F.Out); } -void HTM_TxtColon (const char *Txt) - { - HTM_Txt (Txt); - HTM_Txt (":"); - } - -void HTM_TxtColonNBSP (const char *Txt) - { - HTM_Txt (Txt); - HTM_Txt (":"); - HTM_NBSP (); - } - -void HTM_TxtNBSPTxt (const char *Txt1,const char *Txt2) - { - HTM_Txt (Txt1); - HTM_NBSP (); - HTM_Txt (Txt2); - } - -void HTM_NBSPTxt (const char *Txt) - { - HTM_NBSP (); - HTM_Txt (Txt); - } - -void HTM_TxtNBSP (const char *Txt) - { - HTM_Txt (Txt); - HTM_NBSP (); - } - -void HTM_NBSPTxtNBSP (const char *Txt) - { - HTM_NBSP (); - HTM_Txt (Txt); - HTM_NBSP (); - } - -void HTM_NBSP (void) +void HTM_Space (void) { HTM_Txt (" "); } +void HTM_Colon (void) + { + HTM_Txt (":"); + } + void HTM_Comma (void) { HTM_Txt (","); } +void HTM_Hyphen (void) + { + HTM_Txt ("-"); + } + +void HTM_Asterisk (void) + { + HTM_Txt ("*"); + } + void HTM_Unsigned (unsigned Num) { fprintf (Gbl.F.Out,"%u",Num); } -void HTM_UnsignedColon (unsigned Num) +void HTM_Int (int Num) { - HTM_Unsigned (Num); - HTM_Txt (":"); - } - -void HTM_NBSPUnsigned (unsigned Num) - { - HTM_NBSP (); - HTM_Unsigned (Num); - } - -void HTM_UnsignedNBSP (unsigned Num) - { - HTM_Unsigned (Num); - HTM_NBSP (); - } - -void HTM_UnsignedNBSPTxt (unsigned Num,const char *Txt) - { - HTM_Unsigned (Num); - HTM_NBSP (); - HTM_Txt (Txt); + fprintf (Gbl.F.Out,"%d",Num); } void HTM_UnsignedLong (unsigned long Num) diff --git a/swad_HTML.h b/swad_HTML.h index cf09f5c1..413dbe75 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -162,19 +162,13 @@ void HTM_BR (void); void HTM_TxtF (const char *fmt,...); void HTM_Txt (const char *Txt); -void HTM_TxtColon (const char *Txt); -void HTM_TxtColonNBSP (const char *Txt); -void HTM_TxtNBSPTxt (const char *Txt1,const char *Txt2); -void HTM_NBSPTxt (const char *Txt); -void HTM_TxtNBSP (const char *Txt); -void HTM_NBSPTxtNBSP (const char *Txt); -void HTM_NBSP (void); +void HTM_Space (void); +void HTM_Colon (void); void HTM_Comma (void); +void HTM_Hyphen (void); +void HTM_Asterisk (void); void HTM_Unsigned (unsigned Num); -void HTM_UnsignedColon (unsigned Num); -void HTM_NBSPUnsigned (unsigned Num); -void HTM_UnsignedNBSP (unsigned Num); -void HTM_UnsignedNBSPTxt (unsigned Num,const char *Txt); +void HTM_Int (int Num); void HTM_UnsignedLong (unsigned long Num); void HTM_Long (long Num); void HTM_Double (double Num); diff --git a/swad_ID.c b/swad_ID.c index f9e667eb..52ec65f3 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -607,7 +607,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"UsrID\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_ID); + HTM_TxtF ("%s:",Txt_ID); HTM_LABEL_End (); HTM_TD_End (); @@ -687,8 +687,8 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewID\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID - Txt_ID); // The first user's ID + HTM_TxtF ("%s:",UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID + Txt_ID); // The first user's ID HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_MFU.c b/swad_MFU.c index f925eceb..466e7e42 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -248,7 +248,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL); HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr, NULL); - HTM_NBSPTxt (TabMenuStr); + HTM_TxtF (" %s",TabMenuStr); Frm_LinkFormEnd (); Frm_EndForm (); HTM_LI_End (); @@ -280,7 +280,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) HTM_DIV_Begin ("id=\"MFU_actions\""); Frm_StartForm (ActMFUAct); Frm_LinkFormSubmit (Txt_My_frequent_actions,NULL,NULL); - HTM_NBSPTxt (Txt_Frequent_ACTIONS); + HTM_TxtF (" %s",Txt_Frequent_ACTIONS); Frm_LinkFormEnd (); Frm_EndForm (); @@ -309,7 +309,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) Frm_LinkFormSubmit (TabMenuStr,NULL,NULL); HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr, NULL); - HTM_NBSPTxt (MenuStr); + HTM_TxtF (" %s",MenuStr); Frm_LinkFormEnd (); Frm_EndForm (); HTM_LI_End (); diff --git a/swad_account.c b/swad_account.c index 0ce57f5a..0be988e8 100644 --- a/swad_account.c +++ b/swad_account.c @@ -150,7 +150,7 @@ 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]); - HTM_TxtColonNBSP (Txt_ID); + HTM_TxtF ("%s: ",Txt_ID); HTM_INPUT_TEXT ("ID",ID_MAX_CHARS_USR_ID,"",false, "size=\"18\" required=\"required\""); HTM_LABEL_End (); @@ -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); - HTM_TxtColonNBSP (Txt_ID); - HTM_Txt (ID); + HTM_TxtF ("%s: %s",Txt_ID,ID); HTM_BR (); - HTM_TxtColonNBSP (Txt_Name); + HTM_TxtF ("%s: ",Txt_Name); if (UsrDat->FullName[0]) { HTM_STRONG_Begin (); @@ -374,7 +373,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NewNick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Nickname); + HTM_TxtF ("%s:",Txt_Nickname); HTM_LABEL_End (); HTM_TD_End (); @@ -392,7 +391,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NewEmail\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Email); + HTM_TxtF ("%s:",Txt_Email); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_agenda.c b/swad_agenda.c index 989e1d6a..14d2b5a8 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1501,7 +1501,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Event\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Event); + HTM_TxtF ("%s:",Txt_Event); HTM_LABEL_End (); HTM_TD_End (); @@ -1517,7 +1517,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Location\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Location); + HTM_TxtF ("%s:",Txt_Location); HTM_LABEL_End (); HTM_TD_End (); @@ -1537,7 +1537,7 @@ void Agd_RequestCreatOrEditEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Description); + HTM_TxtF ("%s:",Txt_Description); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_announcement.c b/swad_announcement.c index 013e7600..c2a61b7b 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -338,7 +338,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, if (ShowAllAnnouncements) { /* Users' roles who can view this announcement */ - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); for (Role = Rol_UNK, SomeRolesAreSelected = false; Role <= Rol_TCH; Role++) @@ -347,7 +347,7 @@ static void Ann_DrawAnAnnouncement (long AnnCod,Ann_Status_t Status, if (SomeRolesAreSelected) HTM_Comma (); SomeRolesAreSelected = true; - HTM_NBSPTxt (Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF (" %s",Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]); } } else @@ -415,7 +415,7 @@ void Ann_ShowFormAnnouncement (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Users); + HTM_TxtF ("%s: ",Txt_Users); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -454,7 +454,7 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"",Field,The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Label); + HTM_TxtF ("%s:",Label); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_assignment.c b/swad_assignment.c index 6ec0833d..61b2abab 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1169,7 +1169,7 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1187,12 +1187,12 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Upload_files_QUESTION); + HTM_TxtF ("%s:",Txt_Upload_files_QUESTION); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); HTM_LABEL_Begin ("class=\"DAT\""); - HTM_TxtColon (Txt_Folder); + HTM_TxtF ("%s:",Txt_Folder); HTM_INPUT_TEXT ("Folder",Brw_MAX_CHARS_FOLDER,Asg.Folder,false, "size=\"30\""); HTM_LABEL_End (); @@ -1205,7 +1205,7 @@ void Asg_RequestCreatOrEditAsg (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Description); + HTM_TxtF ("%s:",Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1255,7 +1255,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Groups); + HTM_TxtF ("%s:",Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -1271,7 +1271,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) "id=\"WholeCrs\" value=\"Y\"%s" " onclick=\"uncheckChildren(this,'GrpCods')\"", Asg_CheckIfAsgIsAssociatedToGrps (AsgCod) ? "" : " checked=\"checked\""); - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_LABEL_End (); HTM_TD_End (); @@ -1633,8 +1633,8 @@ static void Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (struct Assignment *Asg) /***** Write heading *****/ HTM_DIV_Begin ("class=\"%s\"",Asg->Hidden ? "ASG_GRP_LIGHT" : "ASG_GRP"); - HTM_TxtColonNBSP ((NumRows == 1) ? Txt_Group : - Txt_Groups); + HTM_TxtF ("%s: ",NumRows == 1 ? Txt_Group : + Txt_Groups); /***** Write groups *****/ if (NumRows) // Groups found... @@ -1648,7 +1648,7 @@ static void Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (struct Assignment *Asg) row = mysql_fetch_row (mysql_res); /* Write group type name and group name */ - HTM_TxtNBSPTxt (row[0],row[1]); + HTM_TxtF ("%s %s",row[0],row[1]); if (NumRows >= 2) { @@ -1661,7 +1661,7 @@ static void Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (struct Assignment *Asg) } } else - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_DIV_End (); diff --git a/swad_attendance.c b/swad_attendance.c index 08d3cf7a..a63a7799 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1105,7 +1105,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1124,7 +1124,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ComTchVisible\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Teachers_comment); + HTM_TxtF ("%s:",Txt_Teachers_comment); HTM_LABEL_End (); HTM_TD_End (); @@ -1144,7 +1144,7 @@ void Att_RequestCreatOrEditAttEvent (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Description); + HTM_TxtF ("%s:",Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1194,7 +1194,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Groups); + HTM_TxtF ("%s:",Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -1210,7 +1210,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) "id=\"WholeCrs\" value=\"Y\"%s" " onclick=\"uncheckChildren(this,'GrpCods')\"", Att_CheckIfAttEventIsAssociatedToGrps (AttCod) ? "" : " checked=\"checked\""); - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_LABEL_End (); HTM_TD_End (); @@ -1517,8 +1517,8 @@ static void Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (struct AttendanceEve /***** Write heading *****/ HTM_DIV_Begin ("class=\"%s\"",Att->Hidden ? "ASG_GRP_LIGHT" : "ASG_GRP"); - HTM_TxtColonNBSP ((NumGrps == 1) ? Txt_Group : - Txt_Groups); + HTM_TxtF ("%s: ",NumGrps == 1 ? Txt_Group : + Txt_Groups); /***** Write groups *****/ if (NumGrps) // Groups found... @@ -1532,12 +1532,12 @@ static void Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (struct AttendanceEve row = mysql_fetch_row (mysql_res); /* Write group type name (row[0]) and group name (row[1]) */ - HTM_TxtNBSPTxt (row[0],row[1]); + HTM_TxtF ("%s %s",row[0],row[1]); /* Write the name of the classroom (row[2]) */ if (row[2]) // May be NULL because of LEFT JOIN if (row[2][0]) - HTM_TxtF (" (%s)",row[2]); + HTM_TxtF (" (%s)",row[2]); /* Write separator */ if (NumGrps >= 2) @@ -1551,7 +1551,7 @@ static void Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (struct AttendanceEve } } else - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_DIV_End (); @@ -2119,7 +2119,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, Gbl.RowEvenOdd); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); HTM_TxtF (", %s",UsrDat->FirstName); HTM_TD_End (); @@ -3123,7 +3123,7 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) HTM_TD_Begin ("class=\"DAT RT COLOR%u\"",Gbl.RowEvenOdd); HTM_LABEL_Begin ("for=\"Att%u\"",NumAttEvent); - HTM_UnsignedColon (NumAttEvent + 1); + HTM_TxtF ("%u:",NumAttEvent + 1); HTM_LABEL_End (); HTM_TD_End (); @@ -3246,7 +3246,7 @@ static void Att_ListUsrsAttendanceTable (Att_TypeOfView_t TypeOfView, HTM_TD_Begin ("colspan=\"%u\" class=\"DAT_N_LINE_TOP RM\"", Gbl.Usrs.Listing.WithPhotos ? 4 : 3); - HTM_TxtColon (Txt_Number_of_users); + HTM_TxtF ("%s:",Txt_Number_of_users); HTM_TD_End (); for (NumAttEvent = 0, Total = 0; @@ -3372,7 +3372,7 @@ static void Att_WriteRowUsrSeveralAttEvents (unsigned NumUsr,struct UsrData *Usr Gbl.RowEvenOdd); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); HTM_TxtF (", %s",UsrDat->FirstName); HTM_TD_End (); @@ -3500,7 +3500,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) UsrDat->Accepted ? "DAT_N" : "DAT", Gbl.RowEvenOdd); - HTM_UnsignedColon (NumUsr); + HTM_TxtF ("%u:",NumUsr); HTM_TD_End (); /***** Show student's photo *****/ @@ -3528,7 +3528,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) "DAT_SMALL"); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); HTM_TxtF (", %s",UsrDat->FirstName); HTM_TD_End (); @@ -3563,7 +3563,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) Present ? "DAT_GREEN" : "DAT_RED", Gbl.RowEvenOdd); - HTM_UnsignedColon (NumAttEvent + 1); + HTM_TxtF ("%u:",NumAttEvent + 1); HTM_TD_End (); HTM_TD_Begin ("class=\"BT%u\"",Gbl.RowEvenOdd); @@ -3603,7 +3603,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, CommentStd,Cns_MAX_BYTES_TEXT,false); HTM_DT_Begin (); - HTM_TxtColon (Txt_Student_comment); + HTM_TxtF ("%s:",Txt_Student_comment); HTM_DT_End (); HTM_DD_Begin (); HTM_Txt (CommentStd); @@ -3614,7 +3614,7 @@ static void Att_ListAttEventsForAStd (unsigned NumUsr,struct UsrData *UsrDat) Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, CommentTch,Cns_MAX_BYTES_TEXT,false); HTM_DT_Begin (); - HTM_TxtColon (Txt_Teachers_comment); + HTM_TxtF ("%s:",Txt_Teachers_comment); HTM_DT_End (); HTM_DD_Begin (); HTM_Txt (CommentTch); diff --git a/swad_centre.c b/swad_centre.c index 300593f8..82f8b266 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -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); - HTM_NBSPTxt (Ctr->FullName); + HTM_TxtF (" %s",Ctr->FullName); /***** End link *****/ Frm_LinkFormEnd (); @@ -415,7 +415,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthInsCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Institution); + HTM_TxtF ("%s:",Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -455,7 +455,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Centre); + HTM_TxtF ("%s:",Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -481,7 +481,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Short_name); + HTM_TxtF ("%s:",Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -508,7 +508,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Place); + HTM_TxtF ("%s:",Txt_Place); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -551,7 +551,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Web); + HTM_TxtF ("%s:",Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -584,7 +584,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Shortcut); + HTM_TxtF ("%s:",Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -607,7 +607,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_QR_code); + HTM_TxtF ("%s:",Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -622,7 +622,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users_of_the_centre); + HTM_TxtF ("%s:",Txt_Users_of_the_centre); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -635,7 +635,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degrees); + HTM_TxtF ("%s:",Txt_Degrees); HTM_TD_End (); /* Form to go to see degrees of this centre */ @@ -657,7 +657,7 @@ static void Ctr_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Courses); + HTM_TxtF ("%s:",Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -742,8 +742,8 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%s:",Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -2297,7 +2297,7 @@ void Ctr_RequestPhoto (void) /***** Upload photo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_File_with_the_photo); + HTM_TxtF ("%s: ",Txt_File_with_the_photo); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*",true,NULL); HTM_LABEL_End (); diff --git a/swad_changelog.h b/swad_changelog.h index e4cab6eb..3d8bbde8 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,27 +487,16 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.62 (2019-11-11)" +#define Log_PLATFORM_VERSION "SWAD 19.63 (2019-11-11)" #define CSS_FILE "swad19.47.css" #define JS_FILE "swad19.39.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // 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) -// TODO: Check the following texts in HTM -"-" -" " -"/%u" -"%u/%u" -"@%s" -"%d" -":" -"*" -"%s*:" -"(%s)" -"[%s]" -"%ld " +// TODO: Code refactoring in HTML h1, title, meta, video, p, iframe, input hidden, area + Version 19.63: Nov 11, 2019 Code refactoring in HTML. (246384 lines) Version 19.62: Nov 11, 2019 Code refactoring in HTML. Floats converted to doubles. (? lines) Version 19.61.8: Nov 10, 2019 Code refactoring in HTML. (246428 lines) diff --git a/swad_chat.c b/swad_chat.c index 583011ea..87acdfdc 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -131,7 +131,7 @@ void Cht_ShowListOfAvailableChatRooms (void) /***** Title of top level *****/ HTM_LI_Begin ("class=\"DAT\""); Ico_PutIcon ("comments.svg",Txt_Chat_rooms,"ICO16x16"); - HTM_NBSPTxt (Txt_Chat_rooms); + HTM_TxtF (" %s",Txt_Chat_rooms); HTM_LI_End (); /***** Link to chat available for all the users *****/ @@ -321,7 +321,7 @@ static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName) if (NumUsrsInRoom) HTM_STRONG_Begin (); - HTM_NBSPTxt (RoomFullName); + HTM_TxtF (" %s",RoomFullName); if (NumUsrsInRoom > 1) HTM_TxtF (" [%d %s]",NumUsrsInRoom,Txt_connected_PLURAL); else if (NumUsrsInRoom == 1) diff --git a/swad_connected.c b/swad_connected.c index 4dab6462..6e3d7b01 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -169,9 +169,9 @@ void Con_ShowGlobalConnectedUsrs (void) Frm_LinkFormSubmitUnique (Txt_Connected_users,"CONNECTED_TXT"); /* Write total number of sessions */ - HTM_UnsignedNBSPTxt (Gbl.Session.NumSessions, - Gbl.Session.NumSessions == 1 ? Txt_session : - Txt_sessions); + HTM_TxtF ("%u %s",Gbl.Session.NumSessions, + Gbl.Session.NumSessions == 1 ? Txt_session : + Txt_sessions); /* End link to view more details about connected users */ Frm_LinkFormEnd (); Frm_EndForm (); @@ -181,10 +181,9 @@ void Con_ShowGlobalConnectedUsrs (void) HTM_DIV_Begin ("class=\"CONNECTED_LIST\""); /***** Write total number of users *****/ - HTM_TxtF ("%u %s:", - NumUsrsTotal, - (NumUsrsTotal == 1) ? Txt_user[Usr_SEX_UNKNOWN] : - Txt_users[Usr_SEX_UNKNOWN]); + HTM_TxtF ("%u %s:",NumUsrsTotal, + NumUsrsTotal == 1 ? Txt_user[Usr_SEX_UNKNOWN] : + Txt_users[Usr_SEX_UNKNOWN]); /***** Write total number of users with each role *****/ for (Role = Rol_GST, NumUsrsTotal = 0; @@ -207,9 +206,9 @@ static void Con_ShowGlobalConnectedUsrsRole (Rol_Role_t Role,unsigned UsrsTotal) if (UsrsTotal) { HTM_BR (); - HTM_UnsignedNBSPTxt (UsrsTotal, - UsrsTotal == 1 ? Txt_ROLES_SINGUL_abc[Role][Usr_SEX_UNKNOWN] : - Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%u %s",UsrsTotal, + UsrsTotal == 1 ? Txt_ROLES_SINGUL_abc[Role][Usr_SEX_UNKNOWN] : + Txt_ROLES_PLURAL_abc[Role][Usr_SEX_UNKNOWN]); } } @@ -353,9 +352,9 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentLocationOnMainZone ( { HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"3\" class=\"CT\""); - HTM_UnsignedNBSPTxt (Usrs.NumUsrs, - Usrs.NumUsrs == 1 ? Txt_ROLES_SINGUL_abc[Role][Usrs.Sex] : - Txt_ROLES_PLURAL_abc[Role][Usrs.Sex]); + HTM_TxtF ("%u %s",Usrs.NumUsrs, + Usrs.NumUsrs == 1 ? Txt_ROLES_SINGUL_abc[Role][Usrs.Sex] : + Txt_ROLES_PLURAL_abc[Role][Usrs.Sex]); HTM_TD_End (); HTM_TR_End (); @@ -387,9 +386,9 @@ static void Con_ShowConnectedUsrsWithARoleBelongingToCurrentCrsOnRightColumn (Ro HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"3\" class=\"CON_USR_NARROW_TIT\""); - HTM_UnsignedNBSPTxt (NumUsrsThisRole, - NumUsrsThisRole == 1 ? Txt_ROLES_SINGUL_abc[Role][UsrSex] : - Txt_ROLES_PLURAL_abc[Role][UsrSex]); + HTM_TxtF ("%u %s",NumUsrsThisRole, + NumUsrsThisRole == 1 ? Txt_ROLES_SINGUL_abc[Role][UsrSex] : + Txt_ROLES_PLURAL_abc[Role][UsrSex]); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_country.c b/swad_country.c index 0247fe89..57b25b65 100644 --- a/swad_country.c +++ b/swad_country.c @@ -323,7 +323,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Country); + HTM_TxtF ("%s:",Txt_Country); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT_N LM\""); @@ -341,7 +341,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Shortcut); + HTM_TxtF ("%s:",Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -364,7 +364,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_QR_code); + HTM_TxtF ("%s:",Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -379,7 +379,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users_of_the_country); + HTM_TxtF ("%s:",Txt_Users_of_the_country); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -392,7 +392,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Institutions); + HTM_TxtF ("%s:",Txt_Institutions); HTM_TD_End (); /* Form to go to see institutions of this country */ @@ -414,7 +414,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Centres); + HTM_TxtF ("%s:",Txt_Centres); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -427,7 +427,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degrees); + HTM_TxtF ("%s:",Txt_Degrees); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -440,7 +440,7 @@ static void Cty_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Courses); + HTM_TxtF ("%s:",Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -485,8 +485,8 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%s:",Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -546,7 +546,7 @@ void Cty_ListCountries2 (void) /***** Separation row *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"8\" class=\"DAT CM\""); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); HTM_TR_End (); @@ -825,7 +825,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action, /***** Write country name *****/ Str_Copy (CountryName,Cty->Name[Gbl.Prefs.Language], Cty_MAX_BYTES_NAME); - HTM_NBSPTxtNBSP (CountryName); + HTM_TxtF (" %s ",CountryName); HTM_TxtF ("(%s)",Cty->Alpha2); /***** End link *****/ @@ -1657,7 +1657,7 @@ static void Cty_ListCountriesForEdition (void) /* Language */ HTM_TD_Begin ("class=\"DAT RM\""); - HTM_TxtColon (Txt_STR_LANG_NAME[Lan]); + HTM_TxtF ("%s:",Txt_STR_LANG_NAME[Lan]); HTM_TD_End (); /* Name */ diff --git a/swad_course.c b/swad_course.c index ca3f506e..a89ed217 100644 --- a/swad_course.c +++ b/swad_course.c @@ -239,7 +239,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthDegCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degree); + HTM_TxtF ("%s:",Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -281,7 +281,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Course); + HTM_TxtF ("%s:",Txt_Course); HTM_LABEL_End (); HTM_TD_End (); @@ -307,7 +307,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Short_name); + HTM_TxtF ("%s:",Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -334,7 +334,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCrsYear\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Year_OF_A_DEGREE); + HTM_TxtF ("%s:",Txt_Year_OF_A_DEGREE); HTM_LABEL_End (); HTM_TD_End (); @@ -367,7 +367,7 @@ static void Crs_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"InsCrsCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Institutional_code); + HTM_TxtF ("%s:",Txt_Institutional_code); HTM_LABEL_End (); HTM_TD_End (); @@ -391,7 +391,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Internal_code); + HTM_TxtF ("%s:",Txt_Internal_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -405,7 +405,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Shortcut); + HTM_TxtF ("%s:",Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -428,7 +428,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_QR_code); + HTM_TxtF ("%s:",Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -451,7 +451,7 @@ static void Crs_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Indicators); + HTM_TxtF ("%s:",Txt_Indicators); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -461,7 +461,7 @@ static void Crs_Configuration (bool PrintView) Indicators.NumIndicators, Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS); Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); - HTM_TxtNBSP (Gbl.Title); + HTM_TxtF ("%s ",Gbl.Title); Ico_PutIcon ((Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" : "exclamation-triangle.svg", Gbl.Title,"ICO16x16"); @@ -499,7 +499,7 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%s:",Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -571,7 +571,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal, NULL); Ico_PutIcon ("sitemap.svg",Txt_System,"ICO16x16"); - HTM_NBSPTxt (Txt_System); + HTM_TxtF (" %s",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"); - HTM_NBSPTxt (Cty.Name[Gbl.Prefs.Language]); + HTM_TxtF (" %s",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); - HTM_NBSPTxt (Ins.FullName); + HTM_TxtF (" %s",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); - HTM_NBSPTxt (Ctr.FullName); + HTM_TxtF (" %s",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); - HTM_NBSPTxt (Deg.FullName); + HTM_TxtF (" %s",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"); - HTM_NBSPTxt (Crs.FullName); + HTM_TxtF (" %s",Crs.FullName); Frm_LinkFormEnd (); Frm_EndForm (); @@ -1750,7 +1750,7 @@ static void Crs_PutHeadCoursesForEdition (void) HTM_TH (1,1,"BM",NULL); HTM_TH (1,1,"RM",Txt_Code); HTM_TH_Begin (1,1,"CM"); - HTM_TxtF ("%s (%s)",Txt_Institutional_code,Txt_optional); + HTM_TxtF ("%s (%s)",Txt_Institutional_code,Txt_optional); HTM_TH_End (); HTM_TH (1,1,"CM",Txt_Year_OF_A_DEGREE); HTM_TH (1,1,"LM",Txt_Short_name_of_the_course); @@ -2989,7 +2989,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TH_Begin (1,7,"LM"); - HTM_TxtColon (Gbl.Title); + HTM_TxtF ("%s:",Gbl.Title); HTM_TH_End (); HTM_TR_End (); @@ -3174,7 +3174,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA row[2]); Frm_LinkFormSubmit (Gbl.Title,StyleNoBR,NULL); Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); - HTM_TxtF (" %s (%s)",row[2],row[6]); + HTM_TxtF (" %s (%s)",row[2],row[6]); Frm_LinkFormEnd (); Frm_EndForm (); HTM_TD_End (); @@ -3265,7 +3265,7 @@ void Crs_AskRemoveOldCrss (void) /***** Form to request number of months without clicks *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtNBSP (Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2); + HTM_TxtF ("%s ",Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2); HTM_SELECT_Begin (false, "name=\"Months\""); for (i = Crs_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS; @@ -3275,7 +3275,7 @@ void Crs_AskRemoveOldCrss (void) i == MonthsWithoutAccess,false, "%u",i); HTM_SELECT_End (); - HTM_NBSP (); + HTM_Space (); HTM_TxtF (Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2, Cfg_PLATFORM_SHORT_NAME); HTM_LABEL_End (); diff --git a/swad_date.c b/swad_date.c index 59b86344..7492a874 100644 --- a/swad_date.c +++ b/swad_date.c @@ -436,7 +436,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** Start date-time *****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_START_END_TIME[Dat_START_TIME]); + HTM_TxtF ("%s:",Txt_START_END_TIME[Dat_START_TIME]); HTM_LABEL_End (); HTM_TD_End (); @@ -467,7 +467,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** End date-time *****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_START_END_TIME[Dat_END_TIME]); + HTM_TxtF ("%s:",Txt_START_END_TIME[Dat_END_TIME]); HTM_LABEL_End (); HTM_TD_End (); @@ -512,7 +512,7 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2], HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_START_END_TIME[StartEndTime]); + HTM_TxtF ("%s:",Txt_START_END_TIME[StartEndTime]); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_degree.c b/swad_degree.c index f2270dbb..cccdb864 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -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); - HTM_NBSPTxt (Deg->FullName); + HTM_TxtF (" %s",Deg->FullName); /***** End link *****/ Frm_LinkFormEnd (); @@ -343,7 +343,7 @@ static void Deg_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCtrCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Centre); + HTM_TxtF ("%s:",Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -382,7 +382,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degree); + HTM_TxtF ("%s:",Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -408,7 +408,7 @@ static void Deg_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Short_name); + HTM_TxtF ("%s:",Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -434,7 +434,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Web); + HTM_TxtF ("%s:",Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -466,7 +466,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Shortcut); + HTM_TxtF ("%s:",Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -489,7 +489,7 @@ static void Deg_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_QR_code); + HTM_TxtF ("%s:",Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -504,7 +504,7 @@ static void Deg_Configuration (bool PrintView) /***** Number of courses *****/ HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Courses); + HTM_TxtF ("%s:",Txt_Courses); HTM_TD_End (); /* Form to go to see courses of this degree */ @@ -565,8 +565,8 @@ static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%s:",Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -2472,7 +2472,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan) { case Hie_SYS: // System Ico_PutIcon ("swad64x64.png",Txt_all_degrees,"ICO16x16"); - HTM_NBSPTxt (Txt_all_degrees); + HTM_TxtF (" %s",Txt_all_degrees); break; case Hie_INS: // Institution Ins.InsCod = Str_ConvertStrCodToLongCod (row[1]); diff --git a/swad_department.c b/swad_department.c index aa7cea7b..14721d52 100644 --- a/swad_department.c +++ b/swad_department.c @@ -171,7 +171,7 @@ void Dpt_SeeDepts (void) /***** Separation row *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"3\" class=\"DAT\""); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_duplicate.c b/swad_duplicate.c index a7084cab..1cc4f6d8 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -199,7 +199,7 @@ void Dup_ListDuplicateUsrs (void) Lay_ShowErrorAndExit ("Wrong number of informants."); if (NumInformants > 1) { - HTM_TxtColonNBSP (Txt_Informants); + HTM_TxtF ("%s: ",Txt_Informants); HTM_Unsigned (NumInformants); HTM_BR (); } diff --git a/swad_enrolment.c b/swad_enrolment.c index af6d6499..0197fe4e 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -379,7 +379,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) FuncParams (); HTM_LABEL_Begin ("for=\"OtherUsrIDNickOrEMail\" class=\"%s RM\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_nick_email_or_ID); + HTM_TxtF ("%s: ",Txt_nick_email_or_ID); HTM_LABEL_End (); HTM_INPUT_TEXT ("OtherUsrIDNickOrEMail",Cns_MAX_CHARS_EMAIL_ADDRESS,"",false, @@ -804,7 +804,7 @@ void Enr_AskRemoveOldUsrs (void) /***** Form to request number of months without clicks *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtNBSP (Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2); + HTM_TxtF ("%s ",Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2); HTM_SELECT_Begin (false, "name=\"Months\""); for (Months = Usr_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS; @@ -814,7 +814,7 @@ void Enr_AskRemoveOldUsrs (void) Months == Usr_DEF_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS,false, "%u",Months); HTM_SELECT_End (); - HTM_NBSP (); + HTM_Space (); HTM_TxtF (Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_2_OF_2, Cfg_PLATFORM_SHORT_NAME); HTM_LABEL_End (); @@ -919,7 +919,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"UsrsIDs\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_List_of_nicks_emails_or_IDs); + HTM_TxtF ("%s:",Txt_List_of_nicks_emails_or_IDs); HTM_LABEL_End (); HTM_TD_End (); @@ -2264,7 +2264,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeEnr\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Scope); + HTM_TxtF ("%s:",Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -2279,7 +2279,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_exam.c b/swad_exam.c index 1aed6ff3..3689a04c 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1076,7 +1076,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Title *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleNormal); - HTM_NBSP (); + HTM_Space (); HTM_BR (); HTM_STRONG_Begin (); HTM_Txt (Txt_EXAM_ANNOUNCEMENT); @@ -1086,7 +1086,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"2\" class=\"%s LM\"",StyleNormal); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); HTM_TR_End (); @@ -1095,7 +1095,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"CrsName\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Course); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Course); HTM_LABEL_End (); HTM_TD_End (); @@ -1118,7 +1118,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Year\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Year_or_semester); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Year_or_semester); HTM_LABEL_End (); HTM_TD_End (); @@ -1146,7 +1146,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ExamSession\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Session); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Session); HTM_LABEL_End (); HTM_TD_End (); @@ -1164,7 +1164,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Exam_date); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Exam_date); HTM_TD_End (); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) @@ -1191,7 +1191,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Start_time); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Start_time); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",StyleNormal); @@ -1231,7 +1231,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Approximate_duration); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Approximate_duration); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",StyleNormal); @@ -1267,15 +1267,15 @@ static void Exa_ShowExamAnnouncement (long ExaCod, Txt_hours_ABBREVIATION, Gbl.ExamAnns.ExaDat.Duration.Minute); else - HTM_UnsignedNBSPTxt (Gbl.ExamAnns.ExaDat.Duration.Hour, - Gbl.ExamAnns.ExaDat.Duration.Hour == 1 ? Txt_hour : - Txt_hours); + HTM_TxtF ("%u %s",Gbl.ExamAnns.ExaDat.Duration.Hour, + Gbl.ExamAnns.ExaDat.Duration.Hour == 1 ? Txt_hour : + Txt_hours); } else if (Gbl.ExamAnns.ExaDat.Duration.Minute) { - HTM_UnsignedNBSPTxt (Gbl.ExamAnns.ExaDat.Duration.Minute, - Gbl.ExamAnns.ExaDat.Duration.Minute == 1 ? Txt_minute : - Txt_minutes); + HTM_TxtF ("%u %s",Gbl.ExamAnns.ExaDat.Duration.Minute, + Gbl.ExamAnns.ExaDat.Duration.Minute == 1 ? Txt_minute : + Txt_minutes); } } HTM_TD_End (); @@ -1287,7 +1287,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Place\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Place_of_exam); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Place_of_exam); HTM_LABEL_End (); HTM_TD_End (); @@ -1314,7 +1314,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"ExamMode\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Mode); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Mode); HTM_LABEL_End (); HTM_TD_End (); @@ -1341,7 +1341,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Structure\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam); HTM_LABEL_End (); HTM_TD_End (); @@ -1368,7 +1368,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"DocRequired\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Documentation_required); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Documentation_required); HTM_LABEL_End (); HTM_TD_End (); @@ -1395,7 +1395,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MatRequired\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Material_required); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Material_required); HTM_LABEL_End (); HTM_TD_End (); @@ -1422,7 +1422,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MatAllowed\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Material_allowed); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Material_allowed); HTM_LABEL_End (); HTM_TD_End (); @@ -1449,7 +1449,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"OtherInfo\" class=\"%s\"",StyleForm); - HTM_TxtColon (Txt_EXAM_ANNOUNCEMENT_Other_information); + HTM_TxtF ("%s:",Txt_EXAM_ANNOUNCEMENT_Other_information); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_figure.c b/swad_figure.c index ec539469..aa58a524 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -207,7 +207,7 @@ void Fig_ReqShowFigures (void) /***** Compute stats for anywhere, degree or course? *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Gbl.Scope.Allowed = 1 << Hie_SYS | 1 << Hie_CTY | 1 << Hie_INS | @@ -222,7 +222,7 @@ void Fig_ReqShowFigures (void) /***** Type of statistic *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Statistic); + HTM_TxtF ("%s: ",Txt_Statistic); HTM_SELECT_Begin (false, "name=\"FigureType\""); for (FigureType = (Fig_FigureType_t) 0; @@ -999,7 +999,7 @@ static void Fig_ShowHierarchyCell (const char *ClassTxt,int Num) if (Num >= 0) HTM_Unsigned ((unsigned) Num); else // < 0 ==> do not show number - HTM_Txt ("-"); + HTM_Hyphen (); HTM_TD_End (); } @@ -1480,7 +1480,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, { Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName, 40,NULL,true); - HTM_NBSP (); + HTM_Space (); } HTM_Txt (Ins.FullName); Frm_LinkFormEnd (); @@ -4542,7 +4542,7 @@ static void Fig_GetAndShowMsgsStats (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT RM\""); - HTM_Txt ("-"); + HTM_Hyphen (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index 90a549cf..da3e648d 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3300,7 +3300,7 @@ static void Brw_FormToChangeCrsGrpZone (void) GrpDat.GrpCod, (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod) ? " checked=\"checked\"" : ""); - HTM_TxtNBSPTxt (GrpDat.GrpTypName,GrpDat.GrpName); + HTM_TxtF ("%s %s",GrpDat.GrpTypName,GrpDat.GrpName); HTM_LABEL_End (); HTM_LI_End (); } @@ -3392,7 +3392,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) Frm_LinkFormSubmit (Txt_View_record_for_this_course,"AUTHOR_TXT",NULL); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); if (UsrDat->FirstName[0]) HTM_TxtF (", %s",UsrDat->FirstName); Frm_LinkFormEnd (); @@ -4125,7 +4125,7 @@ static void Brw_ShowAndStoreSizeOfFileTree (void) Brw_StoreSizeOfFileTreeInDB (); } else - HTM_NBSP (); // Blank to occupy the same space as the text for the browser size + HTM_Space (); // Blank to occupy the same space as the text for the browser size HTM_DIV_End (); } @@ -6256,7 +6256,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) } /***** Write name of the folder *****/ - HTM_NBSP (); + HTM_Space (); if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder? { HTM_INPUT_TEXT ("NewFolderName",Brw_MAX_CHARS_FOLDER,Gbl.FileBrowser.FilFolLnk.Name,true, @@ -6275,7 +6275,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) HTM_STRONG_Begin (); HTM_Txt (FileNameToShow); HTM_STRONG_End (); - HTM_NBSP (); + HTM_Space (); if ((Level == 1) && (Gbl.FileBrowser.Type == Brw_ADMI_ASG_USR || Gbl.FileBrowser.Type == Brw_ADMI_ASG_CRS)) @@ -6296,7 +6296,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) HTM_TD_Begin ("class=\"%s LM\" style=\"width:99%%;\"", Gbl.FileBrowser.TxtStyle); - HTM_NBSP (); + HTM_Space (); HTM_DIV_Begin ("class=\"FILENAME\""); Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]); @@ -6436,13 +6436,13 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata) FileSizeStr[0] = '\0'; HTM_TD_Begin ("class=\"%s RM COLOR%u\"", Gbl.FileBrowser.TxtStyle,Gbl.RowEvenOdd); - HTM_NBSPTxt (FileSizeStr); + HTM_TxtF (" %s",FileSizeStr); HTM_TD_End (); /***** Write the date *****/ HTM_TD_Begin ("class=\"%s RM COLOR%u\"", Gbl.FileBrowser.TxtStyle,Gbl.RowEvenOdd); - HTM_NBSP (); + HTM_Space (); if (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FILE || Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_LINK) { @@ -8339,7 +8339,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1]) /***** Folder *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Folder); + HTM_TxtF ("%s: ",Txt_Folder); HTM_INPUT_TEXT ("NewFolderName",Brw_MAX_CHARS_FOLDER,"",false, "size=\"30\" required=\"required\""); HTM_LABEL_End (); @@ -8505,7 +8505,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NewLinkURL\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_URL); + HTM_TxtF ("%s: ",Txt_URL); HTM_LABEL_End (); HTM_TD_End (); @@ -9499,7 +9499,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Filename); + HTM_TxtF ("%s:",Txt_Filename); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9512,7 +9512,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Uploaded_by); + HTM_TxtF ("%s:",Txt_Uploaded_by); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9543,7 +9543,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_File_size); + HTM_TxtF ("%s:",Txt_File_size); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9556,7 +9556,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Date_of_creation); + HTM_TxtF ("%s:",Txt_Date_of_creation); HTM_TD_End (); HTM_TD_Begin ("id=\"filedate\" class=\"DAT LM\""); @@ -9573,7 +9573,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"PublicFile\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Availability); + HTM_TxtF ("%s:",Txt_Availability); HTM_LABEL_End (); HTM_TD_End (); @@ -9603,7 +9603,7 @@ void Brw_ShowFileMetadata (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"License\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_License); + HTM_TxtF ("%s:",Txt_License); HTM_LABEL_End (); HTM_TD_End (); @@ -9635,7 +9635,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_My_views); + HTM_TxtF ("%s:",Txt_My_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -9649,15 +9649,15 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Identified_views); + HTM_TxtF ("%s:",Txt_Identified_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - HTM_UnsignedNBSP (FileMetadata.NumViewsFromLoggedUsrs); + HTM_TxtF ("%u ",FileMetadata.NumViewsFromLoggedUsrs); HTM_TxtF ("(%u %s)", FileMetadata.NumLoggedUsrs, - (FileMetadata.NumLoggedUsrs == 1) ? Txt_user[Usr_SEX_UNKNOWN] : - Txt_users[Usr_SEX_UNKNOWN]); + FileMetadata.NumLoggedUsrs == 1 ? Txt_user[Usr_SEX_UNKNOWN] : + Txt_users[Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TR_End (); @@ -9666,7 +9666,7 @@ void Brw_ShowFileMetadata (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Public_views); + HTM_TxtF ("%s:",Txt_Public_views); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -10019,7 +10019,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); /* Name of the file of marks, link end and form end */ - HTM_NBSPTxtNBSP (FileNameToShow); + HTM_TxtF (" %s ",FileNameToShow); Ico_PutIcon ("grades32x32.gif",Txt_Check_marks_in_the_file,"ICO40x40"); Frm_LinkFormEnd (); Frm_EndForm (); @@ -10033,7 +10033,7 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"", URL,Title); Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); - HTM_NBSPTxtNBSP (FileNameToShow); + HTM_TxtF (" %s ",FileNameToShow); Ico_PutIcon ("download.svg",Title,"ICO40x40"); HTM_A_End (); } @@ -11921,7 +11921,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); - HTM_NBSPTxt (InsShortName); + HTM_TxtF (" %s",InsShortName); Frm_LinkFormEnd (); Frm_EndForm (); } @@ -11938,7 +11938,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); - HTM_NBSPTxt (CtrShortName); + HTM_TxtF (" %s",CtrShortName); Frm_LinkFormEnd (); Frm_EndForm (); } @@ -11955,7 +11955,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); - HTM_NBSPTxt (DegShortName); + HTM_TxtF (" %s",DegShortName); Frm_LinkFormEnd (); Frm_EndForm (); } @@ -12079,7 +12079,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); - HTM_NBSPTxt (FileNameToShow); + HTM_TxtF (" %s",FileNameToShow); Frm_LinkFormEnd (); /* End form */ @@ -12132,7 +12132,7 @@ void Brw_AskRemoveOldFiles (void) /***** Form to request number of months (to remove files older) *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtNBSP (Txt_Remove_files_older_than_PART_1_OF_2); + HTM_TxtF ("%s ",Txt_Remove_files_older_than_PART_1_OF_2); HTM_SELECT_Begin (false, "name=\"Months\""); for (Months = Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES; @@ -12142,7 +12142,7 @@ void Brw_AskRemoveOldFiles (void) Months == Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES,false, "%u",Months); HTM_SELECT_End (); - HTM_NBSP (); + HTM_Space (); HTM_TxtF (Txt_Remove_files_older_than_PART_2_OF_2, Cfg_PLATFORM_SHORT_NAME); HTM_LABEL_End (); diff --git a/swad_forum.c b/swad_forum.c index 8c7a6f56..448a7569 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2100,7 +2100,7 @@ static void For_WriteLinkToForum (struct Forum *Forum, default: break; } - HTM_NBSPTxt (ForumName); + HTM_TxtF (" %s",ForumName); /***** Write total number of threads and posts in this forum *****/ if (ShowNumOfPosts) @@ -2363,16 +2363,15 @@ static void For_WriteNumThrsAndPsts (unsigned NumThrs,unsigned NumThrsWithNewPos HTM_Txt (" ["); if (NumThrs == 1) { - HTM_UnsignedNBSPTxt (1,Txt_thread); + HTM_TxtF ("%u %s",1,Txt_thread); if (NumThrsWithNewPosts) HTM_TxtF (", 1 %s",Txt_with_new_posts); - HTM_Txt ("; "); - HTM_UnsignedNBSPTxt (NumPosts,NumPosts == 1 ? Txt_FORUM_post : - Txt_FORUM_posts); + HTM_TxtF ("; %u %s",NumPosts,NumPosts == 1 ? Txt_FORUM_post : + Txt_FORUM_posts); } else { - HTM_UnsignedNBSPTxt (NumThrs,Txt_threads); + HTM_TxtF ("%u %s",NumThrs,Txt_threads); if (NumThrsWithNewPosts) HTM_TxtF (", %u %s",NumThrsWithNewPosts,Txt_with_new_posts); HTM_TxtF ("; %u %s",NumPosts,Txt_FORUM_posts); @@ -2392,10 +2391,8 @@ static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts /***** Write number of threads and number of posts *****/ HTM_Txt (" ["); - if (NumThrs == 1) - HTM_UnsignedNBSPTxt (1,Txt_thread); - else - HTM_UnsignedNBSPTxt (NumThrs,Txt_threads); + HTM_TxtF ("%u %s",NumThrs,NumThrs == 1 ? Txt_thread : + Txt_threads); if (NumThrsWithNewPosts) HTM_TxtF (", %u %s",NumThrsWithNewPosts,Txt_with_new_posts); HTM_Txt ("]"); @@ -3471,22 +3468,22 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE], /***** Write number of posts in this thread *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - HTM_UnsignedNBSP (Thr.NumPosts); + HTM_TxtF ("%u ",Thr.NumPosts); HTM_TD_End (); /***** Write number of new posts in this thread *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - HTM_UnsignedNBSP (Thr.NumUnreadPosts); + HTM_TxtF ("%u ",Thr.NumUnreadPosts); HTM_TD_End (); /***** Write number of users who have write posts in this thread *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - HTM_UnsignedNBSP (Thr.NumWriters); + HTM_TxtF ("%u ",Thr.NumWriters); HTM_TD_End (); /***** Write number of users who have read this thread *****/ HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); - HTM_UnsignedNBSP (Thr.NumReaders); + HTM_TxtF ("%u ",Thr.NumReaders); HTM_TD_End (); HTM_TR_End (); @@ -3899,7 +3896,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Subject\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_Subject); + HTM_TxtF ("%s:",Txt_MSG_Subject); HTM_LABEL_End (); HTM_TD_End (); @@ -3917,7 +3914,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Content\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_Content); + HTM_TxtF ("%s:",Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_game.c b/swad_game.c index 8b55ddd6..680a4d73 100644 --- a/swad_game.c +++ b/swad_game.c @@ -460,8 +460,7 @@ void Gam_ShowOneGame (long GamCod, /* Number of questions */ HTM_DIV_Begin ("class=\"%s\"",Game.Hidden ? "ASG_GRP_LIGHT" : "ASG_GRP"); - HTM_TxtColonNBSP (Txt_No_of_questions); - HTM_Unsigned (Game.NumQsts); + HTM_TxtF ("%s: %u",Txt_No_of_questions,Game.NumQsts); HTM_DIV_End (); HTM_TD_End (); @@ -479,7 +478,7 @@ void Gam_ShowOneGame (long GamCod, Game.Hidden ? "ASG_TITLE_LIGHT" : "ASG_TITLE",NULL); if (ShowOnlyThisGame) - HTM_TxtColonNBSP (Txt_Matches); + HTM_TxtF ("%s: ",Txt_Matches); HTM_Unsigned (Game.NumMchs); Frm_LinkFormEnd (); Frm_EndForm (); @@ -1141,7 +1140,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1157,7 +1156,7 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Description); + HTM_TxtF ("%s:",Txt_Description); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_group.c b/swad_group.c index e8300031..66d084ed 100644 --- a/swad_group.c +++ b/swad_group.c @@ -171,8 +171,8 @@ void Grp_WriteNamesOfSelectedGrps (void) struct GroupData GrpDat; /***** Show the selected groups *****/ - HTM_TxtColonNBSP (Gbl.Crs.Grps.LstGrpsSel.NumGrps == 1 ? Txt_Group : - Txt_Groups); + HTM_TxtF ("%s: ",Gbl.Crs.Grps.LstGrpsSel.NumGrps == 1 ? Txt_Group : + Txt_Groups); for (NumGrpSel = 0; NumGrpSel < Gbl.Crs.Grps.LstGrpsSel.NumGrps; NumGrpSel++) @@ -181,15 +181,14 @@ void Grp_WriteNamesOfSelectedGrps (void) { GrpDat.GrpCod = GrpCod; Grp_GetDataOfGroupByCod (&GrpDat); - HTM_TxtNBSPTxt (GrpDat.GrpTypName,GrpDat.GrpName); + HTM_TxtF ("%s %s",GrpDat.GrpTypName,GrpDat.GrpName); } else // GrpCod < 0 ==> students not belonging to any group of type (-GrpCod) { Gbl.Crs.Grps.GrpTyp.GrpTypCod = -GrpCod; Grp_GetDataOfGroupTypeByCod (&Gbl.Crs.Grps.GrpTyp); - HTM_TxtF ("%s (%s)", - Gbl.Crs.Grps.GrpTyp.GrpTypName, - Txt_users_with_no_group); + HTM_TxtF ("%s (%s)",Gbl.Crs.Grps.GrpTyp.GrpTypName, + Txt_users_with_no_group); } if (Gbl.Crs.Grps.LstGrpsSel.NumGrps >= 2) @@ -458,7 +457,7 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE " onclick=\"togglecheckChildren(this,'GrpCods')\"" : " onclick=\"togglecheckChildren(this,'GrpCods')\"") : " disabled=\"disabled\""); - HTM_NBSPTxt (Txt_All_groups); + HTM_TxtF (" %s",Txt_All_groups); HTM_LABEL_End (); HTM_DIV_End (); } @@ -1602,7 +1601,7 @@ static void Grp_ListGroupsForEdition (void) Role--) { HTM_TD_Begin ("class=\"DAT CM\""); - HTM_TxtF ("%d",Grp->NumUsrs[Role]); + HTM_Int (Grp->NumUsrs[Role]); HTM_TD_End (); } @@ -2336,7 +2335,7 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) if (asprintf (&Id,"open_time_%u",UniqueId) < 0) Lay_NotEnoughMemoryExit (); HTM_BR (); - HTM_TxtColonNBSP (Txt_Opening_of_groups); + HTM_TxtF ("%s: ",Txt_Opening_of_groups); HTM_SPAN_Begin ("id=\"%s\"",Id); HTM_SPAN_End (); Dat_WriteLocalDateHMSFromUTC (Id,GrpTyp->OpenTimeUTC, @@ -2416,7 +2415,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight) HTM_TD_Begin ("class=\"DAT CM LIGHT_BLUE\""); else HTM_TD_Begin ("class=\"DAT CM\""); - HTM_TxtF ("%d",Grp->NumUsrs[Role]); + HTM_Int (Grp->NumUsrs[Role]); HTM_TD_End (); } @@ -2426,7 +2425,7 @@ static void Grp_WriteRowGrp (struct Group *Grp,bool Highlight) else HTM_TD_Begin ("class=\"DAT CM\""); Grp_WriteMaxStds (StrMaxStudents,Grp->MaxStudents); - HTM_TxtNBSP (StrMaxStudents); + HTM_TxtF ("%s ",StrMaxStudents); HTM_TD_End (); /***** Vacants in this group *****/ diff --git a/swad_help.c b/swad_help.c index 46e1aa7a..6d55a9ab 100644 --- a/swad_help.c +++ b/swad_help.c @@ -274,7 +274,7 @@ static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description, /***** Description *****/ HTM_TD_Begin ("class=\"DAT RM\""); - HTM_TxtColon (Description); + HTM_TxtF ("%s:",Description); HTM_TD_End (); /***** Button *****/ diff --git a/swad_hierarchy.c b/swad_hierarchy.c index ed03911d..ac105181 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -104,7 +104,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"cty\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Country); + HTM_TxtF ("%s:",Txt_Country); HTM_LABEL_End (); HTM_TD_End (); @@ -122,7 +122,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ins\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Institution); + HTM_TxtF ("%s:",Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -140,7 +140,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ctr\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Centre); + HTM_TxtF ("%s:",Txt_Centre); HTM_LABEL_End (); HTM_TD_End (); @@ -159,7 +159,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"deg\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degree); + HTM_TxtF ("%s:",Txt_Degree); HTM_LABEL_End (); HTM_TD_End (); @@ -178,7 +178,7 @@ void Hie_WriteMenuHierarchy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"crs\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Course); + HTM_TxtF ("%s:",Txt_Course); HTM_LABEL_End (); HTM_TD_End (); @@ -212,7 +212,7 @@ void Hie_WriteHierarchyInBreadcrumb (void) /***** Form to go to the system *****/ HTM_DIV_Begin ("class=\"BC %s\"",ClassTxt); - HTM_NBSP (); + HTM_Space (); Frm_StartFormGoTo (ActMnu); Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys); @@ -416,7 +416,8 @@ void Hie_WriteBigNameCtyInsCtrDegCrs (void) extern const char *The_ClassCourse[The_NUM_THEMES]; extern const char *Txt_TAGLINE; - HTM_TxtF ("

",The_ClassCourse[Gbl.Prefs.Theme]); + HTM_TxtF ("

", + The_ClassCourse[Gbl.Prefs.Theme]); /***** Logo *****/ switch (Gbl.Hierarchy.Level) @@ -471,8 +472,7 @@ void Hie_WriteBigNameCtyInsCtrDegCrs (void) else // No country specified ==> home page { HTM_DIV_Begin ("id=\"big_full_name\""); // Full name - HTM_TxtColonNBSP (Cfg_PLATFORM_SHORT_NAME); - HTM_Txt (Txt_TAGLINE); + HTM_TxtF ("%s: %s",Cfg_PLATFORM_SHORT_NAME,Txt_TAGLINE); HTM_DIV_End (); HTM_DIV_Begin ("class=\"NOT_SHOWN\""); diff --git a/swad_holiday.c b/swad_holiday.c index ee6cf1f2..602cd4f5 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -138,7 +138,7 @@ void Hld_SeeHolidays (void) } HTM_TH_Begin (1,1,"LM"); - HTM_NBSPTxtNBSP (Txt_End_date); + HTM_TxtF (" %s ",Txt_End_date); HTM_TH_End (); HTM_TH (1,1,"LM",Txt_Holiday); @@ -160,11 +160,11 @@ void Hld_SeeHolidays (void) Dat_ConvDateToDateStr (&Gbl.Hlds.Lst[NumHld].StartDate,StrDate); HTM_TD_Begin ("class=\"DAT LM\""); - HTM_NBSPTxt (StrDate); + HTM_TxtF (" %s",StrDate); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - HTM_NBSP (); + HTM_Space (); switch (Gbl.Hlds.Lst[NumHld].HldTyp) { case Hld_HOLIDAY: @@ -177,7 +177,7 @@ void Hld_SeeHolidays (void) HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); - HTM_NBSPTxt (Gbl.Hlds.Lst[NumHld].Name); + HTM_TxtF (" %s",Gbl.Hlds.Lst[NumHld].Name); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_icon.c b/swad_icon.c index 708d9ac3..145e109f 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -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"); - HTM_NBSPTxt (Text); + HTM_TxtF (" %s",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); - HTM_NBSPTxt (Text); + HTM_TxtF (" %s",Text); HTM_DIV_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index 1a39899a..3495f323 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -124,7 +124,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeInd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Scope); + HTM_TxtF ("%s:",Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -140,7 +140,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthDegTypCod\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Types_of_degree); + HTM_TxtF ("%s:",Txt_Types_of_degree); HTM_LABEL_End (); HTM_TD_End (); @@ -159,7 +159,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", Dpt_PARAM_DPT_COD_NAME,The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Department); + HTM_TxtF ("%s:",Txt_Department); HTM_LABEL_End (); HTM_TD_End (); @@ -189,7 +189,7 @@ void Ind_ReqIndicatorsCourses (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_No_of_indicators); + HTM_TxtF ("%s:",Txt_No_of_indicators); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_info.c b/swad_info.c index 0894867c..1916b5b7 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1275,7 +1275,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc) /***** File *****/ HTM_DIV_Begin ("class=\"CM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_File); + HTM_TxtF ("%s: ",Txt_File); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".htm,.html,.pdf",false,NULL); HTM_LABEL_End (); HTM_DIV_End (); @@ -1318,7 +1318,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc) HTM_DIV_Begin ("class=\"CM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_URL); + HTM_TxtF ("%s: ",Txt_URL); HTM_INPUT_URL ("InfoSrcURL",Gbl.Crs.Info.URL,false, "size=\"50\""); HTM_LABEL_End (); diff --git a/swad_institution.c b/swad_institution.c index 2a2c4be0..54d50603 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -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); - HTM_NBSPTxt (Ins->FullName); + HTM_TxtF (" %s",Ins->FullName); /***** End link *****/ Frm_LinkFormEnd (); @@ -356,7 +356,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"OthCtyCod\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Country); + HTM_TxtF ("%s:",Txt_Country); HTM_LABEL_End (); HTM_TD_End (); @@ -396,7 +396,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"FullName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Institution); + HTM_TxtF ("%s:",Txt_Institution); HTM_LABEL_End (); HTM_TD_End (); @@ -422,7 +422,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ShortName\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Short_name); + HTM_TxtF ("%s:",Txt_Short_name); HTM_LABEL_End (); HTM_TD_End (); @@ -448,7 +448,7 @@ static void Ins_Configuration (bool PrintView) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Web); + HTM_TxtF ("%s:",Txt_Web); HTM_LABEL_End (); HTM_TD_End (); @@ -481,7 +481,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Shortcut); + HTM_TxtF ("%s:",Txt_Shortcut); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -504,7 +504,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_QR_code); + HTM_TxtF ("%s:",Txt_QR_code); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -519,7 +519,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users_of_the_institution); + HTM_TxtF ("%s:",Txt_Users_of_the_institution); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -531,7 +531,7 @@ static void Ins_Configuration (bool PrintView) /***** Number of centres *****/ HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Centres); + HTM_TxtF ("%s:",Txt_Centres); HTM_TD_End (); /* Form to go to see centres of this institution */ @@ -553,7 +553,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Degrees); + HTM_TxtF ("%s:",Txt_Degrees); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -566,7 +566,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Courses); + HTM_TxtF ("%s:",Txt_Courses); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -579,7 +579,7 @@ static void Ins_Configuration (bool PrintView) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Departments); + HTM_TxtF ("%s:",Txt_Departments); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -632,8 +632,8 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Role == Rol_UNK ? Txt_Users_in_courses : - Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + HTM_TxtF ("%s:",Role == Rol_UNK ? Txt_Users_in_courses : + Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -1125,7 +1125,7 @@ void Ins_WriteInstitutionNameAndCty (long InsCod) Ins_GetShrtNameAndCtyOfInstitution (&Ins,CtyName); /***** Write institution short name and country name *****/ - HTM_TxtF ("%s (%s)",Ins.ShrtName,CtyName); + HTM_TxtF ("%s (%s)",Ins.ShrtName,CtyName); } /*****************************************************************************/ diff --git a/swad_layout.c b/swad_layout.c index ad10bb32..fd434d90 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -427,10 +427,7 @@ static void Lay_WritePageTitle (void) HTM_TxtF (" > %s",Gbl.Hierarchy.Crs.ShrtName); } else - { - HTM_TxtColonNBSP (Cfg_PLATFORM_SHORT_NAME); - HTM_Txt (Txt_TAGLINE); - } + HTM_TxtF ("%s: %s",Cfg_PLATFORM_SHORT_NAME,Txt_TAGLINE); HTM_Txt ("\n"); } @@ -1226,7 +1223,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char * Frm_EndForm (); /***** Separator *****/ - HTM_TxtF (" "); // This space is necessary to enable + HTM_Txt (" "); // This space is necessary to enable // jumping to the next line on narrow screens } @@ -1269,7 +1266,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction, /***** Text *****/ if (Text) if (Text[0]) - HTM_NBSPTxt (Text); + HTM_TxtF (" %s",Text); /***** End label and container *****/ HTM_LABEL_End (); @@ -1414,7 +1411,7 @@ static void Lay_WriteAboutZone (void) /***** Questions and problems *****/ HTM_DIV_Begin (NULL); - HTM_TxtColonNBSP (Txt_Questions_and_problems); + HTM_TxtF ("%s: ",Txt_Questions_and_problems); HTM_A_Begin ("href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\"", Cfg_PLATFORM_RESPONSIBLE_EMAIL); HTM_Txt (Cfg_PLATFORM_RESPONSIBLE_EMAIL); @@ -1431,7 +1428,7 @@ static void Lay_WriteAboutZone (void) for (size_t i = 0; i < 5; i++) - HTM_NBSP (); + HTM_Space (); /* Time to generate and send page */ Sta_WriteTimeToGenerateAndSendPage (); diff --git a/swad_link.c b/swad_link.c index e7826131..c8489806 100644 --- a/swad_link.c +++ b/swad_link.c @@ -166,7 +166,7 @@ void Lnk_WriteMenuWithInstitutionalLinks (void) Frm_StartForm (ActSeeLnk); Frm_LinkFormSubmit (Txt_Links,NULL,NULL); - HTM_NBSPTxt (Txt_Links); + HTM_TxtF (" %s",Txt_Links); Frm_LinkFormEnd (); Frm_EndForm (); diff --git a/swad_logo.c b/swad_logo.c index 668ccd87..28287972 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -315,7 +315,7 @@ void Log_RequestLogo (Hie_Level_t Scope) /***** Upload logo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_File_with_the_logo); + HTM_TxtF ("%s: ",Txt_File_with_the_logo); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/png",true,NULL); HTM_LABEL_End (); diff --git a/swad_mail.c b/swad_mail.c index fdf1a5ce..e3a77d7c 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1264,7 +1264,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"Email\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Current_email); + HTM_TxtF ("%s:",Txt_Current_email); HTM_LABEL_End (); HTM_TD_End (); @@ -1278,7 +1278,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, NumEmails - 1); HTM_LABEL_Begin ("for=\"Email\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Other_emails); + HTM_TxtF ("%s:",Txt_Other_emails); HTM_LABEL_End (); HTM_TD_End (); } @@ -1363,8 +1363,8 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewEmail\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (NumEmails ? Txt_New_email : // A new email - Txt_Email); // The first email + HTM_TxtF ("%s:",NumEmails ? Txt_New_email : // A new email + Txt_Email); // The first email HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_match.c b/swad_match.c index 30068720..341f53a3 100644 --- a/swad_match.c +++ b/swad_match.c @@ -611,8 +611,8 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Match *Mat /***** Write heading *****/ HTM_DIV_Begin ("class=\"ASG_GRP\""); - HTM_TxtColonNBSP (NumRows == 1 ? Txt_Group : - Txt_Groups); + HTM_TxtF ("%s: ",NumRows == 1 ? Txt_Group : + Txt_Groups); /***** Write groups *****/ if (NumRows) // Groups found... @@ -626,7 +626,7 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Match *Mat row = mysql_fetch_row (mysql_res); /* Write group type name and group name */ - HTM_TxtNBSPTxt (row[0],row[1]); + HTM_TxtF ("%s %s",row[0],row[1]); if (NumRows >= 2) { @@ -639,7 +639,7 @@ static void Mch_GetAndWriteNamesOfGrpsAssociatedToMatch (const struct Match *Mat } } else - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_DIV_End (); @@ -1201,7 +1201,7 @@ static void Mch_PutFormNewMatch (struct Game *Game) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1253,7 +1253,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Groups); + HTM_TxtF ("%s:",Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -1267,7 +1267,7 @@ static void Mch_ShowLstGrpsToCreateMatch (void) HTM_INPUT_CHECKBOX ("WholeCrs",true, "id=\"WholeCrs\" value=\"Y\" checked=\"checked\"" " onclick=\"uncheckChildren(this,'GrpCods')\""); - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_LABEL_End (); HTM_TD_End (); @@ -2152,7 +2152,7 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match) Dat_WriteHoursMinutesSeconds (&Time); } else - HTM_Txt ("-"); + HTM_Hyphen (); HTM_DIV_End (); /***** Number of users who have answered this question *****/ @@ -2166,7 +2166,7 @@ static void Mch_ShowRefreshablePartTch (struct Match *Match) Match->Status.QstInd < Mch_AFTER_LAST_QUESTION) HTM_Unsigned (NumAnswerersQst); else - HTM_Txt ("-"); + HTM_Hyphen (); if (Match->Status.Playing) { /* Get current number of players */ @@ -2421,7 +2421,7 @@ static void Mch_PutCheckboxResult (struct Match *Match) HTM_TxtF ("", Match->Status.ShowQstResults ? "fas fa-toggle-on" : "fas fa-toggle-off"); - HTM_NBSPTxt (Txt_View_results); + HTM_TxtF (" %s",Txt_View_results); HTM_A_End (); HTM_DIV_End (); @@ -2739,12 +2739,12 @@ static void Mch_DrawEmptyRowScore (unsigned NumRow,double MinScore,double MaxSco if (NumRow == 0) { Str_WriteDoubleNumToFile (Gbl.F.Out,MaxScore); - HTM_NBSP (); + HTM_Space (); } else if (NumRow == Mch_NUM_ROWS_SCORE - 1) { Str_WriteDoubleNumToFile (Gbl.F.Out,MinScore); - HTM_NBSP (); + HTM_Space (); } HTM_TD_End (); @@ -2809,7 +2809,7 @@ static void Mch_DrawScoreRow (double Score,double MinScore,double MaxScore, /* Write score */ HTM_TD_Begin ("class=\"MCH_SCO_SCO\""); Str_WriteDoubleNumToFile (Gbl.F.Out,Score); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Draw bar and write number of users for this score */ diff --git a/swad_match_result.c b/swad_match_result.c index c0de352b..72987264 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -209,7 +209,7 @@ void McR_SelUsrsToViewUsrsMchResults (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -566,7 +566,7 @@ static void McR_ShowMchResultsSummaryRow (bool ShowSummaryResults, /***** Row title *****/ HTM_TD_Begin ("colspan=\"3\" class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtColonNBSP (Txt_Matches); + HTM_TxtF ("%s: ",Txt_Matches); HTM_Unsigned (NumResults); HTM_TD_End (); @@ -755,14 +755,14 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); + HTM_TxtF ("%s:",Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs.Role][UsrDat->Sex]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); ID_WriteUsrIDs (UsrDat,NULL); - HTM_NBSPTxt (UsrDat->Surname1); + HTM_TxtF (" %s",UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); if (UsrDat->FirstName[0]) HTM_TxtF (", %s",UsrDat->FirstName); HTM_BR (); @@ -782,7 +782,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_START_END_TIME[StartEndTime]); + HTM_TxtF ("%s:",Txt_START_END_TIME[StartEndTime]); HTM_TD_End (); if (asprintf (&Id,"match_%u",(unsigned) StartEndTime) < 0) @@ -801,7 +801,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Questions); + HTM_TxtF ("%s:",Txt_Questions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -814,7 +814,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Score); + HTM_TxtF ("%s:",Txt_Score); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -836,7 +836,7 @@ void McR_ShowOneMchResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Tags); + HTM_TxtF ("%s:",Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); diff --git a/swad_message.c b/swad_message.c index 572ceed6..4b5caa75 100644 --- a/swad_message.c +++ b/swad_message.c @@ -293,7 +293,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_To); + HTM_TxtF ("%s:",Txt_MSG_To); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -486,8 +486,8 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) HTM_TH_Begin (1,ColSpan,"LM LIGHT_BLUE"); HTM_LABEL_Begin ("for=\"OtherRecipients\""); - HTM_TxtColon (StdsAndTchsWritten ? Txt_Other_recipients : - Txt_Recipients); + HTM_TxtF ("%s:",StdsAndTchsWritten ? Txt_Other_recipients : + Txt_Recipients); HTM_LABEL_End (); HTM_TH_End (); @@ -538,7 +538,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgSubject\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_Subject); + HTM_TxtF ("%s:",Txt_MSG_Subject); HTM_LABEL_End (); HTM_TD_End (); @@ -590,7 +590,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgContent\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_Content); + HTM_TxtF ("%s:",Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); @@ -625,7 +625,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MsgContent\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_MSG_Content); + HTM_TxtF ("%s:",Txt_MSG_Content); HTM_LABEL_End (); HTM_TD_End (); @@ -2614,7 +2614,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void) /***** Course selection *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtNBSP (TxtSelector[Gbl.Msg.TypeOfMessages]); + HTM_TxtF ("%s ",TxtSelector[Gbl.Msg.TypeOfMessages]); HTM_SELECT_Begin (false, "name=\"FilterCrsCod\""); HTM_OPTION (HTM_Type_STRING,"", @@ -2656,7 +2656,7 @@ void Msg_ShowFormToFilterMsgs (void) /***** Filter authors/recipients *****/ HTM_TD_Begin ("class=\"LM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (TxtFromTo[Gbl.Msg.TypeOfMessages]); + HTM_TxtF ("%s: ",TxtFromTo[Gbl.Msg.TypeOfMessages]); HTM_INPUT_SEARCH ("FilterFromTo",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3, Gbl.Msg.FilterFromTo, "size=\"20\""); @@ -2666,7 +2666,7 @@ void Msg_ShowFormToFilterMsgs (void) /***** Filter message content *****/ HTM_TD_Begin ("class=\"LM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_MSG_Content); + HTM_TxtF ("%s: ",Txt_MSG_Content); HTM_INPUT_SEARCH ("FilterContent",Msg_MAX_CHARS_FILTER_CONTENT, Gbl.Msg.FilterContent, "size=\"20\""); @@ -3020,7 +3020,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) /***** Write "From:" *****/ HTM_TD_Begin ("class=\"RT MSG_TIT\""); - HTM_TxtColonNBSP (Txt_MSG_From); + HTM_TxtF ("%s: ",Txt_MSG_From); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"LT\""); @@ -3033,7 +3033,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT MSG_TIT\""); - HTM_TxtColonNBSP (Txt_MSG_To); + HTM_TxtF ("%s: ",Txt_MSG_To); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"LT\""); @@ -3046,7 +3046,7 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) /***** Write "Content:" *****/ HTM_TD_Begin ("class=\"RT MSG_TIT\""); - HTM_TxtColonNBSP (Txt_MSG_Content); + HTM_TxtF ("%s: ",Txt_MSG_Content); HTM_TD_End (); /***** Initialize image *****/ @@ -3377,7 +3377,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted) HTM_Txt (UsrDat->FullName); if (Act_GetSuperAction (Gbl.Action.Act) == ActSeeRcvMsg) { - HTM_NBSP (); + HTM_Space (); if (Msg_CheckIfUsrIsBanned (UsrDat->UsrCod,Gbl.Usrs.Me.UsrDat.UsrCod)) // Sender is banned Msg_PutFormToUnbanSender (UsrDat); @@ -3387,8 +3387,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted) } } else - HTM_TxtF ("[%s]", - Txt_ROLES_SINGUL_abc[Rol_UNK][Usr_SEX_UNKNOWN]); // User not found, likely an old user who has been removed + HTM_TxtF ("[%s]",Txt_ROLES_SINGUL_abc[Rol_UNK][Usr_SEX_UNKNOWN]); // User not found, likely an old user who has been removed HTM_TD_End (); HTM_TR_End (); diff --git a/swad_network.c b/swad_network.c index ba48b883..7ddd2203 100644 --- a/swad_network.c +++ b/swad_network.c @@ -325,7 +325,7 @@ void Net_ShowFormMyWebsAndSocialNets (void) (unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]); HTM_IMG (Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],Net_WebsAndSocialNetworksTitle[NumURL], "class=\"CONTEXT_ICO_16x16\" style=\"margin-right:6px;\""); - HTM_TxtColon (Net_WebsAndSocialNetworksTitle[NumURL]); + HTM_TxtF ("%s:",Net_WebsAndSocialNetworksTitle[NumURL]); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_nickname.c b/swad_nickname.c index 7935567c..a533b464 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -275,7 +275,7 @@ 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\""); HTM_LABEL_Begin ("for=\"Nick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Current_nickname); + HTM_TxtF ("%s:",Txt_Current_nickname); HTM_LABEL_End (); HTM_TD_End (); @@ -289,7 +289,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its NumNicks - 1); HTM_LABEL_Begin ("for=\"Nick\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Other_nicknames); + HTM_TxtF ("%s:",Txt_Other_nicknames); HTM_LABEL_End (); HTM_TD_End (); } @@ -371,8 +371,8 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"NewNick\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (NumNicks ? Txt_New_nickname : // A new nickname - Txt_Nickname); // The first nickname + HTM_TxtF ("%s:",NumNicks ? Txt_New_nickname : // A new nickname + Txt_Nickname); // The first nickname HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_notification.c b/swad_notification.c index 9066dcb6..5f1efbea 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -524,8 +524,7 @@ void Ntf_ShowMyNotifications (void) Frm_LinkFormSubmit (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassAnchor,NULL); else HTM_SPAN_Begin ("class=\"%s\"",ClassAnchor); - HTM_TxtColonNBSP (Txt_Forum); - HTM_Txt (ForumName); + HTM_TxtF ("%s: %s",Txt_Forum,ForumName); if (PutLink) { Frm_LinkFormEnd (); @@ -545,27 +544,15 @@ void Ntf_ShowMyNotifications (void) HTM_SPAN_Begin ("class=\"%s\"",ClassAnchor); if (Crs.CrsCod > 0) - { - HTM_TxtColonNBSP (Txt_Course); - HTM_Txt (Crs.ShrtName); - } + HTM_TxtF ("%s: %s",Txt_Course,Crs.ShrtName); else if (Deg.DegCod > 0) - { - HTM_TxtColonNBSP (Txt_Degree); - HTM_Txt (Deg.ShrtName); - } + HTM_TxtF ("%s: %s",Txt_Degree,Deg.ShrtName); else if (Ctr.CtrCod > 0) - { - HTM_TxtColonNBSP (Txt_Centre); - HTM_Txt (Ctr.ShrtName); - } + HTM_TxtF ("%s: %s",Txt_Centre,Ctr.ShrtName); else if (Ins.InsCod > 0) - { - HTM_TxtColonNBSP (Txt_Institution); - HTM_Txt (Ins.ShrtName); - } + HTM_TxtF ("%s: %s",Txt_Institution,Ins.ShrtName); else - HTM_Txt ("-"); + HTM_Hyphen (); if (PutLink) { @@ -1954,7 +1941,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]); + HTM_TxtF ("%s:",Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent]); HTM_TD_End (); HTM_TD_Begin ("class=\"CM\""); @@ -2067,8 +2054,8 @@ void Ntf_WriteNumberOfNewNtfs (void) /***** Number of unseen notifications *****/ HTM_SPAN_Begin ("id=\"notif_all\""); - HTM_UnsignedNBSPTxt (NumUnseenNtfs,NumUnseenNtfs == 1 ? Txt_notification : - Txt_notifications); + HTM_TxtF ("%u %s",NumUnseenNtfs,NumUnseenNtfs == 1 ? Txt_notification : + Txt_notifications); HTM_BR (); HTM_SPAN_End (); @@ -2079,8 +2066,8 @@ void Ntf_WriteNumberOfNewNtfs (void) "class=\"ICO16x16\""); HTM_TxtF (" %u",NumNewNtfs); HTM_SPAN_Begin ("id=\"notif_new\""); - HTM_NBSPTxt (NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR : - Txt_NOTIF_new_PLURAL); + HTM_TxtF (" %s",NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR : + Txt_NOTIF_new_PLURAL); HTM_SPAN_End (); } diff --git a/swad_password.c b/swad_password.c index 686f6539..6f7acd7a 100644 --- a/swad_password.c +++ b/swad_password.c @@ -283,7 +283,7 @@ void Pwd_ShowFormSendNewPwd (void) /***** User's ID/nickname *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_nick_email_or_ID); + HTM_TxtF ("%s: ",Txt_nick_email_or_ID); HTM_INPUT_TEXT ("UsrId",Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin,false, "size=\"8\" required=\"required\""); HTM_LABEL_End (); @@ -686,7 +686,7 @@ void Pwd_ShowFormChgMyPwd (void) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"UsrPwd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Current_password); + HTM_TxtF ("%s:",Txt_Current_password); HTM_LABEL_End (); HTM_TD_End (); @@ -735,7 +735,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void) /***** Label ****/ HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Paswd\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Password); + HTM_TxtF ("%s:",Txt_Password); HTM_LABEL_End (); HTM_TD_End (); @@ -765,7 +765,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Label */ HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Paswd1\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_New_password); + HTM_TxtF ("%s:",Txt_New_password); HTM_LABEL_End (); HTM_TD_End (); @@ -783,7 +783,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) /* Label */ HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Paswd2\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Retype_new_password); + HTM_TxtF ("%s:",Txt_Retype_new_password); HTM_LABEL_End (); HTM_TD_End (); @@ -872,7 +872,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void) /***** Password *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_For_security_enter_your_password); + HTM_TxtF ("%s: ",Txt_For_security_enter_your_password); HTM_INPUT_PASSWORD ("OthUsrPwd",NULL,"off",true); HTM_LABEL_End (); diff --git a/swad_photo.c b/swad_photo.c index 54b0fe93..c99c921e 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -336,7 +336,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat) /***** Form to upload photo *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_File_with_the_photo); + HTM_TxtF ("%s: ",Txt_File_with_the_photo); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,"image/*",true,NULL); HTM_LABEL_End (); @@ -1258,7 +1258,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_SMALL\""); - HTM_NBSPTxtNBSP (Txt_Following); + HTM_TxtF (" %s ",Txt_Following); HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_N_BOLD\""); @@ -1266,7 +1266,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_SMALL\""); - HTM_NBSPTxt (Txt_Followers); + HTM_TxtF (" %s",Txt_Followers); HTM_SPAN_End (); HTM_DIV_End (); @@ -1800,7 +1800,7 @@ static void Pho_PutSelectorForTypeOfAvg (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"AvgType\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Average_type); + HTM_TxtF ("%s:",Txt_Average_type); HTM_LABEL_End (); HTM_TD_End (); @@ -1865,7 +1865,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"PhotoSize\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Size_of_photos); + HTM_TxtF ("%s:",Txt_Size_of_photos); HTM_LABEL_End (); HTM_TD_End (); @@ -1930,7 +1930,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Order\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Sort_degrees_by); + HTM_TxtF ("%s:",Txt_Sort_degrees_by); HTM_LABEL_End (); HTM_TD_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); - HTM_NBSPTxt (Deg.FullName); + HTM_TxtF (" %s",Deg.FullName); } HTM_TD_End (); diff --git a/swad_place.c b/swad_place.c index 8c5a351a..706b256c 100644 --- a/swad_place.c +++ b/swad_place.c @@ -159,7 +159,7 @@ void Plc_SeePlaces (void) /***** Separation row *****/ HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"2\" class=\"DAT\""); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); HTM_TR_End (); diff --git a/swad_privacy.c b/swad_privacy.c index 5962dca3..747e68eb 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -159,7 +159,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel, /***** Select visibility *****/ HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (TxtLabel); + HTM_TxtF ("%s:",TxtLabel); HTM_TD_End (); /***** Form with list of options *****/ diff --git a/swad_profile.c b/swad_profile.c index f8458fbd..d37a7737 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -206,7 +206,7 @@ void Prf_RequestUserProfile (void) /* By default, the nickname is filled with my nickname If no user logged ==> the nickname is empty */ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Nickname); + HTM_TxtF ("%s: ",Txt_Nickname); snprintf (NicknameWithArroba,sizeof (NicknameWithArroba), "@%s", @@ -479,7 +479,7 @@ static void Prf_ShowTimeSinceFirstClick (const struct UsrData *UsrDat, HTM_SPAN_End (); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); NumYears = UsrFigures->NumDays / 365; if (NumYears) HTM_TxtF ("%d %s", @@ -532,7 +532,7 @@ static void Prf_ShowNumCrssWithRole (const struct UsrData *UsrDat, Prf_StartListItem (Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex],Rol_Icons[Role]); - HTM_UnsignedNBSPTxt (NumCrss,Txt_courses_ABBREVIATION); + HTM_TxtF ("%u %s",NumCrss,Txt_courses_ABBREVIATION); if (NumCrss) HTM_TxtF (" (%u %s/%u %s)", @@ -568,11 +568,11 @@ static void Prf_ShowNumFilesCurrentlyPublished (const struct UsrData *UsrDat) Prf_StartListItem (Txt_Files_uploaded,"file.svg"); - HTM_UnsignedNBSPTxt (NumFiles,(NumFiles == 1) ? Txt_file : + HTM_TxtF ("%u %s",NumFiles,(NumFiles == 1) ? Txt_file : Txt_files); - HTM_NBSP (); + HTM_Space (); HTM_Txt ("("); - HTM_UnsignedNBSPTxt (NumPublicFiles,Txt_public_FILES); + HTM_TxtF ("%u %s",NumPublicFiles,Txt_public_FILES); HTM_Txt (")"); Prf_EndListItem (); @@ -595,12 +595,12 @@ static void Prf_ShowNumClicks (const struct UsrData *UsrDat, if (UsrFigures->NumClicks >= 0) { HTM_Long (UsrFigures->NumClicks); - HTM_NBSPTxtNBSP (Txt_clicks); + HTM_TxtF (" %s ",Txt_clicks); Prf_ShowRanking (Prf_GetRankingFigure (UsrDat->UsrCod,"NumClicks"), Prf_GetNumUsrsWithFigure ("NumClicks")); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); Str_WriteDoubleNumToFile (Gbl.F.Out, (double) UsrFigures->NumClicks / (double) UsrFigures->NumDays); @@ -635,16 +635,16 @@ static void Prf_ShowNumFileViews (const struct UsrData *UsrDat, if (UsrFigures->NumFileViews >= 0) { HTM_Long (UsrFigures->NumFileViews); - HTM_NBSPTxtNBSP ((UsrFigures->NumFileViews == 1) ? Txt_download : + HTM_TxtF (" %s ",(UsrFigures->NumFileViews == 1) ? Txt_download : Txt_downloads); Prf_ShowRanking (Prf_GetRankingFigure (UsrDat->UsrCod,"NumFileViews"), Prf_GetNumUsrsWithFigure ("NumFileViews")); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); Str_WriteDoubleNumToFile (Gbl.F.Out, - (float) UsrFigures->NumFileViews / - (float) UsrFigures->NumDays); + (double) UsrFigures->NumFileViews / + (double) UsrFigures->NumDays); HTM_TxtF ("/%s)",Txt_day); } } @@ -673,16 +673,16 @@ static void Prf_ShowNumSocialPublications (const struct UsrData *UsrDat, if (UsrFigures->NumSocPub >= 0) { HTM_Long (UsrFigures->NumSocPub); - HTM_NBSPTxtNBSP (UsrFigures->NumSocPub == 1 ? Txt_TIMELINE_post : - Txt_TIMELINE_posts); + HTM_TxtF (" %s ",UsrFigures->NumSocPub == 1 ? Txt_TIMELINE_post : + Txt_TIMELINE_posts); Prf_ShowRanking (Prf_GetRankingFigure (UsrDat->UsrCod,"NumSocPub"), Prf_GetNumUsrsWithFigure ("NumSocPub")); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); Str_WriteDoubleNumToFile (Gbl.F.Out, - (float) UsrFigures->NumSocPub / - (float) UsrFigures->NumDays); + (double) UsrFigures->NumSocPub / + (double) UsrFigures->NumDays); HTM_TxtF ("/%s)",Txt_day); } } @@ -711,16 +711,16 @@ static void Prf_ShowNumForumPosts (const struct UsrData *UsrDat, if (UsrFigures->NumForPst >= 0) { HTM_Long (UsrFigures->NumForPst); - HTM_NBSPTxtNBSP (UsrFigures->NumForPst == 1 ? Txt_FORUM_post : - Txt_FORUM_posts); + HTM_TxtF (" %s ",UsrFigures->NumForPst == 1 ? Txt_FORUM_post : + Txt_FORUM_posts); Prf_ShowRanking (Prf_GetRankingFigure (UsrDat->UsrCod,"NumForPst"), Prf_GetNumUsrsWithFigure ("NumForPst")); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); Str_WriteDoubleNumToFile (Gbl.F.Out, - (float) UsrFigures->NumForPst / - (float) UsrFigures->NumDays); + (double) UsrFigures->NumForPst / + (double) UsrFigures->NumDays); HTM_TxtF ("/%s)",Txt_day); } } @@ -749,16 +749,16 @@ static void Prf_ShowNumMessagesSent (const struct UsrData *UsrDat, if (UsrFigures->NumMsgSnt >= 0) { HTM_Long (UsrFigures->NumMsgSnt); - HTM_NBSPTxtNBSP (UsrFigures->NumMsgSnt == 1 ? Txt_message : - Txt_messages); + HTM_TxtF (" %s ",UsrFigures->NumMsgSnt == 1 ? Txt_message : + Txt_messages); Prf_ShowRanking (Prf_GetRankingFigure (UsrDat->UsrCod,"NumMsgSnt"), Prf_GetNumUsrsWithFigure ("NumMsgSnt")); if (UsrFigures->NumDays > 0) { - HTM_NBSPTxt ("("); + HTM_TxtF (" %s","("); Str_WriteDoubleNumToFile (Gbl.F.Out, - (float) UsrFigures->NumMsgSnt / - (float) UsrFigures->NumDays); + (double) UsrFigures->NumMsgSnt / + (double) UsrFigures->NumDays); HTM_TxtF ("/%s)",Txt_day); } } diff --git a/swad_project.c b/swad_project.c index bb0a0ee8..bcfcfb31 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1192,7 +1192,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassLabel); break; } - HTM_TxtColon (Txt_Assigned_QUESTION); + HTM_TxtF ("%s:",Txt_Assigned_QUESTION); HTM_TD_End (); switch (ProjectView) @@ -1206,8 +1206,8 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassData); break; } - HTM_TxtNBSP (Prj->Assigned == Prj_ASSIGNED ? Txt_Yes : - Txt_No); + HTM_TxtF ("%s ",Prj->Assigned == Prj_ASSIGNED ? Txt_Yes : + Txt_No); Ico_PutIconOff (AssignedNonassigImage[Prj->Assigned], Txt_PROJECT_ASSIGNED_NONASSIGNED_SINGUL[Prj->Assigned]); @@ -1232,7 +1232,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, ClassLabel); break; } - HTM_TxtColon (Txt_Number_of_students); + HTM_TxtF ("%s:",Txt_Number_of_students); HTM_TD_End (); switch (ProjectView) @@ -1306,7 +1306,7 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj, HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); break; } - HTM_TxtColon (Txt_Proposal); + HTM_TxtF ("%s:",Txt_Proposal); HTM_TD_End (); switch (ProjectView) @@ -1666,7 +1666,7 @@ static void Prj_ShowOneProjectTxtField (struct Project *Prj, // Not applicable break; } - HTM_TxtColon (Label); + HTM_TxtF ("%s:",Label); HTM_TD_End (); /***** Change text format *****/ @@ -1761,7 +1761,7 @@ static void Prj_ShowOneProjectURL (const struct Project *Prj, // Not applicable break; } - HTM_TxtColon (Txt_URL); + HTM_TxtF ("%s:",Txt_URL); HTM_TD_End (); switch (ProjectView) @@ -1874,22 +1874,22 @@ static void Prj_ShowOneProjectMembersWithARole (const struct Project *Prj, case Prj_LIST_PROJECTS: HTM_TD_Begin ("colspan=\"4\" class=\"RT %s COLOR%u\"", ClassLabel,Gbl.RowEvenOdd); - HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtF ("%s:",NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_FILE_BROWSER_PROJECT: HTM_TD_Begin ("colspan=\"3\" class=\"RT %s\"",ClassLabel); - HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtF ("%s:",NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_PRINT_ONE_PROJECT: HTM_TD_Begin ("colspan=\"2\" class=\"RT %s\"",ClassLabel); - HTM_TxtColon (NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : - Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtF ("%s:",NumUsrs == 1 ? Txt_PROJECT_ROLES_SINGUL_Abc[RoleInProject] : + Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; case Prj_EDIT_ONE_PROJECT: HTM_TD_Begin ("class=\"RT ASG_LABEL\""); - HTM_TxtColon (Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); + HTM_TxtF ("%s:",Txt_PROJECT_ROLES_PLURAL_Abc[RoleInProject]); break; } HTM_TD_End (); @@ -2036,7 +2036,7 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Project *Prj, HTM_LI_Begin (NULL); HTM_Txt (Gbl.Usrs.Other.UsrDat.Surname1); if (Gbl.Usrs.Other.UsrDat.Surname2[0]) - HTM_NBSPTxt (Gbl.Usrs.Other.UsrDat.Surname2); + HTM_TxtF (" %s",Gbl.Usrs.Other.UsrDat.Surname2); HTM_TxtF (", %s",Gbl.Usrs.Other.UsrDat.FirstName); HTM_LI_End (); } @@ -3298,7 +3298,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -3316,7 +3316,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"", Dpt_PARAM_DPT_COD_NAME, The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Department); + HTM_TxtF ("%s:",Txt_Department); HTM_LABEL_End (); HTM_TD_End (); @@ -3335,7 +3335,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Assigned_QUESTION); + HTM_TxtF ("%s:",Txt_Assigned_QUESTION); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3354,7 +3354,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Number_of_students); + HTM_TxtF ("%s:",Txt_Number_of_students); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3367,7 +3367,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Proposal); + HTM_TxtF ("%s:",Txt_Proposal); HTM_TD_End (); HTM_TD_Begin ("class=\"LM\""); @@ -3407,7 +3407,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"WWW\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_URL); + HTM_TxtF ("%s:",Txt_URL); HTM_LABEL_End (); HTM_TD_End (); @@ -3445,7 +3445,7 @@ static void Prj_EditOneProjectTxtArea (const char *Id, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"%s\" class=\"%s\"",Id,The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Label); + HTM_TxtF ("%s:",Label); HTM_LABEL_End (); HTM_TD_End (); @@ -3745,7 +3745,7 @@ void Prj_ShowFormConfig (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Editable); + HTM_TxtF ("%s:",Txt_Editable); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_record.c b/swad_record.c index 7a20e03e..3837f0db 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1803,13 +1803,13 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, ICanEditThisField ? The_ClassFormInBox[Gbl.Prefs.Theme] : "REC_DAT_SMALL", Gbl.RowEvenOdd); - HTM_TxtColon (Gbl.Crs.Records.LstFields.Lst[NumField].Name); + HTM_TxtF ("%s:",Gbl.Crs.Records.LstFields.Lst[NumField].Name); if (TypeOfView == Rec_CRS_LIST_ONE_RECORD || TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS) { HTM_SPAN_Begin ("class=\"DAT_SMALL\""); - HTM_TxtF (" (%s)", - Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); + HTM_Space (); + HTM_TxtF ("(%s)",Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); HTM_SPAN_End (); } HTM_TD_End (); @@ -1847,7 +1847,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, HTM_Txt (Text); } else - HTM_Txt ("-"); + HTM_Hyphen (); } HTM_TD_End (); HTM_TR_End (); @@ -2845,7 +2845,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat,const char *ClassForm) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Email); + HTM_TxtF ("%s:",Txt_Email); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -2879,7 +2879,7 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *ClassForm, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RT %s\"",ClassForm); - HTM_TxtColon (Txt_ID); + HTM_TxtF ("%s:",Txt_ID); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LT\""); @@ -2921,7 +2921,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Role\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Role); + HTM_TxtF ("%s:",Txt_Role); HTM_LABEL_End (); HTM_TD_End (); @@ -3131,7 +3131,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, "value=\"%u\"%s required=\"required\"", (unsigned) Sex, Sex == Gbl.Usrs.Me.UsrDat.Sex ? " checked=\"checked\"" : ""); - HTM_TxtNBSPTxt (Usr_StringsSexIcons[Sex],Txt_SEX_SINGULAR_Abc[Sex]); + HTM_TxtF ("%s %s",Usr_StringsSexIcons[Sex],Txt_SEX_SINGULAR_Abc[Sex]); HTM_LABEL_End (); } HTM_TD_End (); @@ -3140,7 +3140,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat, { /***** No form, only text *****/ HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Role); + HTM_TxtF ("%s:",Txt_Role); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3168,8 +3168,8 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat, HTM_LABEL_Begin ("for=\"Surname1\" class=\"%s\"",ClassForm); HTM_Txt (Txt_Surname_1); if (TypeOfView == Rec_SHA_MY_RECORD_FORM) - HTM_Txt ("*"); - HTM_Txt (":"); + HTM_Asterisk (); + HTM_Colon (); HTM_LABEL_End (); HTM_TD_End (); @@ -3204,7 +3204,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Surname2\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Surname_2); + HTM_TxtF ("%s:",Txt_Surname_2); HTM_LABEL_End (); HTM_TD_End (); @@ -3241,8 +3241,8 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat, HTM_LABEL_Begin ("for=\"FirstName\" class=\"%s\"",ClassForm); HTM_Txt (Txt_First_name); if (TypeOfView == Rec_SHA_MY_RECORD_FORM) - HTM_Txt ("*"); - HTM_Txt (":"); + HTM_Asterisk (); + HTM_Colon (); HTM_LABEL_End (); HTM_TD_End (); @@ -3289,8 +3289,8 @@ static void Rec_ShowCountry (struct UsrData *UsrDat, HTM_LABEL_Begin ("for=\"OthCtyCod\" class=\"%s\"",ClassForm); HTM_Txt (Txt_Country); if (TypeOfView == Rec_SHA_MY_RECORD_FORM) - HTM_Txt ("*"); - HTM_Txt (":"); + HTM_Asterisk (); + HTM_Colon (); HTM_LABEL_End (); HTM_TD_End (); @@ -3330,7 +3330,7 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"OriginPlace\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Place_of_origin); + HTM_TxtF ("%s:",Txt_Place_of_origin); HTM_LABEL_End (); HTM_TD_End (); @@ -3362,7 +3362,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Date_of_birth); + HTM_TxtF ("%s:",Txt_Date_of_birth); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3396,7 +3396,7 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"LocalAddress\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Local_address); + HTM_TxtF ("%s:",Txt_Local_address); HTM_LABEL_End (); HTM_TD_End (); @@ -3429,7 +3429,7 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"LocalPhone\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Phone); + HTM_TxtF ("%s:",Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); @@ -3465,7 +3465,7 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"FamilyAddress\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Family_address); + HTM_TxtF ("%s:",Txt_Family_address); HTM_LABEL_End (); HTM_TD_End (); @@ -3498,7 +3498,7 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"FamilyPhone\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Phone); + HTM_TxtF ("%s:",Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); @@ -3534,7 +3534,7 @@ static void Rec_ShowComments (struct UsrData *UsrDat, HTM_TD_Begin ("class=\"REC_C1_BOT RT\""); HTM_LABEL_Begin ("for=\"Comments\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_USER_comments); + HTM_TxtF ("%s:",Txt_USER_comments); HTM_LABEL_End (); HTM_TD_End (); @@ -3596,7 +3596,7 @@ static void Rec_ShowInstitution (struct Instit *Ins, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Institution); + HTM_TxtF ("%s:",Txt_Institution); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3628,7 +3628,7 @@ static void Rec_ShowCentre (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Centre); + HTM_TxtF ("%s:",Txt_Centre); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3664,7 +3664,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Department); + HTM_TxtF ("%s:",Txt_Department); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3699,7 +3699,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Office); + HTM_TxtF ("%s:",Txt_Office); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -3722,7 +3722,7 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"REC_C1_BOT RM %s\"",ClassForm); - HTM_TxtColon (Txt_Phone); + HTM_TxtF ("%s:",Txt_Phone); HTM_TD_End (); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); @@ -4154,7 +4154,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"Office\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Office); + HTM_TxtF ("%s:",Txt_Office); HTM_LABEL_End (); HTM_TD_End (); @@ -4172,7 +4172,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_TD_Begin ("class=\"REC_C1_BOT RM\""); HTM_LABEL_Begin ("for=\"OfficePhone\" class=\"%s\"",ClassForm); - HTM_TxtColon (Txt_Phone); + HTM_TxtF ("%s:",Txt_Phone); HTM_LABEL_End (); HTM_TD_End (); diff --git a/swad_report.c b/swad_report.c index 964448c4..03702f2f 100644 --- a/swad_report.c +++ b/swad_report.c @@ -305,7 +305,7 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC) HTM_DIV_Begin ("class=\"TITLE_REPORT DAT\""); /***** User *****/ - HTM_TxtColonNBSP (Txt_User[Gbl.Usrs.Me.UsrDat.Sex]); + HTM_TxtF ("%s: ",Txt_User[Gbl.Usrs.Me.UsrDat.Sex]); HTM_SPAN_Begin ("class=\"DAT_N_BOLD\""); HTM_Txt (Gbl.Usrs.Me.UsrDat.FullName); HTM_SPAN_End (); @@ -314,7 +314,7 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC) if (CurrentTimeUTC) { HTM_BR (); - HTM_TxtColonNBSP (Txt_Date); + HTM_TxtF ("%s: ",Txt_Date); HTM_SPAN_Begin ("class=\"DAT_N\""); HTM_TxtF ("%s %s UTC",CurrentTimeUTC->StrDate, CurrentTimeUTC->StrTime); diff --git a/swad_search.c b/swad_search.c index 6f56e19f..6fb4b2ca 100644 --- a/swad_search.c +++ b/swad_search.c @@ -146,7 +146,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Hie current centre, current degree or current course) *****/ HTM_DIV_Begin ("class=\"CM\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Gbl.Scope.Allowed = 1 << Hie_SYS | 1 << Hie_CTY | 1 << Hie_INS | diff --git a/swad_statistic.c b/swad_statistic.c index da00806e..752bec4c 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -377,7 +377,7 @@ void Sta_AskShowCrsHits (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -400,7 +400,7 @@ void Sta_AskShowCrsHits (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RM %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Show); + HTM_TxtF ("%s:",Txt_Show); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"LM\""); @@ -419,7 +419,7 @@ void Sta_AskShowCrsHits (void) Sta_WriteSelectorCountType (); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_NBSPTxtNBSP (Txt_distributed_by); + HTM_TxtF (" %s ",Txt_distributed_by); HTM_SELECT_Begin (false, "id=\"GroupedBy\" name=\"GroupedBy\""); for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR; @@ -540,7 +540,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Role\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_LABEL_End (); HTM_TD_End (); @@ -569,7 +569,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeSta\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Scope); + HTM_TxtF ("%s:",Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -592,7 +592,7 @@ void Sta_AskShowGblHits (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"CountType\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Show); + HTM_TxtF ("%s:",Txt_Show); HTM_LABEL_End (); HTM_TD_End (); @@ -601,7 +601,7 @@ void Sta_AskShowGblHits (void) /***** Type of statistic *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_NBSPTxtNBSP (Txt_distributed_by); + HTM_TxtF (" %s ",Txt_distributed_by); if (Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAY || Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_GBL_PER_COURSE) @@ -717,7 +717,7 @@ static void Sta_WriteSelectorAction (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"StatAct\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Action); + HTM_TxtF ("%s:",Txt_Action); HTM_LABEL_End (); HTM_TD_End (); @@ -1712,18 +1712,18 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql /* Write the user's ID if user is a student */ HTM_TD_Begin ("class=\"LOG CT COLOR%u\"",Gbl.RowEvenOdd); ID_WriteUsrIDs (&UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write the first name and the surnames */ HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (UsrDat.FullName); + HTM_TxtF ("%s ",UsrDat.FullName); HTM_TD_End (); /* Write the user's role */ HTM_TD_Begin ("class=\"LOG CT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (RoleFromLog < Rol_NUM_ROLES ? Txt_ROLES_SINGUL_Abc[RoleFromLog][UsrDat.Sex] : - "?"); + HTM_TxtF ("%s ",RoleFromLog < Rol_NUM_ROLES ? Txt_ROLES_SINGUL_Abc[RoleFromLog][UsrDat.Sex] : + "?"); HTM_TD_End (); /* Write the date-time (row[3]) */ @@ -1742,7 +1742,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql if (ActCod >= 0) { HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (Act_GetActionTextFromDB (ActCod,ActTxt)); + HTM_TxtF ("%s ",Act_GetActionTextFromDB (ActCod,ActTxt)); } else { @@ -1851,17 +1851,17 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res) /* Write the user's ID if user is a student in current course */ HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd); ID_WriteUsrIDs (&UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write the name and the surnames */ HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (UsrDat.FullName); + HTM_TxtF ("%s ",UsrDat.FullName); HTM_TD_End (); /* Write user's role */ HTM_TD_Begin ("class=\"LOG CT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (Txt_ROLES_SINGUL_Abc[UsrDat.Roles.InCurrentCrs.Role][UsrDat.Sex]); + HTM_TxtF ("%s ",Txt_ROLES_SINGUL_Abc[UsrDat.Roles.InCurrentCrs.Role][UsrDat.Sex]); HTM_TD_End (); /* Write the number of clicks */ @@ -1886,7 +1886,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res) NULL, "class=\"LT\" style=\"width:%upx; height:10px; padding-top:4px;\"", BarWidth); - HTM_NBSP (); + HTM_Space (); } Str_WriteDoubleNumToFile (Gbl.F.Out,Hits.Num); HTM_TD_End (); @@ -1965,13 +1965,13 @@ static void Sta_ShowNumHitsPerDay (unsigned long NumRows,MYSQL_RES *mysql_res) Dat_ConvDateToDateStr (&Date,StrDate); HTM_TD_Begin ("class=\"%s RT\"",NumDayWeek == 6 ? "LOG_R" : "LOG"); - HTM_TxtNBSP (StrDate); + HTM_TxtF ("%s ",StrDate); HTM_TD_End (); /* Write the day of the week */ HTM_TD_Begin ("class=\"%s LT\"",NumDayWeek == 6 ? "LOG_R" : "LOG"); - HTM_TxtNBSP (Txt_DAYS_SMALL[NumDayWeek]); + HTM_TxtF ("%s ",Txt_DAYS_SMALL[NumDayWeek]); HTM_TD_End (); /* Draw bar proportional to number of hits */ @@ -2004,13 +2004,13 @@ static void Sta_ShowNumHitsPerDay (unsigned long NumRows,MYSQL_RES *mysql_res) Dat_ConvDateToDateStr (&Date,StrDate); HTM_TD_Begin ("class=\"%s RT\"",NumDayWeek == 6 ? "LOG_R" : "LOG"); - HTM_TxtNBSP (StrDate); + HTM_TxtF ("%s ",StrDate); HTM_TD_End (); /* Write the day of the week */ HTM_TD_Begin ("class=\"%s LT\"",NumDayWeek == 6 ? "LOG_R" : "LOG"); - HTM_TxtNBSP (Txt_DAYS_SMALL[NumDayWeek]); + HTM_TxtF ("%s ",Txt_DAYS_SMALL[NumDayWeek]); HTM_TD_End (); /* Draw bar proportional to number of hits */ @@ -2082,7 +2082,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES } HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Color_of_the_graphic); + HTM_TxtF ("%s: ",Txt_Color_of_the_graphic); HTM_SELECT_Begin (true, "name=\"ColorType\""); for (ColorType = (Sta_ColorType_t) 0; @@ -2183,14 +2183,14 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES /* Write the date */ Dat_ConvDateToDateStr (&Date,StrDate); HTM_TD_Begin ("class=\"%s RT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (StrDate); + "LOG"); + HTM_TxtF ("%s ",StrDate); HTM_TD_End (); /* Write the day of the week */ HTM_TD_Begin ("class=\"%s LT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (Txt_DAYS_SMALL[NumDayWeek]); + "LOG"); + HTM_TxtF ("%s ",Txt_DAYS_SMALL[NumDayWeek]); HTM_TD_End (); /* Draw a cell with the color proportional to the number of clicks */ @@ -2231,14 +2231,14 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES /* Write the date */ Dat_ConvDateToDateStr (&Date,StrDate); HTM_TD_Begin ("class=\"%s RT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (StrDate); + "LOG"); + HTM_TxtF ("%s ",StrDate); HTM_TD_End (); /* Write the day of the week */ HTM_TD_Begin ("class=\"%s LT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (Txt_DAYS_SMALL[NumDayWeek]); + "LOG"); + HTM_TxtF ("%s ",Txt_DAYS_SMALL[NumDayWeek]); HTM_TD_End (); /* Draw the color proporcional al number of clicks */ @@ -2267,14 +2267,14 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES /* Write the date */ Dat_ConvDateToDateStr (&Date,StrDate); HTM_TD_Begin ("class=\"%s RT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (StrDate); + "LOG"); + HTM_TxtF ("%s ",StrDate); HTM_TD_End (); /* Write the day of the week */ HTM_TD_Begin ("class=\"%s LT\"",NumDayWeek == 6 ? "LOG_R" : - "LOG"); - HTM_TxtNBSP (Txt_DAYS_SMALL[NumDayWeek]); + "LOG"); + HTM_TxtF ("%s ",Txt_DAYS_SMALL[NumDayWeek]); HTM_TD_End (); /* Draw the color proportional to number of clicks */ @@ -2867,7 +2867,7 @@ static void Sta_WriteAccessHour (unsigned Hour,struct Sta_Hits *Hits,unsigned Co } else { - HTM_TxtF ("0%%"); + HTM_Txt ("0%"); HTM_BR (); HTM_Unsigned (0); } @@ -3143,7 +3143,7 @@ static void Sta_ShowNumHitsPerAction (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RT\""); if (ActCod >= 0) - HTM_TxtNBSP (Act_GetActionTextFromDB (ActCod,ActTxt)); + HTM_TxtF ("%s ",Act_GetActionTextFromDB (ActCod,ActTxt)); else HTM_Txt ("? "); HTM_TD_End (); @@ -3200,7 +3200,7 @@ static void Sta_ShowNumHitsPerPlugin (unsigned long NumRows, HTM_Txt (Plg.Name); else HTM_Txt ("?"); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Draw bar proportional to number of hits */ @@ -3252,7 +3252,7 @@ static void Sta_ShowNumHitsPerWSFunction (unsigned long NumRows, Lay_ShowErrorAndExit ("Wrong function code."); HTM_TD_Begin ("class=\"LOG LT\""); - HTM_TxtNBSP (API_GetFunctionNameFromFunCod (FunCod)); + HTM_TxtF ("%s ",API_GetFunctionNameFromFunCod (FunCod)); HTM_TD_End (); /* Draw bar proportional to number of hits */ @@ -3377,7 +3377,7 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RM\""); if (CtyCod > 0) HTM_UnsignedLong (++Ranking); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write country */ @@ -3467,7 +3467,7 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RT\""); if (InsCod > 0) HTM_UnsignedLong (++Ranking); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write institution */ @@ -3559,7 +3559,7 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RT\""); if (CtrCod > 0) HTM_UnsignedLong (++Ranking); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write centre */ @@ -3651,7 +3651,7 @@ static void Sta_ShowNumHitsPerDegree (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RT\""); if (DegCod > 0) HTM_UnsignedLong (++Ranking); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write degree */ @@ -3755,7 +3755,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows, HTM_TD_Begin ("class=\"LOG RT\""); if (CrsOK) HTM_UnsignedLong (++Ranking); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /* Write degree */ @@ -3763,8 +3763,11 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows, /* Write degree year */ HTM_TD_Begin ("class=\"LOG CT\""); - HTM_TxtNBSP (CrsOK ? Txt_YEAR_OF_DEGREE[Crs.Year] : - "-"); + if (CrsOK) + HTM_Txt (Txt_YEAR_OF_DEGREE[Crs.Year]); + else + HTM_Hyphen (); + HTM_Space (); HTM_TD_End (); /* Write course, including link */ @@ -3781,8 +3784,8 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows, Frm_LinkFormEnd (); } else - HTM_Txt ("-"); - HTM_NBSP (); + HTM_Hyphen (); + HTM_Space (); if (CrsOK) Frm_EndForm (); HTM_TD_End (); @@ -3856,17 +3859,16 @@ static void Sta_DrawBarNumHits (char Color, free (Icon); /***** Write the number of hits *****/ - HTM_NBSP (); + HTM_Space (); Str_WriteDoubleNumToFile (Gbl.F.Out,HitsNum); - HTM_TxtF (" (%u", - (unsigned) (((HitsNum * 100.0) / - HitsTotal) + 0.5)); + HTM_TxtF (" (%u",(unsigned) (((HitsNum * 100.0) / + HitsTotal) + 0.5)); } else /***** Write the number of clicks *****/ HTM_Txt ("0 (0"); - HTM_TxtF ("%%) "); + HTM_Txt ("%) "); HTM_TD_End (); } diff --git a/swad_survey.c b/swad_survey.c index 0c88008e..24cf6174 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -540,10 +540,10 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, HTM_DIV_Begin ("class=\"%s\"", Svy.Status.Visible ? "ASG_GRP" : "ASG_GRP_LIGHT"); - HTM_TxtColonNBSP (Txt_No_of_questions); + HTM_TxtF ("%s: ",Txt_No_of_questions); HTM_Unsigned (Svy.NumQsts); HTM_Txt ("; "); - HTM_TxtColonNBSP (Txt_No_of_users); + HTM_TxtF ("%s: ",Txt_No_of_users); HTM_Unsigned (Svy.NumUsrs); HTM_DIV_End (); @@ -613,7 +613,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, /* Scope of the survey */ HTM_DIV_Begin ("class=\"%s\"",Svy.Status.Visible ? "ASG_GRP" : "ASG_GRP_LIGHT"); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); switch (Svy.Scope) { case Hie_UNK: // Unknown @@ -623,19 +623,19 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, HTM_Txt (Cfg_PLATFORM_SHORT_NAME); break; case Hie_CTY: // Country - HTM_TxtNBSPTxt (Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + HTM_TxtF ("%s %s",Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); break; case Hie_INS: // Institution - HTM_TxtNBSPTxt (Txt_Institution,Gbl.Hierarchy.Ins.ShrtName); + HTM_TxtF ("%s %s",Txt_Institution,Gbl.Hierarchy.Ins.ShrtName); break; case Hie_CTR: // Centre - HTM_TxtNBSPTxt (Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName); + HTM_TxtF ("%s %s",Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName); break; case Hie_DEG: // Degree - HTM_TxtNBSPTxt (Txt_Degree,Gbl.Hierarchy.Deg.ShrtName); + HTM_TxtF ("%s %s",Txt_Degree,Gbl.Hierarchy.Deg.ShrtName); break; case Hie_CRS: // Course - HTM_TxtNBSPTxt (Txt_Course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_Course,Gbl.Hierarchy.Crs.ShrtName); break; } HTM_DIV_End (); @@ -643,7 +643,7 @@ 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"); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_BR (); Rol_WriteSelectorRoles (1 << Rol_STD | 1 << Rol_NET | @@ -1895,7 +1895,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"ScopeSvy\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Scope); + HTM_TxtF ("%s:",Txt_Scope); HTM_LABEL_End (); HTM_TD_End (); @@ -1912,7 +1912,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"Title\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Title); + HTM_TxtF ("%s:",Txt_Title); HTM_LABEL_End (); HTM_TD_End (); @@ -1931,7 +1931,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Description); + HTM_TxtF ("%s:",Txt_Description); HTM_LABEL_End (); HTM_TD_End (); @@ -1948,7 +1948,7 @@ void Svy_RequestCreatOrEditSvy (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -2080,7 +2080,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Groups); + HTM_TxtF ("%s:",Txt_Groups); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -2095,7 +2095,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod) HTM_INPUT_CHECKBOX ("WholeCrs",false, "id=\"WholeCrs\" value=\"Y\"%s onclick=\"uncheckChildren(this,'GrpCods')\"", Svy_CheckIfSvyIsAssociatedToGrps (SvyCod) ? "" : " checked=\"checked\""); - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_LABEL_End (); HTM_TD_End (); @@ -2465,8 +2465,8 @@ static void Svy_GetAndWriteNamesOfGrpsAssociatedToSvy (struct Survey *Svy) /***** Write heading *****/ HTM_DIV_Begin ("class=\"%s\"",Svy->Status.Visible ? "ASG_GRP" : "ASG_GRP_LIGHT"); - HTM_TxtColonNBSP (NumRows == 1 ? Txt_Group : - Txt_Groups); + HTM_TxtF ("%s: ",NumRows == 1 ? Txt_Group : + Txt_Groups); /***** Write groups *****/ if (NumRows) // Groups found... @@ -2480,7 +2480,7 @@ static void Svy_GetAndWriteNamesOfGrpsAssociatedToSvy (struct Survey *Svy) row = mysql_fetch_row (mysql_res); /* Write group type name and group name */ - HTM_TxtNBSPTxt (row[0],row[1]); + HTM_TxtF ("%s %s",row[0],row[1]); if (NumRows >= 2) { @@ -2493,7 +2493,7 @@ static void Svy_GetAndWriteNamesOfGrpsAssociatedToSvy (struct Survey *Svy) } } else - HTM_TxtNBSPTxt (Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); + HTM_TxtF ("%s %s",Txt_The_whole_course,Gbl.Hierarchy.Crs.ShrtName); HTM_DIV_End (); @@ -2721,7 +2721,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Txt\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Wording); + HTM_TxtF ("%s:",Txt_Wording); HTM_LABEL_End (); HTM_TD_End (); @@ -2737,7 +2737,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Type); + HTM_TxtF ("%s:",Txt_Type); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -3530,7 +3530,7 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs) "class=\"LT\" style=\"width:%upx; height:20px;\"",BarWidth); /***** Write the number of users *****/ - HTM_NBSPTxt (Gbl.Title); + HTM_TxtF (" %s",Gbl.Title); HTM_TD_End (); } diff --git a/swad_syllabus.c b/swad_syllabus.c index 3fb017fa..1161c8c0 100644 --- a/swad_syllabus.c +++ b/swad_syllabus.c @@ -708,8 +708,8 @@ static void Syl_ShowRowSyllabus (unsigned NumItem, StyleSyllabus[Level],Gbl.RowEvenOdd, Level * Syl_WIDTH_NUM_SYLLABUS); if (Level == 1) - HTM_NBSP (); - HTM_TxtNBSP (StrItemCod); + HTM_Space (); + HTM_TxtF ("%s ",StrItemCod); HTM_TD_End (); /***** Text of the item *****/ @@ -899,9 +899,9 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int StyleSyllabus[Level],Gbl.RowEvenOdd, Level * Syl_WIDTH_NUM_SYLLABUS); if (Level == 1) - HTM_NBSP (); + HTM_Space (); Syl_WriteNumItem (NULL,Gbl.F.Out,Level,CodItem); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); } diff --git a/swad_test.c b/swad_test.c index e47c1f54..a6a412d7 100644 --- a/swad_test.c +++ b/swad_test.c @@ -355,7 +355,7 @@ void Tst_ShowFormAskTst (void) HTM_TD_Begin ("class=\"RM\""); HTM_LABEL_Begin ("for=\"NumQst\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_No_of_questions); + HTM_TxtF ("%s:",Txt_No_of_questions); HTM_LABEL_End (); HTM_TD_End (); @@ -471,7 +471,7 @@ void Tst_ShowNewTest (void) HTM_INPUT_CHECKBOX ("Save",false, "value=\"Y\"%s", Gbl.Test.AllowTeachers ? " checked=\"checked\"" : ""); - HTM_NBSPTxt (Txt_Allow_teachers_to_consult_this_test); + HTM_TxtF (" %s",Txt_Allow_teachers_to_consult_this_test); HTM_LABEL_End (); HTM_DIV_End (); @@ -635,7 +635,7 @@ void Tst_ShowTstTotalMark (unsigned NumQsts,double TotalScore) /***** Write total mark ****/ HTM_DIV_Begin ("class=\"DAT CM\""); - HTM_TxtColonNBSP (Txt_Score); + HTM_TxtF ("%s: ",Txt_Score); HTM_SPAN_Begin ("class=\"%s\"", (TotalScoreOverSCORE_MAX >= (double) TotalScoreOverSCORE_MAX / 2.0) ? "ANS_OK" : @@ -1162,7 +1162,7 @@ static void Tst_PutFormToEditQstMedia (struct Media *Media,int NumMediaInForm, UniqueId, (unsigned) Med_ACTION_NEW_MEDIA, OptionsDisabled ? " disabled=\"disabled\"" : ""); - HTM_TxtColonNBSP (Txt_Change_image_video); + HTM_TxtF ("%s: ",Txt_Change_image_video); HTM_LABEL_End (); Med_PutMediaUploader (NumMediaInForm,"TEST_MED_INPUT"); @@ -1681,7 +1681,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, /***** Label *****/ HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Tags); + HTM_TxtF ("%s:",Txt_Tags); HTM_TD_End (); /***** Select all tags *****/ @@ -1700,7 +1700,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\"" : ""); - HTM_NBSPTxt (Txt_All_tags); + HTM_TxtF (" %s",Txt_All_tags); HTM_LABEL_End (); HTM_TD_End (); @@ -1748,7 +1748,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res, "value=\"%s\"%s onclick=\"checkParent(this,'AllTags');\"", row[1], Checked ? " checked=\"checked\"" : ""); - HTM_NBSPTxt (row[1]); + HTM_TxtF (" %s",row[1]); HTM_LABEL_End (); HTM_TD_End (); @@ -1902,7 +1902,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Plugins); + HTM_TxtF ("%s:",Txt_Plugins); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -1927,7 +1927,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_No_of_questions); + HTM_TxtF ("%s:",Txt_No_of_questions); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -1949,8 +1949,8 @@ static void Tst_ShowFormConfigTst (void) HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"MinTimeNxtTstPerQst\" class=\"%s\"", The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Minimum_time_seconds_per_question_between_two_tests); - HTM_LABEL_End (); + HTM_TxtF ("%s:",Txt_Minimum_time_seconds_per_question_between_two_tests); + HTM_LABEL_End (); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -1967,7 +1967,7 @@ static void Tst_ShowFormConfigTst (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Feedback_to_students); + HTM_TxtF ("%s:",Txt_Feedback_to_students); HTM_TD_End (); HTM_TD_Begin ("class=\"LB\""); @@ -2314,7 +2314,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) /***** Label *****/ HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Types_of_answers); + HTM_TxtF ("%s:",Txt_Types_of_answers); HTM_TD_End (); /***** Select all types of answers *****/ @@ -2331,7 +2331,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) HTM_INPUT_CHECKBOX ("AllAnsTypes",false, "value=\"Y\"%s onclick=\"togglecheckChildren(this,'AnswerType');\"", Gbl.Test.AllAnsTypes ? " checked=\"checked\"" : ""); - HTM_NBSPTxt (Txt_All_types_of_answers); + HTM_TxtF (" %s",Txt_All_types_of_answers); HTM_LABEL_End (); HTM_TD_End (); @@ -2361,7 +2361,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols) "value=\"%u\"%s onclick=\"checkParent(this,'AllAnsTypes');\"", (unsigned) AnsType, Checked ? " checked=\"checked\"" : ""); - HTM_NBSPTxt (Txt_TST_STR_ANSWER_TYPES[AnsType]); + HTM_TxtF (" %s",Txt_TST_STR_ANSWER_TYPES[AnsType]); HTM_LABEL_End (); HTM_TD_End (); @@ -3143,7 +3143,7 @@ static void Tst_ListOneOrMoreQuestionsForSelection (unsigned long NumRows, /* Write the question type (row[2]) */ Gbl.Test.AnswerType = Tst_ConvertFromStrAnsTypDBToAnsTyp (row[2]); HTM_TD_Begin ("class=\"DAT_SMALL CT COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtNBSP (Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]); + HTM_TxtF ("%s ",Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]); HTM_TD_End (); /* Write if shuffle is enabled (row[3]) */ @@ -3546,7 +3546,7 @@ void Tst_WriteAnsTF (char AnsTF) HTM_Txt (Txt_TF_QST[1]); break; default: // no answer - HTM_NBSP (); + HTM_Space (); break; } } @@ -4737,7 +4737,7 @@ static void Tst_WriteScoreStart (unsigned ColSpan) HTM_TR_Begin (NULL); HTM_TD_Begin ("colspan=\"%u\" class=\"DAT_SMALL LM\"",ColSpan); - HTM_TxtColonNBSP (Txt_Score); + HTM_TxtF ("%s: ",Txt_Score); } static void Tst_WriteScoreEnd (void) @@ -5123,7 +5123,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Tags); + HTM_TxtF ("%s:",Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); @@ -5202,7 +5202,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TD_Begin ("class=\"RT\""); HTM_LABEL_Begin ("for=\"Stem\" class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Wording); + HTM_TxtF ("%s:",Txt_Wording); HTM_LABEL_End (); HTM_TD_End (); @@ -5217,7 +5217,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], /***** Feedback *****/ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s (%s):",Txt_Feedback,Txt_optional); + HTM_TxtF ("%s (%s):",Txt_Feedback,Txt_optional); HTM_BR (); HTM_TEXTAREA_Begin ("name=\"Feedback\" class=\"STEM_TEXTAREA\" rows=\"2\""); if (Feedback) @@ -5233,7 +5233,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Type); + HTM_TxtF ("%s:",Txt_Type); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -5246,7 +5246,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], "value=\"%u\"%s onclick=\"enableDisableAns(this.form);\"", (unsigned) AnsType, AnsType == Gbl.Test.AnswerType ? " checked=\"checked\"" : ""); - HTM_TxtNBSP (Txt_TST_STR_ANSWER_TYPES[AnsType]); + HTM_TxtF ("%s ",Txt_TST_STR_ANSWER_TYPES[AnsType]); HTM_LABEL_End (); HTM_BR (); } @@ -5259,12 +5259,12 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"RT %s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Answers); + HTM_TxtF ("%s:",Txt_Answers); HTM_TD_End (); HTM_TD_Begin ("class=\"LT\""); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Integer_number); + HTM_TxtF ("%s: ",Txt_Integer_number); snprintf (StrInteger,sizeof (StrInteger), "%ld", Gbl.Test.Answer.Integer); @@ -5415,7 +5415,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], /* Feedback */ HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s (%s):",Txt_Feedback,Txt_optional); + HTM_TxtF ("%s (%s):",Txt_Feedback,Txt_optional); HTM_BR (); HTM_TEXTAREA_Begin ("name=\"FbStr%u\" class=\"ANSWER_TEXTAREA\" rows=\"2\"%s", NumOpt,OptionsDisabled ? " disabled=\"disabled\"" : @@ -5460,14 +5460,14 @@ static void Tst_PutFloatInputField (const char *Label,const char *Field, double Value) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; - char StrFloat[32]; + char StrDouble[32]; HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtNBSP (Label); - snprintf (StrFloat,sizeof (StrFloat), + HTM_TxtF ("%s ",Label); + snprintf (StrDouble,sizeof (StrDouble), "%lg", Value); - HTM_INPUT_TEXT (Field,Tst_MAX_BYTES_FLOAT_ANSWER,StrFloat,false, + HTM_INPUT_TEXT (Field,Tst_MAX_BYTES_FLOAT_ANSWER,StrDouble,false, "size=\"11\" required=\"required\"%s", Gbl.Test.AnswerType == Tst_ANS_FLOAT ? "" : " disabled=\"disabled\""); @@ -7490,7 +7490,7 @@ void Tst_SelUsrsToViewUsrsTstResults (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Users); + HTM_TxtF ("%s:",Txt_Users); HTM_TD_End (); HTM_TD_Begin ("colspan=\"2\" class=\"%s LT\"",The_ClassFormInBox[Gbl.Prefs.Theme]); @@ -7974,7 +7974,7 @@ static void Tst_ShowTestResultsSummaryRow (bool ItsMe, /***** Row title *****/ HTM_TD_Begin ("class=\"DAT_N_LINE_TOP RM COLOR%u\"",Gbl.RowEvenOdd); - HTM_TxtColonNBSP (Txt_Visible_tests); + HTM_TxtF ("%s: ",Txt_Visible_tests); HTM_Unsigned (NumExams); HTM_TD_End (); @@ -8126,14 +8126,14 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs.Role][Gbl.Usrs.Other.UsrDat.Sex]); + HTM_TxtF ("%s:",Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs.Role][Gbl.Usrs.Other.UsrDat.Sex]); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); ID_WriteUsrIDs (&Gbl.Usrs.Other.UsrDat,NULL); - HTM_NBSPTxt (Gbl.Usrs.Other.UsrDat.Surname1); + HTM_TxtF (" %s",Gbl.Usrs.Other.UsrDat.Surname1); if (Gbl.Usrs.Other.UsrDat.Surname2[0]) - HTM_NBSPTxt (Gbl.Usrs.Other.UsrDat.Surname2); + HTM_TxtF (" %s",Gbl.Usrs.Other.UsrDat.Surname2); if (Gbl.Usrs.Other.UsrDat.FirstName[0]) HTM_TxtF (", %s",Gbl.Usrs.Other.UsrDat.FirstName); HTM_BR (); @@ -8149,7 +8149,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Date); + HTM_TxtF ("%s:",Txt_Date); HTM_TD_End (); HTM_TD_Begin ("id=\"test\" class=\"DAT LT\""); @@ -8164,7 +8164,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Questions); + HTM_TxtF ("%s:",Txt_Questions); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -8178,7 +8178,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Score); + HTM_TxtF ("%s:",Txt_Score); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); @@ -8201,7 +8201,7 @@ void Tst_ShowOneTstResult (void) HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"DAT_N RT\""); - HTM_TxtColon (Txt_Tags); + HTM_TxtF ("%s:",Txt_Tags); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LT\""); diff --git a/swad_test_import.c b/swad_test_import.c index cbd9e179..7d51584d 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -142,7 +142,7 @@ void TsI_ShowFormImportQstsFromXML (void) /***** Write a form to import questions *****/ Frm_StartForm (ActImpTstQst); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_XML_file); + HTM_TxtF ("%s: ",Txt_XML_file); HTM_INPUT_FILE (Fil_NAME_OF_PARAM_FILENAME_ORG,".xml",true,NULL); HTM_LABEL_End (); Frm_EndForm (); @@ -1011,7 +1011,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /***** Write number of question *****/ HTM_TD_Begin ("class=\"%s CT COLOR%u\"",ClassData,Gbl.RowEvenOdd); if (!QuestionExists) - HTM_UnsignedNBSP (++NumNonExistingQst); + HTM_TxtF ("%u ",++NumNonExistingQst); HTM_TD_End (); /***** Write the question tags *****/ @@ -1027,7 +1027,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s LT\"",ClassData); - HTM_NBSPTxtNBSP ("•"); + HTM_TxtF (" %s ","•"); HTM_TD_End (); HTM_TD_Begin ("class=\"%s LT\"",ClassData); @@ -1049,7 +1049,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /***** Write the question type *****/ HTM_TD_Begin ("class=\"%s CT COLOR%u\"",ClassData,Gbl.RowEvenOdd); - HTM_TxtNBSP (Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]); + HTM_TxtF ("%s ",Txt_TST_STR_ANSWER_TYPES[Gbl.Test.AnswerType]); HTM_TD_End (); /***** Write if shuffle is enabled *****/ diff --git a/swad_timeline.c b/swad_timeline.c index 302689e7..4261a9d0 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -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\""); - HTM_NBSPTxt (Txt_See_more); + HTM_TxtF (" %s",Txt_See_more); HTM_A_End (); HTM_DIV_End (); } @@ -1581,24 +1581,21 @@ static void TL_WriteNote (const struct TL_Note *SocNot, case TL_NOTE_INS_SHA_PUB_FILE: /* Write location (institution) in hierarchy */ HTM_DIV_Begin ("class=\"TL_LOC\""); - HTM_TxtColonNBSP (Txt_Institution); - HTM_Txt (Ins.ShrtName); + HTM_TxtF ("%s: %s",Txt_Institution,Ins.ShrtName); HTM_DIV_End (); break; case TL_NOTE_CTR_DOC_PUB_FILE: case TL_NOTE_CTR_SHA_PUB_FILE: /* Write location (centre) in hierarchy */ HTM_DIV_Begin ("class=\"TL_LOC\""); - HTM_TxtColonNBSP (Txt_Centre); - HTM_Txt (Ctr.ShrtName); + HTM_TxtF ("%s: %s",Txt_Centre,Ctr.ShrtName); HTM_DIV_End (); break; case TL_NOTE_DEG_DOC_PUB_FILE: case TL_NOTE_DEG_SHA_PUB_FILE: /* Write location (degree) in hierarchy */ HTM_DIV_Begin ("class=\"TL_LOC\""); - HTM_TxtColonNBSP (Txt_Degree); - HTM_Txt (Deg.ShrtName); + HTM_TxtF ("%s: %s",Txt_Degree,Deg.ShrtName); HTM_DIV_End (); break; case TL_NOTE_CRS_DOC_PUB_FILE: @@ -1607,15 +1604,13 @@ static void TL_WriteNote (const struct TL_Note *SocNot, case TL_NOTE_NOTICE: /* Write location (course) in hierarchy */ HTM_DIV_Begin ("class=\"TL_LOC\""); - HTM_TxtColonNBSP (Txt_Course); - HTM_Txt (Crs.ShrtName); + HTM_TxtF ("%s: %s",Txt_Course,Crs.ShrtName); HTM_DIV_End (); break; case TL_NOTE_FORUM_POST: /* Write forum name */ HTM_DIV_Begin ("class=\"TL_LOC\""); - HTM_TxtColonNBSP (Txt_Forum); - HTM_Txt (ForumName); + HTM_TxtF ("%s: %s",Txt_Forum,ForumName); HTM_DIV_End (); break; default: @@ -1954,7 +1949,7 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot) HTM_DIV_Begin ("class=\"TL_FORM_OFF\""); HTM_Txt (Txt_TIMELINE_NOTE[SocNot->NoteType]); if (SocNot->Unavailable) - HTM_TxtF (" (%s)",Txt_not_available); + HTM_TxtF (" (%s)",Txt_not_available); HTM_DIV_End (); } else // Not inside another form @@ -2034,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"); - HTM_NBSPTxt (Txt_TIMELINE_NOTE[SocNot->NoteType]); + HTM_TxtF (" %s",Txt_TIMELINE_NOTE[SocNot->NoteType]); Frm_LinkFormEnd (); Frm_EndForm (); @@ -4613,7 +4608,7 @@ static void TL_ShowUsrsWhoHaveMarkedCommAsFav (const struct TL_Comment *SocCom, static void TL_ShowNumSharersOrFavers (unsigned NumUsrs) { /***** Show number of users who have marked this note as favourite *****/ - HTM_NBSPUnsigned (NumUsrs); + HTM_TxtF (" %u",NumUsrs); } static void TL_ShowSharersOrFavers (MYSQL_RES **mysql_res, diff --git a/swad_user.c b/swad_user.c index a0497345..aa725473 100644 --- a/swad_user.c +++ b/swad_user.c @@ -900,7 +900,7 @@ void Usr_WriteFirstNameBRSurnames (const struct UsrData *UsrDat) /***** Write surname2 if exists *****/ if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); } /*****************************************************************************/ @@ -2807,12 +2807,12 @@ void Usr_WriteLoggedUsrHead (void) HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]); Frm_LinkFormEnd (); Frm_EndForm (); - HTM_TxtNBSP (":"); + HTM_TxtF ("%s ",":"); } else { Rol_PutFormToChangeMyRole ("SEL_ROLE"); - HTM_NBSP (); + HTM_Space (); } /***** Show my photo *****/ @@ -2823,7 +2823,7 @@ void Usr_WriteLoggedUsrHead (void) /***** User's name *****/ if (Gbl.Usrs.Me.UsrDat.FirstName[0]) - HTM_NBSPTxt (Gbl.Usrs.Me.UsrDat.FirstName); + HTM_TxtF (" %s",Gbl.Usrs.Me.UsrDat.FirstName); HTM_DIV_End (); } @@ -3499,7 +3499,7 @@ void Usr_ShowFormsLogoutAndRole (void) if (Rol_GetNumAvailableRoles () == 1) { HTM_SPAN_Begin ("class=\"DAT\""); - HTM_TxtColonNBSP (Txt_Role); + HTM_TxtF ("%s: ",Txt_Role); HTM_SPAN_End (); HTM_SPAN_Begin ("class=\"DAT_N_BOLD\""); @@ -3509,7 +3509,7 @@ void Usr_ShowFormsLogoutAndRole (void) else { HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Role); + HTM_TxtF ("%s: ",Txt_Role); Rol_PutFormToChangeMyRole (NULL); HTM_LABEL_End (); } @@ -3725,7 +3725,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat) /****** Write user's ID ******/ HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd); ID_WriteUsrIDs (UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /***** Write rest of guest's main data *****/ @@ -3829,7 +3829,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames) "DAT_SMALL", Gbl.RowEvenOdd); ID_WriteUsrIDs (UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /***** Write rest of main student's data *****/ @@ -3948,7 +3948,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat) "DAT_SMALL", Gbl.RowEvenOdd); ID_WriteUsrIDs (UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /***** Write rest of main teacher's data *****/ @@ -4026,7 +4026,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) "DAT_SMALL", Gbl.RowEvenOdd); ID_WriteUsrIDs (UsrDat,NULL); - HTM_NBSP (); + HTM_Space (); HTM_TD_End (); /***** Write rest of main administrator's data *****/ @@ -4122,7 +4122,7 @@ static void Usr_WriteUsrData (const char *BgColor, /***** Write data *****/ HTM_Txt (Data); if (NonBreak) - HTM_NBSP (); + HTM_Space (); /***** End link *****/ if (Link) @@ -6135,7 +6135,7 @@ static void Usr_FormToSelectUsrListType (void (*FuncParams) (void), Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : NULL); Ico_PutIcon (Usr_IconsClassPhotoOrList[ListType],Txt_USR_LIST_TYPES[ListType],"ICO20x20"); - HTM_NBSPTxt (Txt_USR_LIST_TYPES[ListType]); + HTM_TxtF (" %s",Txt_USR_LIST_TYPES[ListType]); Frm_LinkFormEnd (); /***** End form *****/ @@ -6307,8 +6307,8 @@ void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role) else Rol_WrongRoleExit (); Sex = Usr_GetSexOfUsrsLst (Role); - HTM_TxtColon (Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : - Txt_ROLES_PLURAL_Abc[Role][Sex]); + HTM_TxtF ("%s:",Gbl.Usrs.LstUsrs[Role].NumUsrs == 1 ? Txt_ROLES_SINGUL_Abc[Role][Sex] : + Txt_ROLES_PLURAL_Abc[Role][Sex]); HTM_LABEL_End (); HTM_TH_End (); @@ -6876,8 +6876,9 @@ void Usr_ListAllDataStds (void) if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type { HTM_TH_Begin (1,1,"LM LIGHT_BLUE"); - HTM_TxtNBSPTxt (Txt_Group, - Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName); + HTM_TxtF ("%s %s", + Txt_Group, + Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName); HTM_TH_End (); } @@ -6905,8 +6906,7 @@ void Usr_ListAllDataStds (void) NumField++) { HTM_TH_Begin (1,1,"LM VERY_LIGHT_BLUE"); - HTM_TxtF ("(%s)", - Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); + HTM_TxtF ("(%s)",Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); HTM_TH_End (); } } @@ -7321,7 +7321,7 @@ void Usr_ListDataAdms (void) Frm_StartForm (ActLstOth); Usr_PutParamListWithPhotos (); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Sco_PutSelectorScope ("ScopeUsr",true); HTM_LABEL_End (); Frm_EndForm (); @@ -7788,7 +7788,7 @@ void Usr_SeeGuests (void) Frm_StartForm (ActLstGst); Usr_PutParamsPrefsAboutUsrList (); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Sco_PutSelectorScope ("ScopeUsr",true); HTM_LABEL_End (); Frm_EndForm (); @@ -7933,7 +7933,7 @@ void Usr_SeeStudents (void) Frm_StartForm (ActLstStd); Usr_PutParamsPrefsAboutUsrList (); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Sco_PutSelectorScope ("ScopeUsr",true); HTM_LABEL_End (); Frm_EndForm (); @@ -8106,7 +8106,7 @@ void Usr_SeeTeachers (void) Frm_StartForm (ActLstTch); Usr_PutParamsPrefsAboutUsrList (); HTM_LABEL_Begin ("class=\"%s\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColonNBSP (Txt_Scope); + HTM_TxtF ("%s: ",Txt_Scope); Sco_PutSelectorScope ("ScopeUsr",true); HTM_LABEL_End (); Frm_EndForm (); @@ -8900,17 +8900,17 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType, if (UsrDat.FirstName[0]) HTM_Txt (UsrDat.FirstName); else - HTM_NBSP (); + HTM_Space (); HTM_BR (); if (UsrDat.Surname1[0]) HTM_Txt (UsrDat.Surname1); else - HTM_NBSP (); + HTM_Space (); HTM_BR (); if (UsrDat.Surname2[0]) HTM_Txt (UsrDat.Surname2); else - HTM_NBSP (); + HTM_Space (); HTM_DIV_End (); @@ -9712,7 +9712,7 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows) HTM_BR (); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) - HTM_NBSPTxt (UsrDat->Surname2); + HTM_TxtF (" %s",UsrDat->Surname2); if (UsrDat->FirstName[0]) { HTM_Comma (); diff --git a/swad_zip.c b/swad_zip.c index 97d884a5..d8920ddd 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -573,7 +573,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, URL,FileName); HTM_IMG (CfG_URL_ICON_FILEXT_PUBLIC "32x32","zip32x32.gif",Txt_ZIP_file, "class=\"ICO40x40\""); - HTM_NBSPTxtNBSP (FileName); + HTM_TxtF (" %s ",FileName); Ico_PutIcon ("download.svg",Txt_Download,"ICO40x40"); HTM_A_End (); HTM_TD_End (); @@ -583,7 +583,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_Filename); + HTM_TxtF ("%s:",Txt_Filename); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\""); @@ -600,7 +600,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, HTM_TR_Begin (NULL); HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtColon (Txt_File_size); + HTM_TxtF ("%s:",Txt_File_size); HTM_TD_End (); HTM_TD_Begin ("class=\"DAT LM\"");