From 8c70bd432bd10b79e7f800905e4bd72ad34bbedf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 1 May 2017 12:36:24 +0200 Subject: [PATCH] Version 16.198.7 --- swad_agenda.c | 4 ++-- swad_assignment.c | 6 +++--- swad_attendance.c | 26 ++++++++++++++------------ swad_centre.c | 4 ++-- swad_changelog.h | 4 +++- swad_connected.c | 6 +++--- swad_course.c | 4 ++-- swad_degree.c | 4 ++-- swad_degree_type.c | 4 ++-- swad_duplicate.c | 8 ++++---- swad_enrolment.c | 24 ++++++++++++------------ swad_file_browser.c | 4 ++-- swad_forum.c | 12 ++++++------ swad_group.c | 8 ++++---- swad_hierarchy.c | 4 ++-- swad_holiday.c | 6 +++--- swad_indicator.c | 10 ++++++---- swad_institution.c | 4 ++-- swad_layout.c | 16 ++++++++++++++++ swad_layout.h | 3 +++ swad_mail.c | 4 ++-- swad_message.c | 25 ++++++++++++------------- swad_notification.c | 12 ++++++------ swad_password.c | 4 ++-- swad_photo.c | 23 +++++++++++------------ swad_place.c | 9 +++++---- swad_privacy.c | 12 +++++------- swad_record.c | 12 ++++++------ swad_statistic.c | 29 ++++++++++++++--------------- swad_survey.c | 12 ++++++------ swad_test.c | 24 ++++++++++++------------ swad_test_import.c | 6 +++--- swad_user.c | 42 ++++++++++++++++++++++-------------------- 33 files changed, 199 insertions(+), 176 deletions(-) diff --git a/swad_agenda.c b/swad_agenda.c index 939ae6a97..8f2cd0a06 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -472,7 +472,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) if (Gbl.Agenda.Num) { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); /***** Table head *****/ Agd_WriteHeaderListEvents (AgendaType); @@ -484,7 +484,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) Agd_ShowOneEvent (AgendaType,Gbl.Agenda.LstAgdCods[NumEvent - 1]); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else Lay_ShowAlert (Lay_INFO,Txt_No_events); diff --git a/swad_assignment.c b/swad_assignment.c index e1bf350c7..a785c8948 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -150,8 +150,8 @@ static void Asg_ShowAllAssignments (void) if (Gbl.Asgs.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); for (Order = Dat_START_TIME; Order <= Dat_END_TIME; Order++) @@ -192,7 +192,7 @@ static void Asg_ShowAllAssignments (void) Asg_ShowOneAssignment (Gbl.Asgs.LstAsgCods[NumAsg - 1]); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No assignments created Lay_ShowAlert (Lay_INFO,Txt_No_assignments); diff --git a/swad_attendance.c b/swad_attendance.c index 4a2bb6779..f0e67d3b0 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -231,8 +231,8 @@ static void Att_ShowAllAttEvents (void) if (Gbl.AttEvents.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); for (Order = Dat_START_TIME; Order <= Dat_END_TIME; Order++) @@ -269,7 +269,7 @@ static void Att_ShowAllAttEvents (void) Att_ShowOneAttEvent (&Gbl.AttEvents.Lst[NumAttEvent - 1],false); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No events created Lay_ShowAlert (Lay_INFO,Txt_No_events); @@ -1929,8 +1929,9 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Grp_PutParamsCodGrps (); /***** List students' data *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableWideMargin (2); + + fprintf (Gbl.F.Out,"" "" "" ""); @@ -1964,7 +1965,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att) Att_WriteRowStdToCallTheRoll (NumStd + 1,&UsrDat,Att); } - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /* Send button */ Lay_PutConfirmButton (Txt_Save); @@ -2627,9 +2628,9 @@ void Usr_ReqListStdsAttendanceCrs (void) Grp_PutParamsCodGrps (); /* Write list of students to select some of them */ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (0); Usr_ListUsersToSelect (Rol_STUDENT); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /* Send button */ Lay_PutConfirmButton (Txt_Show_list); @@ -3145,9 +3146,10 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, NULL), TypeOfView == Att_PRINT_VIEW ? NULL : Hlp_USERS_Attendance_attendance_list); - fprintf (Gbl.F.Out,"", - PutButtonShowDetails ? "FRAME_TBL_WIDE_MARGIN" : - "FRAME_TBL_WIDE"); + if (PutButtonShowDetails) + Lay_StartTableWideMargin (2); + else + Lay_StartTableWide (2); /***** Heading row *****/ Att_WriteTableHeadSeveralAttEvents (); @@ -3196,7 +3198,7 @@ static void Att_ListStdsAttendanceTable (Att_TypeOfView_t TypeOfView, } /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Button to show more details *****/ if (PutButtonShowDetails) diff --git a/swad_centre.c b/swad_centre.c index 0e3432823..97b5b8f09 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -758,7 +758,7 @@ static void Ctr_ListCentres (void) if (Gbl.Ctrs.Num) // There are centres in the current institution { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); Ctr_PutHeadCentresForSeeing (true); // Order selectable /***** Write all the centres and their nuber of teachers *****/ @@ -768,7 +768,7 @@ static void Ctr_ListCentres (void) Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No centres created in the current institution Lay_ShowAlert (Lay_INFO,Txt_No_centres); diff --git a/swad_changelog.h b/swad_changelog.h index 74b1da8e3..507fae0a7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -223,13 +223,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.198.5 (2017-05-01)" +#define Log_PLATFORM_VERSION "SWAD 16.198.7 (2017-05-01)" #define CSS_FILE "swad16.195.8.css" #define JS_FILE "swad16.181.js" // 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 16.198.7: May 01, 2017 Code refactoring related to tables. (218319 lines) + Version 16.198.6: May 01, 2017 Code refactoring related to tables. (218312 lines) Version 16.198.5: May 01, 2017 Code refactoring related to tables. (218302 lines) Version 16.198.4: Apr 30, 2017 Code refactoring related to contextual icons to remove. (218294 lines) Version 16.198.3: Apr 30, 2017 Code refactoring related to contextual icons to hide and unhide. (218320 lines) diff --git a/swad_connected.c b/swad_connected.c index 2ab6c7def..d198994f3 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -213,8 +213,8 @@ void Con_GetAndShowLastClicks (void) NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get last clicks"); /***** Write list of connected users *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (1); + fprintf (Gbl.F.Out,"" "
" "%s" // Click @@ -331,7 +331,7 @@ void Con_GetAndShowLastClicks (void) ClassRow,Deg.ShrtName, ClassRow,row[8]); } - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Free structure that stores the query result *****/ mysql_free_result (mysql_res); diff --git a/swad_course.c b/swad_course.c index b405497a3..f7e4bb941 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1131,7 +1131,7 @@ static void Crs_ListCourses (void) if (Gbl.CurrentDeg.NumCrss) // There are courses in the current degree { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); Crs_PutHeadCoursesForSeeing (); /***** List the courses *****/ @@ -1143,7 +1143,7 @@ static void Crs_ListCourses (void) Crs_ListCoursesOfAYearForSeeing (0); // Courses without a year selected /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No courses created in the current degree Lay_ShowAlert (Lay_INFO,Txt_No_courses); diff --git a/swad_degree.c b/swad_degree.c index fd97239cf..23b39dce2 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1173,7 +1173,7 @@ static void Deg_ListDegrees (void) if (Gbl.CurrentCtr.Ctr.Degs.Num) // There are degrees in the current centre { /***** Write heading *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); Deg_PutHeadDegreesForSeeing (); /***** List the degrees *****/ @@ -1183,7 +1183,7 @@ static void Deg_ListDegrees (void) Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.Ctr.Degs.Lst[NumDeg]),NumDeg + 1); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No degrees created in the current centre Lay_ShowAlert (Lay_INFO,Txt_No_degrees); diff --git a/swad_degree_type.c b/swad_degree_type.c index d2dcfb096..798436611 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -222,14 +222,14 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder if (Gbl.Degs.DegTypes.Num) { /***** Write heading *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); DT_PutHeadDegreeTypesForSeeing (NextAction,SelectedOrder); /***** List current degree types for seeing *****/ DT_ListDegreeTypesForSeeing (); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No degree types created Lay_ShowAlert (Lay_INFO,Txt_No_types_of_degree); diff --git a/swad_duplicate.c b/swad_duplicate.c index 18604d861..53df6beaf 100644 --- a/swad_duplicate.c +++ b/swad_duplicate.c @@ -159,7 +159,7 @@ void Dup_ListDuplicateUsrs (void) Usr_UsrDataConstructor (&UsrDat); /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); /***** Heading row with column names *****/ Gbl.Usrs.Listing.WithPhotos = true; @@ -218,7 +218,7 @@ void Dup_ListDuplicateUsrs (void) } /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -291,7 +291,7 @@ static void Dup_ListSimilarUsrs (void) Usr_UsrDataConstructor (&UsrDat); /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); /***** Heading row with column names *****/ Gbl.Usrs.Listing.WithPhotos = true; @@ -358,7 +358,7 @@ static void Dup_ListSimilarUsrs (void) } /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_enrolment.c b/swad_enrolment.c index 3bbbb0e04..429475602 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -822,8 +822,8 @@ static void Enr_PutAreaToEnterUsrsIDs (void) extern const char *Txt_List_of_nicks_emails_or_IDs; /***** Text area for users' IDs *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" @@ -832,10 +832,10 @@ static void Enr_PutAreaToEnterUsrsIDs (void) " cols=\"60\" rows=\"10\">" "" "" - "" - "
" "" "
", + "", The_ClassForm[Gbl.Prefs.Theme], Txt_List_of_nicks_emails_or_IDs); + Lay_EndTable (); } /*****************************************************************************/ @@ -2210,9 +2210,9 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) Lay_StartRoundFrame ("100%",Txt_Enrolment_requests,NULL,Hlp_USERS_Requests); /***** Selection of scope and roles *****/ - /* Start form */ + /* Start form and table */ Act_FormStart (ActUpdSignUpReq); - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); /* Scope (whole platform, current centre, current degree or current course) */ fprintf (Gbl.F.Out,"" @@ -2237,10 +2237,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) RolesSelected, false,true); fprintf (Gbl.F.Out,"" - "" - "
"); + ""); - /* End form */ + /* End table and form */ + Lay_EndTable (); Act_FormEnd (); /***** Build query *****/ @@ -2683,8 +2683,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) Usr_UsrDataConstructor (&UsrDat); /* Start table */ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" @@ -2824,7 +2824,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) } /* End table */ - fprintf (Gbl.F.Out,"
" "%s" "
"); + Lay_EndTable (); /* Free memory used for user's data */ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_file_browser.c b/swad_file_browser.c index dcf7e64c4..b5b973904 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3122,10 +3122,10 @@ void Brw_AskEditWorksCrs (void) Brw_PutHiddenParamFullTreeIfSelected (); /* Put list of users to select some of them */ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (0); Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_STUDENT); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /* Send button */ Lay_PutConfirmButton (Txt_View_homework); diff --git a/swad_forum.c b/swad_forum.c index 5152cfe08..a226c7122 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2567,8 +2567,8 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, &PaginationThrs); /***** Heading row *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,"" "" @@ -2625,7 +2625,7 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted, For_ListForumThrs (ThrCods,ThrCodHighlighted,&PaginationThrs); /***** End table *****/ - fprintf (Gbl.F.Out,"
" "
"); + Lay_EndTable (); /***** Write links to all the pages in the listing of threads *****/ if (PaginationThrs.MoreThanOnePage) @@ -3841,9 +3841,9 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) } /***** Subject and content *****/ - // If writing a reply to a message of an existing thread ==> write subject - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); + // If writing a reply to a message of an existing thread ==> write subject /* Subject */ fprintf (Gbl.F.Out,"" "", The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Content); - fprintf (Gbl.F.Out,"
" @@ -3875,7 +3875,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) "
"); + Lay_EndTable (); /***** Help for text editor *****/ Lay_HelpPlainEditor (); diff --git a/swad_group.c b/swad_group.c index 1d80eac81..471d7093c 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1274,8 +1274,8 @@ static void Grp_ListGroupTypesForEdition (void) fprintf (Gbl.F.Out,""); Act_FormStartAnchor (ActChgTimGrpTyp,Grp_SECTION_GROUP_TYPES); Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypCod); - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" - "
" "\"%s\"" - "
"); + ""); + Lay_EndTable (); Act_FormEnd (); fprintf (Gbl.F.Out,""); diff --git a/swad_hierarchy.c b/swad_hierarchy.c index 77335e373..0784d63b7 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -97,7 +97,7 @@ void Hie_WriteMenuHierarchy (void) extern const char *Txt_Course; /***** Start of table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); /***** Write a 1st selector with all the countries *****/ @@ -172,7 +172,7 @@ void Hie_WriteMenuHierarchy (void) } /***** End of table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } /*****************************************************************************/ diff --git a/swad_holiday.c b/swad_holiday.c index 8bff78347..4349b1813 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -104,8 +104,8 @@ void Hld_SeeHolidays (void) Hlp_INSTITUTION_Holidays); if (Gbl.Hlds.Num) { - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); for (Order = Hld_ORDER_BY_PLACE; Order <= Hld_ORDER_BY_START_DATE; Order++) @@ -171,7 +171,7 @@ void Hld_SeeHolidays (void) "", Gbl.Hlds.Lst[NumHld].Name); } - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No holidays created in the current institution Lay_ShowAlert (Lay_INFO,Txt_No_holidays); diff --git a/swad_indicator.c b/swad_indicator.c index 3cc377f77..5d4a24273 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -591,8 +591,9 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 const char *ClassHighlight = "DAT RIGHT_MIDDLE LIGHT_BLUE"; /***** Write number of courses with each number of indicators valid *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableCenter (2); + + fprintf (Gbl.F.Out,""); if (PutForm) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"" - "" - "
" @@ -657,11 +658,12 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 "" "(%.1f%%)" "
", + "", Txt_Total, NumCrss, 100.0); + + Lay_EndTable (); } /*****************************************************************************/ diff --git a/swad_institution.c b/swad_institution.c index d9766cf72..0a84c7469 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -681,7 +681,7 @@ static void Ins_ListInstitutions (void) if (Gbl.Inss.Num) // There are institutions in the current country { /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (2); Ins_PutHeadInstitutionsForSeeing (true); // Order selectable /***** Write all the institutions and their nuber of users *****/ @@ -691,7 +691,7 @@ static void Ins_ListInstitutions (void) Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No insrtitutions created in the current country Lay_ShowAlert (Lay_INFO,Txt_No_institutions); diff --git a/swad_layout.c b/swad_layout.c index ba11e3dcc..6eb257442 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1552,6 +1552,14 @@ void Lay_EndRoundFrame (void) ""); } +void Lay_StartTableCenter (unsigned CellPadding) + { + fprintf (Gbl.F.Out,""); + } + void Lay_StartTableWide (unsigned CellPadding) { fprintf (Gbl.F.Out,"
"); } +void Lay_StartTableWideMargin (unsigned CellPadding) + { + fprintf (Gbl.F.Out,"
"); + } + void Lay_EndTable (void) { fprintf (Gbl.F.Out,"
"); diff --git a/swad_layout.h b/swad_layout.h index 33f594429..bf007f81d 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -122,7 +122,10 @@ void Lay_EndRoundFrameTable (void); void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton); void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton); void Lay_EndRoundFrame (void); + +void Lay_StartTableCenter (unsigned CellPadding); void Lay_StartTableWide (unsigned CellPadding); +void Lay_StartTableWideMargin (unsigned CellPadding); void Lay_EndTable (void); void Lay_ShowErrorAndExit (const char *Message); diff --git a/swad_mail.c b/swad_mail.c index 25ce369e0..9433986ba 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1165,10 +1165,10 @@ void Mai_ShowFormOthEmail (void) Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); /***** Form with the user's email *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); Mai_ShowFormChangeUsrEmail (&Gbl.Usrs.Other.UsrDat, (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me? - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** End frame *****/ Lay_EndRoundFrame (); diff --git a/swad_message.c b/swad_message.c index 627bd1928..55d3ceecd 100644 --- a/swad_message.c +++ b/swad_message.c @@ -274,7 +274,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) } /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); /***** "To:" section (recipients) *****/ fprintf (Gbl.F.Out,"" @@ -289,14 +289,14 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) else { /***** Show potential recipients *****/ - fprintf (Gbl.F.Out,"
"); + Lay_StartTableWide (0); if (ShowUsrsInCrs) { Usr_ListUsersToSelect (Rol_TEACHER); // All teachers in course Usr_ListUsersToSelect (Rol_STUDENT); // All students in selected groups } Msg_WriteFormUsrsIDsOrNicksOtherRecipients (); // Other users (nicknames) - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } fprintf (Gbl.F.Out,"" @@ -306,7 +306,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1]) Msg_WriteFormSubjectAndContentMsgToUsrs (Content); /***** End table *****/ - fprintf (Gbl.F.Out,""); + Lay_EndTable (); /***** Help for text editor and send button *****/ Lay_HelpPlainEditor (); @@ -1819,8 +1819,7 @@ static void Msg_ShowSentOrReceivedMessages (void) &Pagination); /***** Show received / sent messages in this page *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (2); mysql_data_seek (mysql_res,(my_ulonglong) (Pagination.FirstItemVisible - 1)); for (NumRow = Pagination.FirstItemVisible; @@ -1835,7 +1834,7 @@ static void Msg_ShowSentOrReceivedMessages (void) Msg_ShowASentOrReceivedMessage (NumMsg,MsgCod); } - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -2627,11 +2626,11 @@ void Msg_ShowFormToFilterMsgs (void) }; /***** Table start *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableCenter (2); /***** Filter authors/recipients *****/ - fprintf (Gbl.F.Out,"" + "", + "" + "", The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Content, Msg_MAX_CHARS_FILTER_CONTENT,Gbl.Msg.FilterContent); /***** End table *****/ - fprintf (Gbl.F.Out,"" - "
" + fprintf (Gbl.F.Out,"
" "" - "
"); + Lay_EndTable (); } /*****************************************************************************/ diff --git a/swad_notification.c b/swad_notification.c index 791979b64..243581979 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -388,8 +388,8 @@ void Ntf_ShowMyNotifications (void) Usr_UsrDataConstructor (&UsrDat); /***** Start table *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,"" "" @@ -622,7 +622,7 @@ void Ntf_ShowMyNotifications (void) } /***** End table *****/ - fprintf (Gbl.F.Out,"
" "%s" "
"); + Lay_EndTable (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -1905,8 +1905,8 @@ void Ntf_PutFormChangeNotifSentByEMail (void) Mai_WriteWarningEmailNotifications (); /***** List of notifications *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" ""); } - fprintf (Gbl.F.Out,"
" "%s" @@ -1947,7 +1947,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) "
"); + Lay_EndTable (); /***** Button to save changes *****/ Lay_PutConfirmButton (Txt_Save_changes); diff --git a/swad_password.c b/swad_password.c index 5d99360a6..d6b2de7ff 100644 --- a/swad_password.c +++ b/swad_password.c @@ -833,9 +833,9 @@ void Pwd_ShowFormOthPwd (void) Usr_PutParamOtherUsrCodEncrypted (); /* New password */ - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); Pwd_PutFormToGetNewPasswordTwice (); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /* End form */ Lay_PutConfirmButton (Txt_Change_password); diff --git a/swad_photo.c b/swad_photo.c index b95e3df42..47ca9d0b8 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -837,8 +837,8 @@ static void Pho_UpdatePhoto2 (void) unsigned NumPhoto; /***** Show the three images resulting of the processing *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWide (0); + fprintf (Gbl.F.Out,""); for (NumPhoto = 0; NumPhoto < 3; NumPhoto++) @@ -854,8 +854,8 @@ static void Pho_UpdatePhoto2 (void) Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto], Pho_PHOTO_REAL_WIDTH,Pho_PHOTO_REAL_HEIGHT, Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]); - fprintf (Gbl.F.Out,"" - "
"); + fprintf (Gbl.F.Out,""); + Lay_EndTable (); /***** Show message *****/ if (Gbl.AlertType == Lay_ERROR) // The file with the selected photo does not exist! @@ -1631,8 +1631,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) Lay_StartRoundFrame (NULL,Txt_Degrees, Pho_PutIconToPrintDegreeStats, Hlp_STATS_Degrees); - - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (2); /***** Put a selector for the type of average *****/ Pho_PutSelectorForTypeOfAvg (); @@ -1643,7 +1642,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) /***** Put a selector for the order of degrees *****/ Pho_PutSelectorForHowOrderDegrees (); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); break; case Pho_DEGREES_PRINT: /***** Start frame *****/ @@ -2025,7 +2024,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin /***** Form to select type of list used to display degree photos *****/ if (SeeOrPrint == Pho_DEGREES_SEE) Usr_ShowFormsToSelectUsrListType (ActSeePhoDeg); - fprintf (Gbl.F.Out,""); + Lay_StartTableCenter (0); /***** Get and print degrees *****/ for (NumRow = 0, NumDegsNotEmpty = 0; @@ -2068,7 +2067,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin if (TRIsOpen) fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No degrees with students found /***** Show warning indicating no students found *****/ @@ -2110,8 +2109,8 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) Usr_ShowFormsToSelectUsrListType (ActSeePhoDeg); /***** Write heading *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" @@ -2182,7 +2181,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) } /***** Photos end *****/ - fprintf (Gbl.F.Out,"
" "%s" "
"); + Lay_EndTable (); } else // No degrees with students found! /***** Show warning indicating no students found *****/ diff --git a/swad_place.c b/swad_place.c index 998c43113..c93524868 100644 --- a/swad_place.c +++ b/swad_place.c @@ -120,8 +120,8 @@ void Plc_SeePlaces (void) ICanEdit ? Plc_PutIconToEditPlaces : NULL, Hlp_INSTITUTION_Places); - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); for (Order = Plc_ORDER_BY_PLACE; Order <= Plc_ORDER_BY_NUM_CTRS; Order++) @@ -193,7 +193,8 @@ void Plc_SeePlaces (void) Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod) - NumCtrsWithPlc); - fprintf (Gbl.F.Out,"
"); + /***** End table *****/ + Lay_EndTable (); /***** Button to create place *****/ if (ICanEdit) @@ -203,7 +204,7 @@ void Plc_SeePlaces (void) Act_FormEnd (); } - /***** End table *****/ + /***** End frame *****/ Lay_EndRoundFrame (); /***** Free list of places *****/ diff --git a/swad_privacy.c b/swad_privacy.c index 03ea12c6f..89cf5e653 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -101,10 +101,9 @@ void Pri_EditMyPrivacy (void) Gbl.Usrs.Me.UsrDat.ProfileVisibility == Pri_VISIBILITY_UNKNOWN) Lay_ShowAlert (Lay_WARNING,Txt_Please_review_your_privacy_preferences); - /***** Start table *****/ - Lay_StartRoundFrame (NULL,Txt_Privacy, - Pri_PutIconsPrivacy,Hlp_PROFILE_Preferences_privacy); - fprintf (Gbl.F.Out,""); + /***** Start frame and table *****/ + Lay_StartRoundFrameTable (NULL,Txt_Privacy,Pri_PutIconsPrivacy, + Hlp_PROFILE_Preferences_privacy,2); /***** Edit photo visibility *****/ Pri_PutFormVisibility (Txt_Photo, @@ -130,9 +129,8 @@ void Pri_EditMyPrivacy (void) Pri_VISIBILITY_SYSTEM, (1 << Pri_VISIBILITY_SYSTEM)); - /***** End table *****/ - fprintf (Gbl.F.Out,"
"); - Lay_EndRoundFrame (); + /***** End table and frame *****/ + Lay_EndRoundFrameTable (); } /*****************************************************************************/ diff --git a/swad_record.c b/swad_record.c index aef39430c..af622ceb2 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1676,9 +1676,9 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, /***** Header *****/ fprintf (Gbl.F.Out,"" - "" - "" - "" + "" "" - "" - "
"); + Lay_StartTableWide (0); + fprintf (Gbl.F.Out,"
", Rec_DEGREE_LOGO_SIZE); Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, @@ -1687,12 +1687,12 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView, "" "%s
%s
%s" "
" - "" "", Gbl.CurrentDeg.Deg.FullName,Gbl.CurrentCrs.Crs.FullName, UsrDat->FullName); + Lay_EndTable (); + fprintf (Gbl.F.Out,"" + ""); /***** Fields of the record that depends on the course *****/ for (NumField = 0, Gbl.RowEvenOdd = 0; diff --git a/swad_statistic.c b/swad_statistic.c index 47dc00997..c77a0d166 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -493,8 +493,8 @@ void Sta_AskShowCrsHits (void) Par_PutHiddenParamLong ("LastRow",0); /***** Put list of users to select some of them *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" "" - "" - "
%s:" "" @@ -583,8 +583,8 @@ void Sta_AskShowCrsHits (void) fprintf (Gbl.F.Out,")" "" "
"); + ""); + Lay_EndTable (); /***** Hidden param used to get client time zone *****/ Dat_PutHiddenParBrowserTZDiff (); @@ -1619,9 +1619,9 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql /***** Put heading with backward and forward buttons *****/ fprintf (Gbl.F.Out,"" - "" - "" - ""); + ""); /* Put link to jump to previous page (older clicks) */ if (FirstRow > 1) @@ -1648,7 +1648,6 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql if (FirstRow > 1) Act_FormEnd (); - /* Write number of current page */ fprintf (Gbl.F.Out,"" - "
"); + Lay_StartTableWide (2); + fprintf (Gbl.F.Out,"
" "" @@ -1685,9 +1684,9 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql if (LastRow < NumRows) Act_FormEnd (); - fprintf (Gbl.F.Out,"
" - "" + fprintf (Gbl.F.Out,""); + Lay_EndTable (); + fprintf (Gbl.F.Out,"" ""); /***** Write heading *****/ @@ -2392,8 +2391,8 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float HitsMax) unsigned B; /***** Write numbers from 0 to Hits.Max *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableWide (0); + fprintf (Gbl.F.Out,"" "", R,G,B,Gbl.Prefs.IconsURL); } - fprintf (Gbl.F.Out,"" - "
" "0" @@ -2433,8 +2432,8 @@ static void Sta_DrawBarColors (Sta_ColorType_t ColorType,float HitsMax) "
"); + fprintf (Gbl.F.Out,""); + Lay_EndTable (); } /*****************************************************************************/ diff --git a/swad_survey.c b/swad_survey.c index 4a1bd498b..fa84ff0b9 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -222,8 +222,8 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) if (Gbl.Svys.Num) { /***** Table head *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); for (Order = Svy_ORDER_BY_START_DATE; Order <= Svy_ORDER_BY_END_DATE; Order++) @@ -263,7 +263,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) Svy_ShowOneSurvey (Gbl.Svys.LstSvyCods[NumSvy - 1],SvyQst,false); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // No surveys created Lay_ShowAlert (Lay_INFO,Txt_No_surveys); @@ -3171,8 +3171,8 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ } /***** Write the heading *****/ - fprintf (Gbl.F.Out,"" - ""); + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,""); if (Svy->Status.ICanEdit) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,"
" @@ -3255,7 +3255,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ "
"); + Lay_EndTable (); if (PutFormAnswerSurvey) { diff --git a/swad_test.c b/swad_test.c index 9db6473c3..c0a9421f6 100644 --- a/swad_test.c +++ b/swad_test.c @@ -443,9 +443,9 @@ void Tst_ShowNewTest (void) Par_PutHiddenParamUnsigned ("NumQst",Gbl.Test.NumQsts); /***** List the questions *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (10); Tst_ShowTestQuestionsWhenSeeing (mysql_res); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Test result will be saved? *****/ fprintf (Gbl.F.Out,"
"); + Lay_StartTableWideMargin (10); Tst_ShowTestResultAfterAssess (TstCod,&NumQstsNotBlank,&TotalScore); - fprintf (Gbl.F.Out,""); + Lay_EndTable (); /***** Write total mark of test *****/ if (Gbl.Test.Config.FeedbackType != Tst_FEEDBACK_NOTHING) @@ -2721,8 +2721,8 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m Tst_PutIconsTests,Hlp_ASSESSMENT_Tests); /***** Write the heading *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableWideMargin (2); + fprintf (Gbl.F.Out,"" "" "
" "%s" @@ -2965,7 +2965,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m } /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Button to add a new question *****/ Tst_PutButtonToAddQuestion (); @@ -6981,8 +6981,8 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) Grp_PutParamsCodGrps (); /***** Put list of users to select some of them *****/ - fprintf (Gbl.F.Out,"" - "" + Lay_StartTableCenter (2); + fprintf (Gbl.F.Out,"" "" @@ -6999,7 +6999,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void) /***** Starting and ending dates in the search *****/ Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false); - fprintf (Gbl.F.Out,"
" "%s:" "
"); + Lay_EndTable (); /***** Send button *****/ Lay_PutConfirmButton (Txt_View_test_results); @@ -7664,7 +7664,7 @@ void Tst_ShowOneTestResult (void) Gbl.CurrentCrs.Crs.CrsCod); /***** Start table *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWideMargin (10); /***** Header row *****/ /* Get data of the user who made the test */ @@ -7758,7 +7758,7 @@ void Tst_ShowOneTestResult (void) Tst_ShowTstTotalMark (TotalScore); /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** End frame *****/ Lay_EndRoundFrame (); diff --git a/swad_test_import.c b/swad_test_import.c index d77804bc6..8ec51f868 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -531,6 +531,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer) /* Current element is */ /***** Write heading of list of imported questions *****/ + Lay_StartTableWideMargin (2); TsI_WriteHeadingListImportedQst (); /***** For each question... *****/ @@ -665,7 +666,7 @@ static void TsI_ImportQuestionsFromXMLBuffer (const char *XMLBuffer) } } - fprintf (Gbl.F.Out,""); + Lay_EndTable (); } else // TestElem not found Lay_ShowAlert (Lay_ERROR,"Root element <test> not found."); @@ -959,8 +960,7 @@ static void TsI_WriteHeadingListImportedQst (void) extern const char *Txt_Question; /***** Write the heading *****/ - fprintf (Gbl.F.Out,"" - "" + fprintf (Gbl.F.Out,"" "" "
" "%s" diff --git a/swad_user.c b/swad_user.c index e0dbb554d..0f3d13cab 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6097,9 +6097,10 @@ void Usr_ListAllDataGsts (void) NumColumnsCommonCard = Usr_NUM_ALL_FIELDS_DATA_GST; /***** Start table with list of guests *****/ + Lay_StartTableWide (0); + /* Start row */ - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,""); /* Columns for the data */ for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 : @@ -6138,7 +6139,7 @@ void Usr_ListAllDataGsts (void) Usr_UsrDataDestructor (&UsrDat); /***** End of table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // Gbl.Usrs.LstUsrs[Rol__GUEST_].NumUsrs == 0 Usr_ShowWarningNoUsersFound (Rol__GUEST_); @@ -6243,7 +6244,7 @@ void Usr_ListAllDataStds (void) } /***** Start table with list of students *****/ - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); if (!Gbl.Usrs.ClassPhoto.AllGroups) { fprintf (Gbl.F.Out,"" @@ -6337,7 +6338,7 @@ void Usr_ListAllDataStds (void) Usr_UsrDataDestructor (&UsrDat); /***** End of table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /***** Free memory used by the string with the list of group names where student belongs to *****/ if (Gbl.Scope.Current == Sco_SCOPE_CRS) @@ -6452,9 +6453,10 @@ void Usr_ListAllDataTchs (void) NumColumns = Usr_NUM_ALL_FIELDS_DATA_TCH; /***** Start table with list of teachers *****/ + Lay_StartTableWide (0); + /* Start row */ - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,""); for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 : 1); NumCol < NumColumns; @@ -6489,7 +6491,7 @@ void Usr_ListAllDataTchs (void) Usr_UsrDataDestructor (&UsrDat); /***** End of table *****/ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); } else // Gbl.Usrs.LstUsrs[Rol_TEACHER].NumUsrs == 0 /***** Show warning indicating no teachers found *****/ @@ -7205,7 +7207,7 @@ void Usr_SeeGuests (void) Act_FormStart (ActSeeRecSevGst); /* Start table */ - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); /* Put a row to select all users */ Usr_PutCheckboxToSelectAllUsers (Rol__GUEST_); @@ -7225,7 +7227,7 @@ void Usr_SeeGuests (void) } /* End table */ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); /* Send button */ Lay_PutConfirmButton (Txt_Show_records); @@ -7371,7 +7373,7 @@ void Usr_SeeStudents (void) } /* Start table */ - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); /* Put a row to select all users */ if (ICanViewRecords) @@ -7393,7 +7395,7 @@ void Usr_SeeStudents (void) } /* End table */ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); if (ICanViewRecords) { @@ -7523,7 +7525,7 @@ void Usr_SeeTeachers (void) Act_FormStart (ActSeeRecSevTch); /* Start table */ - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); /* Put a row to select all users */ if (ICanViewRecords) @@ -7545,7 +7547,7 @@ void Usr_SeeTeachers (void) } /* End table */ - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); if (ICanViewRecords) { @@ -7787,9 +7789,9 @@ void Usr_SeeGstClassPhotoPrn (void) Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : -1L, -1L,-1L); - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); Lay_EndRoundFrame (); } else @@ -7835,9 +7837,9 @@ void Usr_SeeStdClassPhotoPrn (void) -1L, Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); Lay_EndRoundFrame (); } else @@ -7889,9 +7891,9 @@ void Usr_SeeTchClassPhotoPrn (void) -1L, Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); - fprintf (Gbl.F.Out,""); + Lay_StartTableWide (0); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER); - fprintf (Gbl.F.Out,"
"); + Lay_EndTable (); Lay_EndRoundFrame (); } else