diff --git a/icon/iconset/nuvola/action64x64/crs64x64.gif b/icon/iconset/nuvola/action64x64/crs64x64.gif index 8293dec82..03148fe81 100644 Binary files a/icon/iconset/nuvola/action64x64/crs64x64.gif and b/icon/iconset/nuvola/action64x64/crs64x64.gif differ diff --git a/swad_calendar.c b/swad_calendar.c index bbf99f01e..707785816 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -190,6 +190,7 @@ void Cal_DrawCurrentMonth (void) { extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES]; char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256]; + Act_Action_t ActionSeeCalendar; /***** Get list of holidays *****/ if (!Gbl.Hlds.LstIsRead) @@ -212,7 +213,19 @@ void Cal_DrawCurrentMonth (void) Gbl.CurrentCtr.Ctr.PlcCod, Cfg_URL_SWAD_CGI, Txt_STR_LANG_ID[Gbl.Prefs.Language]); - Act_SetParamsForm (ParamsStr,ActSeeCalCrs,true); + if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected + ActionSeeCalendar = ActSeeCalCrs; + else if (Gbl.CurrentDeg.Deg.DegCod > 0) // Degree selected + ActionSeeCalendar = ActSeeCalDeg; + else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // Centre selected + ActionSeeCalendar = ActSeeCalCtr; + else if (Gbl.CurrentIns.Ins.InsCod > 0) // Institution selected + ActionSeeCalendar = ActSeeCalIns; + else if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected + ActionSeeCalendar = ActSeeCalCty; + else + ActionSeeCalendar = ActSeeCalSys; + Act_SetParamsForm (ParamsStr,ActionSeeCalendar,true); fprintf (Gbl.F.Out,"'%s',",ParamsStr); Act_SetParamsForm (ParamsStr,ActSeeDatExaAnn,true); fprintf (Gbl.F.Out,"'%s');" diff --git a/swad_changelog.h b/swad_changelog.h index 2216c08d2..fb0bdeb15 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -193,19 +193,25 @@ // TODO: Ver solución de Guillermo Gómez Trenado cuando se pulsa con el botón derecho para abrir una descarga en otra ventana // TODO: Check icons in course and files tabs -// TODO: Link from current month to calendar depending on scope /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.134 (2017-02-09)" +#define Log_PLATFORM_VERSION "SWAD 16.134.1 (2017-02-09)" #define CSS_FILE "swad16.132.4.css" #define JS_FILE "swad16.123.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.134.1: Feb 09, 2017 Link from current month to calendar depending on scope. (212446 lines) +Copy the following icons to icon public directory: +sudo cp icon/iconset/awesome/action64x64/crs64x64.gif /var/www/html/swad/icon/iconset/awesome/action64x64/crs64x64.gif +sudo cp icon/iconset/nuvola/action64x64/crs64x64.gif /var/www/html/swad/icon/iconset/nuvola/action64x64/crs64x64.gif +sudo cp icon/iconset/awesome/action64x64/fil64x64.gif /var/www/html/swad/icon/iconset/awesome/action64x64/fil64x64.gif +sudo cp icon/iconset/nuvola/action64x64/fil64x64.gif /var/www/html/swad/icon/iconset/nuvola/action64x64/fil64x64.gif + Version 16.134: Feb 09, 2017 New calendars options. (212428 lines) 18 changes necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1622','es','N','Ver calendario plataforma');