From 7e12a1c77a90021c0bda354a766d420eb9fe1587 Mon Sep 17 00:00:00 2001 From: Andreas N Date: Mon, 9 Feb 2015 16:48:31 +0100 Subject: [PATCH] update notification display --- app/views/layouts/_header.html.haml | 2 +- app/views/layouts/_notifications.html.haml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 29c30086..fca1ff72 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -22,8 +22,8 @@ %ul.nav.navbar-nav = nav_entry "Timeline", root_path = nav_entry "Inbox", "/inbox", badge: inbox_count - = render "layouts/notifications" %ul.nav.navbar-nav.navbar-right + = render "layouts/notifications" %li.hidden-xs %span{"data-toggle" => "tooltip", "data-placement" => "bottom", title: "Ask a question"} .btn.btn-link.navbar-btn.btn-sm{name: "toggle-all-ask", "data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} diff --git a/app/views/layouts/_notifications.html.haml b/app/views/layouts/_notifications.html.haml index b29c8f98..7c272aa4 100644 --- a/app/views/layouts/_notifications.html.haml +++ b/app/views/layouts/_notifications.html.haml @@ -2,7 +2,11 @@ - notifications = Notification.for(current_user).limit(4) %li.dropdown.hidden-xs %a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"} - Notifications + - if notification_count.nil? + %i.fa.fa-bell-o + - else + %i.fa.fa-bell + %span.sr-only Notifications %span.badge= notification_count %ul.dropdown-menu.notification--dropdown - if notifications.count == 0