diff --git a/swad_account.c b/swad_account.c index d69345876..70ecc2cc8 100644 --- a/swad_account.c +++ b/swad_account.c @@ -125,10 +125,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** Nickname *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" - "" + "" "" "" @@ -140,10 +140,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** E-mail *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" - "" + "" "" "" @@ -158,7 +158,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** Send button and form end *****/ fprintf (Gbl.F.Out,"" - "" + "" "" "" "", @@ -249,7 +249,7 @@ static void Acc_PrintAccountSeparator (void) /***** Separator *****/ fprintf (Gbl.F.Out,"" - "" + "" "
" "" "", diff --git a/swad_action.c b/swad_action.c index 495a8c99a..3c555a218 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4095,7 +4095,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) { /* Icon and text */ fprintf (Gbl.F.Out,"" - ""); + ""); Act_FormStart (Action); Act_LinkFormSubmit (Title,The_ClassFormulNB[Gbl.Prefs.Theme]); @@ -4150,13 +4150,16 @@ void Act_WriteSmallMFUActions (struct Act_ListMFUActions *ListMFUActions) if ((Title = Act_GetTitleAction (Action)) != NULL) { fprintf (Gbl.F.Out,"" - "", + "" + "", Gbl.Prefs.IconsURL); /* Icon and text */ fprintf (Gbl.F.Out,"" - ""); + ""); Act_FormStart (Action); Act_LinkFormSubmit (Title,"MFU_ACT"); fprintf (Gbl.F.Out,"\"%s\""" "" - "" - "%s" + "" + "%s" "" "" - "%s: " - "" - "" + "" + "%s: " + "" + "" + "" "" "" "" - "%s: " - "" - "" + "" + "%s: " + "" + "" + "" "" "", The_ClassFormul[Gbl.Prefs.Theme], @@ -349,8 +355,12 @@ void Ann_ShowFormAnnouncement (void) /***** Users' roles who can view the announcement *****/ fprintf (Gbl.F.Out,"" - "%s: " - "", + "" + "%s: " + "" + "", Txt_Users); Rol_WriteSelectorRoles (1 << Rol_ROLE_STUDENT | 1 << Rol_ROLE_TEACHER); diff --git a/swad_assignment.c b/swad_assignment.c index e789a0c6b..b07f59928 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -229,7 +229,10 @@ static void Asg_ShowOneAssignment (long AsgCod) /***** Write first row of data of this assignment *****/ /* Start date/time */ fprintf (Gbl.F.Out,"" - "%02u/%02u/%02u
%02u:%02u h", + "" + "%02u/%02u/%02u
%02u:%02u h" + "", Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : (Asg.Open ? "DATE_GREEN" : @@ -242,7 +245,10 @@ static void Asg_ShowOneAssignment (long AsgCod) Asg.DateTimes[Asg_START_TIME].Time.Minute); /* End date/time */ - fprintf (Gbl.F.Out,"%02u/%02u/%02u
%02u:%02u h", + fprintf (Gbl.F.Out,"" + "%02u/%02u/%02u
%02u:%02u h" + "", Asg.Hidden ? (Asg.Open ? "DATE_GREEN_LIGHT" : "DATE_RED_LIGHT") : (Asg.Open ? "DATE_GREEN" : @@ -255,7 +261,8 @@ static void Asg_ShowOneAssignment (long AsgCod) Asg.DateTimes[Asg_END_TIME].Time.Minute); /* Assignment title */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "

%s

", Gbl.ColorRows[Gbl.RowEvenOdd], Asg.Hidden ? "ASG_TITLE_LIGHT" : @@ -264,20 +271,15 @@ static void Asg_ShowOneAssignment (long AsgCod) fprintf (Gbl.F.Out,""); /* Send work? */ - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" - "
" + fprintf (Gbl.F.Out,"" "\"%s\"" - "
%s
" + "
%s" "", - Gbl.ColorRows[Gbl.RowEvenOdd], (Asg.SendWork == Asg_SEND_WORK) ? "DAT_N" : "DAT", + Gbl.ColorRows[Gbl.RowEvenOdd], Gbl.Prefs.IconsURL, (Asg.SendWork == Asg_SEND_WORK) ? "file_on" : "file_off", @@ -287,7 +289,8 @@ static void Asg_ShowOneAssignment (long AsgCod) Txt_No); /* Assignment folder */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.ColorRows[Gbl.RowEvenOdd]); Asg_WriteAssignmentFolder (&Asg); fprintf (Gbl.F.Out,"" @@ -295,7 +298,8 @@ static void Asg_ShowOneAssignment (long AsgCod) /***** Write second row of data of this assignment *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.ColorRows[Gbl.RowEvenOdd]); /* Author of the assignment */ @@ -318,7 +322,7 @@ static void Asg_ShowOneAssignment (long AsgCod) Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML Str_InsertLinkInURLs (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.CurrentCrs.Grps.NumGrps) @@ -420,7 +424,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg) /***** Folder name *****/ fprintf (Gbl.F.Out,"" - "%s" + "%s" "" "", Asg->Folder); @@ -488,7 +492,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) ""); /***** Put form to remove assignment *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActReqRemAsg); Asg_PutParamAsgCod (AsgCod); Asg_PutHiddenParamAsgOrderType (); @@ -503,7 +507,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) Txt_Remove); /***** Put form to hide/show assignment *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (Hidden ? ActShoAsg : ActHidAsg); Asg_PutParamAsgCod (AsgCod); @@ -526,7 +530,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) ""); /***** Put form to edit assignment *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActEdiOneAsg); Asg_PutParamAsgCod (AsgCod); Asg_PutHiddenParamAsgOrderType (); @@ -1136,8 +1140,11 @@ void Asg_RequestCreatOrEditAsg (void) /***** Assignment title *****/ fprintf (Gbl.F.Out,"" - "%s:" - "" + "" + "%s:" + "" + "" "" "" "", @@ -1150,11 +1157,14 @@ void Asg_RequestCreatOrEditAsg (void) StartOrEndTime++) { fprintf (Gbl.F.Out,"" - "%s:" - "" + "" + "%s:" + "" + "" "" "" - "" - "" - "" - "" + "" @@ -1195,8 +1209,11 @@ void Asg_RequestCreatOrEditAsg (void) /***** Assignment text *****/ fprintf (Gbl.F.Out,"" - "" - "" + ""); /***** Teacher's comment: write form, text or nothing */ - fprintf (Gbl.F.Out,"" - "" - "" - "" - "" + "" + "" + "" "", BgColor, NumAttEvent + 1, @@ -2971,7 +3019,8 @@ static void Att_ListEventsToSelect (void) if (Gbl.CurrentAct == ActSeeLstAttStd) { fprintf (Gbl.F.Out,"" - "" @@ -3023,8 +3072,12 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte /***** Last row with the total of students present in each event *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.Usrs.Listing.WithPhotos ? 4 : 3, Txt_Number_of_students); @@ -3033,13 +3086,21 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte NumAttEvent++) if (Gbl.AttEvents.Lst[NumAttEvent].Selected) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList; } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "", Total); @@ -3104,16 +3165,21 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr /***** Write number of student in the list *****/ fprintf (Gbl.F.Out,"" - "", - BgColor, + "", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", + BgColor, NumStd + 1); /***** Show student's photo *****/ if (Gbl.Usrs.Listing.WithPhotos) { - fprintf (Gbl.F.Out,""); /***** Write student's name *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "", - BgColor,NumTimesPresent); + BgColor, + NumTimesPresent); Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; } @@ -3233,14 +3306,18 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) /***** Write number of student in the list *****/ fprintf (Gbl.F.Out,"" - "", - BgColor, + "", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", + BgColor, NumStd + 1); /***** Show student's photo *****/ - fprintf (Gbl.F.Out,""); /***** Write user's ID ******/ - fprintf (Gbl.F.Out,"
", + "", Dates[StartOrEndTime]); /* Date */ @@ -1166,7 +1176,7 @@ void Asg_RequestCreatOrEditAsg (void) false,false); fprintf (Gbl.F.Out,""); + ""); /* Time */ Dat_WriteFormHourMinute (NameSelectHour [StartOrEndTime], @@ -1183,8 +1193,12 @@ void Asg_RequestCreatOrEditAsg (void) /***** Send work? *****/ fprintf (Gbl.F.Out,"
%s:" + "" + "%s:" + "" "%s: " "" "
%s:" + "" + "%s:" + "" "", @@ -2082,7 +2119,8 @@ static void Att_WriteRowStdToCallTheRoll (unsigned NumStd,struct UsrData *UsrDat fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_TEACHER) // Show with form fprintf (Gbl.F.Out,"", @@ -2940,7 +2978,8 @@ static void Att_ListEventsToSelect (void) /* Write a row for this event */ fprintf (Gbl.F.Out,"
" + "" "" "%u:%02u/%02u/%04u %02u:%02u h %s%u" + "%u:" + "" + "%02u/%02u/%04u %02u:%02u h %s" + "" + "%u" + "
"); + ""); Act_LinkFormSubmit (Txt_Update_attendance_according_to_selected_events,The_ClassFormul[Gbl.Prefs.Theme]); Lay_PutSendIcon ("recycle",Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance); fprintf (Gbl.F.Out,"
%s:" + "%s:" + "%u" + "%u" + "%u" + "%u" + "
%u" + "%u" + "",BgColor); + fprintf (Gbl.F.Out,"", + BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat, ShowPhoto ? PhotoURL : @@ -3124,18 +3190,21 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr } /***** Write user's ID ******/ - fprintf (Gbl.F.Out,"", - BgColor, + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : - "DAT_SMALL"); + "DAT_SMALL", + BgColor); ID_WriteUsrIDs (UsrDat,true); fprintf (Gbl.F.Out,"%s", - BgColor, + fprintf (Gbl.F.Out,"" + "%s", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", + BgColor, UsrDat->Surname1); if (UsrDat->Surname2[0]) fprintf (Gbl.F.Out," %s",UsrDat->Surname2); @@ -3168,9 +3237,13 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr } /***** Last column with the number of times this user is present *****/ - fprintf (Gbl.F.Out,"%u" + "%u" + "
%u:" + "%u:" + "", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat, @@ -3251,10 +3328,11 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" "" - ""); /***** Write student's name *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "" + "" + "" @@ -3318,9 +3401,10 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) CommentTch[0]) { fprintf (Gbl.F.Out,"" - "" - "" - "" + "" + "" - "" @@ -340,13 +340,16 @@ static void Ban_ListBannersForEdition (void) Txt_Hide); /* Banner code */ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Ban->IsHidden ? "DAT_LIGHT" : "DAT", Ban->BanCod); /* Banner short name */ - fprintf (Gbl.F.Out,""); /***** Banner short name *****/ - fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName); /***** Banner full name *****/ - fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_FULL_NAME,Ban->FullName); /***** Banner image *****/ - fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_IMAGE,Ban->Img); /***** Banner WWW *****/ - fprintf (Gbl.F.Out,"" "", @@ -765,7 +771,7 @@ static void Ban_PutFormToCreateBanner (void) /***** Send button *****/ fprintf (Gbl.F.Out,"" - "" "", @@ -793,11 +799,11 @@ static void Ban_PutHeadBanners (void) fprintf (Gbl.F.Out,"" "" "" - "" - "" - "" - "" - "" + "" + "" + "" + "" + "" "", Txt_Code, Txt_Short_Name, diff --git a/swad_centre.c b/swad_centre.c index e644d02aa..31d2abdd9 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -163,7 +163,8 @@ void Ctr_SeeCtrWithPendingDegs (void) /* Centre logo */ fprintf (Gbl.F.Out,"" - ""); /* Centre full name */ - fprintf (Gbl.F.Out,"", Ctr.FullName); /* Number of pending degrees (row[1]) */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "", BgColor,row[1]); @@ -267,7 +273,8 @@ static void Ctr_Configuration (bool PrintView) /***** Title *****/ fprintf (Gbl.F.Out,"" - "" - "" - "
", + "", BgColor, UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL"); @@ -3262,7 +3340,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) fprintf (Gbl.F.Out,"%s", + fprintf (Gbl.F.Out,"%s", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", UsrDat->Surname1); @@ -3290,9 +3369,13 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) /***** Write a row for this event *****/ fprintf (Gbl.F.Out,"
%u:" + "" + "%u:" + "" "\"\"" " %02u/%02u/%04u %02u:%02u h %s
" + "" "
", BgColor, BgColor, diff --git a/swad_banner.c b/swad_banner.c index e8c64d686..fdfc6c241 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -98,7 +98,7 @@ void Ban_SeeBanners (void) NumBan++) /* Write data of this banner */ fprintf (Gbl.F.Out,"
" + "" "" "\"%s\"" "%ld " + "%ld " + ""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActRenBanSho); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"ShortName,Gbl.FormId); /* Banner full name */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActRenBanFul); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"FullName,Gbl.FormId); /* Banner image */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActChgBanImg); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"Img,Gbl.FormId); /* Banner WWW */ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActChgBanWWW); Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "" "" + fprintf (Gbl.F.Out,"" "" "
" + "" "" "
%s%s%s%s%s%s%s%s%s%s
" + "" "", BgColor,Ctr.WWW,Ctr.FullName); Ctr_DrawCentreLogo (Ctr.Logo,Ctr.ShortName,16,"vertical-align:top;"); @@ -171,19 +172,24 @@ void Ctr_SeeCtrWithPendingDegs (void) "", + fprintf (Gbl.F.Out,"", BgColor); Act_FormGoToStart (ActSeeDeg); Ctr_PutParamCtrCod (Ctr.CtrCod); sprintf (Gbl.Title,Txt_Go_to_X,Ctr.FullName); Act_LinkFormSubmit (Gbl.Title,"DAT"); - fprintf (Gbl.F.Out,"%s" + fprintf (Gbl.F.Out,"%s" + "" "" "%s" + "%s" + "
"); + ""); if (PutLink) fprintf (Gbl.F.Out,"", @@ -290,7 +297,8 @@ static void Ctr_Configuration (bool PrintView) /* Photo image */ fprintf (Gbl.F.Out,"
"); + ""); if (PutLink) fprintf (Gbl.F.Out,"", Gbl.CurrentCtr.Ctr.WWW); @@ -310,7 +318,8 @@ static void Ctr_Configuration (bool PrintView) if (Gbl.Usrs.Me.LoggedRole == Rol_ROLE_SUPERUSER && !PrintView) { fprintf (Gbl.F.Out,"
"); + ""); Act_FormStart (ActChgCtrPhoAtt); fprintf (Gbl.F.Out,"