Merge 514a88e0be into a4ef10cf1b

2017-01-31 13:57:04 +00:00 · 2017-01-31 13:57:04 +00:00 · f1e37df5a0
commit f1e37df5a0
parent a4ef10cf1b 514a88e0be
21 changed files with 264 additions and 3 deletions
--- a/app/views/layouts/_admin_sidebar.html.haml
+++ b/app/views/layouts/_admin_sidebar.html.haml
@ -139,3 +139,9 @@
      = link_to(admin_conference_roles_path(@conference.short_title)) do
        %span.fa.fa-group
        Roles
+
+  - if can? :show, @conference
+    %li{:class=> active_nav_li(conference_info_admin_conference_path(@conference.short_title))}
+      = link_to(conference_info_admin_conference_path(@conference.short_title)) do
+        %span.fa.fa-expand
+        Conference Info