From 9517f63bc8247ea23a6877771debac35427d7a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 5 Dec 2016 03:16:25 +0100 Subject: [PATCH] Version 16.86.9 --- swad_agenda.c | 34 ++++++++++++++++++++++++++++++++-- swad_changelog.h | 5 +++-- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/swad_agenda.c b/swad_agenda.c index b11ab69e2..81863af53 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -71,7 +71,9 @@ typedef enum static void Agd_ShowEvents (Agd_AgendaType_t AgendaType); +static void Agd_PutIconsListEvents (void); static void Agd_PutIconToCreateNewEvent (void); +static void Agd_PutIconToShowQR (void); static void Agd_PutButtonToCreateNewEvent (void); static void Agd_PutParamsToCreateNewEvent (void); static void Agd_ShowFormToSelWhichEvents (Act_Action_t Action); @@ -208,13 +210,13 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) { case Agd_ALL_EVENTS: Lay_StartRoundFrame ("100%",Txt_My_agenda, - Agd_PutIconToCreateNewEvent, + Agd_PutIconsListEvents, Hlp_PROFILE_Agenda); break; case Agd_ONLY_PUBLIC_EVENTS: sprintf (Gbl.Title,Txt_Public_agenda_USER,Gbl.Usrs.Me.UsrDat.FullName); Lay_StartRoundFrame ("100%",Gbl.Title, - Agd_PutIconToCreateNewEvent, + Agd_PutIconsListEvents, Hlp_PROFILE_Agenda); break; } @@ -296,6 +298,19 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) Agd_FreeListEvents (); } +/*****************************************************************************/ +/***************** Put contextual icons in list of events ********************/ +/*****************************************************************************/ + +static void Agd_PutIconsListEvents (void) + { + /***** Put icon to create a new event *****/ + Agd_PutIconToCreateNewEvent (); + + /***** Put icon to show QR code *****/ + Agd_PutIconToShowQR (); + } + /*****************************************************************************/ /********************** Put icon to create a new event ***********************/ /*****************************************************************************/ @@ -311,6 +326,21 @@ static void Agd_PutIconToCreateNewEvent (void) NULL); } +/*****************************************************************************/ +/********************** Put icon to create a new event ***********************/ +/*****************************************************************************/ + +static void Agd_PutIconToShowQR (void) + { + extern const char *Txt_QR_code; + + /***** Put form to create a new event *****/ + Lay_PutContextualLink (ActFrmNewEvtMyAgd,NULL, + "qr64x64.gif", + Txt_QR_code,NULL, + NULL); + } + /*****************************************************************************/ /********************* Put button to create a new event **********************/ /*****************************************************************************/ diff --git a/swad_changelog.h b/swad_changelog.h index a187746dd..03beb9046 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -183,14 +183,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.86.8 (2016-12-05)" +#define Log_PLATFORM_VERSION "SWAD 16.86.9 (2016-12-05)" #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.8: Dec 05, 2016 Changes in layout of user's agenda. (? lines) + Version 16.86.9: Dec 05, 2016 Link to QR in user's agenda. Not finished. (209889 lines) + Version 16.86.8: Dec 05, 2016 Changes in layout of user's agenda. (209864 lines) Version 16.86.7: Dec 05, 2016 Changes in icons for open/closed and public/private. (209852 lines) 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)