diff --git a/swad_changelog.h b/swad_changelog.h index fc395e01b..712b43c89 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.48.7 (2016-11-07)" +#define Log_PLATFORM_VERSION "SWAD 16.48.8 (2016-11-07)" #define CSS_FILE "swad16.48.4.css" #define JS_FILE "swad16.46.1.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.48.8: Nov 07, 2016 Icon in preferences-notifications to show figure (statistics). (206518 lines) Version 16.48.7: Nov 07, 2016 Icon in preferences-privacy to show figure (statistics). (206505 lines) Version 16.48.6: Nov 07, 2016 Icon in preferences-columns to show figure (statistics). (206492 lines) Version 16.48.5: Nov 07, 2016 Icon in preferences-menu to show figure (statistics). (206479 lines) diff --git a/swad_notification.c b/swad_notification.c index b812b5709..745f88a1c 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -271,6 +271,8 @@ static void Ntf_GetNumNotifSent (long DegCod,long CrsCod, static void Ntf_UpdateNumNotifSent (long DegCod,long CrsCod, Ntf_NotifyEvent_t NotifyEvent, unsigned NumEvents,unsigned NumMails); + +static void Ntf_PutIconsNotif (void); static void Ntf_GetParamsNotifyEvents (void); static unsigned Ntf_GetNumberOfAllMyUnseenNtfs (void); static unsigned Ntf_GetNumberOfMyNewUnseenNtfs (void); @@ -1863,12 +1865,12 @@ void Ntf_PutFormChangeNotifSentByEMail (void) extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS]; Ntf_NotifyEvent_t NotifyEvent; + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif); + /***** Start form *****/ Act_FormStart (ActChgNtfPrf); - /***** Start frame *****/ - Lay_StartRoundFrame (NULL,Txt_Notifications,NULL); - /***** Warning if I can not receive e-mail notifications *****/ if (!Mai_CheckIfUsrCanReceiveEmailNotif (&Gbl.Usrs.Me.UsrDat)) Mai_WriteWarningEmailNotifications (); @@ -1917,11 +1919,25 @@ void Ntf_PutFormChangeNotifSentByEMail (void) fprintf (Gbl.F.Out,""); - /***** Button to save changes and end frame *****/ - Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Save_changes); + /***** Button to save changes *****/ + Lay_PutConfirmButton (Txt_Save_changes); /***** End form *****/ Act_FormEnd (); + + /***** End frame *****/ + Lay_EndRoundFrame (); + } + +/*****************************************************************************/ +/************* Put contextual icons in notifications preference **************/ +/*****************************************************************************/ + +static void Ntf_PutIconsNotif (void) + { + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_NOTIFY_EVENTS; + Sta_PutIconToShowFigure (); } /*****************************************************************************/ diff --git a/swad_privacy.c b/swad_privacy.c index 5ad4df921..6bdd3eaa2 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -134,7 +134,7 @@ void Pri_EditMyPrivacy (void) } /*****************************************************************************/ -/****************** Put contextual icons in menu preference ******************/ +/***************** Put contextual icons in privacy preference ****************/ /*****************************************************************************/ static void Pri_PutIconsPrivacy (void)