From e93a27d1f20c0a2ec835477b000c6cb8f7b8c021 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sun, 26 Jul 2020 23:01:41 -0700 Subject: [PATCH 1/4] Show off track colors some more --- app/views/admin/schedules/_form.html.haml | 2 +- app/views/schedules/_event.html.haml | 9 ++++----- app/views/tracks/show.html.haml | 4 ++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/views/admin/schedules/_form.html.haml b/app/views/admin/schedules/_form.html.haml index 8c6c091d..11fd9967 100644 --- a/app/views/admin/schedules/_form.html.haml +++ b/app/views/admin/schedules/_form.html.haml @@ -6,5 +6,5 @@ .row .col-md-12 = semantic_form_for @schedule, url: admin_conference_schedules_path(@conference.short_title) do |f| - = f.input :track, collection: Track.accessible_by(current_ability).where(program: @program).self_organized.confirmed.pluck(:name, :id), include_blank: false + = f.input :track, collection: Track.accessible_by(current_ability).where(program: @program), include_blank: false = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' } diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 2dbe5087..7d2102d3 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -1,19 +1,18 @@ .panel.panel-default.event-panel{ onClick: 'eventClicked(event, this);', "data-url" => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" } - .panel-body + .panel-heading{ style: event.track&.color && "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } - event.speakers_ordered.each do |speaker| - = image_tag speaker.profile_picture, :class => "img-circle pull-right all-speaker-pic", | - :alt => speaker.name, | - :title => speaker.name | + = image_tag speaker.profile_picture, class: "img-circle pull-right", alt: speaker.name, style: "padding: 2px;" %p = canceled_replacement_event_label(event, event_schedule) = replacement_event_notice(event_schedule) - %span.h3 + %span.h3{style: "margin-bottom: 20px"} = event.title %br %small = event.subtitle + .panel-body %h4 - if(event.speakers.any?) presented by #{event.speaker_names} diff --git a/app/views/tracks/show.html.haml b/app/views/tracks/show.html.haml index 52448b98..a6aa066c 100644 --- a/app/views/tracks/show.html.haml +++ b/app/views/tracks/show.html.haml @@ -45,3 +45,7 @@ Relevance %dd = markdown(@track.relevance) + + .row + - @track.events.each do |event| + = render 'schedules/event', event: event, event_schedule: event.event_schedules.first From 94ea8b3a6c01a3df5708bb6e0116b9ee54a57e8e Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sun, 26 Jul 2020 23:13:28 -0700 Subject: [PATCH 2/4] snapify the schedule! :D --- app/views/schedules/_event.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/schedules/_event.html.haml b/app/views/schedules/_event.html.haml index 7d2102d3..27f7ade2 100644 --- a/app/views/schedules/_event.html.haml +++ b/app/views/schedules/_event.html.haml @@ -1,5 +1,7 @@ .panel.panel-default.event-panel{ onClick: 'eventClicked(event, this);', "data-url" => "#{url_for(conference_program_proposal_path(@conference.short_title, event.id))}" } - .panel-heading{ style: event.track&.color && "background-color: #{event.track.color}; color: #{ contrast_color(event.track.color) }" } + - header_color = event.track&.color || '#f5f5f5' + .trapezoid{style: "color: white; top: 12px; z-index: 100;"} + .panel-heading{ style: "background-color: #{header_color}; color: #{ contrast_color(header_color) }; border-radius: 4px" } - event.speakers_ordered.each do |speaker| = image_tag speaker.profile_picture, class: "img-circle pull-right", alt: speaker.name, style: "padding: 2px;" @@ -12,6 +14,7 @@ %br %small = event.subtitle + .trapezoid{style: "color: #{header_color}; top: 12px;"} .panel-body %h4 - if(event.speakers.any?) From d1b2ad3528e7eb4f53d17eeeba172987b88a72d9 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Sun, 26 Jul 2020 23:23:23 -0700 Subject: [PATCH 3/4] admins can update volunteers, show names --- app/controllers/admin/events_controller.rb | 2 +- app/helpers/application_helper.rb | 2 +- app/views/admin/events/_proposal.html.haml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb index d8e9c1c9..41feb8b1 100644 --- a/app/controllers/admin/events_controller.rb +++ b/app/controllers/admin/events_controller.rb @@ -180,7 +180,7 @@ module Admin :track_id, :state, :language, :is_highlight, :max_attendees, # Not used anymore? :proposal_additional_speakers, :user, :users_attributes, - speaker_ids: []) + speaker_ids: [], volunteer_ids: []) end def comment_params diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9115b51e..96c2f8b1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -126,7 +126,7 @@ module ApplicationHelper def volunteer_links(event) safe_join(event.volunteers.map do |volunteer| link_to(volunteer.name, admin_user_path(volunteer)) - end, ',') + end, ', ') end def volunteer_selector_input(form) diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml index 999313b7..722387ac 100644 --- a/app/views/admin/events/_proposal.html.haml +++ b/app/views/admin/events/_proposal.html.haml @@ -85,6 +85,11 @@ ( = link_to speaker.email, "mailto: #{speaker.email}" ) + %tr + %td + %b Volunteers + %td + = volunteer_links(@event) %tr %td %b Biographies From 13d78c26091b0621c01d7f5c9a0ad5642dc0d870 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Mon, 27 Jul 2020 00:23:56 -0700 Subject: [PATCH 4/4] Fix display of volunteer events --- app/models/user.rb | 2 +- app/views/proposals/index.html.haml | 18 +++++++++--------- app/views/schedules/_event.html.haml | 5 +++-- 3 files changed, 13 insertions(+), 12 deletions(-) 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?)