From 7daeabb79e71cf141c0a081ce6917ee72ba5f3bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 4 Dec 2016 23:31:48 +0100 Subject: [PATCH] Version 16.86.6 --- swad_changelog.h | 3 ++- swad_global.h | 1 - swad_timetable.c | 40 +--------------------------------------- 3 files changed, 3 insertions(+), 41 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 73a0d20fe..0098fb536 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,13 +183,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.86.5 (2016-12-04)" +#define Log_PLATFORM_VERSION "SWAD 16.86.6 (2016-12-04)" #define CSS_FILE "swad16.86.5.css" #define JS_FILE "swad16.84.2.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.86.6: Dec 04, 2016 Removed contextual icons to change which groups to show. (209876 lines) Version 16.86.5: Dec 04, 2016 Changes in layout of forms to change which groups to show / first day of week. (209913 lines) Version 16.86.4: Dec 04, 2016 Contextual icons to change which groups to show. (209864 lines) Version 16.86.3: Dec 04, 2016 Changed icons related to hierarchy. (209815 lines) diff --git a/swad_global.h b/swad_global.h index 4c13dc692..19b19c847 100644 --- a/swad_global.h +++ b/swad_global.h @@ -639,7 +639,6 @@ struct Globals long GrpCod; // Group code (-1 if no group selected) struct { - bool PutIconWhichGroups; bool PutIconEditCrsTT; bool PutIconEditOfficeHours; bool PutIconPrint; diff --git a/swad_timetable.c b/swad_timetable.c index 8ee4956be..46f7d56de 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -257,9 +257,6 @@ void TT_ShowClassTimeTable (void) Lay_ShowErrorAndExit ("Wrong action."); } - Gbl.TimeTable.ContextualIcons.PutIconWhichGroups = Gbl.TimeTable.Type == TT_MY_TIMETABLE || - (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE && - Gbl.CurrentCrs.Grps.NumGrps); Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT = (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE && !PrintView && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER); @@ -273,8 +270,7 @@ void TT_ShowClassTimeTable (void) /***** Start frame *****/ Lay_StartRoundFrame ("100%",Txt_TIMETABLE_TYPES[Gbl.TimeTable.Type], - (Gbl.TimeTable.ContextualIcons.PutIconWhichGroups || - Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || + (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT || Gbl.TimeTable.ContextualIcons.PutIconEditOfficeHours || Gbl.TimeTable.ContextualIcons.PutIconPrint) ? TT_PutContextualIcons : NULL, @@ -319,43 +315,9 @@ void TT_ShowClassTimeTable (void) static void TT_PutContextualIcons (void) { - extern const char *Txt_Show_WHICH_groups[2]; extern const char *Txt_Edit; extern const char *Txt_Edit_office_hours; extern const char *Txt_Print; - Act_Action_t Action; - - if (Gbl.TimeTable.ContextualIcons.PutIconWhichGroups) - { - switch (Gbl.TimeTable.Type) - { - case TT_COURSE_TIMETABLE: - Action = ActSeeCrsTT; - break; - case TT_MY_TIMETABLE: - Action = ActSeeMyTT; - break; - default: // Not used - Action = ActUnk; - break; - } - if (Action != ActUnk) // Always true - switch (Gbl.CurrentCrs.Grps.WhichGrps) - { - case Grp_ONLY_MY_GROUPS: - Lay_PutContextualLink (Action,Grp_PutParamWhichGrpsAllGrps, - "hierarchy64x64.png", - Txt_Show_WHICH_groups[Grp_ALL_GROUPS],NULL, - NULL); - break; - case Grp_ALL_GROUPS: - Lay_PutContextualLink (Action,Grp_PutParamWhichGrpsOnlyMyGrps, - "myhierarchy64x64.png", - Txt_Show_WHICH_groups[Grp_ONLY_MY_GROUPS],NULL, - NULL); - break; - } - } if (Gbl.TimeTable.ContextualIcons.PutIconEditCrsTT) Lay_PutContextualLink (ActEdiCrsTT,Grp_PutParamWhichGrps,