diff --git a/swad_assignment.c b/swad_assignment.c index f6ff33740..7faf5ce90 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -500,7 +500,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) Asg_PutHiddenParamAsgOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("delon",Txt_Remove); + Act_PutIconLink ("delon16x16.gif",Txt_Remove); /***** Put form to hide/show assignment *****/ Act_FormStart (Hidden ? ActShoAsg : @@ -510,9 +510,9 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); if (Hidden) - Act_PutIconLink ("hidden_on",Txt_Show); + Act_PutIconLink ("hidden_on16x16.gif",Txt_Show); else - Act_PutIconLink ("visible_on",Txt_Hide); + Act_PutIconLink ("visible_on16x16.gif",Txt_Hide); /***** Put form to edit assignment *****/ Act_FormStart (ActEdiOneAsg); @@ -520,7 +520,7 @@ static void Asg_PutFormsToRemEditOneAsg (long AsgCod,bool Hidden) Asg_PutHiddenParamAsgOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("edit",Txt_Edit); + Act_PutIconLink ("edit16x16.gif",Txt_Edit); fprintf (Gbl.F.Out,""); } diff --git a/swad_attendance.c b/swad_attendance.c index 9d0233ce5..a69e24b75 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -528,7 +528,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden) Att_PutHiddenParamAttOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("delon",Txt_Remove); + Act_PutIconLink ("delon16x16.gif",Txt_Remove); /***** Put form to hide/show attendance event *****/ Act_FormStart (Hidden ? ActShoAtt : @@ -538,9 +538,9 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden) Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); if (Hidden) - Act_PutIconLink ("hidden_on",Txt_Show); + Act_PutIconLink ("hidden_on16x16.gif",Txt_Show); else - Act_PutIconLink ("visible_on",Txt_Hide); + Act_PutIconLink ("visible_on16x16.gif",Txt_Hide); /***** Put form to edit attendance event *****/ Act_FormStart (ActEdiOneAtt); @@ -548,7 +548,7 @@ static void Att_PutFormsToRemEditOneAttEvent (long AttCod,bool Hidden) Att_PutHiddenParamAttOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("edit",Txt_Edit); + Act_PutIconLink ("edit16x16.gif",Txt_Edit); fprintf (Gbl.F.Out,""); } diff --git a/swad_changelog.h b/swad_changelog.h index ee4a1f007..461758b52 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -112,12 +112,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.60 (2015/12/07)" +#define Log_PLATFORM_VERSION "SWAD 15.60.1 (2015/12/07)" #define CSS_FILE "swad15.59.4.css" // 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.60.1: Dec 07, 2015 Fixed names of some small icons. + New link in student's record card to see her/his attendance. (? lines) Version 15.60: Dec 07, 2015 By default, the language of a new user is unknown. Fixed bugs when registering a new user. (? lines) Version 15.59.4: Dec 06, 2015 Changes in some small icons. (186462 lines) diff --git a/swad_exam.c b/swad_exam.c index 36c126352..2092ed282 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -775,18 +775,18 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t /***** Link to remove this exam announcement *****/ Act_FormStart (ActRemExaAnn); Par_PutHiddenParamLong ("ExaCod",ExaCod); - Act_PutIconLink ("delon",Txt_Remove); + Act_PutIconLink ("delon16x16.gif",Txt_Remove); /***** Link to edit this exam announcement *****/ Act_FormStart (ActEdiExaAnn); Par_PutHiddenParamLong ("ExaCod",ExaCod); - Act_PutIconLink ("edit",Txt_Edit); + Act_PutIconLink ("edit16x16.gif",Txt_Edit); } /***** Link to print view *****/ Act_FormStart (ActPrnExaAnn); Par_PutHiddenParamLong ("ExaCod",ExaCod); - Act_PutIconLink ("print",Txt_Print); + Act_PutIconLink ("print16x16.gif",Txt_Print); fprintf (Gbl.F.Out,"" ""); diff --git a/swad_record.c b/swad_record.c index 72932cc68..a3c42e89c 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2257,7 +2257,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, Act_FormEnd (); } - if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected + if (Gbl.CurrentCrs.Crs.CrsCod > 0 && // A course is selected UsrDat->RoleInCurrentCrsDB == Rol_STUDENT && // He/she is a student in the current course (ItsMe || IAmLoggedAsTeacher || IAmLoggedAsSysAdm)) // I can view { @@ -2307,12 +2307,20 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, Act_FormEnd (); /***** Button to view user's attendance *****/ - // TODO: A student should see her/his attendance - if (IAmLoggedAsTeacher || IAmLoggedAsSysAdm) + if (IAmLoggedAsStudent || + IAmLoggedAsTeacher || + IAmLoggedAsSysAdm) { - Act_FormStart (ActSeeLstStdAtt); - Par_PutHiddenParamString ("UsrCodStd",UsrDat->EncryptedUsrCod); - Grp_PutParamAllGroups (); + if (IAmLoggedAsStudent) + // As student, I can see my attendance + Act_FormStart (ActSeeLstMyAtt); + else // IAmLoggedAsTeacher || IAmLoggedAsSysAdm + { + // As teacher, I can see attendance of the student + Act_FormStart (ActSeeLstStdAtt); + Par_PutHiddenParamString ("UsrCodStd",UsrDat->EncryptedUsrCod); + Grp_PutParamAllGroups (); + } Act_LinkFormSubmit (Txt_Attendance,ClassData); fprintf (Gbl.F.Out,"
" @@ -2823,9 +2831,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, fprintf (Gbl.F.Out,">%s", Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]); } - fprintf (Gbl.F.Out,""); - - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" + "" ""); } } diff --git a/swad_survey.c b/swad_survey.c index 6174390b1..0761b7ab3 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -734,7 +734,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) Svy_PutHiddenParamSvyOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("delon",Txt_Remove); + Act_PutIconLink ("delon16x16.gif",Txt_Remove); /***** Put form to reset survey *****/ Act_FormStart (ActReqRstSvy); @@ -742,7 +742,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) Svy_PutHiddenParamSvyOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("reset",Txt_Reset); + Act_PutIconLink ("reset16x16.gif",Txt_Reset); /***** Put form to hide/show survey *****/ Act_FormStart (Visible ? ActHidSvy : @@ -752,9 +752,9 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); if (Visible) - Act_PutIconLink ("visible_on",Txt_Hide); + Act_PutIconLink ("visible_on16x16.gif",Txt_Hide); else - Act_PutIconLink ("hidden_on",Txt_Show); + Act_PutIconLink ("hidden_on16x16.gif",Txt_Show); /***** Put form to edit survey *****/ Act_FormStart (ActEdiOneSvy); @@ -762,7 +762,7 @@ static void Svy_PutFormsToRemEditOneSvy (long SvyCod,bool Visible) Svy_PutHiddenParamSvyOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_PutIconLink ("edit",Txt_Edit); + Act_PutIconLink ("edit16x16.gif",Txt_Edit); fprintf (Gbl.F.Out,"
"); }