diff --git a/app/models/user.rb b/app/models/user.rb index 986a96ed..d7f23779 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -259,7 +259,7 @@ class User < ApplicationRecord # TODO: Use a real authorization in the right place.... def manages_volunteers?(conference) organizer_roles = get_roles['organizer'] - organizer_roles&.include?(conference.short_title) # TODO or Volunteer Coorinator. + organizer_roles&.include?(conference.short_title) # TODO or Volunteer Coorinator. end def registered diff --git a/app/views/proposals/index.html.haml b/app/views/proposals/index.html.haml index 129f54f5..6785af29 100644 --- a/app/views/proposals/index.html.haml +++ b/app/views/proposals/index.html.haml @@ -70,9 +70,6 @@ %span{ title: event.state.humanize, class: "fa #{status_icon(event)}" } %td.col-md-7{style: "padding:20px 8px 20px 8px;"} - - if event.volunteers.include?(current_user) - %strong You are volunteer host for: - %br = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id) %br %small.text-muted @@ -117,12 +114,15 @@ = link_to 'Edit', edit_conference_program_proposal_path(@conference.short_title, event.id), class: 'btn btn-default', id: "edit_proposal_#{event.id}" - - if @volunteer_events.any? - %h2 - Volunteer Events - %small - Thanks for being a host at #{@conference.title} - = render 'volunteers_table', events: @volunteer_events + - if @volunteer_events.any? + .row + .col-md-12 + %h2 + Volunteer Duties + %small + Thanks for being a host at #{@conference.title} + = render 'volunteers_table', events: @volunteer_events + .row .col-md-12 - if can? :create, @event diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 27f7ade2..4f40cf2c 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -9,12 +9,13 @@ = canceled_replacement_event_label(event, event_schedule) = replacement_event_notice(event_schedule) - %span.h3{style: "margin-bottom: 20px"} + %span.h3{style: "margin-bottom: 14px"} = event.title %br - %small + %small{style: "color: #{contrast_color(header_color)}"} = event.subtitle .trapezoid{style: "color: #{header_color}; top: 12px;"} + .panel-body %h4 - if(event.speakers.any?)