diff --git a/app/views/admin/questions/index.html.haml b/app/views/admin/questions/index.html.haml
index 9fe119ba..f69d2846 100644
--- a/app/views/admin/questions/index.html.haml
+++ b/app/views/admin/questions/index.html.haml
@@ -1,7 +1,7 @@
.row
.col-md-12
.page-header
- %h1
+ %h1
Questions
- if can? :create, Question.new(conference_id: @conference.id)
= link_to 'Create New Question','#', 'data-toggle' => 'modal',
@@ -14,7 +14,7 @@
= semantic_form_for(@conference, url: update_conference_admin_conference_questions_path(@conference.short_title)) do |f|
.questions{id: 'myquestions'}
= render partial: 'questions'
- - if can? :update, @conference
+ - if can? :update, Question.new(conference_id: @conference.id)
= f.submit "Save Questions", class: 'btn btn-primary pull-right',
confirm: 'Are you sure you want to make these changes?'
diff --git a/app/views/layouts/_admin_sidebar.html.haml b/app/views/layouts/_admin_sidebar.html.haml
index 63b15ded..9fc01035 100644
--- a/app/views/layouts/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@@ -90,6 +90,8 @@
- if can? :update, Question.new(conference_id: @conference.id)
%li{:class=> active_nav_li(admin_conference_questions_path(@conference.short_title))}
= link_to 'Questions', admin_conference_questions_path(@conference.short_title)
+
+ - if (can? :manage, @conference.sponsorship_levels.build) || (can? :manage, @conference.sponsors.build) || (can? :manage, @conference.tickets.build)
%li
%a
%span.fa.fa-usd
@@ -104,12 +106,14 @@
- if can? :update, @conference.tickets.build
%li{ class: active_nav_li(admin_conference_tickets_path(@conference.short_title)) }
= link_to 'Tickets', admin_conference_tickets_path(@conference.short_title)
+
+ - if (can? :manage, @conference.targets.build) || (can? :manage, @conference.campaigns.build)
%li
%a
%span.fa.fa-money
Objectives
%ul
- - if can? :update, @conference
+ - if can? :update, @conference.campaigns.build
%li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))}
= link_to 'Campaigns', admin_conference_campaigns_path(@conference.short_title)
- if can? :update, @conference.targets.build
diff --git a/app/views/layouts/_user_menu.html.haml b/app/views/layouts/_user_menu.html.haml
index 31c2d895..f270d6b4 100644
--- a/app/views/layouts/_user_menu.html.haml
+++ b/app/views/layouts/_user_menu.html.haml
@@ -21,7 +21,7 @@
= link_to(destroy_user_session_path, :method=>'delete') do
%span.fa.fa-minus
Sign out
-- if can? :index, Conference
+- if can? :manage, Conference
%li.divider
%li
= link_to(admin_conference_index_path()) do