diff --git a/Gemfile b/Gemfile index ad32662d..6085dc1c 100644 --- a/Gemfile +++ b/Gemfile @@ -221,7 +221,7 @@ gem 'dalli' gem 'icalendar' -#pagination +# pagination gem 'pagy', '<4.0' # Use guard and spring for testing in development diff --git a/app/helpers/conference_helper.rb b/app/helpers/conference_helper.rb index 255cf2fa..c392a814 100644 --- a/app/helpers/conference_helper.rb +++ b/app/helpers/conference_helper.rb @@ -3,7 +3,6 @@ DEFAULT_LOGO = 'snapcon_logo.png' DEFAULT_COLOR = '#0B3559' - module ConferenceHelper # Return true if only call_for_papers or call_for_tracks or call_for_booths is open def one_call_open(*calls) @@ -82,7 +81,7 @@ module ConferenceHelper def get_happening_now_events_schedules(conference) events_schedules = conference.program.selected_event_schedules( includes: [:room, { event: %i[track event_type speakers submitter] }] - )#.select(&:happening_now?) + ).select(&:happening_now?) events_schedules ||= [] events_schedules end diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml index cf4ae80d..0d7e1d20 100644 --- a/app/views/conferences/show.html.haml +++ b/app/views/conferences/show.html.haml @@ -54,11 +54,11 @@ - if @conference.splashpage.include_happening_now - if @events_schedules.any? .row - %h2.text-center{:style => "margin-bottom:30px"} Happening Now + %h2.text-center{ style: "margin-bottom:30px" } Happening Now - for event_schedule in @events_schedules = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event - .container{:style => "margin:auto; width:50%"} - != pagy_nav(@pagy) + .container{ style: "margin:auto; width:50%" } + != pagy_nav(@pagy) - else .row %h3.text-center There are no events happening now. @@ -66,7 +66,7 @@ .col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4 #about .row - %h2.text-left{:style => "margin-bottom:30px"} About the Conference + %h2.text-left{ style: "margin-bottom:30px" } About the Conference = markdown(@conference.description, escape_html=false) .trapezoid diff --git a/config/initializers/pagy.rb b/config/initializers/pagy.rb index 6f5e8550..c1dcb0be 100644 --- a/config/initializers/pagy.rb +++ b/config/initializers/pagy.rb @@ -1,15 +1,12 @@ -# encoding: utf-8 # frozen_string_literal: true # Pagy initializer file (4.1.0) # Customize only what you really need and notice that Pagy works also without any of the following lines. # Should you just cherry pick part of this file, please maintain the require-order of the extras - # Extras # See https://ddnexus.github.io/pagy/extras - # Backend Extras # Array extra: Paginate arrays efficiently, avoiding expensive array-wrapping and without overriding @@ -71,7 +68,6 @@ require 'pagy/extras/array' # See https://ddnexus.github.io/pagy/extras/navs#steps # Pagy::VARS[:steps] = { 0 => [2,3,3,2], 540 => [3,5,5,3], 720 => [5,7,7,5] } # example - # Feature Extras # Headers extra: http response headers (and other helpers) useful for API pagination @@ -106,19 +102,15 @@ require 'pagy/extras/array' # See https://ddnexus.github.io/pagy/extras/trim # require 'pagy/extras/trim' - - # Pagy Variables # See https://ddnexus.github.io/pagy/api/pagy#variables # All the Pagy::VARS are set for all the Pagy instances but can be overridden # per instance by just passing them to Pagy.new or the #pagy controller method - # Instance variables # See https://ddnexus.github.io/pagy/api/pagy#instance-variables # Pagy::VARS[:items] = 20 # default - # Other Variables # See https://ddnexus.github.io/pagy/api/pagy#other-variables # Pagy::VARS[:size] = [1,4,4,1] # default @@ -127,7 +119,6 @@ require 'pagy/extras/array' # Pagy::VARS[:anchor] = '#anchor' # example # Pagy::VARS[:link_extra] = 'data-remote="true"' # example - # Rails # Rails: extras assets path required by the helpers that use javascript @@ -135,7 +126,6 @@ require 'pagy/extras/array' # See https://ddnexus.github.io/pagy/extras#javascript # Rails.application.config.assets.paths << Pagy.root.join('javascripts') - # I18n # Pagy internal I18n: ~18x faster using ~10x less memory than the i18n gem @@ -165,11 +155,10 @@ require 'pagy/extras/array' # filepath: 'path/to/pagy-xyz.yml', # pluralize: lambda{|count| ... } ) - # I18n extra: uses the standard i18n gem which is ~18x slower using ~10x more memory # than the default pagy internal i18n (see above) # See https://ddnexus.github.io/pagy/extras/i18n # require 'pagy/extras/i18n' # Default i18n key -# Pagy::VARS[:i18n_key] = 'pagy.item_name' # default \ No newline at end of file +# Pagy::VARS[:i18n_key] = 'pagy.item_name' # default