Skip to content

Commit b5ad3b8

Browse files
committed
fix(sidebar): fixed UI problems for diffrent roles
removed the duplicate checkin button for orginizers and had checkin page defaut to be highlighted for volenteers
1 parent 057e3aa commit b5ad3b8

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

app/views/layouts/_header.html.haml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
= btn_link_to "Home", homepage_url
1111
.header-nav
1212
- if user_signed_in?
13-
- if current_user.staff?
13+
- if current_user.organizing_staff?
1414
= btn_link_to "Manage", manage_root_path
15+
- elsif current_user.volunteer?
16+
= btn_link_to "Manage", manage_checkins_path
1517
= btn_link_to "Sign Out", destroy_user_session_path, method: :delete

app/views/layouts/manage/application.html.haml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,18 @@
4242
= active_link_to manage_messages_path, class: "nav-link" do
4343
.fa.fa-bullhorn.fa-fw.icon-space-r-half
4444
= t(:title, scope: 'pages.manage.messages')
45+
- elsif current_user.organizer?
46+
%ul.nav.flex-column.mb-2
47+
%li.nav-item
48+
= active_link_to manage_questionnaires_path, class: "nav-link" do
49+
.fa.fa-inbox.fa-fw.icon-space-r-half
50+
= t(:title, scope: 'pages.manage.questionnaires')
4551
- else
4652
%ul.nav.flex-column.mb-2
4753
%li.nav-item
48-
= active_link_to manage_checkins_path, class: "nav-link" do
49-
.fa.fa-drivers-license-o.fa-fw.icon-space-r-half
50-
= t(:title, scope: 'pages.manage.check-in')
54+
= active_link_to manage_checkins_path, class: "nav-link" do
55+
.fa.fa-drivers-license-o.fa-fw.icon-space-r-half
56+
= t(:title, scope: 'pages.manage.check-in')
5157
%li.nav-item
5258
= active_link_to manage_questionnaires_path, class: "nav-link" do
5359
.fa.fa-inbox.fa-fw.icon-space-r-half

0 commit comments

Comments
 (0)