From 611277ef679e905d2c7a9cf536dd4e912bf54652 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Fri, 17 Jul 2020 22:48:05 -0700 Subject: [PATCH] More tweaks to the event registrations page --- .../conference_registrations/_event.html.haml | 16 ++++++++-------- .../_registration_info.html.haml | 4 ++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/views/conference_registrations/_event.html.haml b/app/views/conference_registrations/_event.html.haml index 75b6020c..67a35ba2 100644 --- a/app/views/conference_registrations/_event.html.haml +++ b/app/views/conference_registrations/_event.html.haml @@ -1,4 +1,4 @@ -.panel.panel-default +.panel.panel-default{class: ("panel-success" if event.registrations.include?(@registration)) } .panel-heading %label{for: "registration_event_ids_#{event.id}"} %h3{style: 'margin: 0 auto;'} @@ -14,17 +14,17 @@ %p - if event.speakers.any? presented by #{event.speaker_names} + - if event_schedule.present? + .h4.track + %span.fa.fa-clock-o + %span.label{ style: "background-color: grey" } + = event_schedule.start_time.strftime('%A, %B %-d %H:%M') + \- + = event_schedule.end_time.strftime('%H:%M') %p = markdown(truncate(event.abstract, length: 250)) -# TODO: More informative text or aria-label. = link_to 'more', conference_program_proposal_path(@conference.short_title, event.id), target: '_blank' - - if event_schedule.present? - %span.track - %span.fa.fa-clock-o - %span.label{ style: "background-color: grey" } - = event_schedule.start_time.strftime('%A, %d %b %-d %H:%M') - \- - = event_schedule.end_time.strftime('%H:%M') - if event.track %span.track diff --git a/app/views/conference_registrations/_registration_info.html.haml b/app/views/conference_registrations/_registration_info.html.haml index 18b6e985..a04952d9 100644 --- a/app/views/conference_registrations/_registration_info.html.haml +++ b/app/views/conference_registrations/_registration_info.html.haml @@ -13,6 +13,10 @@ - if @conference.program.events.with_registration_open.any? || @registration.events.any? = f.inputs 'Pre-registration required for the following:' do + -# TODO: This needs to be easier to use. + %p + You are registered for #{pluralize(@registration.events.count, 'event')}. + They are at the end of this list. - @registration.events_ordered.each do |event| = render 'event', event: event, event_schedule: event.event_schedules.first