diff --git a/css/swad.css b/css/swad.css index b77f08c8d..1100ccef3 100644 --- a/css/swad.css +++ b/css/swad.css @@ -141,12 +141,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} display:none; } } -@media only screen and (min-width: 1280px) { /* For desktop */ - #head_search_text - { - display:initial; - } -} + #head_row_1_usr_lang { display:table-cell; @@ -194,7 +189,7 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} display:none; } } -@media only screen and (max-width: 1279px) { /* For tablets */ +@media only screen and (min-width: 1024px) and (max-width: 1279px) { /* For tablets */ #current_date { display:none; @@ -222,6 +217,27 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} vertical-align:top; padding-top:10px; } +@media only screen and (max-width: 1023px) { /* For mobile phones */ + #notif_all + { + display:none; + } + #notif_new + { + display:none; + } +} +@media only screen and (min-width: 1024px) and (max-width: 1279px) { /* For tablets */ + #notif_all + { + display:none; + } +} +.WHITE_NOTIF {color:#707070; font-size:12pt; white-space:nowrap;} +.GREY_NOTIF {color:#E0E0E0; font-size:12pt; white-space:nowrap;} +.BLUE_NOTIF {color:white; font-size:12pt; white-space:nowrap;} +.YELLOW_NOTIF {color:#B3B0B3; font-size:12pt; white-space:nowrap;} + /******************* Layout (third heading row with tabs) ********************/ #head_row_3 @@ -1064,11 +1080,6 @@ a:hover img.CENTRE_PHOTO_SHOW .BLUE_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white; font-size:25pt; white-space:nowrap;} .YELLOW_COURSE {font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif; color:white; font-size:25pt; white-space:nowrap;} -.WHITE_NOTIF {color:#707070; font-size:12pt; white-space:nowrap;} -.GREY_NOTIF {color:#E0E0E0; font-size:12pt; white-space:nowrap;} -.BLUE_NOTIF {color:white; font-size:12pt; white-space:nowrap;} -.YELLOW_NOTIF {color:#B3B0B3; font-size:12pt; white-space:nowrap;} - .WHITE_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} .GREY_USR {color:#E0E0E0; font-size:15pt; font-weight:bold; white-space:nowrap;} .BLUE_USR {color:white; font-size:15pt; font-weight:bold; white-space:nowrap;} diff --git a/swad_changelog.h b/swad_changelog.h index 4545ba950..8ad60983e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -115,11 +115,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.47.2 (2015/11/27)" +#define Log_PLATFORM_VERSION "SWAD 15.47.3 (2015/11/27)" // 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 15.47.3: Nov 27, 2015 Responsive design in notifications. (186365 lines) Version 15.47.2: Nov 27, 2015 Responsive design in current local date and time. (? lines) Version 15.47.1: Nov 27, 2015 swad_desktop.css is renamed to swad.css. swad_mobile.css is removed. (186343 lines) diff --git a/swad_notification.c b/swad_notification.c index 9286c51ca..5c9441658 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -1808,43 +1808,32 @@ void Ntf_WriteNumberOfNewNtfs (void) unsigned NumNewNtfs = 0; /***** Get my number of unseen notifications *****/ - if ((NumUnseenNtfs = Ntf_GetNumberOfAllMyUnseenNtfs ()) != 0) + if ((NumUnseenNtfs = Ntf_GetNumberOfAllMyUnseenNtfs ())) NumNewNtfs = Ntf_GetNumberOfMyNewUnseenNtfs (); /***** Start form *****/ Act_FormStartId (ActSeeNewNtf,"form_ntf"); Act_LinkFormSubmitId (Txt_See_notifications, - The_ClassNotif[Gbl.Prefs.Theme],"form_ntf"); + The_ClassNotif[Gbl.Prefs.Theme],"form_ntf"); /***** Number of unseen notifications *****/ - if (NumUnseenNtfs == 1) - fprintf (Gbl.F.Out,"1 %s", - Txt_notification); - else - fprintf (Gbl.F.Out,"%u %s", - NumUnseenNtfs, - Txt_notifications); + fprintf (Gbl.F.Out,"%u %s
", + NumUnseenNtfs, + NumUnseenNtfs == 1 ? Txt_notification : + Txt_notifications); + /***** Icon and number of new notifications *****/ if (NumNewNtfs) - { - /***** Icon *****/ - fprintf (Gbl.F.Out,"
" - "\"%s\" ", - Gbl.Prefs.PathTheme, - Txt_Notifications, - Txt_Notifications); - - /***** Number of new notifications *****/ - if (NumNewNtfs == 1) - fprintf (Gbl.F.Out,"1 %s", - Txt_NOTIF_new_SINGULAR); - else - fprintf (Gbl.F.Out,"%u %s", - NumNewNtfs, - Txt_NOTIF_new_PLURAL); - } + fprintf (Gbl.F.Out,"\"%s\"" + " %u %s", + Gbl.Prefs.PathTheme, + Txt_Notifications, + Txt_Notifications, + NumNewNtfs, + NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR : + Txt_NOTIF_new_PLURAL); /***** End form *****/ fprintf (Gbl.F.Out,"");