From fcc432367ca9dbd136a4a3359f93b8eae8689018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sat, 26 Nov 2016 17:40:48 +0100 Subject: [PATCH] Version 16.71.3 --- swad_changelog.h | 5 +++- swad_notification.c | 22 +++++++++++----- swad_text.c | 63 ++++++++++++++++++++++++++++++--------------- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 39da22440..6e1f71345 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -172,17 +172,20 @@ // TODO: List only confirmed emails to send a message with MESSAGES > Email ? +// TODO: Link "Show office hours" in bold when activated + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.71.2 (2016-11-25)" +#define Log_PLATFORM_VERSION "SWAD 16.71.3 (2016-11-26)" #define CSS_FILE "swad16.69.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.71.3: Nov 26, 2016 Change in layout of notifications. (207597 lines) Version 16.71.2: Nov 25, 2016 Fix bug in shared record card. (207569 lines) Version 16.71.1: Nov 25, 2016 Contextual help on test results. (207568 lines) Version 16.71: Nov 25, 2016 Fixed bugs and changes in layout related with selection of groups. (207560 lines) diff --git a/swad_notification.c b/swad_notification.c index 2c1c0ca21..401ead224 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -302,7 +302,8 @@ void Ntf_ShowMyNotifications (void) extern const char *Txt_Centre; extern const char *Txt_Institution; extern const char *Txt_NOTIFICATION_STATUS[Ntf_NUM_STATUS_TXT]; - extern const char *Txt_No_notifications_for_you; + extern const char *Txt_You_have_no_notifications; + extern const char *Txt_You_have_no_unread_notifications; char Query[512]; char SubQuery[128]; MYSQL_RES *mysql_res; @@ -366,6 +367,10 @@ void Ntf_ShowMyNotifications (void) fprintf (Gbl.F.Out,""); + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Notifications, + Ntf_PutIconsNotif,Hlp_MESSAGES_Notifications); + /***** List my notifications *****/ if (NumNotifications) // Notifications found { @@ -376,10 +381,9 @@ void Ntf_ShowMyNotifications (void) /***** Initialize structure with user's data *****/ Usr_UsrDataConstructor (&UsrDat); - /***** Table start *****/ - Lay_StartRoundFrameTable (NULL,Txt_Notifications, - Ntf_PutIconsNotif,Hlp_MESSAGES_Notifications,2); - fprintf (Gbl.F.Out,"" + /***** Start table *****/ + fprintf (Gbl.F.Out,"" + "" "" @@ -620,7 +624,7 @@ void Ntf_ShowMyNotifications (void) } /***** End table *****/ - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"
" "%s" "
"); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); @@ -629,7 +633,11 @@ void Ntf_ShowMyNotifications (void) free ((void *) SummaryStr); } else - Lay_ShowAlert (Lay_INFO,Txt_No_notifications_for_you); + Lay_ShowAlert (Lay_INFO,AllNotifications ? Txt_You_have_no_notifications : + Txt_You_have_no_unread_notifications); + + /***** End frame *****/ + Lay_EndRoundFrame (); /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); diff --git a/swad_text.c b/swad_text.c index 3f3891a47..84fe3e446 100644 --- a/swad_text.c +++ b/swad_text.c @@ -24402,27 +24402,6 @@ const char *Txt_No_notices = "Não há avisos."; #endif -const char *Txt_No_notifications_for_you = -#if L==1 - "No tiene notificaciones."; // Necessita traduccio -#elif L==2 - "Keine Anmeldungen für Sie."; -#elif L==3 - "No notifications for you."; -#elif L==4 - "No tiene notificaciones."; -#elif L==5 - "Il n'y a pas de notifications pour vous."; -#elif L==6 - "No tiene notificaciones."; // Okoteve traducción -#elif L==7 - "Non ci sono notifiche per te."; -#elif L==8 - "Brak powiadomienia dla Ciebie."; -#elif L==9 - "Não há notificações para você."; -#endif - const char *Txt_No_of_files = #if L==1 "Nombre d'arxius"; @@ -53016,6 +52995,48 @@ const char *Txt_You_have_eliminated_the_confirmation_that_you_have_read_this_inf " that you have read this information."; // Necessita de tradução #endif +const char *Txt_You_have_no_notifications = +#if L==1 + "No tens notificacions."; +#elif L==2 + "Sie haben keine Benachrichtigungen."; +#elif L==3 + "You have no notifications."; +#elif L==4 + "No tiene notificaciones."; +#elif L==5 + "Vous n'avez aucune notification."; +#elif L==6 + "No tiene notificaciones."; // Okoteve traducción +#elif L==7 + "Non ci sono notifiche."; +#elif L==8 + "Nie masz żadnych powiadomień."; +#elif L==9 + "Você não tem notificações."; +#endif + +const char *Txt_You_have_no_unread_notifications = +#if L==1 + "No tens notificacions sense llegir."; +#elif L==2 + "Sie haben keine ungelesenen Benachrichtigungen."; +#elif L==3 + "You have no unread notifications."; +#elif L==4 + "No tiene notificaciones sin leer."; +#elif L==5 + "Vous n'avez aucune notification non lue."; +#elif L==6 + "No tiene notificaciones sin leer."; // Okoteve traducción +#elif L==7 + "Non ci sono notifiche non lette."; +#elif L==8 + "Nie masz nieprzeczytanych powiadomień."; +#elif L==9 + "Você não tem notificações não lidas."; +#endif + const char *Txt_You_have_not_banned_any_sender = #if L==1 "Usted no ha bloqueado ningún remitente."; // Necessita traduccio