update

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,17 +21,19 @@
             - 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)
                 = link_to "My Registration", conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
               - else
-                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), :class =>"btn btn-default"
+                = link_to "Register", new_conference_conference_registrations_path(conference.short_title), class: "btn btn-default", disabled: conference.registration_limit_exceeded?
+                - if conference.registration_limit_exceeded?
+                  Sorry, no places left
             - 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/_registration.html.haml

@@ -6,14 +6,25 @@
   .row
     .col-md-12.text-center
       %h1 Registration
-      %p.lead
-        Going to
-        = @conference.short_title
-        is free of charge.
-      %p
-        We only ask you to register yourself until
-        = @conference.registration_period.end_date.strftime('%A, %B %-d. %Y')
-        so we can plan for the right amount of people.
-      %p.cta-button
+
+      - if @conference.registration_limit_exceeded?
+        %p
+          Sorry, the conference registration limit has exceeded
+      - else
+        - if @conference.tickets.empty?
+          %p.lead
+            Going to
+            = @conference.short_title
+            is free of charge.
+          %p
+            We only ask you to register yourself until
+            = @conference.registration_period.end_date.strftime('%A, %B %-d. %Y')
+            so we can plan for the right amount of people.
+            %p.cta-button
+        - else
+          %p
+            The registration period ends on
+            = @conference.registration_period.end_date.strftime('%A, %B %-d. %Y')
+          %p.cta-button
         = link_to(new_conference_conference_registrations_path(@conference.short_title), class: 'btn btn-lg btn-success') do
           Register Now

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/_venue.html.haml

@@ -6,8 +6,9 @@
   - popup = "<h3>#{@conference.venue.name}</h3><br>#{@conference.venue.street}<br>#{@conference.venue.city}<br>#{@conference.venue.country_name}"
   - content_for(:script_body) do
     :javascript
+      L.Icon.Default.imagePath = '/assets/leaflet/';
       // create a map in the "map" div, set the view to a given place and zoom
-      var map = L.map('map', {scrollWheelZoom: false}).setView([#{@conference.venue.latitude}, #{@conference.venue.longitude}], 11);
+      var map = L.map('map', { scrollWheelZoom: false }).setView([#{@conference.venue.latitude}, #{@conference.venue.longitude}], 11);
       // add an OpenStreetMap tile layer
       L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
         attribution: 'Map data &copy; <a href="http://openstreetmap.org">OpenStreetMap</a> contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="http://mapbox.com">Mapbox</a>',

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'
 
@@ -69,8 +69,13 @@
     var triangle_colors = triangle_tcs.map(function(t) { return t.toHexString(); });
     $(function () {
       $(document).ready(function() {
-        var t = new Trianglify({cellsize: 100, x_gradient: triangle_colors });
-        var pattern = t.generate(document.body.clientWidth, ($( "#banner" ).height() + 200 ));
-        $('#banner').css('background-image', pattern.dataUrl);
+        var triangle_width = document.body.clientWidth;
+        var triangle_height = ($( "#banner" ).height() + 200 );
+        var pattern = Trianglify({ width: triangle_width,
+                                   height: triangle_height,
+                                   cell_size: 100,
+                                   x_colors: triangle_colors
+                                  });
+        $('#banner').css('background-image', 'url("' + pattern.png() + '")');
       });
     });