spina-admin-conferences-fork 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d4f99ddd9bb98f040badcd6932efa9488a3942f493695351af340161d8d41f8
-  data.tar.gz: 962d1f8d378591cacb509cde4b95de75b0070031d35cdcf9fa8eac33f6568c8d
+  metadata.gz: d2069cad41a5e1fa9f40f6b8ca9be7b946105af40c65583c50029299a1ed355f
+  data.tar.gz: f0acfe5219d447618b3a5c483a9083f5cc119e5986823b948930ab5cbcae4d8d
 SHA512:
-  metadata.gz: b170baf53afa700552aa77180d312b53fd607d39f523a7d3b00db1d22817209f6b57102787c13eebef7557961a0a678571bffecc0a018653eb9058c568b46a89
-  data.tar.gz: 8629259d8564b8ff94f8e9c9e48213cb27c85c9413682a7571624565aae405d5a79dc9884f8cd8dddf5787163d26a98a0e5156a3bd03bbdaf398d04fb98d8929
+  metadata.gz: c2a1b90a47c802b67c44c97df7c0baa7f97c5a845e7c7b9cc6665d4ba278c08dd0d5f3d243ea170d41fe35c9f2a6337071916f70faca05f32f3655da6255cd8a
+  data.tar.gz: ba33885b606f4d54e469e3f528d8a2e9e997cbf22755cbfa0b090472aa4f495592c292a5c3dfb7a6e084b15fd9c4ee3beb0780692c69638490edfe93825083f3

data/app/components/spina/admin/conferences/application_component.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Spina
+  module Admin
+    module Conferences
+      # Base class for components.
+      class ApplicationComponent < Spina::ApplicationComponent
+      end
+    end
+  end
+end

data/app/components/spina/admin/conferences/form_group_component.html.haml

@@ -0,0 +1,4 @@
+.mt-6
+  %label.block.text-sm.leading-5.font-medium.text-gray-700= label
+  .text-gray-400.text-sm= description
+  .mt-1= content

data/app/components/spina/admin/conferences/form_group_component.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Spina
+  module Admin
+    module Conferences
+      # Correctly styles label, description and content of form fields.
+      class FormGroupComponent < ApplicationComponent
+        attr_reader :label, :description
+
+        def initialize(label:, description: '')
+          @label = label
+          @description = description
+        end
+      end
+    end
+  end
+end

data/app/views/spina/admin/conferences/application/_empty_list.html.haml

@@ -1,3 +1,3 @@
 %tr
-  %td.align-center{ colspan: 1000 }
+  %td.text-center.text-lg.text-medium.text-gray-700.py-8{ colspan: 10 }
     %em= message

data/app/views/spina/admin/conferences/conferences/_event_fields.html.haml

@@ -1,16 +1,16 @@
 %div{ data: { 'part-id': "#{f.object.object_id}", 'tabs-target': 'pane' }, id: "pane_#{f.object.object_id}" }
   = f.hidden_field :id
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:name)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :name)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:start_datetime)) do
-    = f.datetime_field :start_datetime
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:finish_datetime)) do
-    = f.datetime_field :finish_datetime
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:location)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:start_datetime)) do
+    = f.datetime_field :start_datetime, class: 'form-input'
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:finish_datetime)) do
+    = f.datetime_field :finish_datetime, class: 'form-input'
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:location)) do
     = render Spina::Forms::TextFieldComponent.new(f, :location)
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:description)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Event.human_attribute_name(:description)) do
     .mt-1.relative
       = f.hidden_field :description, id: "#{f.object.object_id}_input"
 

data/app/views/spina/admin/conferences/conferences/_form.html.haml

@@ -26,4 +26,4 @@
     = form_with model: [spina, :admin_conferences, @conference], id: dom_id(@conference), html: { autocomplete: 'off' } do |f|
       - @tabs.each_with_index do |tab, i|
         %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-          = render "form_#{tab}", f: f
+          .max-w-5xl= render "form_#{tab}", f: f

data/app/views/spina/admin/conferences/conferences/_form_conference_details.html.haml

@@ -1,9 +1,10 @@
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:name)) do
+.-mt-6
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:name)) do
   = render Spina::Forms::TextFieldComponent.new(f, :name)
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date)) do
-  = f.date_field :start_date, value: (@conference.start_date.strftime("%Y-%m-%d") if @conference.start_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date)
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date)) do
-  = f.date_field :finish_date, value: (@conference.finish_date.strftime("%Y-%m-%d") if @conference.finish_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date)
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date)) do
+  = f.date_field :start_date, value: (@conference.start_date.strftime("%Y-%m-%d") if @conference.start_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:start_date), class: 'form-input'
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date)) do
+  = f.date_field :finish_date, value: (@conference.finish_date.strftime("%Y-%m-%d") if @conference.finish_date.present?), placeholder: Spina::Admin::Conferences::Conference.human_attribute_name(:finish_date), class: 'form-input'
 
 
 .mt-6{ 'data-controller': 'repeater' }

data/app/views/spina/admin/conferences/conferences/_form_parts.html.haml

@@ -1,3 +1,4 @@
+.-mt-6
 = f.fields_for :"#{@locale}_content", @parts do |ff|
   = ff.hidden_field :type, value: ff.object.class
   = ff.hidden_field :title

data/app/views/spina/admin/conferences/delegates/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/delegates/_form_delegate_details.html.haml

@@ -1,29 +1,24 @@
 = form_with model: [spina, :admin_conferences, @delegate], id: dom_id(@delegate), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:first_name)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:first_name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :first_name)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:last_name)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:last_name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :last_name)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:institution)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:institution)) do
     = f.collection_select :institution_id, Spina::Admin::Conferences::Institution.all, :id, :name, {}, class: 'form-select'
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:email_address)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:email_address)) do
     = f.email_field :email_address, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:url)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:url)) do
     = f.url_field :url, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:dietary_requirements)) do
-    %table.table{ style: 'margin: 0' }
-      %tbody.collection-check-boxes
-        = f.collection_check_boxes :dietary_requirement_ids, Spina::Admin::Conferences::DietaryRequirement.all, :id, :name do |builder|
-          %tr
-            %td{ style: "padding-left: 16px" }
-              .form-checkbox
-                = builder.check_box
-                = builder.label
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:conferences)) do
-    %table.table{ style: 'margin: 0' }
-      %tbody.collection-check-boxes
-        = f.collection_check_boxes :conference_ids, Spina::Admin::Conferences::Conference.all, :id, :name do |builder|
-          %tr
-            %td{ style: "padding-left: 16px" }
-              .form-checkbox
-                = builder.check_box
-                = builder.label
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:dietary_requirements)) do
+    %ul.list-none.ml-4
+      = f.collection_check_boxes :dietary_requirement_ids, Spina::Admin::Conferences::DietaryRequirement.all, :id, :name, {}, class: 'form-checkbox rounded' do |builder|
+        %li
+          = builder.check_box
+          %span.text-sm.font-medium.text-gray-600= builder.label
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Delegate.human_attribute_name(:conferences)) do |builder|
+    %ul.list-none.ml-4
+      = f.collection_check_boxes :conference_ids, Spina::Admin::Conferences::Conference.all, :id, :name, {}, class: 'form-checkbox rounded' do |builder|
+        %li
+          = builder.check_box
+          %span.text-sm.font-medium.text-gray-600= builder.label

data/app/views/spina/admin/conferences/dietary_requirements/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/dietary_requirements/_form_dietary_requirement_details.html.haml

@@ -1,3 +1,4 @@
 = form_with model: [spina, :admin_conferences, @dietary_requirement], id: dom_id(@dietary_requirement), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::DietaryRequirement.human_attribute_name(:name)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::DietaryRequirement.human_attribute_name(:name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :name)

data/app/views/spina/admin/conferences/institutions/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/institutions/_form_institution_details.html.haml

@@ -1,7 +1,8 @@
 = form_with model: [spina, :admin_conferences, @institution], id: dom_id(@institution), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:name)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :name)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:city)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:city)) do
     = render Spina::Forms::TextFieldComponent.new(f, :city)
 
 

data/app/views/spina/admin/conferences/presentation_attachment_types/_form.html.haml

@@ -13,6 +13,8 @@
       = t '.save'
 
 .p-4.md:p-8
-  = form_with model: [spina, :admin_conferences, @presentation_attachment_type], id: dom_id(@presentation_attachment_type), html: { autocomplete: 'off' } do |f|
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::DietaryRequirement.human_attribute_name(:name)) do
-      = render Spina::Forms::TextFieldComponent.new(f, :name)
+  .max-w-5xl
+    = form_with model: [spina, :admin_conferences, @presentation_attachment_type], id: dom_id(@presentation_attachment_type), html: { autocomplete: 'off' } do |f|
+      .-mt-6
+      = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::DietaryRequirement.human_attribute_name(:name)) do
+        = render Spina::Forms::TextFieldComponent.new(f, :name)

data/app/views/spina/admin/conferences/presentation_types/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/presentation_types/_form_presentation_type_details.html.haml

@@ -1,7 +1,8 @@
 = form_with model: [spina, :admin_conferences, @presentation_type], id: dom_id(@presentation_type), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:conference)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:conference)) do
     = f.collection_select :conference_id, Spina::Admin::Conferences::Conference.order(:dates).reverse_order, :id, :name
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:name)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :name)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:duration)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::PresentationType.human_attribute_name(:duration)) do
     = f.number_field :minutes, value: @presentation_type.minutes, placeholder: Spina::Admin::Conferences::PresentationType.human_attribute_name(:duration), required: true, step: 5, min: 5

data/app/views/spina/admin/conferences/presentations/_attachment_fields.html.haml

@@ -1,12 +1,12 @@
 %div{ data: { 'part-id': "#{f.object.object_id}", 'tabs-target': 'pane' }, id: "pane_#{f.object.object_id}" }
   = f.hidden_field :id
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::PresentationAttachment.human_attribute_name(:attachment_type)) do
-    = f.collection_select :attachment_type_id, Spina::Admin::Conferences::PresentationAttachmentType.all, :id, :name
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::PresentationAttachment.human_attribute_name(:attachment_type)) do
+    = f.collection_select :attachment_type_id, Spina::Admin::Conferences::PresentationAttachmentType.all, :id, :name, {}, class: 'form-select'
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::PresentationAttachment.human_attribute_name(:attachment)) do
-    .mt-6{ data: { controller: 'attachment-picker' } }
-      = f.collection_select :attachment_id, Spina::Attachment.sorted, :id, :name, { include_blank: t('spina.attachments.choose_attachment') }, { class: 'form-select mt-1', data: { action: 'attachment-picker#pick' } }
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::PresentationAttachment.human_attribute_name(:attachment)) do
+    %div{ data: { controller: 'attachment-picker' } }
+      = f.collection_select :attachment_id, Spina::Attachment.sorted, :id, :name, { include_blank: t('spina.attachments.choose_attachment') }, { class: 'form-select', data: { action: 'attachment-picker#pick' } }
 
   .text-right
     = button_tag t('spina.ui.delete'), type: :button, class: 'btn btn-default bg-transparent hover:bg-white hover:text-red-500 h-8 px-3 inline-block mt-3', data: { action: 'repeater#removeFields', id: "pane_#{f.object.object_id}" }

data/app/views/spina/admin/conferences/presentations/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/presentations/_form_presentation_details.html.haml

@@ -1,18 +1,19 @@
 = form_with model: [spina, :admin_conferences, @presentation], id: dom_id(@presentation), html: { autocomplete: 'off' } do |f|
   %div{ data: { controller: 'select-options', select_options: { record_value: @conferences } } }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:conference)) do
-      = select_tag :conference_id, options_from_collection_for_select(Spina::Admin::Conferences::Conference.all, :id, :name, (@presentation.conference.id unless @presentation.conference.blank?)), include_blank: true, required: true, data: { action: 'spina--admin--conferences--select-options#setVisibility', 'spina--admin--conferences--select_options_target': 'select', text_key: 'name' }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:presentation_type)) do
-      = select_tag :presentation_type_id, options_from_collection_for_select((@presentation.conference || Spina::Admin::Conferences::Conference.first).presentation_types, :id, :name, (@presentation.presentation_type.id unless @presentation.presentation_type.blank?)), include_blank: true, required: true, data: { action: 'spina--admin--conferences--select-options#setVisibility','spina--admin--conferences--select_options_target': 'select', key_path: 'presentation_types', text_key: 'name' }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:session)) do
-      = f.collection_select :session_id, (@presentation.presentation_type || Spina::Admin::Conferences::Conference.first).sessions, :id, :name, { include_blank: true }, required: true, data: {'spina--admin--conferences--select_options_target': 'select', key_path: 'presentation_types:sessions', text_key: 'name' }
-
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:start_datetime)) do
-    = f.datetime_field :start_datetime
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:title)) do
+    .-mt-6
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:conference)) do
+      = select_tag :conference_id, options_from_collection_for_select(Spina::Admin::Conferences::Conference.all, :id, :name, (@presentation.conference.id unless @presentation.conference.blank?)), include_blank: true, required: true, data: { action: 'select-options#setVisibility', 'select_options_target': 'select', text_key: 'name' }, class: 'form-select'
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:presentation_type)) do
+      = select_tag :presentation_type_id, options_from_collection_for_select((@presentation.conference || Spina::Admin::Conferences::Conference.first).presentation_types, :id, :name, (@presentation.presentation_type.id unless @presentation.presentation_type.blank?)), include_blank: true, required: true, data: { action: 'select-options#setVisibility','select_options_target': 'select', key_path: 'presentation_types', text_key: 'name' }, class: 'form-select'
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:session)) do
+      = f.collection_select :session_id, (@presentation.presentation_type || Spina::Admin::Conferences::Conference.first).sessions, :id, :name, { include_blank: true }, required: true, data: {'select_options_target': 'select', key_path: 'presentation_types:sessions', text_key: 'name' }, class: 'form-select'
+
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:start_datetime)) do
+    = f.datetime_field :start_datetime, class: 'form-input'
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:title)) do
     = render Spina::Forms::TextFieldComponent.new(f, :title)
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:abstract)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:abstract)) do
     .mt-1.relative
       = f.hidden_field :abstract, id: "#{f.object.object_id}_input"
 
@@ -21,16 +22,12 @@
 
         %trix-editor(class='prose prose-sm focus:outline-none max-w-3xl xl:border-r border-dashed border-gray-200 pr-3' toolbar="#{f.object.object_id}_trix-toolbar" input="#{f.object.object_id}_input" data-trix-target='editor' data-action='trix-file-accept->trix#preventDefault')
 
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:presenters)) do
-    %table.table{ style: 'margin: 0' }
-      %tbody
-        = f.collection_check_boxes :presenter_ids, Spina::Admin::Conferences::Delegate.order(:last_name, :first_name), :id, :reversed_name_and_institution do |builder|
-          %tr
-            %td{ style: "padding-left: 16px" }
-              .form-checkbox
-                = builder.check_box
-                = builder.label
-
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Presentation.human_attribute_name(:presenters)) do
+    %ul.list-none.ml-4
+      = f.collection_check_boxes :presenter_ids, Spina::Admin::Conferences::Delegate.order(:last_name, :first_name), :id, :reversed_name_and_institution, {}, class: 'form-checkbox rounded' do |builder|
+        %li
+          = builder.check_box
+          %span.text-sm.font-medium.text-gray-600= builder.label
 
   .mt-6{ 'data-controller': 'repeater' }
     %label.block.text-sm.leading-5.font-medium.text-gray-700= Spina::Admin::Conferences::Presentation.human_attribute_name :attachments

data/app/views/spina/admin/conferences/rooms/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/rooms/_form_room_details.html.haml

@@ -1,7 +1,8 @@
 = form_with model: [spina, :admin_conferences, @room], id: dom_id(@room), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:institution)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Room.human_attribute_name(:institution)) do
     = f.collection_select :institution_id, Spina::Admin::Conferences::Institution.all, :id, :name, {}, class: 'form-select'
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:building)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:building)) do
     = render Spina::Forms::TextFieldComponent.new(f, :building)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:number)) do
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Institution.human_attribute_name(:number)) do
     = render Spina::Forms::TextFieldComponent.new(f, :number)

data/app/views/spina/admin/conferences/sessions/_form.html.haml

@@ -25,4 +25,4 @@
   .p-4.md:p-8
     - @tabs.each_with_index do |tab, i|
       %div{ 'data-tabs-target': 'pane', id: tab, hidden: i != 0 }
-        = render "form_#{tab}"
+        .max-w-5xl= render "form_#{tab}"

data/app/views/spina/admin/conferences/sessions/_form_session_details.html.haml

@@ -1,15 +1,16 @@
 = form_with model: [spina, :admin_conferences, @session], id: dom_id(@session), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:name)) do
+  .-mt-6
+  = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:name)) do
     = render Spina::Forms::TextFieldComponent.new(f, :name)
 
   %div{ data: { controller: 'select-options', 'select_options': { record_value: @conferences } } }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:conference)) do
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:conference)) do
       = select_tag :conference_id, options_from_collection_for_select(Spina::Admin::Conferences::Conference.all, :id, :name, (@session.conference.id unless @session.conference.blank?)), include_blank: true, data: { action: 'select-options#setVisibility','select_options_target': 'select', text_key: 'name' }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:presentation_type)) do
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:presentation_type)) do
       = f.collection_select :presentation_type_id, @session.conference.present? ? @session.conference.presentation_types : Spina::Admin::Conferences::Conference.first.presentation_types, :id, :name, { include_blank: true }, data: {'select_options_target': 'select', text_key: 'name', key_path: 'presentation_types' }
 
   %div{ data: { controller: 'select-options', 'select_options': { record_value: @institutions } } }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:institution)) do
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:institution)) do
       = select_tag :institution_id, options_from_collection_for_select(Spina::Admin::Conferences::Institution.all, :id, :name, (@session.institution.id unless @session.institution.blank?)), include_blank: true, data: { action: 'select-options#setVisibility','select_options_target': 'select', text_key: 'name' }
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:room)) do
+    = render Spina::Admin::Conferences::FormGroupComponent.new(label: Spina::Admin::Conferences::Session.human_attribute_name(:room)) do
       = f.collection_select :room_id, @session.institution.present? ? @session.institution.rooms : Spina::Admin::Conferences::Institution.first.rooms, :id, :name, { include_blank: true }, data: {'select_options_target': 'select', text_key: 'name', key_path: 'rooms' }

data/app/views/spina/admin/parts/admin/conferences/dates/_form.html.haml

@@ -1,2 +1,2 @@
-= render Spina::Forms::GroupComponent.new(label: f.object.title) do
-  = f.date_field :content, placeholder: f.object.title
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: f.object.title) do
+  = f.date_field :content, placeholder: f.object.title, class: 'form-select'

data/app/views/spina/admin/parts/admin/conferences/email_addresses/_form.html.haml

@@ -1,4 +1,2 @@
-.mt-6
-  %label.block.text-sm.leading-5.font-medium.text-gray-700= f.object.title
-  .mt-1
-    = f.email_field :content, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: f.object.title) do
+  = f.email_field :content, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'

data/app/views/spina/admin/parts/admin/conferences/times/_form.html.haml

@@ -1,2 +1,2 @@
-= render Spina::Forms::GroupComponent.new(label: f.object.title) do
-  = f.datetime_field :content, placeholder: f.object.title
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: f.object.title) do
+  = f.datetime_field :content, placeholder: f.object.title, class: 'form-select'

data/app/views/spina/admin/parts/admin/conferences/urls/_form.html.haml

@@ -1,4 +1,2 @@
-.mt-6
-  %label.block.text-sm.leading-5.font-medium.text-gray-700= f.object.title
-  .mt-1
-    = f.url_field :content, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'
+= render Spina::Admin::Conferences::FormGroupComponent.new(label: f.object.title) do
+  = f.url_field :content, class: 'form-input block w-full max-w-5xl sm:text-sm sm:leading-5'

data/config/locales/en.yml

@@ -1,34 +1,3 @@
-# Files in the config/locales directory are used for internationalization
-# and are automatically loaded by Rails. If you want to use locales other
-# than English, add the necessary files in this directory.
-#
-# To use the locales, use `I18n.t`:
-#
-#     I18n.t 'hello'
-#
-# In views, this is aliased to just `t`:
-#
-#     <%= t('hello') %>
-#
-# To use a different locale, set it with `I18n.locale`:
-#
-#     I18n.locale = :es
-#
-# This would use the information in config/locales/es.yml.
-#
-# The following keys must be escaped otherwise they will not be retrieved by
-# the default I18n backend:
-#
-# true, false, on, off, yes, no
-#
-# Instead, surround them with single quotes.
-#
-# en:
-#   'true': 'foo'
-#
-# To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
-
 en:
   spina:
     show: Show

data/lib/spina/admin/conferences/version.rb

@@ -4,7 +4,7 @@ module Spina
   module Admin
     module Conferences
       # Version number.
-      VERSION = '3.0.0.rc1'
+      VERSION = '3.0.0.rc2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-conferences-fork
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc2
 platform: ruby
 authors:
 - Louis Van Steene
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -337,14 +337,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 description: Keep track of conference attendees and presentations with this plugin.
 email:
 - louis@lvs.me.uk
@@ -360,6 +360,9 @@ files:
 - app/assets/javascripts/spina/admin/conferences/application.js
 - app/assets/javascripts/spina/admin/conferences/controllers/select_options_controller.js
 - app/assets/stylesheets/spina/admin/conferences/application.tailwind.css
+- app/components/spina/admin/conferences/application_component.rb
+- app/components/spina/admin/conferences/form_group_component.html.haml
+- app/components/spina/admin/conferences/form_group_component.rb
 - app/controllers/spina/admin/conferences/application_controller.rb
 - app/controllers/spina/admin/conferences/conferences_controller.rb
 - app/controllers/spina/admin/conferences/delegates_controller.rb