From c4137693cbe21b048c9f353b8c06f7c678020227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 9 Feb 2017 09:57:33 +0100 Subject: [PATCH] Version 16.134.1 --- icon/iconset/nuvola/action64x64/crs64x64.gif | Bin 2863 -> 2362 bytes swad_calendar.c | 15 ++++++++++++++- swad_changelog.h | 10 ++++++++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/icon/iconset/nuvola/action64x64/crs64x64.gif b/icon/iconset/nuvola/action64x64/crs64x64.gif index 8293dec820478c4b9c9e53339e7881c49fcfe1d5..03148fe81d77506a02f02da65f7aab7effab9ed7 100644 GIT binary patch literal 2362 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 N&hnPKoFoAO06Pu2gp~jQ 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');