Introduce Program to include cfp/rooms/tracks/events/event_types/difficulty_levels

app/views/admin/call_for_papers/_form.html.haml

@@ -1,14 +0,0 @@
-.row
-  .col-md-12
-    .page-header
-      %h1 Call for Papers
-.row
-  .col-md-8
-    = semantic_form_for(@call_for_paper, :url => admin_conference_call_for_paper_path(@conference.short_title),:html => {:multipart => true}) do |f|
-      = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
-      = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
-      = f.input :schedule_public, label: "Show Schedule on the home and splash page"
-      = f.input :schedule_changes, label: "Allow submitters to change their event after it is scheduled"
-      = f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals. Enter 0 if you do not want to vote on proposals."
-      %p.text-right
-        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/cfps/_form.html.haml

@@ -0,0 +1,11 @@
+.row
+  .col-md-12
+    .page-header
+      %h1 Call for Papers
+.row
+  .col-md-8
+    = semantic_form_for(@cfp, :url => admin_conference_program_cfp_path(@conference.short_title),:html => {:multipart => true}) do |f|
+      = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
+      = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
+      %p.text-right
+        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/cfps/show.html.haml

@@ -4,22 +4,22 @@
       %h1 Call for Papers
       %p.text-muted
         Call for people to submit events to your conference
-- if @call_for_paper
+- if @cfp
   .row
     .col-md-8
       %dl.dl-horizontal
         %dt
           Start Date:
         %dd#start_date
-          = @call_for_paper.start_date.strftime('%A, %B %-d. %Y')
+          = @cfp.start_date.strftime('%A, %B %-d. %Y')
         %dt
           End Date:
         %dd#end_date
-          = @call_for_paper.end_date.strftime('%A, %B %-d. %Y')
+          = @cfp.end_date.strftime('%A, %B %-d. %Y')
         %dt
           Days Left:
         %dd
-          = pluralize(@call_for_paper.remaining_days, 'day')
+          = pluralize(@cfp.remaining_days, 'day')
         %dt
           Event types:
         %dd
@@ -31,28 +31,28 @@
         %dt
           Public Schedule
         %dd#schedule_public
-          - if @call_for_paper.schedule_public
+          - if @program.schedule_public
             Yes
           - else
             No
         %dt
           Schedule changeable?
         %dd#schedule_changes
-          - if @call_for_paper.schedule_changes
+          - if @program.schedule_fluid
             Yes
           - else
             No
         %dt
           Rating Levels
         %dd#rating
-          = @call_for_paper.rating
+          = @program.rating
   .row
     .col-md-12.text-right
-      = link_to(edit_admin_conference_call_for_paper_path(@conference.short_title), class: 'btn btn-primary') do
+      = link_to(edit_admin_conference_program_cfp_path(@conference.short_title), class: 'btn btn-primary') do
         Edit
-      = link_to(admin_conference_call_for_paper_path(@conference.short_title), method: 'delete', class: 'btn btn-danger') do
+      = link_to(admin_conference_program_cfp_path(@conference.short_title), method: 'delete', class: 'btn btn-danger', data: { confirm: 'Are you sure you want to delete the CfP?' }) do
         Delete
 -else
   .row
     .col-md-12.text-right
-      = link_to 'Create Call for Papers', new_admin_conference_call_for_paper_path(@conference.short_title), class: 'btn btn-primary'
+      = link_to 'Create Call for Papers', new_admin_conference_program_cfp_path(@conference.short_title), class: 'btn btn-primary'

app/views/admin/comments/_all_comments.html.haml

@@ -5,7 +5,7 @@
     .panel-body
       - events.each do |event, comments|
         .notifications
-          %h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+          %h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
           %hr
           - comments.each do |comment|
             %h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}

app/views/admin/comments/_posted_comments.html.haml

@@ -5,7 +5,7 @@
     .panel-body
       - events.each do |event, comments|
         .notifications
-          %h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+          %h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
           %hr
           - comments.each do |comment|
             %h5.strong Created at: #{comment.created_at}

app/views/admin/comments/_unread_comments.html.haml

@@ -5,7 +5,7 @@
     .panel-body
       - events.each do |event, comments|
         .notifications
-          %h4.title= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+          %h4.title= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
           %hr
           - comments.each do |comment|
             %h5.strong Posted by: #{comment.user.name} | Created at: #{comment.created_at}

app/views/admin/conference/_recent_submissions.html.haml

@@ -16,8 +16,8 @@
                 %td= link_to event.submitter.name, admin_user_path(event.submitter.id)
               - else
                 %td Unknown Submitter
-              %td= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
-              %td= link_to event.conference.title, admin_conference_path(event.conference.short_title)
+              %td= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
+              %td= link_to event.program.conference.title, admin_conference_path(event.program.conference.short_title)
               %td
                 .span{'class'=>label_for(event.state)} #{event.state.humanize}
 - else

app/views/admin/conference/_todo_list.html.haml

@@ -17,8 +17,8 @@
       Set up registration period
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['cfp'])}"}
     %span{'class'=>icon_for_todo(conference_progress['cfp'])}
-    - if can? :update, CallForPaper.new(conference_id: @conference.id)
-      = link_to 'Set up call for papers', admin_conference_call_for_paper_path(conference_progress['short_title'])
+    - if can? :update, Cfp.new(program_id: @program.id)
+      = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title'])
     - else
       Set up call for papers
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['venue'])}"}
@@ -32,26 +32,26 @@
       Add venue
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['rooms'])}"}
     %span{'class'=>icon_for_todo(conference_progress['rooms'])}
-    - if can? :update, @conference.rooms.build
-      = link_to 'Add rooms', admin_conference_rooms_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.rooms.build
+      = link_to 'Add rooms', admin_conference_program_rooms_path(conference_progress['short_title'])
     - else
       Add rooms
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['tracks'])}"}
     %span{'class'=>icon_for_todo(conference_progress['tracks'])}
-    - if can? :update, @conference.tracks.build
-      = link_to 'Add tracks', admin_conference_tracks_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.tracks.build
+      = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title'])
     - else
       Add tracks
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['event_types'])}"}
     %span{'class'=>icon_for_todo(conference_progress['event_types'])}
-    - if can? :update, @conference.event_types.build
-      = link_to 'Add event types', admin_conference_event_types_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.event_types.build
+      = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title'])
     - else
       Add event types
   %li{'class'=>"list-group-item #{class_for_todo(conference_progress['difficulty_levels'])}"}
     %span{'class'=>icon_for_todo(conference_progress['difficulty_levels'])}
-    - if can? :update, @conference.difficulty_levels.build
-      = link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
+    - if can? :update, @conference.program.difficulty_levels.build
+      = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title'])
     - else
       Add difficulty levels
   %li{class: "list-group-item #{class_for_todo(conference_progress['splashpage'])}"}

app/views/admin/difficulty_levels/_form.html.haml

@@ -8,7 +8,7 @@
         = @difficulty_level.title
 .row
   .col-md-8
-    = semantic_form_for(@difficulty_level, :url => (@difficulty_level.new_record? ? admin_conference_difficulty_levels_path : admin_conference_difficulty_level_path(@conference.short_title, @difficulty_level))) do |f|
+    = semantic_form_for(@difficulty_level, :url => (@difficulty_level.new_record? ? admin_conference_program_difficulty_levels_path : admin_conference_program_difficulty_level_path(@conference.short_title, @difficulty_level))) do |f|
       = f.input :title, :required => true
       = f.input :description, :input_html => {:rows => 3, :class => "span6"}
       = f.input :color, :input_html => {:size => 6, :type => "color"}

app/views/admin/difficulty_levels/index.html.haml

@@ -3,7 +3,7 @@
     .page-header
       %h1 Difficulty Levels
       %p.text-muted
-        Classify your conference events by difficulty
+        Classify your conference.program.events by difficulty
 .row
   .col-md-12
     %table.table.table-hover#difficulty_levels
@@ -13,7 +13,7 @@
         %th Color
         %th Actions
       %tbody
-        - @conference.difficulty_levels.each do |difficulty_level|
+        - @conference.program.difficulty_levels.each do |difficulty_level|
           %tr
             %td
               = difficulty_level.title
@@ -24,11 +24,11 @@
                 = difficulty_level.color
             %td
               .btn-group{role: "group"}
-                = link_to 'Edit', edit_admin_conference_difficulty_level_path(@conference.short_title, difficulty_level.id),
+                = link_to 'Edit', edit_admin_conference_program_difficulty_level_path(@conference.short_title, difficulty_level.id),
                 method: :get, class: 'btn btn-primary'
-                = link_to 'Delete', admin_conference_difficulty_level_path(@conference.short_title, difficulty_level.id),
+                = link_to 'Delete', admin_conference_program_difficulty_level_path(@conference.short_title, difficulty_level.id),
                 method: :delete, class: 'btn btn-danger',
                 data: { confirm: "Do you really want to delete #{difficulty_level.title}? Attention: This difficulty level will be removed from all Events that have it set" }
 .row
   .col-md-12.text-right
-    = link_to 'Add Difficulty Level', new_admin_conference_difficulty_level_path(@conference.short_title), class: 'btn btn-primary'
+    = link_to 'Add Difficulty Level', new_admin_conference_program_difficulty_level_path(@conference.short_title), class: 'btn btn-primary'

app/views/admin/emails/_help.html.haml

@@ -41,14 +41,14 @@
       %tr
         %td {venue_address}
         %td The address of the venue
-    - unless @conference.call_for_paper.blank? || @conference.call_for_paper.start_date.blank? || @conference.call_for_paper.end_date.blank?
+    - unless @conference.program.cfp.blank? || @conference.program.cfp.start_date.blank? || @conference.program.cfp.end_date.blank?
       %tr
         %td {cfp_start_date}
         %td The call for papers start date
       %tr
         %td {cfp_end_date}
         %td The call for papers end date
-      -if @conference.call_for_paper.schedule_public
+      -if @conference.program.schedule_public
         %td {schedule_link}
         %td The link to complete schedule of the conference
     - if @conference.splashpage && @conference.splashpage.public

app/views/admin/emails/index.html.haml

@@ -69,18 +69,18 @@
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_venue_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_venue_help', show_event_variables: false}
               #cfp.tab-pane{:role => "tabpanel"}
-                = f.input :send_on_call_for_papers_schedule_public, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_schedule_public_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_schedule_public_body, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :send_on_program_schedule_public, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
+                = f.input :program_schedule_public_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
+                = f.input :program_schedule_public_template, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe Conference Call for Papers Details of {conference} has changed.The schedule is being made public.\n Link to Schedule {schedule_link} \n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_call_for_papers_schedule_public_body"} Load Template
+                "data-name"=>"email_settings_program_schedule_public_template"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_cfp_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_cfp_help', show_event_variables: false}
-                = f.input :send_on_call_for_papers_dates_updated, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_dates_updated_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
-                = f.input :call_for_papers_dates_updated_body, :input_html => { :rows => 10, :cols => 20 }
+                = f.input :send_on_cfp_dates_updated, hint: "This will notify all participants when the dates are updated or when the schedule is made public"
+                = f.input :cfp_dates_updated_subject, hint: "This subject will used whenever dates are updated or when the schedule is made public"
+                = f.input :cfp_dates_updated_template, :input_html => { :rows => 10, :cols => 20 }
                 %a.btn.btn-link.control_label.load_template{"data-template"=>"Dear {name},\n\nThe Conference Call for Papers Details of {conference} has changed.\nNew Dates : {cfp_start_date} - {cfp_end_date}.\n Link to Schedule {schedule_link} \n\nBest wishes\n\n{conference} Team",
-                "data-name"=>"email_settings_call_for_papers_dates_updated_body"} Load Template
+                "data-name"=>"email_settings_cfp_dates_updates_template"} Load Template
                 %a.btn.btn-link.control_label.template_help_link{"data-name"=>"updated_cfp_help"} Show Help
                 = render partial: 'help', locals: {id: 'updated_cfp_help', show_event_variables: false}
       .row

app/views/admin/event_types/_form.html.haml

@@ -8,7 +8,7 @@
         = @event_type.title
 .row
   .col-md-12
-    = semantic_form_for(@event_type, :url => (@event_type.new_record? ? admin_conference_event_types_path : admin_conference_event_type_path(@conference.short_title, @event_type))) do |f|
+    = semantic_form_for(@event_type, :url => (@event_type.new_record? ? admin_conference_program_event_types_path : admin_conference_program_event_type_path(@conference.short_title, @event_type))) do |f|
       = f.input :title
       = f.input :length, :input_html => {:size => 3}
       = f.input :description

app/views/admin/event_types/index.html.haml

@@ -15,7 +15,7 @@
         %th Color
         %th Actions
       %tbody
-        - @conference.event_types.each do |event_type|
+        - @conference.program.event_types.each do |event_type|
           %tr
             %td
               = event_type.title
@@ -32,11 +32,11 @@
                 = event_type.color
             %td
               .btn-group{role: "group"}
-                = link_to 'Edit', edit_admin_conference_event_type_path(@conference.short_title, event_type.id),
+                = link_to 'Edit', edit_admin_conference_program_event_type_path(@conference.short_title, event_type.id),
                 method: :get, class: 'btn btn-primary'
-                = link_to 'Delete', admin_conference_event_type_path(@conference.short_title, event_type.id),
+                = link_to 'Delete', admin_conference_program_event_type_path(@conference.short_title, event_type.id),
                 method: :delete, class: 'btn btn-danger', data: { confirm: "Do you really want to delete #{event_type.name}?" }
 .row
   .col-md-12.text-right
-    = link_to 'Add Event Type', new_admin_conference_event_type_path(@conference.short_title), class: 'btn btn-primary'
+    = link_to 'Add Event Type', new_admin_conference_program_event_type_path(@conference.short_title), class: 'btn btn-primary'
 

app/views/admin/events/_change_state_dropdown.html.haml

@@ -1,37 +1,37 @@
 - if event.transition_possible? :accept
   %li= link_to 'Accept event',
-  accept_admin_conference_event_path(@conference.short_title, event),
+  accept_admin_conference_program_event_path(@conference.short_title, event),
   method: :patch, id: "accept_event_#{event.id}"
 
   - if @conference.email_settings.send_on_accepted?
     %li= link_to 'Accept event (without email)',
-    accept_admin_conference_event_path(@conference.short_title, event, send_mail: false),
+    accept_admin_conference_program_event_path(@conference.short_title, event, send_mail: false),
     method: :patch, hint: 'Accept this event without sending an automated email.',
     id: "accept_event_without_mail_#{event.id}"
 
 - if event.transition_possible? :reject
   %li= link_to 'Reject event',
-  reject_admin_conference_event_path(@conference.short_title, event),
+  reject_admin_conference_program_event_path(@conference.short_title, event),
   method: :patch, confirm: 'Are you sure?', id: "reject_event_#{event.id}"
 
   - if @conference.email_settings.send_on_rejected?
     %li= link_to 'Reject event (without email)',
-    reject_admin_conference_event_path(@conference.short_title, event, send_mail: false),
+    reject_admin_conference_program_event_path(@conference.short_title, event, send_mail: false),
     method: :patch, confirm: 'Are you sure?', id: "reject_event_without_mail_#{event.id}"
 
 - if event.transition_possible? :restart
   %li= link_to 'Start review',
-  restart_admin_conference_event_path(@conference.short_title, event),
+  restart_admin_conference_program_event_path(@conference.short_title, event),
   method: :patch, id: "restart_event_#{event.id}"
 
 - if event.transition_possible? :confirm
   %li= link_to 'Confirm event',
-  confirm_admin_conference_event_path(@conference.short_title, event),
+  confirm_admin_conference_program_event_path(@conference.short_title, event),
   method: :patch, id: "confirm_event_#{event.id}",
   hint: 'Confirm that the speaker(s) will be present and that the event will actually take place.'
 
 - if event.transition_possible? :cancel
   %li= link_to 'Cancel event',
-  cancel_admin_conference_event_path(@conference.short_title, event),
+  cancel_admin_conference_program_event_path(@conference.short_title, event),
   method: :patch, id: "cancel_event_#{event.id}",
-  hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'
+  hint: 'Mark this event as cancelled. Usually this means that the speakers had to cancel their appearance.'

app/views/admin/events/_nested_comments.html.haml

@@ -6,7 +6,7 @@
     %div
       %a.pull-right.comment-reply-link{href: "#"} Reply
       .comment-reply
-        = form_tag "#{comment_admin_conference_event_path(@conference.short_title, comment.commentable_id)}", method: :post do
+        = form_tag "#{comment_admin_conference_program_event_path(@conference.short_title, comment.commentable_id)}", method: :post do
           %input{name: "parent", type: "hidden", value: "#{comment.id}"}
           %input{name: "authenticity_token", type: "hidden", value: "#{form_authenticity_token}"}
           %textarea{name: "comment"}

app/views/admin/events/_proposal.html.haml

@@ -5,7 +5,7 @@
       %br
       %small
         = @event.subtitle
-      = link_to 'Edit', edit_admin_conference_event_path(@conference.short_title, @event), class: 'btn btn-mini btn-primary pull-right'
+      = link_to 'Edit', edit_admin_conference_program_event_path(@conference.short_title, @event), class: 'btn btn-mini btn-primary pull-right'
 
 .row
   .col-md-12
@@ -24,7 +24,7 @@
             %ul.dropdown-menu
               - @event_types.each do |type|
                 %li= link_to type.title,
-                admin_conference_event_path(@conference.short_title,
+                admin_conference_program_event_path(@conference.short_title,
                                             @event,
                                             event: { event_type_id: type.id }),
                 method: :patch
@@ -33,7 +33,7 @@
           %b Highlight
         %td
           = check_box_tag @conference.short_title, @event.id, @event.is_highlight,
-            method: :patch, url: "/admin/conference/#{@conference.short_title}/events/#{@event.id}?event[is_highlight]=",
+            method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{@event.id}?event[is_highlight]=",
             class: 'switch-checkbox', data: { size: 'small',
                                               off_color: 'warning',
                                               on_text: 'Yes',
@@ -63,7 +63,7 @@
             %ul.dropdown-menu
               - @tracks.each do |track|
                 %li= link_to track.name,
-                admin_conference_event_path(@conference.short_title,
+                admin_conference_program_event_path(@conference.short_title,
                                             @event,
                                             event: { track_id: track.id }),
                 method: :patch
@@ -80,7 +80,7 @@
               <b class="caret"></b>
             %ul.dropdown-menu
               - @difficulty_levels.each do |difficulty|
-                %li= link_to difficulty.title, admin_conference_event_path(@conference.short_title,
+                %li= link_to difficulty.title, admin_conference_program_event_path(@conference.short_title,
                                             @event,
                                             event: { difficulty_level_id: difficulty.id }),
                 method: :patch
@@ -89,7 +89,7 @@
           %b Requires Registration
         %td
           = check_box_tag @conference.short_title, @event.id, @event.require_registration,
-            method: :patch, url: "/admin/conference/#{@conference.short_title}/events/#{@event.id}?event[require_registration]=",
+            method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{@event.id}?event[require_registration]=",
             class: 'switch-checkbox', data: { size: 'small',
                                               off_color: 'warning',
                                               on_text: 'Yes',
@@ -137,7 +137,7 @@
           %b Description
         %td= simple_format(@event.description)
 
-      - if @conference.call_for_paper && @conference.call_for_paper.rating && @conference.call_for_paper.rating > 0
+      - if @conference.program && @conference.program.rating && @conference.program.rating > 0
         = render partial: 'voting'
 
 .row
@@ -147,7 +147,7 @@
     %ul.media
       %div
         .row-fluid
-          = form_tag(comment_admin_conference_event_path(@conference.short_title, @event.id), method: :post) do
+          = form_tag(comment_admin_conference_program_event_path(@conference.short_title, @event.id), method: :post) do
             = text_area_tag(:comment, '')
             = submit_tag 'Add Comment', class: 'btn btn-primary pull-right'
         %br

app/views/admin/events/_voting.html.haml

@@ -4,11 +4,11 @@
       %b Rating
     %td
       - if @event.average_rating.to_f > 0
-        #{@event.average_rating}/#{@conference.call_for_paper.rating}
+        #{@event.average_rating}/#{@conference.program.rating}
       - else
-        Rating: 0/#{@conference.call_for_paper.rating}
+        Rating: 0/#{@conference.program.rating}
 
-      - @conference.call_for_paper.rating.times do |counter|
+      - @conference.program.rating.times do |counter|
         - if @event.average_rating.to_f.round == counter+1
           = label_tag "label_rating", "", :class => "avgrating", :avgrate => true
           = javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
@@ -27,12 +27,12 @@
     %td
       %b Your vote
     %td
-      - @conference.call_for_paper.rating.times do |counter|
+      - @conference.program.rating.times do |counter|
         - voted = @event.voted?(@event, current_user)
         - if voted && voted.rating == counter+1
-          = link_to "", vote_admin_conference_event_path(@conference.short_title, @event, :rating => counter+1), :remote => true, :id =>"label#{counter+1}", :class => "myrating", :voted => true
+          = link_to "", vote_admin_conference_program_event_path(@conference.short_title, @event, :rating => counter+1), :remote => true, :id =>"label#{counter+1}", :class => "myrating", :voted => true
         - else
-          = link_to "", vote_admin_conference_event_path(@conference.short_title, @event, :rating => counter+1), :remote => true, :id =>"label#{counter+1}", :class => "myrating"
+          = link_to "", vote_admin_conference_program_event_path(@conference.short_title, @event, :rating => counter+1), :remote => true, :id =>"label#{counter+1}", :class => "myrating"
       %br
 
   - if @ratings.length > 0
@@ -42,7 +42,7 @@
           %td
             = rate.name
           %td
-            - @conference.call_for_paper.rating.times do |counter|
+            - @conference.program.rating.times do |counter|
               - voted = @event.voted?(@event, rate.user)
               - if voted && voted.rating == counter+1
                 = label_tag "label#{counter+1}", "", :class => "othersrating", :voted => true

app/views/admin/events/index.html.haml

@@ -15,7 +15,7 @@
           %b ID
         %th
           %b Title
-        - if @conference.call_for_paper && @conference.call_for_paper.rating && @conference.call_for_paper.rating > 0
+        - if @program.rating_enabled?
           %th
             %b Rating
         %th
@@ -39,16 +39,16 @@
           %td
             = event.id
           %td
-            =link_to event.title, admin_conference_event_path(@conference.short_title, event)
+            =link_to event.title, admin_conference_program_event_path(@conference.short_title, event)
 
-          - if @conference.call_for_paper && @conference.call_for_paper.rating && @conference.call_for_paper.rating > 0
+          - if @program.rating_enabled?
             %td.col-md-1{'data-order' => "#{event.average_rating}"}
               - if event.average_rating.to_f > 0
-                #{event.average_rating}/#{@conference.call_for_paper.rating}
+                #{event.average_rating}/#{@program.rating}
                 %br
                 #{pluralize(event.voters.length, 'voter')}
                 %br
-                - @conference.call_for_paper.rating.times do |counter|
+                - @program.cfp.rating.times do |counter|
                   - if event.average_rating.to_f.round == counter+1
                     = label_tag "label_rating", "", :class => "avgrating", :avgrate => true
                     = javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"
@@ -63,7 +63,7 @@
                   %span.label.label-danger
                     Not rated
               - else
-                0/#{@conference.call_for_paper.rating}
+                0/#{@program.rating}
               %br
 
           - if event.submitter && event.submitter.registrations && event.submitter.registrations.count < 1
@@ -85,7 +85,7 @@
 
           %td{'data-order' => "#{event.require_registration}"}
             = check_box_tag @conference.short_title, event.id, event.require_registration,
-              method: :patch, url: "/admin/conference/#{@conference.short_title}/events/#{event.id}?event[require_registration]=",
+              method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{event.id}?event[require_registration]=",
               class: 'switch-checkbox', data: { size: 'small',
                                                 off_color: 'warning',
                                                 on_text: 'Yes',
@@ -93,7 +93,7 @@
 
           %td{'data-order' => "#{event.is_highlight}"}
             = check_box_tag @conference.short_title, event.id, event.is_highlight,
-              method: :patch, url: "/admin/conference/#{@conference.short_title}/events/#{event.id}?event[is_highlight]=",
+              method: :patch, url: "/admin/conference/#{@conference.short_title}/program/events/#{event.id}?event[is_highlight]=",
               class: 'switch-checkbox', data: { size: 'small',
                                                 off_color: 'warning',
                                                 on_text: 'Yes',
@@ -110,7 +110,7 @@
               %ul.dropdown-menu
                 - @event_types.each do |type|
                   %li= link_to type.title,
-                  admin_conference_event_path(@conference.short_title,
+                  admin_conference_program_event_path(@conference.short_title,
                                               event,
                                               event: { event_type_id: type.id }),
                   method: :patch
@@ -125,7 +125,7 @@
               %ul.dropdown-menu
                 - @tracks.each do |track|
                   %li= link_to track.name,
-                  admin_conference_event_path(@conference.short_title,
+                  admin_conference_program_event_path(@conference.short_title,
                                               event,
                                               event: { track_id: track.id }),
                   method: :patch
@@ -140,7 +140,7 @@
               %ul.dropdown-menu
                 - @difficulty_levels.each do |difficulty_level|
                   %li= link_to difficulty_level.title,
-                  admin_conference_event_path(@conference.short_title,
+                  admin_conference_program_event_path(@conference.short_title,
                                               event,
                                               event: { difficulty_level_id: difficulty_level.id }),
                   method: :patch

app/views/admin/programs/_form.html.haml

@@ -0,0 +1,12 @@
+.row
+  .col-md-12
+    .page-header
+      %h1 Program
+.row
+  .col-md-8
+    = semantic_form_for(@program, :url => admin_conference_program_path(@conference.short_title),:html => {:multipart => true}) do |f|
+      = f.input :schedule_public, label: "Show Schedule on the home and splash page"
+      = f.input :schedule_fluid, label: "Allow submitters to change their event after it is scheduled"
+      = f.input :rating, :hint => "Enter the number of different rating levels you want to have for voting on proposals. Enter 0 if you do not want to vote on proposals."
+      %p.text-right
+        = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}

app/views/admin/programs/show.html.haml

@@ -0,0 +1,61 @@
+.row
+  .col-md-12
+    .page-header
+      %h1 Program
+- if @program
+  .row
+    .col-md-8
+      %dl.dl-horizontal
+        - if @cfp
+          %dt
+            Start Date:
+          %dd#start_date
+            = @cfp.start_date.strftime('%A, %B %-d. %Y')
+          %dt
+            End Date:
+          %dd#end_date
+            = @cfp.end_date.strftime('%A, %B %-d. %Y')
+          %dt
+            Days Left:
+          %dd
+            = pluralize(@cfp.remaining_days, 'day')
+        %dt
+          Event types:
+        %dd
+          = event_types(@conference)
+        %dt
+          Tracks:
+        %dd
+          = tracks(@conference)
+        %dt
+          Difficulty Levels:
+        %dd
+          = difficulty_levels(@conference)
+        %dt
+          Public Schedule
+        %dd#schedule_public
+          - if @program.schedule_public
+            Yes
+          - else
+            No
+        %dt
+          Schedule changeable?
+        %dd#schedule_changes
+          - if @program.schedule_fluid
+            Yes
+          - else
+            No
+        %dt
+          Rating Levels
+        %dd#rating
+          = @program.rating
+
+
+  .row
+    .col-md-12.text-right
+      - if can? :edit, @progam
+        = link_to edit_admin_conference_program_path(@conference.short_title), class: 'btn btn-primary' do
+          Edit
+      - if can? :destroy, @program
+        = link_to admin_conference_program_path(@conference.short_title), method: 'delete', class: 'btn btn-danger', data: { confirm: 'Are you sure you want to delete this program?' } do
+          Delete

app/views/admin/rooms/_form.html.haml

@@ -8,7 +8,7 @@
         = @room.name
 .row
   .col-md-8
-    = semantic_form_for(@room, :url => (@room.new_record? ? admin_conference_rooms_path : admin_conference_room_path(@conference.short_title, @room))) do |f|
+    = semantic_form_for(@room, :url => (@room.new_record? ? admin_conference_program_rooms_path : admin_conference_program_room_path(@conference.short_title, @room))) do |f|
       = f.input :name
       = f.input :size, :input_html => {:size => 5}
       %p.text-right

app/views/admin/rooms/index.html.haml

@@ -5,7 +5,7 @@
       %p.text-muted
         The rooms of your conference venue
 
-- if @conference.rooms.any?
+- if @conference.program.rooms.any?
   .row
     .col-md-12
       %table.table.table-hover#rooms
@@ -14,18 +14,18 @@
           %th Size
           %th Actions
         %tbody
-          - @conference.rooms.each_with_index do |room, index|
+          - @conference.program.rooms.each_with_index do |room, index|
             %tr
               %td
                 = room.name
               %td
                 = room.size
               %td
-                = link_to 'Edit', edit_admin_conference_room_path(@conference.short_title, room.id),
+                = link_to 'Edit', edit_admin_conference_program_room_path(@conference.short_title, room.id),
                 method: :get, class: 'btn btn-primary'
-                = link_to 'Delete', admin_conference_room_path(@conference.short_title, room.id),
+                = link_to 'Delete', admin_conference_program_room_path(@conference.short_title, room.id),
                 method: :delete, class: 'btn btn-danger',
                 data: { confirm: "Do you really want to delete #{room.name}? Attention: This room will be removed from all Events that have it set"}
 .row
   .col-md-12.text-right
-    = link_to 'Add Room', new_admin_conference_room_path(@conference.short_title), class: 'btn btn-primary'
+    = link_to 'Add Room', new_admin_conference_program_room_path(@conference.short_title), class: 'btn btn-primary'

app/views/admin/tracks/_form.html.haml

@@ -8,7 +8,7 @@
         Track
 .row
   .col-md-12
-    = semantic_form_for(@track, :url => (@track.new_record? ? admin_conference_tracks_path : admin_conference_track_path(@conference.short_title, @track))) do |f|
+    = semantic_form_for(@track, :url => (@track.new_record? ? admin_conference_program_tracks_path : admin_conference_program_track_path(@conference.short_title, @track))) do |f|
       = f.input :name
       = f.input :color, :input_html => {:size => 6, :type => "color"}, :required=> true
       = f.input :description, :input_html => {:rows => 2, data: { provide: "markdown-editable" } }, hint: markdown_hint

app/views/admin/tracks/index.html.haml

@@ -13,10 +13,10 @@
         %th Color
         %th Actions
       %tbody
-        - @conference.tracks.each do |track|
+        - @tracks.each do |track|
           %tr
             %td
-              = link_to(admin_conference_track_path(@conference.short_title, track)) do
+              = link_to(admin_conference_program_track_path(@conference.short_title, track)) do
                 = track.name
             %td
               %p
@@ -26,12 +26,12 @@
                 = track.color
             %td
               .btn-group{role: "group"}
-                = link_to 'Edit', edit_admin_conference_track_path(@conference.short_title, track.id),
+                = link_to 'Edit', edit_admin_conference_program_track_path(@conference.short_title, track.id),
                 method: :get, class: 'btn btn-primary'
-                = link_to 'Delete', admin_conference_track_path(@conference.short_title, track.id),
+                = link_to 'Delete', admin_conference_program_track_path(@conference.short_title, track.id),
                 method: :delete, class: 'btn btn-danger',
                 data: { confirm: "Do you really want to delete #{track.name}? Attention: This track will be removed from all Events that have it set" }
 .row
   .col-md-12.text-right
-    = link_to 'New Track', new_admin_conference_track_path(@conference.short_title), class: 'btn btn-success'
+    = link_to 'New Track', new_admin_conference_program_track_path(@conference.short_title), class: 'btn btn-success'
 

app/views/admin/tracks/show.html.haml

@@ -19,7 +19,7 @@
         - @track.events.each_with_index do |event|
           %tr
             %td
-              =link_to event.title, admin_conference_event_path(@conference.short_title, event)
+              =link_to event.title, admin_conference_program_event_path(@conference.short_title, event)
             %td
               = event.event_type.title
             %td

app/views/admin/users/_submissions.html.haml

@@ -17,13 +17,13 @@
           - @user.events.each do |event|
             %tr
               %td= event.id
-              %td= link_to event.conference.short_title, admin_conference_path(event.conference.short_title)
-              %td= link_to event.title, admin_conference_event_path(event.conference.short_title, event)
+              %td= link_to event.program.conference.short_title, admin_conference_path(event.program.conference.short_title)
+              %td= link_to event.title, admin_conference_program_event_path(event.program.conference.short_title, event)
               %td= event.state
               %td= "#{event.event_type.title} (#{show_time(event.event_type.length)})"
               %td
-                - if event.conference.call_for_paper && event.conference.call_for_paper.rating && event.conference.call_for_paper.rating > 0
-                  - event.conference.call_for_paper.rating.times do |counter|
+                - if event.program && event.program.rating && event.program.rating > 0
+                  - event.program.rating.times do |counter|
                     - if event.average_rating.to_f.round == counter+1
                       = label_tag 'label_rating', '', class: 'avgrating', avgrate: true
                       = javascript_tag "$('label[avgrate=true]').prevAll().andSelf().addClass('bright');"

app/views/commercials/edit.html.haml

@@ -0,0 +1,9 @@
+.container
+  .row
+    .col-md-12
+      .page-header
+        %h1 Editing Commercial
+  .row
+    .col-md-12
+      = semantic_form_for @commercial, url: conference_program_proposal_commercial_path(conference_id: @conference.short_title, proposal_id: @event.id, id: @commercial.id) do |f|
+        = render 'form', f: f

app/views/commercials/new.html.haml

@@ -0,0 +1,9 @@
+.container
+  .row
+    .col-md-12
+      .page-header
+        %h1 New Commercial
+  .row
+    .col-md-12
+      = semantic_form_for @commercial, url: conference_program_proposal_commercials_path(conference_id: @conference.short_title, proposal_id: @event.id) do |f|
+        = render 'form', f: f

app/views/conference/_all_events.html.erb

@@ -1,8 +1,8 @@
 <h1 class="text-center">Program for <%= @conference.title %></h1>
-<% @conference.events.confirmed.each do |event| %>
+<% @conference.program.events.confirmed.each do |event| %>
     <div>
         <h3>
-          <%= link_to event.title, conference_proposal_path(@conference.short_title, event.id) %>
+          <%= link_to event.title, conference_program_proposal_path(@conference.short_title, event.id) %>
           <br>
           <small>
             <%= event.subtitle %>
@@ -13,7 +13,7 @@
         </h4>
         <p>
           <%= truncate(event.abstract, :length => 400) -%>
-          <%= link_to 'more', conference_proposal_path(@conference.short_title, event.id) if event.abstract.length > 400 %>
+          <%= link_to 'more', conference_program_proposal_path(@conference.short_title, @conference.program.id, event.id) if event.abstract.length > 400 %>
         </p>
     </div>
 <% end %>

app/views/conference/_call_for_paper.html.haml

@@ -12,22 +12,22 @@
   .row
     .col-md-6.col-md-offset-3.col-sm-10.col-sm-offset-1
       %p
-        - if @conference.event_types.any?
+        - if @program.event_types.any?
           You can submit proposals for
           = "#{event_types(@conference)}."
-        - if @conference.tracks.any?
+        - if @program.tracks.any?
           Proposals should fit in one of the
-          = "#{pluralize(@conference.tracks.count, 'track')}:"
+          = "#{pluralize(@program.tracks.count, 'track')}:"
           = "#{tracks(@conference)}."
         The submission period has begun
         %em
-          = @conference.call_for_paper.start_date.strftime('%A, %B %-d. %Y')
+          = @program.cfp.start_date.strftime('%A, %B %-d. %Y')
         and closes
         %em
-          = @conference.call_for_paper.end_date.strftime('%A, %B %-d. %Y.')
-        - if @conference.cfp_open?
+          = @program.cfp.end_date.strftime('%A, %B %-d. %Y.')
+        - if @program.cfp_open?
           That means you have only
-          %b= pluralize(@conference.call_for_paper.remaining_days, 'day')
+          %b= pluralize(@program.cfp.remaining_days, 'day')
           left!
           Remember
           = @conference.short_title
@@ -37,4 +37,4 @@
   .row
     .col-md-12.text-center
       %p.cta-button
-        = link_to "Submit your paper now", conference_proposal_index_path(@conference.short_title), class: 'btn btn-success btn-lg text-center'
+        = link_to "Submit your paper now", conference_program_proposal_index_path(@conference.short_title), class: 'btn btn-success btn-lg text-center'

app/views/conference/_conference_details.html.haml

@@ -21,7 +21,7 @@
             - if !@conference || @conference != conference
               - if conference.splashpage && conference.splashpage.public
                 = link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
-            - if conference.call_for_paper and conference.call_for_paper.schedule_public
+            - if conference.program and conference.program.schedule_public
               = link_to "Schedule", schedule_conference_path(conference.short_title), :class =>"btn btn-default"
             - if conference.registration_open?
               - if conference.user_registered?(current_user)
@@ -29,9 +29,9 @@
               - else
                 = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
             - if !current_user.nil? && current_user.proposal_count(conference) > 0
-              = link_to "My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
-            - elsif conference.cfp_open?
-              = link_to "Submit Proposal", new_conference_proposal_path(conference.short_title), :class =>"btn btn-default"
+              = link_to "My Proposals", conference_program_proposal_index_path(conference.short_title), :class =>"btn btn-default"
+            - elsif conference.program.cfp_open?
+              = link_to "Submit Proposal", new_conference_program_proposal_path(conference.short_title), :class =>"btn btn-default"
             - if current_user.nil? || !current_user.subscribed?(conference)
               = link_to 'Subscribe', conference_subscriptions_path(conference.short_title), method: :post, class: 'btn btn-default'
             - else

app/views/conference/_program.html.haml

@@ -0,0 +1,40 @@
+= content_for :splash_nav do
+  %li
+    %a.smoothscroll{ href: '#callforpapers' } Call For Papers
+
+.container
+  .row
+    .col-md-12.text-center
+      %h2
+        Call for Papers
+      %p.lead
+        We are ready to accept your proposals for sessions!
+  .row
+    .col-md-6.col-md-offset-3.col-sm-10.col-sm-offset-1
+      %p
+        - if @conference.program.event_types.any?
+          You can submit proposals for
+          = "#{event_types(@conference)}."
+        - if @conference.tracks.any?
+          Proposals should fit in one of the
+          = "#{pluralize(@conference.tracks.count, 'track')}:"
+          = "#{tracks(@conference)}."
+        The submission period has begun
+        %em
+          = @program.cfp.start_date.strftime('%A, %B %-d. %Y')
+        and closes
+        %em
+          = @program.cfp.end_date.strftime('%A, %B %-d. %Y.')
+        - if @conference.cfp_open?
+          That means you have only
+          %b= pluralize(@program.cfp.remaining_days, 'day')
+          left!
+          Remember
+          = @conference.short_title
+          will only be as good as the sessions you present. Submit early, submit often!
+        - else
+          The submission period is closed.
+  .row
+    .col-md-12.text-center
+      %p.cta-button
+        = link_to "Submit your paper now", conference_proposal_index_path(@conference.short_title), class: 'btn btn-success btn-lg text-center'

app/views/conference/_schedule_item.html.haml

@@ -1,7 +1,7 @@
 %td.event{ style: "width: #{95 / @rooms.length}%; cursor:pointer", |
            rowspan: span[room.id], |
            role: "button" } |
-  %a.unstyled-link{href: url_for(conference_proposal_path(@conference.short_title, event[0].id))}
+  %a.unstyled-link{href: url_for(conference_program_proposal_path(@conference.short_title, event[0].id))}
     - if speaker = event[0].speakers.first
       = image_tag speaker.gravatar_url, :class => "img-circle pull-right", |
                                          :alt => speaker.name, |

app/views/conference/_schedule_splashpage.html.haml

@@ -6,10 +6,10 @@
       %p.lead.text-center
         = @conference.short_title
         has the most awesome program ever!
-        - if @conference.splashpage and @conference.tracks.any? and @conference.splashpage.include_tracks
+        - if @conference.splashpage and @conference.program.tracks.any? and @conference.splashpage.include_tracks
           See rock-star speakers cover the topics of
       - if @conference.splashpage and @conference.splashpage.include_tracks
-        - @conference.tracks.each_slice(3) do |slice|
+        - @conference.program.tracks.each_slice(3) do |slice|
           .row.row-centered
             - slice.each do |track|
               .col-md-4.col-sm-4.col-centered.col-top.track
@@ -17,7 +17,7 @@
                   = track.name
                 = markdown(track.description)
 
-  - if @conference.call_for_paper and @conference.call_for_paper.schedule_public
+  - if @conference.program and @conference.program.schedule_public
     .row
       .col-md-12
         %p.cta-button.text-center
@@ -28,10 +28,10 @@
   %h3.text-center
     Don't miss out!
   %br
-  - if @conference.events.highlights.any?
+  - if @conference.program.events.highlights.any?
     .row
       .col-md-12
-        - @conference.events.highlights.each_slice(2) do |slice|
+        - @conference.program.events.highlights.each_slice(2) do |slice|
           .row.row-centered
             - slice.each do |event|
               .col-md-6.col-centered.col-top.highlights
@@ -39,7 +39,7 @@
                   %b= event.title
                 %h5.text-center
                   = simple_format truncate(event.abstract, length: 500, separator: ' ')
-                  = link_to "Read More", conference_proposal_path(@conference.short_title, event)
+                  = link_to "Read More", conference_program_proposal_path(@conference.short_title, event)
 
   = content_for :splash_nav do
     %li

app/views/conference/schedule.html.erb

@@ -1,5 +1,5 @@
 <div class="container">
-  <% if @conference.events.scheduled.any? %>
+  <% if @conference.program.events.scheduled.any? %>
       <div role="tabpanel">
         <!-- Nav tabs -->
         <ul class="nav nav-tabs" role="tablist">
@@ -24,4 +24,4 @@
   <% else %>
       <%= render 'all_events' %>
   <% end %>
-</div>
+</div>

app/views/conference/show.html.haml

@@ -36,7 +36,7 @@
       %section#program
         = render 'schedule_splashpage'
 
-    - if @conference.cfp_open? and @conference.splashpage.include_cfp
+    - if @program.cfp_open? and @conference.splashpage.include_cfp
       %section#callforpapers
         = render 'call_for_paper'
 

app/views/conference_registrations/_registration_info.html.haml

@@ -1,8 +1,8 @@
 - if @conference.questions.any?
   = render partial: 'conference_registrations/questions', locals: { f: f }
-- if @conference.events.workshops.any?
+- if @conference.program.events.workshops.any?
   =f.inputs 'Pre-registration required for the following:' do
-    = f.input :events, as: :check_boxes, label: false, collection: @conference.events.workshops
+    = f.input :events, as: :check_boxes, label: false, collection: @conference.program.events.workshops
 = f.inputs 'Your Travel Info' do
   = f.input :arrival, as: :string, label: 'Your arrival time', input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker', readonly: 'readonly'  }
   = f.input :departure, as: :string, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly'  }

app/views/conference_registrations/show.html.haml

@@ -126,13 +126,13 @@
         - @conference.participants.each do |participant|
           = image_tag(participant.gravatar_url(size: '25'), title: "#{participant.name}!", class: 'img-circle')
     .col-md-4.col-md-offset-2
-      - if @conference.speakers.confirmed.any?
+      - if @conference.program.speakers.confirmed.any?
         %h4
           %span.fa-stack
             %i.fa.fa-square-o.fa-stack-2x
             %i.fa.fa-microphone.fa-stack-1x
-          = @conference.speakers.confirmed.count
+          = @conference.program.speakers.confirmed.count
           Confirmed
-          = word_pluralize(@conference.speakers.confirmed.count, 'Speaker')
-        - @conference.speakers.confirmed.each do |speaker|
+          = word_pluralize(@conference.program.speakers.confirmed.count, 'Speaker')
+        - @conference.program.speakers.confirmed.each do |speaker|
           = image_tag(speaker.gravatar_url(size: '25'), title: "#{speaker.name}!", class: 'img-circle')

app/views/layouts/_admin_sidebar.html.haml

@@ -53,33 +53,33 @@
         %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 can? :update, @conference.program.rooms.build
+          %li{:class=> active_nav_li(admin_conference_program_rooms_path(@conference.short_title))}
+            = link_to 'Rooms', admin_conference_program_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)
-  - if can? :update, @conference.events.build
-    %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
-        %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/proposal/_encouragement_text.html.haml

@@ -1,20 +1,20 @@
 %p.lead
-  - if @conference.event_types.any?
+  - if @program.event_types.any?
     You can submit proposals for
     = "#{event_types(@conference)}."
-  - if @conference.tracks.any?
+  - if @program.tracks.any?
     Proposals should fit in one of the
-    = "#{pluralize(@conference.tracks.count, 'track')}:"
+    = "#{pluralize(@program.tracks.count, 'track')}:"
     = "#{tracks(@conference)}."
-  - if @conference.cfp_open?
+  - if @program.cfp_open?
     The submission period has begun
     %em
-      = @conference.call_for_paper.start_date.strftime('%A, %B %-d. %Y')
+      = @program.cfp.start_date.strftime('%A, %B %-d. %Y')
     and closes
     %em
-      = @conference.call_for_paper.end_date.strftime('%A, %B %-d. %Y.')
+      = @program.cfp.end_date.strftime('%A, %B %-d. %Y.')
     That means you have
-    %b= pluralize(@conference.call_for_paper.remaining_days, 'day')
+    %b= pluralize(@program.cfp.remaining_days, 'day')
     left!
     Remember
     = @conference.title

app/views/proposal/_form.html.haml

@@ -13,7 +13,7 @@
           #commercials-content.tab-pane
             %p.text-muted
               You can add commercials for your proposal. These commercials will be displayed on the
-              = link_to 'public proposal page.', conference_proposal_path(@conference.short_title, @event)
+              = link_to 'public proposal page.', conference_program_proposal_path(@conference.short_title, @event)
               If you don't add a commercial, the conference commercial will be displayed!
             - if can? :create, @event.commercials.new
               .row
@@ -37,9 +37,9 @@
                           = render partial: 'shared/media_item', locals: { commercial: commercial }
                         .caption
                           - if can? :update, commercial
-                            = semantic_form_for commercial, url: conference_proposal_commercial_path(conference_id: @conference.short_title, proposal_id: @event, id: commercial) do |f|
+                            = semantic_form_for commercial, url: conference_program_proposal_commercial_path(conference_id: @conference.short_title, proposal_id: @event, id: commercial) do |f|
                               = f.input :url, label: 'URL', as: :string, input_html: { id: "commercial_url_#{commercial.id}", required: 'required', type: 'url' }
                               = f.action :submit, as: :button, button_html: { class: 'btn btn-success' }, label: 'Update'
                               - if can? :destroy, commercial
-                                = link_to 'Delete', conference_proposal_commercial_path(@conference.short_title, @event.id, commercial.id),
+                                = link_to 'Delete', conference_program_proposal_commercial_path(@conference.short_title, @event.id, commercial.id),
                                 :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'

app/views/proposal/_proposal_form.html.haml

@@ -5,21 +5,21 @@
     = f.input :subtitle, as: :string
 
     = f.input :event_type_id, as: :select,
-      collection: @conference.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
+      collection: @conference.program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
       data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
       include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
 
-    - @conference.event_types.each do |event_type|
+    - @conference.program.event_types.each do |event_type|
       %span{ class: 'help-block select-help-text event_event_type_id collapse', id: "#{event_type.id}-help" }
         = event_type.description
 
     :javascript
-      $("##{@conference.event_types.first.id}-help").collapse('show');
+      $("##{@conference.program.event_types.first.id}-help").collapse('show');
 
-    = f.input :difficulty_level, as: :select, collection: @conference.difficulty_levels, input_html: { class: 'select-help-toggle' },
-      include_blank: '(Please select)' if @conference.difficulty_levels.any?
+    = f.input :difficulty_level, as: :select, collection: @conference.program.difficulty_levels, input_html: { class: 'select-help-toggle' },
+      include_blank: '(Please select)' if @conference.program.difficulty_levels.any?
 
-    - @conference.difficulty_levels.each do |difficulty_level|
+    - @conference.program.difficulty_levels.each do |difficulty_level|
       %span{ class: 'help-block select-help-text collapse event_difficulty_level_id', id: "#{difficulty_level.id}-help" }
         = difficulty_level.description
 

app/views/proposal/_tooltip.html.haml

@@ -3,9 +3,9 @@
   %li{'class'=>class_for_todo(progress_status['registered'])}
     %span{'class'=>icon_for_todo(progress_status['registered'])}
       - if progress_status['registered']
-        = link_to 'Edit your registration', edit_conference_conference_registrations_path(event.conference.short_title)
+        = link_to 'Edit your registration', edit_conference_conference_registrations_path(event.program.conference.short_title)
       - else
-        = link_to 'Register to the conference', new_conference_conference_registrations_path(event.conference.short_title)
+        = link_to 'Register to the conference', new_conference_conference_registrations_path(event.program.conference.short_title)
 
   %li{'class'=>class_for_todo(progress_status['biography'])}
     %span{'class'=>icon_for_todo(progress_status['biography'])}
@@ -17,20 +17,19 @@
   %li{'class'=>class_for_todo(progress_status['subtitle'])}
     %span{'class'=>icon_for_todo(progress_status['subtitle'])}
       - if progress_status['subtitle']
-        = link_to 'Edit the subtitle', edit_conference_proposal_path(event.conference.short_title, event)
+        = link_to 'Edit the subtitle', edit_conference_program_proposal_path(event.program.conference.short_title, event)
       - else
-        = link_to 'Add a subtitle', edit_conference_proposal_path(event.conference.short_title, event)
+        = link_to 'Add a subtitle', edit_conference_program_proposal_path(event.program.conference.short_title, event)
 
   %li{'class'=>class_for_todo(progress_status['commercials'])}
     %span{'class'=>icon_for_todo(progress_status['commercials'])}
       - if progress_status['commercials']
-        = link_to 'Edit the commercials', edit_conference_proposal_path(event.conference.short_title, event, anchor: 'commercials-content')
+        = link_to 'Edit the commercials', edit_conference_program_proposal_path(event.program.conference.short_title, event, anchor: 'commercials-content')
       - else
-        = link_to 'Add a commercial', edit_conference_proposal_path(event.conference.short_title, event, anchor: 'commercials-content')
-
+        = link_to 'Add a commercial', edit_conference_program_proposal_path(event.conference.short_title, event, anchor: 'commercials-content')
   %li{'class'=>class_for_todo(progress_status['difficulty_level'])}
     %span{'class'=>icon_for_todo(progress_status['difficulty_level'])}
       - if progress_status['difficulty_level']
-        = link_to 'Change the difficulty level', edit_conference_proposal_path(event.conference.short_title, event)
+        = link_to 'Change the difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event)
       - else
-        = link_to 'Add a difficulty level', edit_conference_proposal_path(event.conference.short_title, event)
+        = link_to 'Add a difficulty level', edit_conference_program_proposal_path(event.program.conference.short_title, event)

app/views/proposal/index.html.haml

@@ -18,7 +18,7 @@
             Some of your proposals have been selected as a highlight of #{@conference.title}!
             %ul
               - @events.highlighted.each do |event|
-                %li= link_to event.title, conference_proposal_path(@conference.short_title, event)
+                %li= link_to event.title, conference_program_proposal_path(@conference.short_title, event)
 
 
     .row
@@ -60,7 +60,7 @@
                 %span{ title: event.state.humanize, class: "fa #{event_status_icon(event)}" }
 
               %td.col-md-7{style: "padding:20px 8px 20px 8px;"}
-                = link_to event.title, conference_proposal_path(@conference.short_title, event.id)
+                = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
                 %br
                 %small.text-muted
                   = event.event_type.title
@@ -82,20 +82,20 @@
                 .pull-right
                   - if event.transition_possible? :confirm
                     = link_to 'Confirm',
-                    confirm_conference_proposal_path(@conference.short_title, event),
+                    confirm_conference_program_proposal_path(@conference.short_title, event),
                     method: :patch, class: 'btn btn-mini btn-success', id: "confirm_proposal_#{event.id}"
 
                   - if event.transition_possible? :withdraw
-                    = link_to 'Withdraw', conference_proposal_path(@conference.short_title, event.id), method: :delete,
+                    = link_to 'Withdraw', conference_program_proposal_path(@conference.short_title, event.id), method: :delete,
                                 data: { confirm: 'Are you sure you want to withdraw this proposal?' }, class: 'btn btn-mini btn-warning',
                                 id: "delete_proposal_#{event.id}"
                   - if event.state == 'withdrawn' || event.state == 'rejected'
                     = link_to 'Re-Submit',
-                    restart_conference_proposal_path(@conference.short_title, event.id),
+                    restart_conference_program_proposal_path(@conference.short_title, event.id),
                     method: :patch, class: 'btn btn-mini btn-success', id: "review_event_#{event.id}"
-                  = link_to 'Edit', edit_conference_proposal_path(@conference.short_title, event.id),
+                  = link_to 'Edit', edit_conference_program_proposal_path(@conference.short_title, event.id),
                   class: 'btn btn-default', id: "edit_proposal_#{event.id}"
   .row
     .col-md-12
-      - if @conference.cfp_open? || (current_user.has_role? :organizer, @conference)
-        = link_to "New Proposal", new_conference_proposal_path(@conference.short_title), :class => "btn btn-success pull-right"
+      - if can? :create, @program.events.new
+        = link_to "New Proposal", new_conference_program_proposal_path(@conference.short_title), :class => "btn btn-success pull-right"

app/views/proposal/new.html.haml

@@ -27,16 +27,16 @@
             = f.inputs name: 'Proposal Information' do
               = f.input :title, as: :string, required: true, input_html: { required: true }
               = f.input :event_type_id, as: :select,
-                collection: @conference.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
+                collection: @program.event_types.map {|type| ["#{type.title} - #{show_time(type.length)}", type.id,
                 data: { min_words: type.minimum_abstract_length, max_words: type.maximum_abstract_length }]},
                 include_blank: false, label: 'Type', input_html: { class: 'select-help-toggle' }
 
-              - @conference.event_types.each do |event_type|
+              - @program.event_types.each do |event_type|
                 %span{ class: 'help-block event_event_type_id collapse', id: "#{event_type.id}-help" }
                   = event_type.description
 
               :javascript
-                $("##{@conference.event_types.first.id}-help").collapse('show');
+                $("##{@program.event_types.first.id}-help").collapse('show');
 
               = f.input :abstract, input_html: { rows: 5, required: true },
                 required: true, hint: link_to('Tips to improve your presentations', 'http://blog.hubspot.com/blog/tabid/6307/bid/5975/10-Rules-to-Instantly-Improve-Your-Presentations.aspx')

app/views/proposal/show.html.haml

@@ -9,7 +9,7 @@
             = @event.subtitle
         = link_to "Schedule", schedule_conference_path(@conference.short_title), :class =>"btn btn-success pull-right"
         - if can? :edit, @event
-          = link_to "Edit", edit_admin_conference_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
+          = link_to "Edit", edit_admin_conference_program_event_path(@conference.short_title, @event), :class => "btn btn-mini btn-primary pull-right"
   .row
     .col-md-3
       %p
@@ -24,7 +24,7 @@
           - if @event.room_id
             = @event.room.name
         %dt Conference:
-        %dd= @event.conference.title
+        %dd= @event.program.conference.title
         %dt Language:
         %dd= @event.language if @event.language
         %dt Track: