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

Move notification navigation to new location

Browse source
This commit is contained in:
Andreas Nedbal 2020-04-25 20:27:56 +02:00
parent aeedee8b2f
commit 18d4fad00e
4 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/notifications.haml
View file

@ -1,4 +1,4 @@
= render 'notifications/notification_nav' = render 'navigation/notification'
.container.j2-page .container.j2-page
.row .row
.col-md-3.col-xs-12.col-sm-4 .col-md-3.col-xs-12.col-sm-4

14
app/views/navigation/_notification.haml Normal file
View file

@ -0,0 +1,14 @@
%nav.navbar.navbar-light.bg-white.navbar-static-top.j2-navbar.d-flex.d-sm-none{role: "navigation"}
%a.navbar-brand{href: notifications_path} Notifications
%button.navbar-toggler{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation
%span.navbar-toggler-icon
#j2-tl-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
= nav_entry "New Notifications", notifications_path
= nav_entry "All Notifications", notifications_path('all')
= nav_entry t('views.notifications.tabs.answer'), notifications_path('answer')
= nav_entry t('views.notifications.tabs.smile'), notifications_path('smile')
= nav_entry t('views.notifications.tabs.comment'), notifications_path('comment')
= nav_entry t('views.notifications.tabs.commentsmile'), notifications_path('commentsmile')
= nav_entry t('views.notifications.tabs.relationship'), notifications_path('relationship')

15
app/views/notifications/_notification_nav.html.haml
View file

@ -1,15 +0,0 @@
%nav.navbar.navbar-default.navbar-static-top.j2-navbar.d-block.d-sm-none{role: "navigation"}
.container
%a.navbar-brand{href: notifications_path} Notifications
%button.navbar-toggler{"data-target" => "#j2-tl-navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation
%span.navbar-toggler-icon
#j2-tl-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
= nav_entry "New Notifications", notifications_path
= nav_entry "All Notifications", notifications_path('all')
= nav_entry t('views.notifications.tabs.answer'), notifications_path('answer')
= nav_entry t('views.notifications.tabs.smile'), notifications_path('smile')
= nav_entry t('views.notifications.tabs.comment'), notifications_path('comment')
= nav_entry t('views.notifications.tabs.commentsmile'), notifications_path('commentsmile')
= nav_entry t('views.notifications.tabs.relationship'), notifications_path('relationship')

4
app/views/tabs/_notifications.haml
View file

@ -1,9 +1,9 @@
.card.hidden-xs .card.d-none.d-sm-block
.list-group .list-group
= list_group_item "New Notifications", notifications_path, badge: Notification.for(current_user).where(new: true).count = list_group_item "New Notifications", notifications_path, badge: Notification.for(current_user).where(new: true).count
= list_group_item "All Notifications", notifications_path('all') = list_group_item "All Notifications", notifications_path('all')
.card.hidden-xs .card.d-none.d-sm-block
.card-header .card-header
Filter by Type Filter by Type
.list-group .list-group