diff --git a/swad_changelog.h b/swad_changelog.h index bac122cb9..9f0624d86 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -129,14 +129,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.147.5 (2016-03-16)" +#define Log_PLATFORM_VERSION "SWAD 15.147.6 (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.147.5: Mar 16, 2016 Icon to edit links integrated in frame. (195863 lines) + Version 15.147.6: Mar 16, 2016 Icon to edit departments integrated in frame. (195862 lines) + Version 15.147.5: Mar 16, 2016 Icon to edit institutional links integrated in frame. (195863 lines) Version 15.147.4: Mar 16, 2016 Icon to edit places integrated in frame. (195866 lines) Version 15.147.3: Mar 16, 2016 Icon to edit groups integrated in frame. (195867 lines) Version 15.147.2: Mar 16, 2016 Icon to edit degree types integrated in frame. (195866 lines) diff --git a/swad_department.c b/swad_department.c index 11f7cb418..b8a1be922 100644 --- a/swad_department.c +++ b/swad_department.c @@ -62,7 +62,7 @@ extern struct Globals Gbl; /*****************************************************************************/ static void Dpt_GetParamDptOrderType (void); -static void Dpt_PutFormToEditDpts (void); +static void Dpt_PutIconToEditDpts (void); static void Dpt_ListDepartmentsForEdition (void); static void Dpt_PutParamDptCod (long DptCod); static void Dpt_RenameDepartment (Cns_ShortOrFullName_t ShortOrFullName); @@ -95,13 +95,12 @@ void Dpt_SeeDepts (void) /***** Get list of departments *****/ Dpt_GetListDepartments (Gbl.CurrentIns.Ins.InsCod); - /***** Put link (form) to edit departments *****/ - if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) - Dpt_PutFormToEditDpts (); - /***** Table head *****/ - Lay_StartRoundFrameTable (NULL,0,Txt_Departments); - fprintf (Gbl.F.Out,""); + Lay_StartRoundFrame (NULL,Txt_Departments, + Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Dpt_PutIconToEditDpts : + NULL); + fprintf (Gbl.F.Out,"" + ""); for (Order = Dpt_ORDER_BY_DEPARTMENT; Order <= Dpt_ORDER_BY_NUM_TCHS; Order++) @@ -180,7 +179,8 @@ void Dpt_SeeDepts (void) Rol_TEACHER) - NumTchsInsWithDpt); /***** Table end *****/ - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
"); + Lay_EndRoundFrame (); /***** Free list of departments *****/ Dpt_FreeListDepartments (); @@ -204,17 +204,14 @@ static void Dpt_GetParamDptOrderType (void) } /*****************************************************************************/ -/******************** Put a link (form) to edit departments ******************/ +/************************ Put icon to edit departments ***********************/ /*****************************************************************************/ -static void Dpt_PutFormToEditDpts (void) +static void Dpt_PutIconToEditDpts (void) { extern const char *Txt_Edit; - fprintf (Gbl.F.Out,"
"); - Lay_PutContextualLink (ActEdiDpt,NULL,"edit64x64.png", - Txt_Edit,Txt_Edit); - fprintf (Gbl.F.Out,"
"); + Lay_PutContextualLink (ActEdiDpt,NULL,"edit64x64.png",Txt_Edit,NULL); } /*****************************************************************************/