Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.158.1

This commit is contained in:
Antonio Cañas Vargas 2017-03-21 01:35:36 +01:00
parent ac7a29b84d
commit 7f3c6222d6
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
icon/future64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
icon/past64x64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

20
swad_agenda.c
View File

@ -166,8 +166,8 @@ static void Agd_ShowFormToSelPastFutureEvents (void)
Agd_PastFutureEvents_t PstFut;
static const char *Image[2] =
{
"backward64x64.png", // Agd_PAST_EVENTS
"forward64x64.png", // Agd_FUTURE_EVENTS
"past64x64.png", // Agd_PAST_EVENTS
"future64x64.png", // Agd_FUTURE_EVENTS
};
fprintf (Gbl.F.Out,"<div class=\"PREF_CONTAINER\">");
@ -216,11 +216,11 @@ static void Agd_ShowFormToSelPrivatePublicEvents (void)
PrvPub++)
{
fprintf (Gbl.F.Out,"<div class=\"%s\">",
(Gbl.Agenda.PastFutureEvents & (1 << PrvPub)) ? "PREF_ON" :
"PREF_OFF");
(Gbl.Agenda.PrivatePublicEvents & (1 << PrvPub)) ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActSeeMyAgd);
Agd_PutHiddenParamsPastFutureEvents (1 << PrvPub);
Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
Agd_PutHiddenParamsPrivatePublicEvents (1 << PrvPub);
Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
@ -256,12 +256,12 @@ static void Agd_ShowFormToSelHiddenVisibleEvents (void)
HidVis++)
{
fprintf (Gbl.F.Out,"<div class=\"%s\">",
(Gbl.Agenda.PastFutureEvents & (1 << HidVis)) ? "PREF_ON" :
"PREF_OFF");
(Gbl.Agenda.HiddenVisibleEvents & (1 << HidVis)) ? "PREF_ON" :
"PREF_OFF");
Act_FormStart (ActSeeMyAgd);
Agd_PutHiddenParamsPastFutureEvents (1 << HidVis);
Agd_PutHiddenParamsPastFutureEvents (Gbl.Agenda.PastFutureEvents);
Agd_PutHiddenParamsPrivatePublicEvents (Gbl.Agenda.PrivatePublicEvents);
Agd_PutHiddenParamsHiddenVisibleEvents (Gbl.Agenda.HiddenVisibleEvents);
Agd_PutHiddenParamsHiddenVisibleEvents (1 << HidVis);
fprintf (Gbl.F.Out,"<input type=\"image\" src=\"%s/%s\""
" alt=\"%s\" title=\"%s\" class=\"ICO25x25\""

5
swad_changelog.h
View File

@ -210,14 +210,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.158 (2017-03-21)"
#define Log_PLATFORM_VERSION "SWAD 16.158.1 (2017-03-21)"
#define CSS_FILE "swad16.157.css"
#define JS_FILE "swad16.144.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.158: Mar 21, 2017 Changes in agenda. No finished.
Version 16.158.1: Mar 21, 2017 Changes in agenda. Not finished. (217395 lines)
Version 16.158: Mar 21, 2017 Changes in agenda. Not finished.
Fixed bug in user enrollment. (217394 lines)
Copy the following icons to icon public directory:
sudo cp -a backward64x64.png /var/www/html/swad/icon/

2
swad_global.c
View File

@ -424,7 +424,7 @@ void Gbl_InitializeGlobals (void)
/* Agenda */
Gbl.Agenda.PastFutureEvents = (1 << Agd_FUTURE_EVENTS);
Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) &
Gbl.Agenda.PrivatePublicEvents = (1 << Agd_PRIVATE_EVENTS) |
(1 << Agd_PUBLIC_EVENTS);
Gbl.Agenda.HiddenVisibleEvents = (1 << Agd_VISIBLE_EVENTS);
Gbl.Agenda.SelectedOrder = Agd_ORDER_DEFAULT;