From 0adf348515af319484d6f7fd34e5e07f3892e4b7 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 6 Apr 2022 15:14:47 +0100 Subject: [PATCH 1/2] bootstrap bott half of meeting admin page --- .../meetings/_invitation_management.html.haml | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/admin/meetings/_invitation_management.html.haml b/app/views/admin/meetings/_invitation_management.html.haml index 543339985..add235eaa 100644 --- a/app/views/admin/meetings/_invitation_management.html.haml +++ b/app/views/admin/meetings/_invitation_management.html.haml @@ -1,34 +1,34 @@ - if @invitations.any? .row - .large-12.columns + .col .panel %p #{@invitations.count} members have RSVP'd to this event. - .row - .large-9.columns - %small + %div + = simple_form_for :meeting_invitations, url: admin_meeting_invitations_path do |f| .row - = simple_form_for :meeting_invitations, url: admin_meeting_invitations_path do |f| - .medium-6.columns - = f.select :member, - Member.all.map { |u| ["#{u.full_name}", u.id] }, - { include_blank: true }, { class: 'chosen-select', required: true, - data: { placeholder: t('messages.invitations.select_a_member_to_rsvp') } } - = f.input :meeting_id, as: :hidden, input_html: { value: @meeting.slug } + .col-6 + = f.select :member, + Member.all.map { |u| ["#{u.full_name}", u.id] }, + { include_blank: true }, { class: 'chosen-select', required: true, + data: { placeholder: t('messages.invitations.select_a_member_to_rsvp') } } + = f.input :meeting_id, as: :hidden, input_html: { value: @meeting.slug } - .large-3.columns - %span{ 'data-tooltip': true, 'aria-haspopup': 'true', class: 'has-tip', title: t('admin.workshop.manage_rsvps.text') } - %i.fas.fa-info - = f.submit 'Add' - %br + .col-3 + %span{ 'data-tooltip': true, 'aria-haspopup': 'true', class: 'has-tip', title: t('admin.workshop.manage_rsvps.text') } + %i.fas.fa-info + = f.submit 'Add' - .row - .medium-12.columns.attendances + .row.mt-4 + .col.attendances %h4 Participants - - @invitations.each do |invitation| - .attendee.medium-5.columns - .small-1.columns + + .row + - @invitations.each do |invitation| + .col-5.attendee + .row.mb-4 + .col-1 - if (@meeting.date_and_time - 30.minutes).past? - if invitation.attended? = link_to '', admin_meeting_invitation_path(invitation, attendance_status: true, attended: false), class: 'far fa-check-square', method: :put @@ -40,6 +40,6 @@ - else = link_to '', admin_meeting_invitation_path(invitation, attendance_status: false, attended: false), class: 'far fa-minus-square', method: :put - .small-10.columns + .col-11 = link_to admin_member_path(invitation.member) do = invitation.member.full_name From 1e68ebccf713c81161cdc5b6c0a8af59c8b88651 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Tue, 12 Apr 2022 09:43:35 +0100 Subject: [PATCH 2/2] update panel and button --- .../meetings/_invitation_management.html.haml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/admin/meetings/_invitation_management.html.haml b/app/views/admin/meetings/_invitation_management.html.haml index add235eaa..dd793823f 100644 --- a/app/views/admin/meetings/_invitation_management.html.haml +++ b/app/views/admin/meetings/_invitation_management.html.haml @@ -1,11 +1,12 @@ - if @invitations.any? .row .col - .panel - %p - #{@invitations.count} members have RSVP'd to this event. + .card.bg-white.border-success + .card-body + %p.mb-0 + #{@invitations.count} members have RSVP'd to this event. - %div + %div.mt-4 = simple_form_for :meeting_invitations, url: admin_meeting_invitations_path do |f| .row .col-6 @@ -16,11 +17,10 @@ = f.input :meeting_id, as: :hidden, input_html: { value: @meeting.slug } .col-3 - %span{ 'data-tooltip': true, 'aria-haspopup': 'true', class: 'has-tip', title: t('admin.workshop.manage_rsvps.text') } - %i.fas.fa-info - = f.submit 'Add' + %span{'data-bs-toggle': 'tooltip', 'data-bs-placement': 'bottom', title: t('admin.workshop.manage_rsvps.text')} + = f.button :button, 'Add', class: 'btn btn-primary' - .row.mt-4 + .row .col.attendances %h4 Participants