mirror of https://github.com/acanas/swad-core.git
Version 16.86.6
This commit is contained in:
parent
fe81a59198
commit
7daeabb79e
|
@ -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)
|
||||
|
|
|
@ -639,7 +639,6 @@ struct Globals
|
|||
long GrpCod; // Group code (-1 if no group selected)
|
||||
struct
|
||||
{
|
||||
bool PutIconWhichGroups;
|
||||
bool PutIconEditCrsTT;
|
||||
bool PutIconEditOfficeHours;
|
||||
bool PutIconPrint;
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue