diff --git a/swad_changelog.h b/swad_changelog.h index d4a0fe780..cb673446a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,13 +129,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.146 (2016-03-16)" +#define Log_PLATFORM_VERSION "SWAD 15.146.1 (2016-03-16)" #define CSS_FILE "swad15.146.css" #define JS_FILE "swad15.131.3.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 15.146.1: Mar 16, 2016 Icons to remove/edit/print an exam announcement integrated in frame. (195771 lines) Version 15.146: Mar 16, 2016 Now frame rectangles can have icons at top. Icon to edit banners integrated in frame. (195772 lines) Version 15.145.6: Mar 16, 2016 Fixed bug in connected users. (195757 lines) diff --git a/swad_exam.c b/swad_exam.c index 0f28001c0..67359a7d1 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -78,6 +78,7 @@ static long Exa_AddExamAnnouncementToDB (void); static void Exa_ModifyExamAnnouncementInDB (long ExaCod); static void Exa_GetDataExamAnnouncementFromDB (long ExaCod); static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t TypeViewExamAnnouncement); +static void Exa_PutIconsExamAnnouncement (void); static void Exa_PutParamExaCod (void); static void Exa_GetNotifContentExamAnnouncement (char **ContentStr); @@ -724,9 +725,6 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t { extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE]; extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_Remove; - extern const char *Txt_Edit; - extern const char *Txt_Print; extern const char *Txt_EXAM_ANNOUNCEMENT; extern const char *Txt_EXAM_ANNOUNCEMENT_Course; extern const char *Txt_EXAM_ANNOUNCEMENT_Year; @@ -773,37 +771,10 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t } /***** Start frame *****/ - Lay_StartRoundFrameTable ("625px",0,NULL); - - if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) - { - Gbl.LstExamAnnouncements.ExaCodToEdit = ExaCod; // Used as parameters in contextual links - - fprintf (Gbl.F.Out,"" \ - ""); - - if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) - { - /***** Link to remove this exam announcement *****/ - Lay_PutContextualLink (ActRemExaAnn,Exa_PutParamExaCod,"remove-on64x64.png", - Txt_Remove,NULL); - - /***** Link to edit this exam announcement *****/ - Lay_PutContextualLink (ActEdiExaAnn,Exa_PutParamExaCod,"edit64x64.png", - Txt_Edit,NULL); - } - - /***** Link to print view *****/ - Lay_PutContextualLink (ActPrnExaAnn,Exa_PutParamExaCod,"print64x64.png", - Txt_Print,NULL); - - fprintf (Gbl.F.Out,"" - ""); - } - - fprintf (Gbl.F.Out,"" \ - ""); + Gbl.LstExamAnnouncements.ExaCodToEdit = ExaCod; // Used as parameter in contextual links + Lay_StartRoundFrame ("625px",NULL, + TypeViewExamAnnouncement == Exa_NORMAL_VIEW ? Exa_PutIconsExamAnnouncement : + NULL); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1210,21 +1181,46 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_TypeViewExamAnnouncement_t ""); /***** End frame *****/ - fprintf (Gbl.F.Out,"" \ - ""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) - Lay_EndRoundFrameTableWithButton ((ExaCod > 0) ? Lay_CONFIRM_BUTTON : - Lay_CREATE_BUTTON, - Txt_Publish_announcement_OF_EXAM); + Lay_EndRoundFrameWithButton ((ExaCod > 0) ? Lay_CONFIRM_BUTTON : + Lay_CREATE_BUTTON, + Txt_Publish_announcement_OF_EXAM); else - Lay_EndRoundFrameTable (); + Lay_EndRoundFrame (); if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) QR_ExamAnnnouncement (); } /*****************************************************************************/ -/***************** Params used to edit an attendance event *******************/ +/********* Put icons to remove / edit / print an exam announcement ***********/ +/*****************************************************************************/ + +static void Exa_PutIconsExamAnnouncement (void) + { + extern const char *Txt_Remove; + extern const char *Txt_Edit; + extern const char *Txt_Print; + + if (Gbl.Usrs.Me.LoggedRole == Rol_TEACHER || + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) + { + /***** Link to remove this exam announcement *****/ + Lay_PutContextualLink (ActRemExaAnn,Exa_PutParamExaCod,"remove-on64x64.png", + Txt_Remove,NULL); + + /***** Link to edit this exam announcement *****/ + Lay_PutContextualLink (ActEdiExaAnn,Exa_PutParamExaCod,"edit64x64.png", + Txt_Edit,NULL); + } + + /***** Link to print view *****/ + Lay_PutContextualLink (ActPrnExaAnn,Exa_PutParamExaCod,"print64x64.png", + Txt_Print,NULL); + } + +/*****************************************************************************/ +/*************** Param with the code of an exam announcement *****************/ /*****************************************************************************/ static void Exa_PutParamExaCod (void)