diff --git a/swad_account.c b/swad_account.c index 59b7e2cf0..863f6f558 100644 --- a/swad_account.c +++ b/swad_account.c @@ -141,7 +141,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith "" "%s:" "" - "" + "" "" @@ -158,7 +158,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith "" "%s:" "" - "" + "" "" @@ -260,8 +260,7 @@ static void Acc_PrintAccountSeparator (void) /***** Separator *****/ fprintf (Gbl.F.Out,"" - "" + "" "
" "" "", diff --git a/swad_action.c b/swad_action.c index ecc391c8a..b9dfb6744 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4726,8 +4726,8 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) /* Icon and text */ fprintf (Gbl.F.Out,"" - ""); + ""); Act_FormStart (Action); Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"", + " class=\"ICON16x16\"" + " style=\"margin:1px; vertical-align:middle;\" />", Gbl.Prefs.PathIconSet,Cfg_ICON_ACTION, Act_Actions[Action].Icon, MenuStr,TabMenuStr); diff --git a/swad_announcement.c b/swad_announcement.c index b46ce71d5..9cd4cfceb 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -327,7 +327,7 @@ void Ann_ShowFormAnnouncement (void) "" "%s: " "" - "" + "" "" "" @@ -336,7 +336,7 @@ void Ann_ShowFormAnnouncement (void) "" "%s: " "" - "" + "" "" "" @@ -351,8 +351,7 @@ void Ann_ShowFormAnnouncement (void) "" "%s: " "" - "", + "", The_ClassForm[Gbl.Prefs.Theme], Txt_Users); Rol_WriteSelectorRoles (1 << Rol_STUDENT | diff --git a/swad_assignment.c b/swad_assignment.c index 59a918ab1..1d75cc0f9 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -161,8 +161,7 @@ static void Asg_ShowAllAssignments (void) Order <= Asg_ORDER_BY_END_DATE; Order++) { - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (ActSeeAsg); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); @@ -177,13 +176,13 @@ static void Asg_ShowAllAssignments (void) Act_FormEnd (); fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "" - "" + "" "%s" "" - "" + "" "%s" "" "", @@ -240,9 +239,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") : @@ -256,9 +256,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") : @@ -272,8 +273,7 @@ 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" : @@ -282,8 +282,8 @@ static void Asg_ShowOneAssignment (long AsgCod) fprintf (Gbl.F.Out,""); /* Send work? */ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "\"%s\"" "
%s" @@ -300,8 +300,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,"" @@ -309,8 +309,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 */ @@ -333,7 +333,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) @@ -438,7 +438,7 @@ static void Asg_WriteAssignmentFolder (struct Assignment *Asg) /***** Folder name *****/ fprintf (Gbl.F.Out,"" - "%s" + "%s" "" "", Asg->Folder); @@ -1130,7 +1130,7 @@ void Asg_RequestCreatOrEditAsg (void) "" "%s:" "" - "" + "" "" "" "", @@ -1147,10 +1147,10 @@ void Asg_RequestCreatOrEditAsg (void) "" "%s:" "" - "" + "" "" "" - "" - "" - "" @@ -1198,7 +1198,7 @@ void Asg_RequestCreatOrEditAsg (void) "" - ""); /***** Teacher's comment: write form, text or nothing */ - fprintf (Gbl.F.Out,"" - "" - "" "", @@ -2982,8 +2974,8 @@ static void Att_ListEventsToSelect (void) /* Write a row for this event */ fprintf (Gbl.F.Out,"" - "" - "" - "" - "" "", @@ -3023,7 +3015,7 @@ static void Att_ListEventsToSelect (void) if (Gbl.CurrentAct == ActSeeLstAttStd) { fprintf (Gbl.F.Out,"" - "" @@ -3075,9 +3067,8 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte /***** Last row with the total of students present in each event *****/ fprintf (Gbl.F.Out,"" - "", @@ -3089,18 +3080,16 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte NumAttEvent++) if (Gbl.AttEvents.Lst[NumAttEvent].Selected) { - fprintf (Gbl.F.Out,"", Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList); Total += Gbl.AttEvents.Lst[NumAttEvent].NumStdsFromList; } - fprintf (Gbl.F.Out,"" @@ -3136,8 +3125,7 @@ static void Att_WriteTableHeadSeveralAttEvents (void) unsigned NumAttEvent; fprintf (Gbl.F.Out,"" - "", Gbl.Usrs.Listing.WithPhotos ? 4 : @@ -3152,15 +3140,14 @@ static void Att_WriteTableHeadSeveralAttEvents (void) /***** Get data of this attendance event *****/ Att_GetDataOfAttEventByCodAndCheckCrs (&Gbl.AttEvents.Lst[NumAttEvent]); - fprintf (Gbl.F.Out,"", Gbl.AttEvents.Lst[NumAttEvent].Title, NumAttEvent + 1); } - fprintf (Gbl.F.Out,"" "", @@ -3186,8 +3173,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr /***** Write number of student in the list *****/ fprintf (Gbl.F.Out,"" - "", UsrDat->Accepted ? "DAT_SMALL_N" : @@ -3198,8 +3185,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr /***** Show student's photo *****/ if (Gbl.Usrs.Listing.WithPhotos) { - fprintf (Gbl.F.Out,""); /***** Write student's name *****/ - fprintf (Gbl.F.Out,"" "", @@ -3327,8 +3314,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) /***** Write number of student in the list *****/ fprintf (Gbl.F.Out,"" - "", UsrDat->Accepted ? "DAT_SMALL_N" : @@ -3337,8 +3324,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) NumStd + 1); /***** Show student's photo *****/ - fprintf (Gbl.F.Out,""); /***** Write user's ID ******/ - fprintf (Gbl.F.Out,"
", + "", The_ClassForm[Gbl.Prefs.Theme], Dates[StartOrEndTime]); @@ -1163,7 +1163,7 @@ void Asg_RequestCreatOrEditAsg (void) false,false); fprintf (Gbl.F.Out,""); + ""); /* Time */ Dat_WriteFormHourMinute (NameSelectHour [StartOrEndTime], @@ -1183,7 +1183,7 @@ void Asg_RequestCreatOrEditAsg (void) "" "%s:" "" + "" "%s: " "" "" "%s:" "" + "" "", @@ -2123,8 +2116,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_TEACHER) // Show with form fprintf (Gbl.F.Out,"", @@ -2958,11 +2951,10 @@ static void Att_ListEventsToSelect (void) /***** Heading row *****/ fprintf (Gbl.F.Out,"
" + "" "%s" "" + "" "%s" "
" + "" "" "" + "" "%u:" "" + "" "%02u/%02u/%04u %02u:%02u h %s" "" + "" "%u" "
"); + ""); Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance); fprintf (Gbl.F.Out,"
" "%s:" "" "%u" "" "%u" "
" + "" "%s" "" + fprintf (Gbl.F.Out,"" "%u" "" + fprintf (Gbl.F.Out,"" "%s" "
" + "" "%u" "", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3209,8 +3196,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr } /***** Write user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -3218,8 +3205,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", @@ -3258,8 +3245,8 @@ static void Att_WriteRowStdSeveralAttEvents (unsigned NumStd,struct UsrData *Usr } /***** Last column with the number of times this user is present *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u" "
" + "" "%u:" "", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3347,11 +3334,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,"" "" - "" - "" @@ -3424,8 +3410,8 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) fprintf (Gbl.F.Out,"" "" "" - "
", + "", BgColor, UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL"); @@ -3359,8 +3346,7 @@ 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); @@ -3389,12 +3375,12 @@ static void Att_ListAttEventsForAStd (unsigned NumStd,struct UsrData *UsrDat) /***** Write a row for this event *****/ fprintf (Gbl.F.Out,"
" + "" "%u:" "" + "" "\"%s\"" " %02u/%02u/%04u %02u:%02u h %s
" + "" "
", BgColor, BgColor, diff --git a/swad_changelog.h b/swad_changelog.h index 62a48df97..26e1145b0 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.122 (2015/07/27)" +#define Log_PLATFORM_VERSION "SWAD 14.123 (2015/07/27)" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 14.123: Jul 28, 2015 Changes in CSS of forms. (184877 lines) Version 14.122: Jul 27, 2015 Changes in CSS of forms. (184892 lines) Version 14.121: Jul 27, 2015 Changes in CSS of forms. (184890 lines) Version 14.120.9: Jul 27, 2015 Changes in CSS of forms. (184855 lines)