spina-conferences-primer_theme 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 647773b8710b54bb05cfd3b9b59d329ff0006a3283d2612694dd2a389c9dc6b9
-  data.tar.gz: 60cdaba4af25262ad324f15dc4d3b60bacbdd317ed4894c975d65ad3fb17d9c1
+  metadata.gz: b0df29dcc05259867e8c4337bbb0c2e391e18a8e54f68fdfbfa86307f15ff270
+  data.tar.gz: fdfe65b73ba9a4468eccb22b96239df8a7dd96d3bf8b324f49ff99c119e02e4c
 SHA512:
-  metadata.gz: 26453a2c8013741ca8fed90e7bbbb7c87591b8e2d5540b57983613260ee9d044c7c01e01e57033eff9c32a1c36c022d49df0edd3fae5b459dbb48af2c533f84a
-  data.tar.gz: 871d716b6640411450356a993570c7a95a7f1a675eca2f1f8b23a82fd81ec1668a0126e2a26fa274010499f09fac12566fd4750388b136beb00eea055454f950
+  metadata.gz: 9fc2ba47c8eb7f5db1ab77561b79adb69c12a9230d991737d346faf2706ff248d0b19e6d080da09c34014b8a1ffad878ed94a2abdd272eb375ffc2203b58381e
+  data.tar.gz: a0868dae94f816b3700f2b79c11ea3cec0108dce2059963c02150dd599017ceb04e7388606b5b6827de85f9c2cabfba72f0a7639dac78350667f243ee7d91399

data/app/assets/config/spina_conferences_primer_theme_manifest.js

@@ -6,3 +6,4 @@
 //= link @github/include-fragment-element/dist/index.js
 //= link @github/tab-container-element/dist/index.js
 //= link @github/filter-input-element/dist/index.js
+//= link @github/details-menu-element/dist/index.js

data/app/controllers/spina/conferences/primer_theme/presentations_controller.rb

@@ -5,7 +5,7 @@ module Spina
     module PrimerTheme
       # User-facing controller for presentations, serving both html and ics
       class PresentationsController < ApplicationController
-        before_action :set_presentation, :set_conference, :set_breadcrumb, :set_metadata
+        before_action :set_presentation, :set_conference, :set_breadcrumb
 
         def show
           add_breadcrumb @presentation.name
@@ -34,11 +34,6 @@ module Spina
           add_breadcrumb Admin::Conferences::Conference.model_name.human.pluralize, frontend_conferences_path
           add_breadcrumb @conference.name, frontend_conference_path(@conference)
         end
-
-        def set_metadata
-          @title = @presentation.present? ? @presentation.name : Admin::Conferences::Presentation.model_name.human(count: 0)
-          @description = @presentation.present? ? helpers.strip_tags(@presentation.abstract) : ''
-        end
       end
     end
   end

data/app/helpers/spina/conferences/primer_theme/application_helper.rb

@@ -5,56 +5,38 @@ module Spina
     module PrimerTheme
       # Base helper
       module ApplicationHelper
+        include Spina::PagesHelper
+
         def latest_conference
           Spina::Admin::Conferences::Conference.sorted.first
         end
 
-        def breadcrumbs(options = {}, &block)
-          render_breadcrumbs(builder: Breadcrumbs::Builder, **options, &block)
-        end
-
         def ancestors
           return [] if current_page.blank?
 
           render Primer::BreadcrumbComponent.new(mb: 4) do |component|
             current_page.ancestors.each do |ancestor|
-              component.slot(:item, href: 'ancestor.materialized_path') { ancestor.menu_title }
+              component.slot(:item, href: ancestor.materialized_path) { ancestor.menu_title }
             end
             component.slot(:item, selected: true) { current_page.menu_title }
           end
         end
 
-        def author
-          current_account.name
-        end
-
-        def description
-          current_page.present? ? current_page.description : @description # rubocop:disable Rails/HelperInstanceVariable
-        end
-
-        def title
-          # noinspection RailsI18nInspection
-          t :'.title', title: current_page.present? ? current_page.title : @title, suffix: current_account.name # rubocop:disable Rails/HelperInstanceVariable
-        end
-
-        def seo_title
-          # noinspection RailsI18nInspection
-          t :'.title', title: current_page.present? ? current_page.seo_title : @title, suffix: current_account.name # rubocop:disable Rails/HelperInstanceVariable
-        end
-
-        def partable_for(*parts, parent: current_page)
+        def partable_for(*part_names, parent: current_page)
           association = case parent
                         when Spina::Page then :page_partable
                         when Spina::StructureItem then :structure_partable
                         when Spina::Account then :layout_partable
                         else :partable
                         end
-          part = parent.parts.find_by(name: parts)
-          [part, part.try(association)]
+          parts = parent.parts.where(name: part_names)
+          partables = parts.collect { |part| part.try(association) }
+          [*parts, *partables]
         end
 
         def calendar(name:, &block)
           # noinspection SpellCheckingInspection
+          block ||= proc { '' }
           Icalendar::Calendar.new.tap { |calendar| calendar.x_wr_calname = name }
                              .then(&:to_ical).then { |calendar| calendar.insert(calendar.index('END:VCALENDAR'), capture(&block)) }
         end

data/app/helpers/spina/conferences/primer_theme/asset_helper.rb

@@ -5,29 +5,22 @@ module Spina
     module PrimerTheme
       # Helper for computing asset sources
       module AssetHelper
-        METHODS_TO_RESIZE = %i[resize_to_limit resize_to_fit resize_to_fill resize_and_pad].freeze
-        DEFAULT_FACTORS = [1, 2, 3, 4].freeze
-
-        def concat_srcset(image, **options)
-          srcset(image, **options).collect { |src_path, size| "#{src_path} #{size}" }
-                                  .join ', '
-        end
-
         def srcset(image, **options)
           return if image.blank?
 
           options = options.symbolize_keys
           variant_options = options.delete(:variant)
+          return if variant_options.blank?
+
           factors = options.delete(:factors) || DEFAULT_FACTORS
           variants_for image, variant_options: variant_options, factors: factors
         end
 
-        def src(image, **options)
-          main_app.url_for(image.variant(**options))
-        end
-
         private
 
+        METHODS_TO_RESIZE = %i[resize_to_limit resize_to_fit resize_to_fill resize_and_pad].freeze
+        DEFAULT_FACTORS = [1, 2, 3, 4].freeze
+
         def variants_for(image, variant_options:, factors:)
           factors.inject({}) { |srcset, factor| srcset.update(variant_url(image, variant_options, factor) => "#{factor}x") }
         end
@@ -41,7 +34,7 @@ module Spina
         end
 
         def resize_dimensions_for_key(key, factor, dimensions)
-          dimensions.collect { |dimension| resize_dimension(dimension, factor) } if METHODS_TO_RESIZE.include? key
+          METHODS_TO_RESIZE.include?(key) ? dimensions.collect { |dimension| resize_dimension(dimension, factor) } : dimensions
         end
 
         def resize_dimension(dimension = 0, factor = 0)

data/app/views/conferences_primer_theme/pages/about.html.haml

@@ -13,6 +13,9 @@
     - cache [partable_for(:minutes), content(:minutes)&.structure_items,
              content(:minutes)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
       .mt-4.col-12.col-md-6.float-md-left= render partial: 'minutes', object: content(:minutes)
+    - cache [partable_for(:documents), content(:documents)&.structure_items,
+             content(:documents)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
+      .mt-4.col-12.col-md-12.float-md-left= render partial: 'documents', object: content(:documents)
   - cache [partable_for(:partner_societies), content(:partner_societies)&.structure_items,
            content(:partner_societies)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
     - if has_content?(:partner_societies) && content(:partner_societies).structure_items.any?

data/app/views/conferences_primer_theme/pages/events.html.haml

@@ -0,0 +1,12 @@
+- cache current_page do
+  %h1= current_page.title
+
+  - cache partable_for(:text) do
+    - if has_content? :text
+      .mt-4= render partial: 'text', object: content(:text)
+  - cache [partable_for(:events_list), content(:events_list)&.structure_items, 
+           content(:events_list)&.structure_items&.collect_concat(&:structure_parts)&.collect(&:structure_partable)] do
+    - if has_content?(:events_list) && content(:events_list).structure_items.any?
+      .mt-2= render partial: 'events_list', object: content(:events_list)
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')

data/app/views/conferences_primer_theme/pages/homepage.html.haml

@@ -1,6 +1,5 @@
 - content_for :hero do
-  - cache current_page do
-    - cache partable_for(:gallery) do
-      = render partial: 'homepage_content',
-               layout: has_content?(:gallery) && content(:gallery).images.any? ? 'image_collection' : 'jumbotron',
-               locals: { conference: latest_conference, advance: true, image_collection: content(:gallery) }
+  - cache [current_page, partable_for(:gallery), latest_conference] do
+    = render partial: 'homepage_content',
+             layout: has_content?(:gallery) && content(:gallery).images.any? ? 'image_collection' : 'jumbotron',
+             locals: { conference: latest_conference, advance: true, image_collection: content(:gallery) }

data/app/views/layouts/conferences_primer_theme/application.html.haml

@@ -2,4 +2,6 @@
   - if current_page.ancestors.any?
     = ancestors
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: current_page.description,
+                   seo_title: current_page.seo_title, title: current_page.title }

data/app/views/layouts/spina/conferences/primer_theme/application.html.haml

@@ -5,12 +5,12 @@
     %meta{ name: 'author', content: author }
     %meta{ name: 'description', content: description }
     %meta{ name: 'viewport', content: 'initial-scale=1.0' }
-    %meta{ name: 'og:title', content: title }
+    %meta{ name: 'og:title', content: t(:'.title', title: title, suffix: current_account.name) }
     %meta{ name: 'og:description', content: description }
     %meta{ name: 'turbolinks-cache-control', content: 'no-preview' }
     %base{ target: '_blank' }
     = csrf_meta_tags
-    %title= seo_title
+    %title= t(:'.title', title: seo_title, suffix: current_account.name)
     = render 'spina/shared/google_site_verification'
     = render 'spina/shared/analytics'
     = stylesheet_link_tag 'spina/conferences/primer_theme/application', media: 'all', data: { turbolinks_track: true }
@@ -19,6 +19,7 @@
     %script{ type: 'module', src: asset_path('@github/include-fragment-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/tab-container-element/dist/index.js') }
     %script{ type: 'module', src: asset_path('@github/filter-input-element/dist/index.js') }
+    %script{ type: 'module', src: asset_path('@github/details-menu-element/dist/index.js') }
     = yield :head
   %body
     .admin= render 'spina/shared/admin_bar'

data/app/views/layouts/spina/conferences/primer_theme/conferences.html.haml

@@ -1,4 +1,5 @@
 - content_for :breadcrumbs do
-  = breadcrumbs
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: @description, title: @title, seo_title: @title }

data/app/views/layouts/spina/conferences/primer_theme/presentations.html.haml

@@ -1,4 +1,6 @@
 - content_for :breadcrumbs do
-  = breadcrumbs
+  = render_breadcrumbs(builder: Spina::Conferences::PrimerTheme::Breadcrumbs::Builder)
 
-= render template: 'layouts/spina/conferences/primer_theme/application'
+= render template: 'layouts/spina/conferences/primer_theme/application',
+         locals: { author: current_account.name, description: strip_tags(@presentation.abstract), title: @presentation.name,
+                   seo_title: @presentation.name }

data/app/views/spina/admin/layout_partables/texts/_form.html.haml

@@ -0,0 +1,4 @@
+= f.fields_for :layout_partable, f.object.layout_partable do |ff|
+  - object_id = (ff.object.persisted? ? ff.object.object_id : "new_association_#{ff.object.object_id}").to_s + "_content"
+  = ff.hidden_field :content, id: "#{object_id}_input", value: ff.object.content(fallback: false, default: nil)
+  %trix-editor.text-input.trix-content{ input: "#{object_id}_input" }

data/app/views/spina/application/_current_conference_alert.html.haml

@@ -1,4 +1,4 @@
 - content_for :flash do
   - cache partable_for(:current_conference_alert, parent: current_account) do
     - if current_account.has_content? :current_conference_alert
-      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert) }
+      = render(Primer::FlashComponent.new(full: true, variant: :warning)) { current_account.content(:current_conference_alert).html_safe }

data/app/views/spina/application/_list_item.html.haml

@@ -1 +1 @@
-%li.list-style-none.py-4.border-bottom= yield
+%li.list-style-none.py-4.border-bottom{ id: local_assigns[:list_item_id]&.call(local_assigns) }= yield

data/app/views/spina/application/_mobile_navigation_item.html.haml

@@ -1,2 +1,11 @@
-= link_to mobile_navigation_item.menu_title, mobile_navigation_item.materialized_path,
-          class: %w[d-block py-2 border-top border-white-fade text-white]
+- if mobile_navigation_item.has_children?
+  %details.details-reset
+    %summary.btn-link.d-block.py-2.border-top.border-white-fade.text-white
+      = mobile_navigation_item.menu_title
+      = render Primer::OcticonComponent.new(icon: 'chevron-down')
+    %ul.list-style-none
+      - mobile_navigation_item.children.each do |child|
+        %li= link_to child.menu_title, child.materialized_path, class: %w[d-block py-2 pl-3 border-top border-white-fade text-white]
+- elsif mobile_navigation_item.is_root?
+  = link_to mobile_navigation_item.menu_title, mobile_navigation_item.materialized_path,
+            class: %w[d-block py-2 border-top border-white-fade text-white]

data/app/views/spina/application/_navigation_item.html.haml

@@ -1 +1,12 @@
-.Header-item.d-none.d-lg-flex= link_to navigation_item.menu_title, navigation_item.materialized_path, class: 'Header-link'
+- if navigation_item.has_children?
+  .Header-item.d-none.d-lg-flex
+    %details.dropdown.details-reset.details-overlay
+      %summary.Header-link
+        = navigation_item.menu_title
+        %span.dropdown-caret
+      %details-menu.dropdown-menu.dropdown-menu-se.mt-3{ role: 'menu' }
+        - navigation_item.children.in_menu.sorted.each do |child|
+          %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
+- elsif navigation_item.is_root?
+  .Header-item.d-none.d-lg-flex
+    = link_to navigation_item.menu_title, navigation_item.materialized_path, class: 'Header-link'

data/app/views/spina/conferences/primer_theme/conferences/_conference.html.haml

@@ -1,16 +1,15 @@
-- cache [conference, conference.institutions, conference.institutions.collect(&:logo)] do
-  .d-flex.flex-column.flex-md-row-reverse.flex-justify-start.flex-md-justify-between
-    %ul.list-style-none.d-flex.flex-wrap.flex-md-justify-end.pl-md-2.pb-2.pb-md-0{ class: dom_class(conference.institutions) }
-      = render partial: 'institution', collection: conference.institutions, cached: -> institution { [institution, institution.logo] }
-    .flex-auto
-      %h3.mb-1
-        = link_to conference.name, frontend_conference_path(conference)
-      %ul.text-gray.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
-        %li.mr-sm-3
-          = octicon 'calendar'
-          = t :'.dates_html', start_date: time_tag(conference.start_date, format: :date), finish_date: time_tag(conference.finish_date)
-        - if conference.institutions.any?
-          %li
-            = octicon 'location'
-            %address.d-inline= t :'.locations', institutions: conference.institutions.pluck(:name).to_sentence,
-                                    cities: conference.institutions.pluck(:city).uniq.to_sentence
+.d-flex.flex-column.flex-md-row-reverse.flex-justify-start.flex-md-justify-between
+  %ul.list-style-none.d-flex.flex-wrap.flex-md-justify-end.pl-md-2.pb-2.pb-md-0{ class: dom_class(conference.institutions) }
+    = render partial: 'institution', collection: conference.institutions, cached: -> institution { [institution, institution.logo] }
+  .flex-auto
+    %h3.mb-1
+      = link_to conference.name, frontend_conference_path(conference)
+    %ul.text-gray.list-style-none.d-flex.flex-column.flex-sm-row.flex-wrap
+      %li.mr-sm-3
+        = octicon 'calendar'
+        = t :'.dates_html', start_date: time_tag(conference.start_date, format: :date), finish_date: time_tag(conference.finish_date)
+      - if conference.institutions.any?
+        %li
+          = octicon 'location'
+          %address.d-inline= t :'.locations', institutions: conference.institutions.pluck(:name).to_sentence,
+                                  cities: conference.institutions.pluck(:city).uniq.to_sentence

data/app/views/spina/conferences/primer_theme/conferences/_conference.ics.erb

@@ -1,3 +1 @@
-<% cache conference do %>
 <%= conference.to_event.to_ical -%>
-<% end %>

data/app/views/spina/conferences/primer_theme/conferences/_event.html.haml

@@ -1,12 +1,11 @@
-- cache event do
-  .d-flex.flex-column.flex-sm-row
-    .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-4
-      %span.f3-light.mb-1
-        = octicon 'clock', class: 'v-align-baseline'
-        = t :'.times_html', start_time: time_tag(event.start_time, format: :short), finish_time: time_tag(event.finish_time, format: :time)
-      .text-gray
-        = octicon 'location'
-        %address.d-inline= event.location
-    .flex-auto
-      %h3.mb-1= event.name
-      .text-gray= event.description.try(:html_safe)
+.d-flex.flex-column.flex-sm-row
+  .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-4
+    %span.f3-light.mb-1
+      = octicon 'clock', class: 'v-align-baseline'
+      = t :'.times_html', start_time: time_tag(event.start_time, format: :short), finish_time: time_tag(event.finish_time, format: :time)
+    .text-gray
+      = octicon 'location'
+      %address.d-inline= event.location
+  .flex-auto
+    %h3.mb-1= event.name
+    .text-gray= event.description.try(:html_safe)

data/app/views/spina/conferences/primer_theme/conferences/_event.ics.erb

@@ -1,3 +1 @@
-<% cache event do %>
 <%= event.to_event.to_ical -%>
-<% end %>

data/app/views/spina/conferences/primer_theme/conferences/_institution.html.haml

@@ -1,6 +1,5 @@
-- cache [institution, institution.logo] do
-  %li
-    - if institution.logo.present?
-      = render partial: 'institution_logo', object: institution.logo, locals: { institution: institution }
-    - else
-      = institution.name
+%li
+  - if institution.logo.present?
+    = render partial: 'institution_logo', object: institution.logo, locals: { institution: institution }
+  - else
+    = institution.name

data/app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml

@@ -1,3 +1,4 @@
-- if institution_logo.file.present?
-  = image_tag main_app.url_for(institution_logo.file.variant(resize_to_limit: [300, 60])), srcset: srcset(institution_logo.file,
-              variant: { resize_to_limit: [300, 60] }), alt_description: institution.name, draggable: false, class: 'p-1'
+- cache institution_logo do
+  - if institution_logo.file.present?
+    = image_tag main_app.url_for(institution_logo.file.variant(resize_to_limit: [300, 60])), srcset: srcset(institution_logo.file,
+                variant: { resize_to_limit: [300, 60] }), alt_description: institution.name, draggable: false, class: 'p-1'

data/app/views/spina/conferences/primer_theme/conferences/_presentation.html.haml

@@ -1,14 +1,13 @@
-- cache [presentation, presentation.presenters] do
-  .d-flex.flex-column.flex-sm-row
-    .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-3
-      %span.f3-light.mb-1
-        = octicon 'clock', class: 'v-align-baseline'
-        = time_tag presentation.start_datetime, format: :short
-      .text-gray
-        = octicon 'location'
-        %address.d-inline= presentation.session.room_name
-    .flex-auto
-      %h3.mb-1= link_to presentation.title, frontend_conference_presentation_path(conference, presentation)
-      .text-gray
-        = octicon presentation.presenters.many? ? 'people' : 'person'
-        %address.d-inline= presentation.presenters.collect(&:full_name_and_institution).to_sentence
+.d-flex.flex-column.flex-sm-row
+  .flex-shrink-0.mr-sm-3.mb-3.mb-sm-0.col-sm-3
+    %span.f3-light.mb-1
+      = octicon 'clock', class: 'v-align-baseline'
+      = time_tag presentation.start_datetime, format: :short
+    .text-gray
+      = octicon 'location'
+      %address.d-inline= presentation.session.room_name
+  .flex-auto
+    %h3.mb-1= link_to presentation.title, frontend_conference_presentation_path(conference, presentation)
+    .text-gray
+      = octicon presentation.presenters.many? ? 'people' : 'person'
+      %address.d-inline= presentation.presenters.collect(&:full_name_and_institution).to_sentence

data/app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb

@@ -1,3 +1 @@
-<% cache presentation do %>
 <%= presentation.to_event.to_ical -%>
-<% end %>

data/app/views/spina/conferences/primer_theme/conferences/_presentation_type.html.haml

@@ -1,6 +1,5 @@
-- cache [presentation_type, @presentation_type] do
-  %li
-    = link_to frontend_conference_url(presentation_type.conference, presentation_type: presentation_type.id, tab: 'presentations'),
-              class: 'filter-item', aria: { current: @presentation_type == presentation_type ? 'page' : nil } do
-      = presentation_type.name.pluralize
-      %span.count{ title: t(:'.results') }= presentation_type.presentations.count
+%li
+  = link_to frontend_conference_url(presentation_type.conference, presentation_type: presentation_type.id, tab: 'presentations'),
+            class: 'filter-item', aria: { current: @presentation_type == presentation_type ? 'page' : nil } do
+    = presentation_type.name.pluralize
+    %span.count{ title: t(:'.results') }= presentation_type.presentations.count

data/app/views/spina/conferences/primer_theme/conferences/_sponsor.html.haml

@@ -1,9 +1,8 @@
-- cache [sponsor, sponsor.structure_parts.collect(&:structure_partable)] do
-  %li.d-inline-block.m-2.v-align-middle
-    - if sponsor.has_content?(:logo) && sponsor.content(:logo).file.present?
-      = link_to sponsor.content(:website) do
-        = image_tag(main_app.url_for(sponsor.content(:logo).file.variant(resize_to_limit: [200, 60])),
-                    srcset: srcset(sponsor.content(:logo).file, variant: { resize_to_limit: [200, 60] }),
-                    alt_description: sponsor.content(:name), draggable: false)
-    - else
-      = link_to sponsor.content(:name), sponsor.content(:website)
+%li.d-inline-block.m-2.v-align-middle
+  - if sponsor.has_content?(:logo) && sponsor.content(:logo).file.present?
+    = link_to sponsor.content(:website) do
+      = image_tag(main_app.url_for(sponsor.content(:logo).file.variant(resize_to_limit: [200, 60])),
+                  srcset: srcset(sponsor.content(:logo).file, variant: { resize_to_limit: [200, 60] }),
+                  alt_description: sponsor.content(:name), draggable: false)
+  - else
+    = link_to sponsor.content(:name), sponsor.content(:website)

data/app/views/spina/conferences/primer_theme/conferences/index.html.haml

@@ -14,6 +14,7 @@
   - if @conferences.any?
     %ul{ class: dom_class(@conferences), data: { filter: { list: true } } }
       = render partial: 'conference', collection: @conferences, layout: 'list_item',
+               locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:conference]) } },
                cached: -> conference { [conference, conference.institutions, conference.institutions.collect(&:logo)] }
   - else
     = render Primer::BlankslateComponent.new(title: t(:'.no_conferences'), icon: 'mortar-board')

data/app/views/spina/conferences/primer_theme/conferences/show.html.haml

@@ -1,15 +1,15 @@
 - if @conference.has_content?(:submission_date) && @conference.content(:submission_date) >= Date.today
   - content_for :flash do
     - cache partable_for(:submission_url, :submission_date, :submission_text, parent: @conference) do
-      = render Primer::FlashComponent.new(variant: :warning, full: true) do
+      = render Primer::FlashComponent.new(variant: :warning, full: true, classes: dom_class(@conference)) do
         - cache partable_for(:submission_url, parent: @conference) do
           - if @conference.content(:submission_url).present?
             = link_to t(:'.submit_abstract'), @conference.content(:submission_url),
-                      class: %i[btn btn-sm flash-action d-none d-sm-inline-block]
+                      class: %i[btn btn-primary flash-action]
         - cache partable_for(:submission_date, parent: @conference) do
           %p
             = octicon('clock')
-            = t :'.submit_by_html', date: time_tag(@conference.content(:submission_date), format: :short)
+            = t :'.submit_by_html', date: time_tag(@conference.content(:submission_date), format: :full)
         - cache partable_for(:submission_text, parent: @conference) do
           - if @conference.content(:submission_text).present?
             %p= @conference.content(:submission_text).html_safe

data/app/views/spina/pages/_committee_bio.html.haml

@@ -1,20 +1,23 @@
 - cache [committee_bio, committee_bio.structure_parts.collect(&:structure_partable)] do
   .d-flex.flex-column.flex-md-row.flex-items-start
     - cache partable_for(:profile_picture, parent: committee_bio) do
-      - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted?
+      - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted? && committee_bio.content(:profile_picture).file.present?
         .flex-shrink-0
-          = render Primer::AvatarComponent.new(src: src(committee_bio.content(:profile_picture).file, resize_to_fill: [150, 150]),
-                                               srcset: concat_srcset(committee_bio.content(:profile_picture).file,
-                                                                     variant: { resize_to_limit: [150, 150] }),
+          = render Primer::AvatarComponent.new(src: main_app.url_for(committee_bio.content(:profile_picture).file.variant(resize_to_fill: [150, 150])),
+                                               srcset: srcset(committee_bio.content(:profile_picture).file,
+                                                              variant: { resize_to_limit: [150, 150] }),
                                                draggable: false, alt: committee_bio.content(:name), size: 150, mr: [nil, nil, 3, nil],
                                                mb: [3, nil, 0, nil])
     .flex-auto
       .d-flex.flex-column.flex-md-row.mb-1
-        - cache partable_for(:name, :role, parent: committee_bio) do
-          - if committee_bio.has_content?(:name) && committee_bio.has_content?(:role)
-            %h3.flex-auto= t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
-          - elsif committee_bio.has_content?(:name)
-            %h3.flex-auto= committee_bio.content(:name)
+        - cache partable_for(:name, :role, :institution, parent: committee_bio) do
+          .flex-column
+            - if committee_bio.has_content?(:name) && committee_bio.has_content?(:role)
+              %h3.flex-auto= t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
+            - elsif committee_bio.has_content?(:name)
+              %h3.flex-auto= committee_bio.content(:name)
+            - if committee_bio.has_content?(:institution)
+              %h4.flex-auto= committee_bio.content(:institution)
         .BtnGroup.mt-1.mt-md-0.ml-md-1{ aria: { label: t(:'.contact_buttons') } }
           - cache partable_for(:twitter_profile, parent: committee_bio) do
             - if committee_bio.has_content?(:twitter_profile)

data/app/views/spina/pages/_committee_bios.html.haml

@@ -1,6 +1,7 @@
 - if committee_bios.structure_items.any?
   %ul{ class: dom_class(committee_bios), id: dom_id(committee_bios) }
     = render partial: 'committee_bio', collection: committee_bios.structure_items.sorted_by_structure, layout: 'list_item',
+             locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:committee_bio]) } },
              cached: ->(committee_bio) { [committee_bio, committee_bio.structure_parts.collect(&:structure_partable)] }
 - else
   = render Primer::BlankslateComponent.new(title: t(:'.no_bios'), icon: 'file')

data/app/views/spina/pages/_document.html.haml

@@ -0,0 +1,15 @@
+- cache [document, document.structure_parts.collect(&:structure_partable)] do
+  %li.list-style-none.py-1.d-flex.flex-items-center
+    - cache partable_for(:name, parent: document) do
+      - if(document.has_content?(:name))
+        %h3.flex-auto= document.content(:name)
+      - else
+        %h3.flex-auto= t :'.no_name'
+    - cache partable_for(:attachment, parent: document) do
+      - if document.has_content?(:attachment) && document.content(:attachment).persisted?
+        = render Primer::ButtonComponent.new(tag: :a, ml: 2,
+                                             href: main_app.rails_blob_path(document.content(:attachment), disposition: :attachment)) do
+          = render Primer::OcticonComponent.new(icon: 'desktop-download')
+          = t(:'.download')
+      - else
+        .text-small.text-gray= t :'.no_file'

data/app/views/spina/pages/_documents.html.haml

@@ -0,0 +1,7 @@
+- if documents.present? && documents.structure_items.any?
+  = render Primer::SubheadComponent.new do |component|
+    = component.slot(:heading) { t :'.title' }
+
+  %ul{ class: dom_class(documents), id: dom_id(documents) }
+    = render partial: 'document', collection: documents.structure_items.sorted_by_structure,
+            cached: ->(document) { [document, document.structure_parts.collect(&:structure_partable)] }

data/app/views/spina/pages/_event.html.haml

@@ -0,0 +1,17 @@
+- cache [event, event.structure_parts.collect(&:structure_partable)] do
+  .d-flex.flex-column.flex-items-start
+    - cache partable_for(:name, parent: event) do
+      - if event.has_content?(:name)
+        %h3.flex-auto= event.content(:name)
+    - cache partable_for(:location, :start_time, parent: event) do
+      %h4.flex-auto= t(:'.time_and_place', time: event.has_content?(:start_time) ? time_tag(event.content(:start_time), format: :ordinal_datetime_with_year) : t('.time_tbc'),
+                                          place: event.has_content?(:location) ? event.content(:location) : t('.location_tbc')).try(:html_safe)
+    - cache partable_for(:description, parent: event) do
+      - if event.has_content?(:description)
+        .mt-1.text-gray-light= event.content(:description).try(:html_safe)
+    - cache partable_for(:url, parent: event) do
+      - if event.has_content?(:url)
+        .mt-2
+          = render Primer::ButtonComponent.new(tag: :a, href: event.content(:url)) do
+            = render Primer::OcticonComponent.new(icon: 'link-external')
+            = t :'.more_info'

data/app/views/spina/pages/_events_list.html.haml

@@ -0,0 +1,19 @@
+%div{ class: dom_class(events_list), id: dom_id(events_list) }
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
+    = component.slot(:heading) { t :'.upcoming' }
+  - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) >= Time.now }.then do |events|
+    - if events.any?
+      %ul
+        = render partial: 'event', layout: 'list_item', cached: ->(event) { [event, event.structure_parts.collect(&:structure_partable)] },
+                 collection: events
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')
+  = render Primer::SubheadComponent.new(mt: 4) do |component|
+    = component.slot(:heading) { t :'.past' }
+  - events_list.structure_items.sorted_by_structure.filter { |item| item.has_content?(:start_time) && item.content(:start_time) < Time.now }.then do |events|
+    - if events.any?
+      %ul
+        = render partial: 'event', layout: 'list_item', cached: ->(event) { [event, event.structure_parts.collect(&:structure_partable)] },
+                 collection: events
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_events'), icon: 'calendar')

data/app/views/spina/pages/_minutes_entry.html.haml

@@ -1,5 +1,5 @@
 - cache [minutes_entry, minutes_entry.structure_parts.collect(&:structure_partable)] do
-  %li.list-style-none.py-1.d-flex.flex-items-center
+  %li.list-style-none.py-1.d-flex.flex-items-center{ id: dom_id(local_assigns[:minutes_entry]) }
     - cache partable_for(:date, parent: minutes_entry) do
       .flex-auto= minutes_entry.has_content?(:date) ? t(:'.minutes_html', date: time_tag(minutes_entry.content(:date))) : t(:'.no_date')
     - cache partable_for(:attachment, parent: minutes_entry) do

data/app/views/spina/pages/_partner_societies.html.haml

@@ -4,7 +4,7 @@
 - if partner_societies.structure_items.any?
   %ul{ class: dom_class(partner_societies), id: dom_id(partner_societies) }
     = render partial: 'partner_society', collection: partner_societies.structure_items.sorted_by_structure,
-             layout: 'list_item',
+             layout: 'list_item', locals: { list_item_id: ->(local_assigns) { dom_id(local_assigns[:partner_society]) } },
              cached: ->(partner_society) { [partner_society, partner_society.structure_parts.collect(&:structure_partable)] }
 - else
   = render Primer::BlankslateComponent.new(title: t(:'.no_societies'), icon: 'organization')

data/app/views/spina/pages/_partner_society.html.haml

@@ -20,7 +20,7 @@
         - if partner_society.has_content? :description
           .text-gray= render partial: 'text', object: partner_society.content(:description)
     - cache partable_for(:logo, parent: partner_society) do
-      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted?
+      - if partner_society.has_content?(:logo) && partner_society.content(:logo).persisted? && partner_society.content(:logo).file.present?
         = image_tag(main_app.url_for(partner_society.content(:logo).file.variant(resize_to_limit: [200, 150])),
                     srcset: srcset(partner_society.content(:logo).file, variant: { resize_to_limit: [200, 150] }), size: nil,
                     alt_description: partner_society.content(:name), draggable: false, class: %w[mt-4 mt-md-0 mr-md-4])

data/config/initializers/themes/conferences_primer_theme.rb

@@ -36,6 +36,10 @@
     name: 'minutes',
     title: 'Minutes',
     partable_type: 'Spina::Structure'
+  }, {
+    name: 'documents',
+    title: 'Documents',
+    partable_type: 'Spina::Structure'
   }, {
     name: 'contact',
     title: 'Contact',
@@ -68,12 +72,16 @@
     name: 'sponsors',
     title: 'Sponsors',
     partable_type: 'Spina::Structure'
+  }, {
+    name: 'events_list',
+    title: 'Events',
+    partable_type: 'Spina::Structure'
   }]
 
   theme.layout_parts = [{
     name: 'current_conference_alert',
     title: 'Alert',
-    partable_type: 'Spina::Line'
+    partable_type: 'Spina::Text'
   }, {
     name: 'github_url',
     title: 'GitHub URL',
@@ -114,6 +122,17 @@
       title: 'Attachment',
       partable_type: 'Spina::Attachment'
     }]
+  }, {
+    name: 'documents',
+    structure_parts: [{
+      name: 'name',
+      title: 'Name',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'attachment',
+      title: 'Attachment',
+      partable_type: 'Spina::Attachment'
+    }]
   }, {
     name: 'socials',
     structure_parts: [{
@@ -158,6 +177,10 @@
       name: 'name',
       title: 'Name',
       partable_type: 'Spina::Line'
+    }, {
+      name: 'institution',
+      title: 'Institution',
+      partable_type: 'Spina::Line'
     }, {
       name: 'role',
       title: 'Role',
@@ -194,6 +217,30 @@
       title: 'Website',
       partable_type: 'Spina::Admin::Conferences::UrlPart'
     }]
+  }, {
+    name: 'events_list',
+    title: 'Events',
+    structure_parts: [{
+      name: 'name',
+      title: 'Name',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'start_time',
+      title: 'Time',
+      partable_type: 'Spina::Admin::Conferences::TimePart'
+    }, {
+      name: 'location',
+      title: 'Location',
+      partable_type: 'Spina::Line'
+    }, {
+      name: 'description',
+      title: 'Description',
+      partable_type: 'Spina::Text'
+    }, {
+      name: 'url',
+      title: 'Link',
+      partable_type: 'Spina::Admin::Conferences::UrlPart'
+    }]
   }]
 
   theme.view_templates = [{
@@ -214,7 +261,12 @@
     name: 'about',
     title: 'About',
     description: 'Contains information about the society',
-    page_parts: %w[text constitution minutes partner_societies contact]
+    page_parts: %w[text constitution minutes documents partner_societies contact]
+  }, {
+    name: 'events',
+    title: 'Events',
+    description: 'Contains details of past and upcoming events',
+    page_parts: %w[text events_list]
   }, {
     name: 'show',
     title: 'Blank',

data/config/locales/en.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+{
+  en: {
+    date: {
+      formats: {
+        full: ->(time, _) { "%A, #{time.day.ordinalize} %B %Y" }
+      }
+    },
+    time: {
+      formats: {
+        ordinal_datetime_with_year: ->(time, _) { "#{time.day.ordinalize} %b %Y, %R" }
+      }
+    }
+  }
+}

data/config/locales/en.yml

@@ -82,6 +82,11 @@ en:
         download: Download
         no_file: No file uploaded.
         no_date: No date specified.
+      documents:
+        title: Documents
+        download: Download
+        no_file: No file uploaded.
+        no_name: No name.
       partner_societies:
         title: Partner societies
         no_societies: No societies added.
@@ -89,6 +94,17 @@ en:
         website: Website
         email: Email
         contact_buttons: Contact buttons
+      events:
+        no_events: No events.
+      events_list:
+        upcoming: Upcoming events
+        past: Past events
+        no_events: No events.
+      event:
+        time_and_place: "%{place}, %{time}"
+        time_tbc: Time TBC
+        location_tbc: Location TBC
+        more_info: More information
 
     conferences:
       primer_theme:

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
+  def up
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Line').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Text.create(content: layout_part.partable.content).then do |text|
+          layout_part.partable.destroy
+          layout_part.update(partable: text)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Text')
+      end
+    end
+  end
+
+  def down
+    Spina::LayoutPart.where(name: 'current_conference_alert', layout_partable_type: 'Spina::Text').each do |layout_part|
+      if layout_part.partable.present?
+        Spina::Line.create(content: layout_part.partable.content).then do |line|
+          layout_part.partable.destroy
+          layout_part.update(partable: line)
+        end
+      else
+        layout_part.update(partable_type: 'Spina::Line')
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.8'
+      VERSION = '0.1.13'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.18
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.2
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: spina
   requirement: !ruby/object:Gem::Requirement
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: minitest-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: web-console
   requirement: !ruby/object:Gem::Requirement
@@ -303,6 +303,7 @@ files:
 - app/helpers/spina/conferences/primer_theme/navigations_helper.rb
 - app/views/conferences_primer_theme/pages/about.html.haml
 - app/views/conferences_primer_theme/pages/committee.html.haml
+- app/views/conferences_primer_theme/pages/events.html.haml
 - app/views/conferences_primer_theme/pages/homepage.html.haml
 - app/views/conferences_primer_theme/pages/information.html.haml
 - app/views/conferences_primer_theme/pages/show.html.haml
@@ -310,6 +311,7 @@ files:
 - app/views/layouts/spina/conferences/primer_theme/application.html.haml
 - app/views/layouts/spina/conferences/primer_theme/conferences.html.haml
 - app/views/layouts/spina/conferences/primer_theme/presentations.html.haml
+- app/views/spina/admin/layout_partables/texts/_form.html.haml
 - app/views/spina/application/_cookies.html.haml
 - app/views/spina/application/_current_conference_alert.html.haml
 - app/views/spina/application/_footer.html.haml
@@ -347,6 +349,10 @@ files:
 - app/views/spina/pages/_committee_bios.html.haml
 - app/views/spina/pages/_constitution.html.haml
 - app/views/spina/pages/_contact.html.haml
+- app/views/spina/pages/_document.html.haml
+- app/views/spina/pages/_documents.html.haml
+- app/views/spina/pages/_event.html.haml
+- app/views/spina/pages/_events_list.html.haml
 - app/views/spina/pages/_homepage_content.html.haml
 - app/views/spina/pages/_jumbotron.html.haml
 - app/views/spina/pages/_minutes.html.haml
@@ -355,8 +361,10 @@ files:
 - app/views/spina/pages/_partner_society.html.haml
 - config/initializers/assets.rb
 - config/initializers/themes/conferences_primer_theme.rb
+- config/locales/en.rb
 - config/locales/en.yml
 - config/routes.rb
+- db/migrate/20210206170704_change_current_conference_alert_to_text.rb
 - lib/spina/conferences/primer_theme.rb
 - lib/spina/conferences/primer_theme/breadcrumbs/builder.rb
 - lib/spina/conferences/primer_theme/engine.rb
@@ -381,7 +389,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Spina::Admin::Conferences frontend theme.