diff --git a/swad_action.c b/swad_action.c index 6830df07a..eb07b8e66 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2843,14 +2843,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActUnbUsrMsg */{1016,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenShowingMsgs ,NULL}, /* ActUnbUsrLst */{1018,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenListingUsrs ,NULL}, - // TabSta ****************************************************************** + // TabAna ****************************************************************** // Actions in menu: - /* ActReqUseGbl */{ 761, 0,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, - /* ActSeePhoDeg */{ 447, 1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, - /* ActReqStaCrs */{ 767, 2,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, - /* ActReqAccGbl */{ 591, 3,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, - /* ActReqMyUsgRep */{1586, 4,TabSta,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, - /* ActMFUAct */{ 993, 5,TabSta,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, + /* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, + /* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, + /* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, + /* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, + /* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, + /* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, // Actions not in menu: /* ActSeeUseGbl */{ 84,-1,TabUnk,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ShowFigures ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index 9d76e104f..d65660649 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,14 +221,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.193.1 (2017-04-27)" +#define Log_PLATFORM_VERSION "SWAD 16.193.2 (2017-04-27)" #define CSS_FILE "swad16.192.css" #define JS_FILE "swad16.181.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.193.1: Apr 27, 2017 Examn announcements action moved to end of assessment tab. (218263 lines) + Version 16.193.2: Apr 27, 2017 Statistics tab is renamed as Analytics tab. (218265 lines) + Version 16.193.1: Apr 27, 2017 Exam announcements action moved to end of assessment tab. (218263 lines) Version 16.193: Apr 27, 2017 Surveys action moved from statistics to assessment tab. (218262 lines) Version 16.192.1: Apr 25, 2017 Code refactoring in timetable. (218258 lines) Version 16.192: Apr 25, 2017 Changes in layout and code refactoring in timetable. (218262 lines) diff --git a/swad_menu.c b/swad_menu.c index 99e4b2148..5ad7179cc 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -248,7 +248,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB 0, // 10 0, // 11 }, - // TabSta ******************* + // TabAna ******************* { ActReqUseGbl, // 0 ActSeePhoDeg, // 1 diff --git a/swad_statistic.c b/swad_statistic.c index 7f587f750..47dc00997 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -3865,8 +3865,9 @@ void Sta_ReqShowFigures (void) { extern const char *Hlp_STATS_Figures; extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *Txt_Statistic; + extern const char *Txt_Figures; extern const char *Txt_Scope; + extern const char *Txt_Statistic; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES]; extern const char *Txt_Show_statistic; Sta_FigureType_t FigureType; @@ -3875,7 +3876,7 @@ void Sta_ReqShowFigures (void) Act_FormStart (ActSeeUseGbl); /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Statistic,NULL,Hlp_STATS_Figures); + Lay_StartRoundFrame (NULL,Txt_Figures,NULL,Hlp_STATS_Figures); /***** Compute stats for anywhere, degree or course? *****/ fprintf (Gbl.F.Out,"