diff --git a/swad_changelog.h b/swad_changelog.h index 712b43c89..317b6b6fc 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.48.8 (2016-11-07)" +#define Log_PLATFORM_VERSION "SWAD 16.48.9 (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.9: Nov 07, 2016 Icon in my notifications to show figure (statistics). (206521 lines) 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) diff --git a/swad_notification.c b/swad_notification.c index 745f88a1c..21fe7bf99 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -256,6 +256,8 @@ static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] = /***************************** Private prototypes ****************************/ /*****************************************************************************/ +static void Ntf_PutIconsNotif (void); + static void Ntf_WriteFormAllNotifications (bool AllNotifications); static bool Ntf_GetAllNotificationsFromForm (void); @@ -272,7 +274,6 @@ 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); @@ -370,8 +371,9 @@ void Ntf_ShowMyNotifications (void) Usr_UsrDataConstructor (&UsrDat); /***** Table start *****/ - Lay_StartRoundFrameTable (NULL,2,Txt_Notifications); - fprintf (Gbl.F.Out,"" + Lay_StartRoundFrame (NULL,Txt_Notifications,Ntf_PutIconsNotif); + fprintf (Gbl.F.Out,"" + "" "" @@ -612,7 +614,8 @@ void Ntf_ShowMyNotifications (void) } /***** End table *****/ - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
" "%s" "
"); + Lay_EndRoundFrame (); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -630,6 +633,17 @@ void Ntf_ShowMyNotifications (void) Ntf_UpdateMyLastAccessToNotifications (); } +/*****************************************************************************/ +/****************** Put contextual icons in notifications ********************/ +/*****************************************************************************/ + +static void Ntf_PutIconsNotif (void) + { + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_NOTIFY_EVENTS; + Sta_PutIconToShowFigure (); + } + /*****************************************************************************/ /********** Write a form to select whether show all notifications ************/ /*****************************************************************************/ @@ -1929,17 +1943,6 @@ void Ntf_PutFormChangeNotifSentByEMail (void) 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 (); - } - /*****************************************************************************/ /** Get parameter with the sending of e-mail to notify me that I have msgs. **/ /*****************************************************************************/