diff --git a/swad_changelog.h b/swad_changelog.h index dd1125bfd..9f67c9184 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -209,13 +209,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.164.2 (2017-03-24)" +#define Log_PLATFORM_VERSION "SWAD 16.164.4 (2017-03-24)" #define CSS_FILE "swad16.161.css" #define JS_FILE "swad16.144.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.164.4: Mar 24, 2017 Link to figures in types of degree. (217604 lines) Version 16.164.3: Mar 24, 2017 Fixed bug in types of degree. Types of degree in system tab restricted to system admins only. (217579 lines) Version 16.164.2: Mar 24, 2017 Code refactoring in types of degree. (217576 lines) diff --git a/swad_degree_type.c b/swad_degree_type.c index 264b25359..71ca43424 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -69,6 +69,7 @@ static DT_Order_t DT_GetParamDegTypOrder (DT_Order_t DefaultOrder); static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder); static void DT_EditDegreeTypes (void); static void DT_ListDegreeTypesForSeeing (void); +static void DT_PutIconsListDegTypes (void); static void DT_PutIconToEditDegTypes (void); static void DT_ListDegreeTypesForEdition (void); @@ -201,12 +202,23 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder if (Gbl.Degs.DegTypes.Num) { /***** Write heading *****/ - Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree, - Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? DT_PutIconToEditDegTypes : - NULL, - (NextAction == ActSeeDegTyp) ? Hlp_SYSTEM_Studies : - Hlp_STATS_Figures_types_of_degree, - 2); + switch (NextAction) + { + case ActSeeDegTyp: + Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree, + DT_PutIconsListDegTypes, + Hlp_SYSTEM_Studies, + 2); + break; + case ActSeeUseGbl: + Lay_StartRoundFrameTable (NULL,Txt_Types_of_degree, + DT_PutIconToEditDegTypes, + Hlp_STATS_Figures_types_of_degree, + 2); + break; + default: // Bad call + return; + } DT_PutHeadDegreeTypesForSeeing (NextAction,SelectedOrder); /***** List current degree types for seeing *****/ @@ -281,6 +293,20 @@ static void DT_ListDegreeTypesForSeeing (void) } } +/*****************************************************************************/ +/************** Put contextual icons in list of degree types *****************/ +/*****************************************************************************/ + +static void DT_PutIconsListDegTypes (void) + { + /***** Put icon to edit degree types *****/ + DT_PutIconToEditDegTypes (); + + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_DEGREE_TYPES; + Sta_PutIconToShowFigure (); + } + /*****************************************************************************/ /******************* Put link (form) to edit degree types ********************/ /*****************************************************************************/ @@ -289,10 +315,11 @@ static void DT_PutIconToEditDegTypes (void) { extern const char *Txt_Edit; - Lay_PutContextualLink (ActEdiDegTyp,NULL, - "edit64x64.png", - Txt_Edit,NULL, - NULL); + if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) + Lay_PutContextualLink (ActEdiDegTyp,NULL, + "edit64x64.png", + Txt_Edit,NULL, + NULL); } /*****************************************************************************/