mirrors/retrospring
1
0
Fork 1
mirror of https://github.com/Retrospring/retrospring.git synced 2025-03-20 10:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'notifications' of git.rrerr.net:justask/justask into notifications

Browse source
This commit is contained in:
nilsding 2014-12-14 12:27:45 +01:00
commit dd7d4311a4
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/layouts/_header.html.haml
View file

@ -22,6 +22,7 @@
%ul.nav.navbar-nav %ul.nav.navbar-nav
= nav_entry "Timeline", root_path = nav_entry "Timeline", root_path
= nav_entry "Inbox", "/inbox", badge: inbox_count = nav_entry "Inbox", "/inbox", badge: inbox_count
= render "layouts/notifications"
%ul.nav.navbar-nav.navbar-right %ul.nav.navbar-nav.navbar-right
%button.btn.btn-primary.navbar-btn.btn-sm{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"} %button.btn.btn-primary.navbar-btn.btn-sm{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
%i.fa.fa-pencil-square-o %i.fa.fa-pencil-square-o

1
app/views/layouts/_notifications.html.haml Normal file
View file

@ -0,0 +1 @@
= nav_entry "Notifications", "/notifications/index"