From a7974f0be9c7480d7b9671fda5ddbe8d3344aba0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 2 Sep 2015 23:51:44 +0200 Subject: [PATCH] Version 14.124.10 --- swad_changelog.h | 3 +- swad_timetable.c | 44 +++++----- swad_user.c | 209 +++++++++++++++++++++++------------------------ swad_zip.c | 9 +- 4 files changed, 126 insertions(+), 139 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f557686aa..561814785 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.124.9 (2015/09/02)" +#define Log_PLATFORM_VERSION "SWAD 14.124.10 (2015/09/02)" // 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.124.10:Sep 02, 2015 Changes in styles. (184571 lines) Version 14.124.9: Sep 02, 2015 Changes in styles. (184584 lines) Version 14.124.8: Sep 02, 2015 Changes in styles. (184635 lines) Version 14.124.7: Aug 24, 2015 Changes in styles. (184648 lines) diff --git a/swad_timetable.c b/swad_timetable.c index 9d30b1136..5db76a458 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -136,8 +136,7 @@ static void TT_ShowTimeTableGrpsSelected (void) extern const char *Txt_All_groups; fprintf (Gbl.F.Out,"" - ""); + ""); switch (Gbl.CurrentCrs.Grps.WhichGrps) { case Grp_ONLY_MY_GROUPS: @@ -291,7 +290,7 @@ void TT_ShowClassTimeTable (void) /***** Show the time table *****/ fprintf (Gbl.F.Out,"" - ""); + ""); TT_ShowTimeTable (TimeTableType,Gbl.Usrs.Me.UsrDat.UsrCod); fprintf (Gbl.F.Out,"" ""); @@ -757,16 +756,16 @@ static void TT_DrawTimeTable (void) /***** Row with day names *****/ fprintf (Gbl.F.Out,"" - "" + "" "%u:00" "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR); TT_DrawCellAlignTimeTable (); TT_TimeTableDrawDaysCells (); TT_DrawCellAlignTimeTable (); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%u:00" "" "", @@ -786,9 +785,8 @@ static void TT_DrawTimeTable (void) /* Hour */ if (Hour % 2) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%2u:00" "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2); @@ -845,9 +843,8 @@ static void TT_DrawTimeTable (void) /* Hour */ if (Hour % 2) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%2u:00" "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN,TT_START_HOUR + (Hour+1)/2); @@ -883,8 +880,7 @@ static void TT_TimeTableDrawAdjustRow (void) unsigned Minicolumn; fprintf (Gbl.F.Out,"" - "" + "" " " "", TT_PERCENT_WIDTH_OF_AN_HOUR_COLUMN); @@ -895,14 +891,14 @@ static void TT_TimeTableDrawAdjustRow (void) for (Minicolumn = 0; Minicolumn < TT_NUM_MINICOLUMNS_PER_DAY; Minicolumn++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "", TT_PERCENT_WIDTH_OF_A_MINICOLUMN); TT_DrawCellAlignTimeTable (); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "" "", @@ -921,8 +917,8 @@ static void TT_TimeTableDrawDaysCells (void) for (Day = 0; Day < TT_DAYS; Day++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s" "", TT_NUM_MINICOLUMNS_PER_DAY,TT_PERCENT_WIDTH_OF_A_DAY, @@ -990,8 +986,7 @@ static unsigned TT_TimeTableCalculateColsToDraw (unsigned Day,unsigned Hour) static void TT_DrawCellAlignTimeTable (void) { - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "", TT_PERCENT_WIDTH_OF_A_SEPARATION_COLUMN); @@ -1085,8 +1080,7 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns RowSpan,ColSpan,TimeTableClasses[ClassType]); if (ClassType == TT_NO_CLASS) fprintf (Gbl.F.Out,"%u",Hour % 4); - fprintf (Gbl.F.Out,"\" style=\"text-align:center;" - " vertical-align:middle;\">"); + fprintf (Gbl.F.Out," CENTER_MIDDLE\">"); /***** Form to modify this cell *****/ if (TimeTableView == TT_CRS_EDIT) diff --git a/swad_user.c b/swad_user.c index 50406e347..ff07051e2 100644 --- a/swad_user.c +++ b/swad_user.c @@ -196,7 +196,7 @@ void Usr_InformAboutNumClicksBeforePhoto (void) Pho_MAX_CLICKS_WITHOUT_PHOTO-Gbl.Usrs.Me.NumAccWithoutPhoto); Lay_ShowAlert (Lay_WARNING,Message); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Pho_PutLinkToChangeMyPhoto (); fprintf (Gbl.F.Out,"
"); } @@ -1373,7 +1373,7 @@ void Usr_WriteFormLogin (void) fprintf (Gbl.F.Out,"
"); /***** Start form *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActAutUsrInt); Lay_StartRoundFrameTable (NULL,2,Txt_Log_in); @@ -1384,7 +1384,7 @@ void Usr_WriteFormLogin (void) " alt=\"%s\" title=\"%s\"" " class=\"ICON16x16\" />" "" - "" + "" "" @@ -1396,7 +1396,7 @@ void Usr_WriteFormLogin (void) " alt=\"%s\" title=\"%s\"" " class=\"ICON16x16\" />" "" - "" + "" "" "" @@ -1415,7 +1415,7 @@ void Usr_WriteFormLogin (void) /***** Send button and form end *****/ fprintf (Gbl.F.Out,"" - "" + "" "" @@ -1447,7 +1447,8 @@ void Usr_WelcomeUsr (void) { if (Gbl.Usrs.Me.UsrDat.Prefs.Language == Txt_Current_CGI_SWAD_Language) { - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** User's first name *****/ if (Gbl.Usrs.Me.UsrDat.FirstName[0]) @@ -2611,8 +2612,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat) /***** Checkbox to select user *****/ // Two colors are used alternatively to better distinguish the rows BgColor = Gbl.ColorRows[Gbl.RowEvenOdd]; - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); Usr_PutCheckboxToSelectUser (Rol__GUEST_,UsrDat->EncryptedUsrCod,false); fprintf (Gbl.F.Out,""); @@ -2627,8 +2628,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat) Gbl.Prefs.IconsURL); /***** Write number of user in the list *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " %u " "", BgColor,NumUsr); @@ -2636,7 +2637,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat) if (Gbl.Usrs.Listing.WithPhotos) { /***** Show student's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -2649,8 +2651,8 @@ static void Usr_WriteRowGstMainData (unsigned NumUsr,struct UsrData *UsrDat) Usr_RestrictLengthMainData (true,UsrDat,MailLink); /****** Write user's IDs ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -2702,8 +2704,8 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe Gbl.ColorRows[Gbl.RowEvenOdd]; if (PutCheckBoxToSelectUsr) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); Usr_PutCheckboxToSelectUser (Rol_STUDENT,UsrDat->EncryptedUsrCod,UsrIsTheMsgSender); fprintf (Gbl.F.Out,""); @@ -2729,8 +2731,8 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe Txt_Enrollment_not_confirmed); /***** Write number of student in the list *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " %u " "", UsrDat->Accepted ? "DAT_SMALL_N" : @@ -2741,7 +2743,8 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe if (Gbl.Usrs.Listing.WithPhotos) { /***** Show student's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -2754,8 +2757,8 @@ void Usr_WriteRowStdMainData (unsigned NumUsr,struct UsrData *UsrDat,bool PutChe Usr_RestrictLengthMainData (ShowEmail,UsrDat,MailLink); /****** Write user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -2798,7 +2801,8 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat) if (Gbl.Usrs.Listing.WithPhotos) { /***** Show guest's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -2808,8 +2812,8 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat) } /****** Write user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ID_WriteUsrIDs (UsrDat,true); fprintf (Gbl.F.Out," "); @@ -2902,7 +2906,8 @@ void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames) if (Gbl.Usrs.Listing.WithPhotos) { /***** Show student's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -2912,8 +2917,8 @@ void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames) } /****** Write user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -3025,8 +3030,8 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool Gbl.ColorRows[Gbl.RowEvenOdd]; // Two colors are used alternatively to better distinguish the rows if (PutCheckBoxToSelectUsr) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); Usr_PutCheckboxToSelectUser (Rol_TEACHER,UsrDat->EncryptedUsrCod,UsrIsTheMsgSender); fprintf (Gbl.F.Out,""); @@ -3052,8 +3057,8 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool Txt_Enrollment_not_confirmed); /***** Write number of user *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " %u " "", BgColor,NumUsr); @@ -3061,7 +3066,8 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool if (Gbl.Usrs.Listing.WithPhotos) { /***** Show teacher's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3074,8 +3080,8 @@ static void Usr_WriteRowTchMainData (unsigned NumUsr,struct UsrData *UsrDat,bool Usr_RestrictLengthMainData (ShowEmail,UsrDat,MailLink); /****** Write the user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -3120,7 +3126,8 @@ void Usr_WriteRowTchAllData (struct UsrData *UsrDat) if (Gbl.Usrs.Listing.WithPhotos) { /***** Show teacher's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3130,8 +3137,8 @@ void Usr_WriteRowTchAllData (struct UsrData *UsrDat) } /****** Write the user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -3193,8 +3200,8 @@ void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /***** Write number of user *****/ - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " %u " "", BgColor,NumUsr); @@ -3202,7 +3209,8 @@ void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) if (Gbl.Usrs.Listing.WithPhotos) { /***** Show administrator's photo *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", BgColor); ShowPhoto = Pho_ShowUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -3215,8 +3223,8 @@ void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat) Usr_RestrictLengthMainData (true,UsrDat,MailLink); /****** Write the user's ID ******/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", UsrDat->Accepted ? "DAT_SMALL_N" : "DAT_SMALL", BgColor); @@ -3297,8 +3305,8 @@ static void Usr_WriteMainUsrDataExceptUsrID (struct UsrData *UsrDat,const char * static void Usr_WriteUsrData (const char *BgColor,const char *Data,const char *Link,bool NonBreak,bool Accepted) { - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Accepted ? (NonBreak ? "DAT_SMALL_NOBR_N" : "DAT_SMALL_N") : (NonBreak ? "DAT_SMALL_NOBR" : @@ -4334,7 +4342,7 @@ static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs) extern const char *Txt_The_list_of_X_users_is_too_large_to_be_displayed; extern const char *Txt_Show_anyway; - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /***** Show warning *****/ sprintf (Gbl.Message,Txt_The_list_of_X_users_is_too_large_to_be_displayed, @@ -4746,8 +4754,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction) /***** Select USR_CLASS_ROOM *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO ? "USR_LIST_TYPE_ON" : "USR_LIST_TYPE_OFF"); Usr_FormToSelectUsrListType (NextAction,Usr_CLASS_PHOTO); @@ -4763,8 +4770,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction) fprintf (Gbl.F.Out,""); /***** Select Usr_LIST *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.Usrs.Me.ListType == Usr_LIST ? "USR_LIST_TYPE_ON" : "USR_LIST_TYPE_OFF"); Usr_FormToSelectUsrListType (NextAction,Usr_LIST); @@ -4895,8 +4901,8 @@ void Usr_PutCheckboxToSelectAllTheUsers (Rol_Role_t Role) Usr_Sex_t Sex; fprintf (Gbl.F.Out,"" - "", + "", Usr_GetColumnsForSelectUsrs (),VERY_LIGHT_BLUE); if (Role == Rol_STUDENT) { @@ -5037,8 +5043,8 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "", VERY_LIGHT_BLUE); @@ -5048,8 +5054,8 @@ static void Usr_ListMainDataGsts (bool PutCheckBoxToSelectUsr) NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,Usr_UsrDatMainFieldNames[NumCol]); @@ -5110,8 +5116,7 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) if (!Gbl.Usrs.ClassPhoto.AllGroups) { fprintf (Gbl.F.Out,"" - "", + "", 1 + Usr_NUM_MAIN_FIELDS_DATA_USR); Grp_WriteNamesOfSelectedGrps (); fprintf (Gbl.F.Out,"" @@ -5124,8 +5129,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "", VERY_LIGHT_BLUE); @@ -5135,8 +5140,8 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr) NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,Usr_UsrDatMainFieldNames[NumCol]); @@ -5198,8 +5203,8 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr) /* First column used for selection */ if (PutCheckBoxToSelectUsr) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" " " "", VERY_LIGHT_BLUE); @@ -5209,8 +5214,8 @@ static void Usr_ListMainDataTchs (bool PutCheckBoxToSelectUsr) NumCol < NumColumns; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,Usr_UsrDatMainFieldNames[NumCol]); @@ -5316,8 +5321,8 @@ void Usr_ListAllDataGsts (void) 1); NumCol < NumColumnsCommonCard; NumCol++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,FieldNames[NumCol]); @@ -5447,8 +5452,7 @@ void Usr_ListAllDataStds (void) if (!Gbl.Usrs.ClassPhoto.AllGroups) { fprintf (Gbl.F.Out,"" - "", + "", NumColumnsTotal); Grp_WriteNamesOfSelectedGrps (); fprintf (Gbl.F.Out,"" @@ -5464,8 +5468,8 @@ void Usr_ListAllDataStds (void) 1); NumCol < NumColumnsCommonCard; NumCol++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,FieldNames[NumCol]); @@ -5478,9 +5482,8 @@ void Usr_ListAllDataStds (void) NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp++) if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s %s " "", VERY_LIGHT_BLUE,Txt_Group, @@ -5492,9 +5495,8 @@ void Usr_ListAllDataStds (void) for (NumField = 0; NumField < Gbl.CurrentCrs.Records.LstFields.Num; NumField++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name); @@ -5504,14 +5506,14 @@ void Usr_ListAllDataStds (void) NumCol < NumColumnsCardAndGroups; NumCol++) if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want it in listing - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"" + "", LIGHTEST_BLUE); for (NumField = 0; NumField < Gbl.CurrentCrs.Records.LstFields.Num; NumField++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "(%s) " "", LIGHTEST_BLUE, @@ -5577,8 +5579,8 @@ void Usr_ListUsrsForSelection (Rol_Role_t Role) /***** Heading row with column names *****/ /* Start row and first column used for selection */ fprintf (Gbl.F.Out,"" - "" + "" " " "", VERY_LIGHT_BLUE); @@ -5587,8 +5589,8 @@ void Usr_ListUsrsForSelection (Rol_Role_t Role) NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,Usr_UsrDatMainFieldNames[NumCol]); @@ -5701,8 +5703,8 @@ void Usr_ListAllDataTchs (void) 1); NumCol < NumColumns; NumCol++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,FieldNames[NumCol]); @@ -5774,8 +5776,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) /* Number of users found */ fprintf (Gbl.F.Out,"" - "", + "", Usr_NUM_MAIN_FIELDS_DATA_USR); if (NumUsrs == 1) fprintf (Gbl.F.Out,"1 %s", @@ -5793,8 +5794,8 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery) for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE, @@ -5914,7 +5915,7 @@ void Usr_ListDataAdms (void) if (Gbl.Usrs.LstAdms.NumUsrs) { /****** See the photos? *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); Act_FormStart (ActLstAdm); Sco_PutParamScope (Gbl.Scope.Current); Usr_PutCheckboxListWithPhotos (); @@ -5934,8 +5935,8 @@ void Usr_ListDataAdms (void) NumCol < NumColumns; NumCol++) if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "%s " "", VERY_LIGHT_BLUE,FieldNames[NumCol]); @@ -6675,7 +6676,7 @@ void Usr_SeeTeachers (void) } /***** Draw a class photo with teachers of the course *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); /* Start form */ if (ICanViewRecords) @@ -6969,18 +6970,16 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType, Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM); /***** Begin user's cell *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,">"); /***** Checkbox to select this user *****/ if (PutCheckBoxToSelectUsr) @@ -7166,20 +7165,16 @@ void Usr_GetAndShowNumUsrsInPlatform (Rol_Role_t Role) /***** Write the total number of users *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s" "" - "" + "" "%u" "" - "" + "" "%.2f" "" - "" + "" "%.2f" "" "", diff --git a/swad_zip.c b/swad_zip.c index eaaf18b54..5e6cde2ed 100644 --- a/swad_zip.c +++ b/swad_zip.c @@ -571,8 +571,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, /***** Link to download the file *****/ fprintf (Gbl.F.Out,"" - "" + "" "" "\"%s\"" "%s:" "" - "" + "" "%s" "" "", @@ -611,8 +609,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL, "" "%s:" "" - "", + "", The_ClassForm[Gbl.Prefs.Theme],Txt_File_size); Str_WriteSizeInBytesFull ((double) FileSize); if (UncompressedSize)