Merge branch 'master' into 176895077-Google-Calendar-Link-Should-Be-Visible-only-with-registration

app/controllers/conferences_controller.rb

@@ -147,16 +147,4 @@ class ConferencesController < ApplicationController
   def current_user_has_unpaid_tickets?
     current_user && current_user_tickets.unpaid.any?
   end
-
-  def load_happening_now
-    events_schedules_list = get_happening_now_events_schedules(@conference)
-    @is_happening_next = false
-    if events_schedules_list.empty?
-      events_schedules_list = get_happening_next_events_schedules(@conference)
-      @is_happening_next = true
-    end
-    @events_schedules_limit = EVENTS_PER_PAGE
-    @events_schedules_length = events_schedules_list.length
-    @pagy, @events_schedules = pagy_array(events_schedules_list, items: @events_schedules_limit, link_extra: 'data-remote="true"')
-  end
 end

app/controllers/proposals_controller.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
+EVENTS_PER_PAGE = Rails.configuration.conference[:events_per_page]
+
 class ProposalsController < ApplicationController
+  include ConferenceHelper
   before_action :authenticate_user!, except: [:show, :new, :create]
   load_resource :conference, find_by: :short_title
   load_resource :program, through: :conference, singleton: true
@@ -19,6 +22,7 @@ class ProposalsController < ApplicationController
     @event_schedule = @event.event_schedules.find_by(schedule_id: @program.selected_schedule_id)
     @speakers_ordered = @event.speakers_ordered
     @surveys_after_event = @event.surveys.after_event.select(&:active?)
+    load_happening_now
   end
 
   def new

app/helpers/conference_helper.rb

@@ -98,6 +98,18 @@ module ConferenceHelper
     events_schedules
   end
 
+  def load_happening_now
+    events_schedules_list = get_happening_now_events_schedules(@conference)
+    @is_happening_next = false
+    if events_schedules_list.empty?
+      events_schedules_list = get_happening_next_events_schedules(@conference)
+      @is_happening_next = true
+    end
+    @events_schedules_limit = EVENTS_PER_PAGE
+    @events_schedules_length = events_schedules_list.length
+    @pagy, @events_schedules = pagy_array(events_schedules_list, items: @events_schedules_limit, link_extra: 'data-remote="true"')
+  end
+
   private
 
   def filter_events_schedules(conference, filter)

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

@@ -1,7 +1,7 @@
 .row
   .col-md-12
     .page-header
-      %h1 Session Materials
+      %h1 #{@conference.title} Materials
       %p.text-muted
         Conference materials will be displayed on the events in the
         = link_to 'schedule,', conference_schedule_path(@conference.short_title)

app/views/conferences/_about_and_happening_now.haml

@@ -16,9 +16,9 @@
   .container
     .row
       -# happening now events are displayed second in md or lg view
-      - if conference.splashpage.include_happening_now && conference.splashpage.include_program
+      - if conference.splashpage.include_happening_now? && conference.splashpage.include_program?
         - if conference.description.present?
-          .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8
+          .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8{ style: 'margin-top: 60px' }
             = yield :happening_now
         - else
           .col-md-12

app/views/conferences/_happening_now.haml

@@ -1,16 +1,15 @@
-- if conference.splashpage.include_program && conference.splashpage.include_happening_now
-  - if events_schedules.any?
-    .row
-      %h2.text-center{ style: 'margin-bottom:30px' }
-        - if is_happening_next
-          Happening Next
-        - else
-          Happening Now
-    - events_schedules.each do |event_schedule|
-      = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true
-    - if events_schedules_length > events_schedules_limit
-      .container{ style: 'width:100%; text-align:center' }
-        != pagy_bootstrap_nav_js(pagy)
-  - else
-    .row
-      %h3.text-center There are no events scheduled yet.
+- if events_schedules.present? && events_schedules.any?
+  .row
+    %h3.text-left{ style: 'margin-bottom:30px; padding-left:20px' }
+      - if is_happening_next
+        Events Happening Next
+      - else
+        Events Happening Now
+  - events_schedules.each do |event_schedule|
+    = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true
+  - if events_schedules_length > events_schedules_limit
+    .container{ style: 'width:100%; text-align:center' }
+      != pagy_bootstrap_nav_js(pagy)
+- else
+  .row
+    %h3.text-center There are no events scheduled yet.

app/views/conferences/show.js.erb

@@ -1,5 +1,6 @@
 $('#happening-now').html("<%= j(render 'happening_now', conference: @conference,
                                 events_schedules: @events_schedules, pagy: @pagy,
                                 events_schedules_length: @events_schedules_length,
-                                events_schedules_limit: @events_schedules_limit)%>");
+                                events_schedules_limit: @events_schedules_limit,
+                                is_happening_next: @is_happening_next) %>");
 Pagy.init(document.getElementById('happening-now'));

app/views/proposals/show.html.haml

@@ -52,7 +52,7 @@
         - @event.volunteers.each do |volunteer|
           = render 'volunteer_info', speaker: volunteer, show_bio: false
 
-    .col-md-9
+    .col-md-6
       .row
         .col-md-12
           .lead
@@ -139,3 +139,11 @@
           - if @surveys_after_event.any? && @event.ended?
             .page-header
             = render partial: 'surveys/list', locals: { surveys: @surveys_after_event, conference: @conference }
+    .col-md-3
+      #happening-now
+        = render 'conferences/happening_now', conference: @conference,
+          events_schedules: @events_schedules, pagy: @pagy,
+          events_schedules_length: @events_schedules_length,
+          events_schedules_limit: @events_schedules_limit,
+          is_happening_next: @is_happening_next
+

app/views/proposals/show.js.erb

@@ -0,0 +1,6 @@
+$('#happening-now').html("<%= j(render 'conferences/happening_now', conference: @conference,
+                                events_schedules: @events_schedules, pagy: @pagy,
+                                events_schedules_length: @events_schedules_length,
+                                events_schedules_limit: @events_schedules_limit,
+                                is_happening_next: @is_happening_next) %>");
+Pagy.init(document.getElementById('happening-now'));