diff --git a/swad_calendar.c b/swad_calendar.c index 2f2d53cb..06caea17 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -247,19 +247,15 @@ void Cal_DrawCalendar (void) /***** Create list of calls for examination *****/ Exa_CreateListOfExamAnnouncements (); - /***** Start of table and title *****/ + /***** Start frame *****/ Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL : Cal_PutIconToPrintCalendar); - fprintf (Gbl.F.Out,""); - Lay_WriteHeaderClassPhoto (1,PrintView,false, + Lay_WriteHeaderClassPhoto (PrintView,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, Gbl.CurrentCrs.Crs.CrsCod); /***** Draw several months *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "
"); - /* Show form to change first day of week */ if (!PrintView) Cal_ShowIntegratedFormToSelFirstDayOfWeek (ActChgCal1stDay); @@ -287,10 +283,6 @@ void Cal_DrawCalendar (void) "", Params); - fprintf (Gbl.F.Out,"
"); - /***** Free list of dates of exam announcements *****/ Exa_FreeListExamAnnouncements (); diff --git a/swad_changelog.h b/swad_changelog.h index 65d248de..531774bc 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -141,6 +141,7 @@ // 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 15.151: Mar 18, 2016 Changes in layout of header class photo. (195930 lines) Version 15.150.10:Mar 18, 2016 Icon to print calendar integrated in frame. (195961 lines) Version 15.150.9: Mar 18, 2016 Icons to print/show-all students/teachers integrated in frame. (195957 lines) Version 15.150.8: Mar 18, 2016 Icons to print/show-all guests integrated in frame. (195967 lines) diff --git a/swad_info.c b/swad_info.c index 60000f13..f905f794 100644 --- a/swad_info.c +++ b/swad_info.c @@ -1590,18 +1590,16 @@ static void Inf_ShowPlainTxtInfo (void) if (TxtHTML[0]) { - /***** Start table *****/ + /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : NULL); - fprintf (Gbl.F.Out,""); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); + Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); - fprintf (Gbl.F.Out,"" - "" - "" - "
"); + fprintf (Gbl.F.Out,"
"); /***** Convert to respectful HTML and insert links *****/ Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML, @@ -1611,10 +1609,8 @@ static void Inf_ShowPlainTxtInfo (void) /***** Write text *****/ fprintf (Gbl.F.Out,"%s",TxtHTML); - /***** End table *****/ - fprintf (Gbl.F.Out,"
"); + /***** End frame *****/ + fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); } else @@ -1646,19 +1642,16 @@ static void Inf_ShowRichTxtInfo (void) if (TxtMD[0]) { - /***** Start table *****/ + /***** Start frame *****/ Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type], ICanEdit ? Inf_PutIconToEditInfo : NULL); - fprintf (Gbl.F.Out,""); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); + Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); - fprintf (Gbl.F.Out,"" - "" - "" - "
" - "
"); + fprintf (Gbl.F.Out,"
"); /***** Store text into a temporary .md file in HTML output directory *****/ // TODO: change to another directory? @@ -1717,11 +1710,8 @@ static void Inf_ShowRichTxtInfo (void) fclose (FileHTML); unlink (PathFileHTML); - /***** Finish table *****/ - fprintf (Gbl.F.Out,"
" - "
"); + /***** End frame *****/ + fprintf (Gbl.F.Out,""); Lay_EndRoundFrame (); } else @@ -1834,30 +1824,28 @@ void Inf_EditPlainTxtInfo (void) /***** Set info type *****/ Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType (); - /***** Start table *****/ + /***** Start form and frame *****/ Act_FormStart (Inf_ActionsRcvPlaTxtInfo[Gbl.CurrentCrs.Info.Type]); - Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type]); + Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (1,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); + Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); /***** Get info text from database *****/ Inf_GetInfoTxtFromDB (TxtHTML,NULL,Cns_MAX_BYTES_LONG_TEXT); /***** Edition area *****/ - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); Lay_HelpPlainEditor (); fprintf (Gbl.F.Out,"", + "" + "
", TxtHTML); - fprintf (Gbl.F.Out,"" - ""); - /***** End form *****/ - Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); + /***** End frame and form *****/ + Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Act_FormEnd (); } @@ -1874,30 +1862,28 @@ void Inf_EditRichTxtInfo (void) /***** Set info type *****/ Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType (); - /***** Start form *****/ + /***** Start form and frame *****/ Act_FormStart (Inf_ActionsRcvRchTxtInfo[Gbl.CurrentCrs.Info.Type]); - Lay_StartRoundFrameTable (NULL,0,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type]); + Lay_StartRoundFrame (NULL,Txt_INFO_TITLE[Gbl.CurrentCrs.Info.Type],NULL); if (Gbl.CurrentCrs.Info.Type == Inf_INTRODUCTION || Gbl.CurrentCrs.Info.Type == Inf_TEACHING_GUIDE) - Lay_WriteHeaderClassPhoto (1,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); + Lay_WriteHeaderClassPhoto (false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); /***** Get info text from database *****/ Inf_GetInfoTxtFromDB (TxtHTML,NULL,Cns_MAX_BYTES_LONG_TEXT); /***** Edition area *****/ - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); Lay_HelpRichEditor (); fprintf (Gbl.F.Out,"", + "" + "
", TxtHTML); - fprintf (Gbl.F.Out,"" - ""); - /***** End form *****/ - Lay_EndRoundFrameTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save); + /***** End frame and form *****/ + Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save); Act_FormEnd (); } diff --git a/swad_layout.c b/swad_layout.c index c4c1e1e2..10763d25 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1539,7 +1539,7 @@ static void Lay_WriteFootFromHTMLFile (void) /****** Write header and footer of the class photo or academic calendar ******/ /*****************************************************************************/ -void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingClassPhoto, +void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto, long InsCod,long DegCod,long CrsCod) { struct Institution Ins; @@ -1559,11 +1559,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC Crs_GetDataOfCourseByCod (&Crs); /***** Table start *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "", - NumColumns); + fprintf (Gbl.F.Out,"
" + ""); /***** First column: institution logo *****/ fprintf (Gbl.F.Out,"" - "
"); @@ -1627,9 +1624,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC /***** Table end *****/ fprintf (Gbl.F.Out,"
" - "" - ""); + ""); } /*****************************************************************************/ diff --git a/swad_layout.h b/swad_layout.h index 2ba79827..7edf478a 100644 --- a/swad_layout.h +++ b/swad_layout.h @@ -110,7 +110,7 @@ void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message); void Lay_RefreshNotifsAndConnected (void); void Lay_RefreshLastClicks (void); -void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingClassPhoto, +void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto, long InsCod,long DegCod,long CrsCod); void Lay_AdvertisementMobile (void); diff --git a/swad_test.c b/swad_test.c index f647f264..d710acf9 100644 --- a/swad_test.c +++ b/swad_test.c @@ -604,15 +604,14 @@ static bool Tst_CheckIfNextTstAllowed (void) if (NumSecondsFromNowToNextAccTst > 0) { /***** Start frame *****/ - Lay_StartRoundFrameTable (NULL,2,Txt_Test); - Lay_WriteHeaderClassPhoto (1,false,false, + Lay_StartRoundFrame (NULL,Txt_Test,NULL); + Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, Gbl.CurrentCrs.Crs.CrsCod); /***** Write warning *****/ - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); fprintf (Gbl.F.Out,Txt_You_can_not_make_a_new_test_in_the_course_X_until, Gbl.CurrentCrs.Crs.FullName); fprintf (Gbl.F.Out,": " @@ -621,12 +620,11 @@ static bool Tst_CheckIfNextTstAllowed (void) "" - "" - "", + "
", (long) TimeNextTestUTC,Txt_Today); /***** End frame *****/ - Lay_EndRoundFrameTable (); + Lay_EndRoundFrame (); return false; } @@ -738,24 +736,25 @@ static void Tst_WriteTestHead (unsigned NumTst) extern const char *Txt_Test_result; extern const char *Txt_Test_No_X_that_you_make_in_this_course; - /***** Start table *****/ - Lay_StartRoundFrameTable (NULL,2,Gbl.Action.Act == ActSeeTst ? Txt_Test : - Txt_Test_result); - Lay_WriteHeaderClassPhoto (3,false,false, + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Gbl.Action.Act == ActSeeTst ? Txt_Test : + Txt_Test_result,NULL); + Lay_WriteHeaderClassPhoto (false,false, Gbl.CurrentIns.Ins.InsCod, Gbl.CurrentDeg.Deg.DegCod, Gbl.CurrentCrs.Crs.CrsCod); - /***** Header row *****/ + /***** Header *****/ if (Gbl.Action.Act == ActAssTst && Gbl.Usrs.Me.IBelongToCurrentCrs) { - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); fprintf (Gbl.F.Out,Txt_Test_No_X_that_you_make_in_this_course,NumTst); - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); } + + /***** Start table *****/ + fprintf (Gbl.F.Out,""); } /*****************************************************************************/ @@ -764,7 +763,8 @@ static void Tst_WriteTestHead (unsigned NumTst) static void Tst_WriteTestFoot (void) { - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); } /*****************************************************************************/ diff --git a/swad_timetable.c b/swad_timetable.c index 059c6bfd..97b18103 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -142,8 +142,7 @@ static void TT_ShowTimeTableGrpsSelected (void) extern const char *Txt_Groups_OF_A_USER; extern const char *Txt_All_groups; - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); switch (Gbl.CurrentCrs.Grps.WhichGrps) { case Grp_ONLY_MY_GROUPS: @@ -154,8 +153,7 @@ static void TT_ShowTimeTableGrpsSelected (void) fprintf (Gbl.F.Out,"%s",Txt_All_groups); break; } - fprintf (Gbl.F.Out,"" - ""); + fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ @@ -261,11 +259,10 @@ void TT_ShowClassTimeTable (void) Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons : NULL); - fprintf (Gbl.F.Out,""); /***** Start time table drawing *****/ if (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE) - Lay_WriteHeaderClassPhoto (1,PrintView,false, + Lay_WriteHeaderClassPhoto (PrintView,false, Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod); if (PrintView) @@ -273,28 +270,17 @@ void TT_ShowClassTimeTable (void) TT_ShowTimeTableGrpsSelected (); else { - fprintf (Gbl.F.Out,"" - "" - ""); + ActChgMyTT1stDay); } /***** Show the time table *****/ - fprintf (Gbl.F.Out,"" - "" - "" - "
"); - /***** Select whether show only my groups or all groups *****/ TT_ShowSelectorWhichGrps (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActSeeCrsTT : - ActSeeMyTT); + ActSeeMyTT); /***** Show form to change first day of week *****/ Cal_ShowIntegratedFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay : - ActChgMyTT1stDay); - - fprintf (Gbl.F.Out,"
"); TT_ShowTimeTable (Gbl.Usrs.Me.UsrDat.UsrCod); - fprintf (Gbl.F.Out,"
"); /***** End frame *****/ Lay_EndRoundFrame (); diff --git a/swad_user.c b/swad_user.c index d0e22920..a6ab5dcb 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6677,17 +6677,17 @@ void Usr_SeeGuests (void) Act_FormStart (ActSeeRecSevGst); Grp_PutParamsCodGrps (); - /* Start table */ - fprintf (Gbl.F.Out,""); - if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, + Lay_WriteHeaderClassPhoto (false,true, (Gbl.Scope.Current == Sco_SCOPE_CTR || Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : -1L, -1L, -1L); + /* Start table */ + fprintf (Gbl.F.Out,"
"); + /* Put a row to select all users */ Usr_PutCheckboxToSelectAllTheUsers (Rol__GUEST_); @@ -6830,11 +6830,8 @@ void Usr_SeeStudents (void) Grp_PutParamsCodGrps (); } - /* Start table */ - fprintf (Gbl.F.Out,"
"); - if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, + Lay_WriteHeaderClassPhoto (false,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG || Gbl.Scope.Current == Sco_SCOPE_CTR || @@ -6846,6 +6843,9 @@ void Usr_SeeStudents (void) Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); + /* Start table */ + fprintf (Gbl.F.Out,"
"); + /* Put a row to select all users */ if (ICanViewRecords) Usr_PutCheckboxToSelectAllTheUsers (Rol_STUDENT); @@ -6973,11 +6973,8 @@ void Usr_SeeTeachers (void) if (ICanViewRecords) Act_FormStart (ActSeeRecSevTch); - /* Start table */ - fprintf (Gbl.F.Out,"
"); - if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, + Lay_WriteHeaderClassPhoto (false,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG || Gbl.Scope.Current == Sco_SCOPE_CTR || @@ -6989,6 +6986,9 @@ void Usr_SeeTeachers (void) Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); + /* Start table */ + fprintf (Gbl.F.Out,"
"); + /* Put a row to select all users */ if (ICanViewRecords) Usr_PutCheckboxToSelectAllTheUsers (Rol_TEACHER); @@ -7140,14 +7140,16 @@ void Usr_SeeGstClassPhotoPrn (void) if (Gbl.Usrs.LstGsts.NumUsrs) { /***** Draw the guests' class photo *****/ - Lay_StartRoundFrameTable (NULL,0,NULL); - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true, + Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CTR || Gbl.Scope.Current == Sco_SCOPE_INS) ? Gbl.CurrentIns.Ins.InsCod : -1L, -1L,-1L); + fprintf (Gbl.F.Out,"
"); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_); - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); } else Usr_ShowWarningNoUsersFound (Rol__GUEST_); @@ -7180,8 +7182,8 @@ void Usr_SeeStdClassPhotoPrn (void) if (Gbl.Usrs.LstStds.NumUsrs) { /***** Draw the students' class photo *****/ - Lay_StartRoundFrameTable (NULL,0,NULL); - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true, + Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG || Gbl.Scope.Current == Sco_SCOPE_CTR || @@ -7192,8 +7194,10 @@ void Usr_SeeStdClassPhotoPrn (void) -1L, Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); + fprintf (Gbl.F.Out,""); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT); - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); } else Usr_ShowWarningNoUsersFound (Rol_STUDENT); @@ -7234,8 +7238,8 @@ void Usr_SeeTchClassPhotoPrn (void) if (Gbl.Usrs.LstTchs.NumUsrs) { /***** Draw the teachers' class photo *****/ - Lay_StartRoundFrameTable (NULL,0,NULL); - Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,true,true, + Lay_StartRoundFrame (NULL,NULL,NULL); + Lay_WriteHeaderClassPhoto (true,true, (Gbl.Scope.Current == Sco_SCOPE_CRS || Gbl.Scope.Current == Sco_SCOPE_DEG || Gbl.Scope.Current == Sco_SCOPE_CTR || @@ -7246,8 +7250,10 @@ void Usr_SeeTchClassPhotoPrn (void) -1L, Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : -1L); + fprintf (Gbl.F.Out,""); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER); - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); } else Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_TEACHER]);