update

app/views/layouts/_admin_sidebar.html.haml

@@ -47,39 +47,39 @@
         - if can? :update, @conference
           %li{:class=> active_nav_li(edit_admin_conference_splashpage_path(@conference.short_title))}
             = link_to 'Splashpage', admin_conference_splashpage_path(@conference.short_title)
-  - if can? :index, Venue.new(conference_id: @conference.id)
+  - if can? :show, Venue.new(conference_id: @conference.id)
     %li{:class=> "#{active_nav_li(admin_conference_venue_path(@conference.short_title))}"}
       = link_to(admin_conference_venue_path(@conference.short_title)) do
         %span.fa.fa-road
         Venue
       %ul
-        - if can? :update, @conference.rooms.build
-          %li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))}
-            = link_to 'Rooms', admin_conference_rooms_path(@conference.short_title)
+        - if @conference.venue && @conference.venue.persisted? && (can? :update, @conference.venue.rooms.build)
+          %li{:class=> active_nav_li(admin_conference_venue_rooms_path(@conference.short_title))}
+            = link_to 'Rooms', admin_conference_venue_rooms_path(@conference.short_title)
         - if can? :update, @conference.lodgings.build
           %li{ class: active_nav_li(admin_conference_lodgings_path(@conference.short_title)) }
             = link_to 'Lodgings', admin_conference_lodgings_path(@conference.short_title)
-    %li
-      %a
+    %li{:class=> "#{active_nav_li(admin_conference_program_path(@conference.short_title))}"}
+      = link_to admin_conference_program_path(@conference.short_title) do
         %span.fa.fa-calendar
         Program
       %ul
-        - if can? :update, @conference.events.build
-          %li{:class=> active_nav_li(admin_conference_events_path(@conference.short_title))}
-            = link_to 'Events', admin_conference_events_path(@conference.short_title)
-        - if can? :update, CallForPaper.new(conference_id: @conference.id)
-          %li{:class=> "#{active_nav_li(admin_conference_call_for_paper_path(@conference.short_title))}"}
-            = link_to 'Call for Papers', admin_conference_call_for_paper_path(@conference.short_title)
-        - if can? :update, @conference.tracks.build
-          %li{:class=> active_nav_li(admin_conference_tracks_path(@conference.short_title))}
-            = link_to 'Tracks', admin_conference_tracks_path(@conference.short_title)
-        - if can? :update, @conference.event_types.build
-          %li{:class=> active_nav_li(admin_conference_event_types_path(@conference.short_title))}
-            = link_to 'Event Types', admin_conference_event_types_path(@conference.short_title)
-        - if can? :update, @conference.difficulty_levels.build, conference_id: @conference.id
-          %li{:class=> active_nav_li(admin_conference_difficulty_levels_path(@conference.short_title))}
-            = link_to 'Difficulty Levels', admin_conference_difficulty_levels_path(@conference.short_title)
-        - if can? :update, @conference.events.build
+        - if can? :update, Cfp.new(program_id: @conference.program.id)
+          %li{:class=> active_nav_li(admin_conference_program_cfp_path(@conference.short_title))}
+            = link_to 'Call for Papers', admin_conference_program_cfp_path(@conference.short_title)
+        - if can? :update, @conference.program.events.build
+          %li{:class=> active_nav_li(admin_conference_program_events_path(@conference.short_title))}
+            = link_to 'Events', admin_conference_program_events_path(@conference.short_title)
+        - if can? :update, @conference.program.tracks.build
+          %li{:class=> active_nav_li(admin_conference_program_tracks_path(@conference.short_title))}
+            = link_to 'Tracks', admin_conference_program_tracks_path(@conference.short_title)
+        - if can? :update, @conference.program.event_types.build
+          %li{:class=> active_nav_li(admin_conference_program_event_types_path(@conference.short_title))}
+            = link_to 'Event Types', admin_conference_program_event_types_path(@conference.short_title)
+        - if can? :update, @conference.program.difficulty_levels.build, conference_id: @conference.id
+          %li{:class=> active_nav_li(admin_conference_program_difficulty_levels_path(@conference.short_title))}
+            = link_to 'Difficulty Levels', admin_conference_program_difficulty_levels_path(@conference.short_title)
+        - if can? :update, @conference.program.events.build
           %li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))}
             = link_to 'Schedule', admin_conference_schedule_path(@conference.short_title), target: '_blank'
 

app/views/layouts/_navigation.html.haml

@@ -37,7 +37,7 @@
                       - if unread_notifications(current_user).length > 0
                         %li.dropdown-header Last 5 Comments for:
                         - unread_notifications(current_user).limit(5).group_by{ |comment| comment.commentable}.each do |event, comments|
-                          %li= link_to("#{event.title}(#{comments.count})", admin_conference_event_path(event.conference.short_title, event.id))
+                          %li= link_to("#{event.title}(#{comments.count})", admin_conference_program_event_path(event.program.conference.short_title, event.id))
                         %li.divider
                         %li= link_to "See all unread Comments (#{unread_notifications(current_user).length})", admin_comments_path
                       %li= link_to 'See all Comments', admin_comments_path(anchor: 'all_comments')

app/views/layouts/_user_menu.html.haml

@@ -7,9 +7,9 @@
   = link_to(edit_user_path(current_user.id)) do
     %span.fa.fa-user
     Edit Profile
--if @conference and @conference.call_for_paper
+-if @conference and @conference.program
   %li
-    = link_to(conference_proposal_index_path(@conference.short_title)) do
+    = link_to(conference_program_proposal_index_path(@conference.short_title)) do
       %span.fa.fa-comment
       My Submissions
 %li

app/views/layouts/application.html.haml

@@ -2,7 +2,7 @@
   %head
     %meta{:charset => "utf-8"}
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
-    %title= content_for?(:title) ? yield(:title) : "OSEM"
+    %title= content_for?(:title) ? yield(:title) : CONFIG['name']
     %meta{:content => "", :name => "description"}
     %meta{:content => "", :name => "author"}
     = stylesheet_link_tag "application", :media => "all"

app/views/layouts/schedule.html.haml

@@ -3,7 +3,7 @@
   %head
     %meta{:charset => "utf-8"}
     %meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1"}
-    %title= content_for?(:title) ? yield(:title) : "OSEM"
+    %title= content_for?(:title) ? yield(:title) : CONFIG['name']
     %meta{:content => "", :name => "description"}
     %meta{:content => "", :name => "author"}
     = stylesheet_link_tag "/stylesheets/schedule/jquery-ui-1.9.2.custom.min"