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 18.45.4

This commit is contained in:
Antonio Cañas Vargas 2019-02-15 13:59:30 +01:00
parent 85b0e6100e
commit 64268e724f
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -365,8 +365,6 @@ Buenos d
// Para bloquear/desbloquear se usará un icono candado
// Para preasignado/no preasignado usar otro icono (usuario/usuario tachado, por ej.)
// TODO: Check -> /* Write new year greeting */
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
@ -386,10 +384,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.45.3 (2019-02-15)"
#define Log_PLATFORM_VERSION "SWAD 18.45.4 (2019-02-15)"
#define CSS_FILE "swad18.41.1.css"
#define JS_FILE "swad18.32.1.js"
/*
Version 18.45.4: Feb 15, 2019 Changes in new year greeting. (238431 lines)
Version 18.45.3: Feb 15, 2019 Contextual icon to see calendar from holidays. (238434 lines)
Version 18.45.2: Feb 15, 2019 Changed holidays icon. (238411 lines)
Copy the following icons to icon public directory:

14
swad_layout.c
View File

@ -112,7 +112,6 @@ void Lay_WriteStartOfPage (void)
extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES];
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *The_TabOnBgColors[The_NUM_THEMES];
extern const char *Txt_NEW_YEAR_GREETING;
const char *LayoutMainZone[Mnu_NUM_MENUS] =
{
"main_horizontal", // Mnu_MENU_HORIZONTAL
@ -344,19 +343,6 @@ void Lay_WriteStartOfPage (void)
Gbl.Layout.WritingHTMLStart = false;
Gbl.Layout.HTMLStartWritten = true;
/* Write new year greeting */
if (Gbl.Action.Act == ActLogIn ||
Gbl.Action.Act == ActLogInNew ||
Gbl.Action.Act == ActLogInLan)
if (Gbl.Now.Date.Month == 1 &&
Gbl.Now.Date.Day == 1)
{
fprintf (Gbl.F.Out,"<div class=\"ASG_TITLE CENTER_MIDDLE\""
" style=\"margin:62px;\">");
fprintf (Gbl.F.Out,Txt_NEW_YEAR_GREETING,Gbl.Now.Date.Year);
fprintf (Gbl.F.Out,"</div>");
}
/* Write message indicating number of clicks allowed before sending my photo */
Usr_InformAboutNumClicksBeforePhoto ();
}

11
swad_user.c
View File

@ -2508,6 +2508,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
void Usr_WelcomeUsr (void)
{
extern const unsigned Txt_Current_CGI_SWAD_Language;
extern const char *Txt_NEW_YEAR_GREETING;
extern const char *Txt_Happy_birthday_X;
extern const char *Txt_Please_check_your_email_address;
extern const char *Txt_Check;
@ -2519,6 +2520,16 @@ void Usr_WelcomeUsr (void)
{
if (Gbl.Usrs.Me.UsrDat.FirstName[0])
{
/***** New year greeting *****/
if (Gbl.Now.Date.Day == 1 &&
Gbl.Now.Date.Month == 1)
{
snprintf (Gbl.Alert.Txt,sizeof (Gbl.Alert.Txt),
Txt_NEW_YEAR_GREETING,
Gbl.Now.Date.Year);
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
}
/***** Birthday congratulation *****/
if (Gbl.Usrs.Me.UsrDat.Birthday.Day == Gbl.Now.Date.Day &&
Gbl.Usrs.Me.UsrDat.Birthday.Month == Gbl.Now.Date.Month)