spina-conferences-primer_theme 0.1.16 → 0.2.3

data/config/locales/en.yml

@@ -37,72 +37,64 @@ en:
           application:
             title: "%{title} — %{suffix}"
 
-  spina:
-    show: Show
-
-    application:
-      cookies:
-        title: About cookies
-      footer:
-        copyright: © %{name} %{year}
-        find_on_github: Find us on GitHub
-      footer_content:
-        cookies: About cookies
-        loading: Loading…
-      image_collection:
-        previous: Previous
-        next: Next
-
+  conferences_primer_theme:
     pages:
-      homepage_content:
-        more_info: More info
-        dates_html: "%{start_date}–%{finish_date}"
-      committee_bios:
+      about:
+        contact:
+          title: Contact
+        constitution:
+          title: Constitution
+          uploaded: Uploaded %{date}
+          download: Download
+          no_constitution: No constitution uploaded.
+        minutes:
+          title: Minutes
+          no_minutes: No minutes added.
+          minutes_for_html: Minutes for %{date}
+          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.
+          website: Website
+          email: Email
+          contact_buttons: Contact buttons
+      committee:
         no_bios: No bios added.
-      committee_bio:
         twitter: Twitter
         facebook: Facebook
         name_and_role: "%{name}, %{role}"
         contact_buttons: Contact buttons
-      constitution:
-        title: Constitution
-        uploaded: Uploaded %{date}
-        download: Download
-        no_constitution: No constitution uploaded.
-      contact:
-        title: Contact
-      minutes:
-        title: Minutes
-        no_minutes: No minutes added.
-      minutes_entry:
-        minutes_html: Minutes for %{date}
-        download: Download
-        no_file: No file uploaded.
-        no_date: No date specified.
-      documents:
-        title: Documents
-      document:
-        download: Download
-        no_file: No file uploaded.
-        no_name: No name.
-      partner_societies:
-        title: Partner societies
-        no_societies: No societies added.
-      partner_society:
-        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_html: "%{place}, %{time}"
         time_tbc: Time TBC
         location_tbc: Location TBC
         more_info: More information
+      homepage:
+        more_info: More info
+        dates_html: "%{start_date}–%{finish_date}"
+
+  spina:
+    show: Show
+
+    application:
+      cookies:
+        title: About cookies
+      footer:
+        copyright: © %{name} %{year}
+        find_on_github: Find us on GitHub
+      footer_content:
+        cookies: About cookies
+        loading: Loading…
 
     conferences:
       primer_theme:
@@ -123,6 +115,8 @@ en:
               events: Events
             no_tab: No tab.
             tab_does_not_exist: "The tab '%{tab}' does not exist."
+            no_information: No information.
+            conference_navigation: Conference content
           presentations:
             all_presentation_types: All
             results: Results
@@ -137,10 +131,6 @@ en:
             no_events: No events.
           event:
             times_html: "%{start_time}–%{finish_time}"
-          information:
-            no_information: No information.
-          sponsors:
-            title: Sponsors
           conference:
             dates_html: "%{start_date}–%{finish_date}"
             locations: "%{institutions}, %{cities}"
@@ -150,10 +140,26 @@ en:
           header:
             dates_html: "%{start_date}–%{finish_date}"
             locations: "%{institutions}, %{cities}"
+            gallery:
+              previous: Previous
+              next: Next
+            sponsors:
+              title: Sponsors
+
         presentations:
           show:
             room_and_institution: "%{room}, %{institution}"
 
+        kaminari:
+          next_page:
+            next: Next
+            next_page: Next page
+          prev_page:
+            previous: Previous
+            previous_page: Previous page
+          page:
+            page: Page %{number}
+
   languages:
     en-GB: British English
 

data/db/migrate/20210206170704_change_current_conference_alert_to_text.rb

@@ -27,3 +27,20 @@ class ChangeCurrentConferenceAlertToText < ActiveRecord::Migration[6.0]
     end
   end
 end
+
+module Spina
+  class LayoutPart < ::Spina::ApplicationRecord
+    belongs_to :account
+    belongs_to :layout_partable, polymorphic: true
+  end
+
+  class Line < ApplicationRecord
+    extend Mobility
+    translates :content, fallbacks: true
+  end
+
+  class Text < ApplicationRecord
+    extend Mobility
+    translates :content, fallbacks: true
+  end
+end

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.1.16'
+      VERSION = '0.2.3'
     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.16
+  version: 0.2.3
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.31
+        version: 0.0.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.31
+        version: 0.0.35
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: spina-admin-conferences
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -289,11 +289,8 @@ files:
 - app/assets/config/spina_conferences_primer_theme_manifest.js
 - app/assets/javascripts/spina/conferences/primer_theme/application.js
 - app/assets/javascripts/spina/conferences/primer_theme/controllers/slideshow_controller.es6
-- app/assets/stylesheets/spina/conferences/primer_theme/_admin.sass
 - app/assets/stylesheets/spina/conferences/primer_theme/_custom.sass
-- app/assets/stylesheets/spina/conferences/primer_theme/_github.sass
-- app/assets/stylesheets/spina/conferences/primer_theme/_primer.sass
-- app/assets/stylesheets/spina/conferences/primer_theme/_turbolinks.sass
+- app/assets/stylesheets/spina/conferences/primer_theme/_custom_variables.sass
 - app/assets/stylesheets/spina/conferences/primer_theme/application.sass
 - app/controllers/spina/conferences/primer_theme/application_controller.rb
 - app/controllers/spina/conferences/primer_theme/conferences_controller.rb
@@ -316,10 +313,10 @@ files:
 - app/views/spina/application/_current_conference_alert.html.haml
 - app/views/spina/application/_footer.html.haml
 - app/views/spina/application/_footer_content.html.haml
-- app/views/spina/application/_image_collection.html.haml
 - app/views/spina/application/_list_item.html.haml
 - app/views/spina/application/_logo.html.haml
 - app/views/spina/application/_mobile_navigation_item.html.haml
+- app/views/spina/application/_mobile_navigation_items.html.haml
 - app/views/spina/application/_navigation.html.haml
 - app/views/spina/application/_navigation_item.html.haml
 - app/views/spina/application/_text.html.haml
@@ -329,38 +326,26 @@ files:
 - app/views/spina/conferences/primer_theme/conferences/_event.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_events.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_header.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_information.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_institution_logo.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentation.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentation.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/_presentation_type.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_presentations.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_sponsor.html.haml
-- app/views/spina/conferences/primer_theme/conferences/_sponsors.html.haml
 - app/views/spina/conferences/primer_theme/conferences/_submission_flash.html.haml
 - app/views/spina/conferences/primer_theme/conferences/index.html.haml
 - app/views/spina/conferences/primer_theme/conferences/index.ics.erb
 - app/views/spina/conferences/primer_theme/conferences/show.html.haml
 - app/views/spina/conferences/primer_theme/conferences/show.ics.erb
+- app/views/spina/conferences/primer_theme/kaminari/_gap.html.haml
+- app/views/spina/conferences/primer_theme/kaminari/_next_page.html.haml
+- app/views/spina/conferences/primer_theme/kaminari/_page.html.haml
+- app/views/spina/conferences/primer_theme/kaminari/_paginator.html.haml
+- app/views/spina/conferences/primer_theme/kaminari/_prev_page.html.haml
 - app/views/spina/conferences/primer_theme/presentations/_abstract.html.haml
 - app/views/spina/conferences/primer_theme/presentations/_attachment.html.haml
 - app/views/spina/conferences/primer_theme/presentations/_attachments.html.haml
 - app/views/spina/conferences/primer_theme/presentations/show.html.haml
-- app/views/spina/pages/_committee_bio.html.haml
-- 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
-- app/views/spina/pages/_minutes_entry.html.haml
-- app/views/spina/pages/_partner_societies.html.haml
-- app/views/spina/pages/_partner_society.html.haml
 - config/initializers/assets.rb
 - config/initializers/primer.rb
 - config/initializers/themes/conferences_primer_theme.rb

data/app/assets/stylesheets/spina/conferences/primer_theme/_admin.sass

@@ -1,4 +0,0 @@
-.admin
-  @import spina/admin_editing
-  #admin_bar
-    font-family: 'Metropolis', sans-serif

data/app/assets/stylesheets/spina/conferences/primer_theme/_github.sass

@@ -1,2 +0,0 @@
-//noinspection CssUnknownTarget
-@import @github/details-dialog-element/dist

data/app/assets/stylesheets/spina/conferences/primer_theme/_primer.sass

@@ -1,4 +0,0 @@
-//noinspection CssUnknownTarget
-@import @primer/css
-//noinspection CssUnknownTarget
-@import @primer/octicons

data/app/assets/stylesheets/spina/conferences/primer_theme/_turbolinks.sass

@@ -1,3 +0,0 @@
-//noinspection CssUnusedSymbol
-.turbo-progress-bar
-  background-color: white

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

@@ -1,19 +0,0 @@
-- return if image_collection.images.none?
-
-.position-relative{ data: { controller: :slideshow, slideshow: { incrementer: 0, advance: (true if local_assigns[:advance]) } } }
-  - image_collection.images.each_with_index do |image, index|
-    - if image.file.present?
-      = image_tag(main_app.url_for(image.file.variant(resize_to_fill: [1680, 600])), alt_description: image.file.name, draggable: false,
-                  srcset: srcset(image.file, variant: { resize_to_fill: [1680, 600] }), hidden: index != 0,
-                  data: { 'slideshow-target': 'slide' }, class: %w[d-block mx-auto])
-  .position-absolute.top-0.left-0.right-0.bottom-0.container-lg.p-responsive{ class: ('position-absolute top-0' if local_assigns[:controls]) }
-    - if local_assigns[:controls] && image_collection.images.many?
-      .d-none.d-sm-flex.flex-justify-between.flex-items-center.height-full
-        = render Primer::ButtonComponent.new(data: { action: :'slideshow#previous' }) do
-          = render Primer::OcticonComponent.new(icon: 'arrow-left')
-          = t(:'.previous')
-        = render Primer::ButtonComponent.new(data: { action: :'slideshow#next' }) do
-          = t(:'.next')
-          = render Primer::OcticonComponent.new(icon: 'arrow-right')
-    - else
-      .text-white= yield

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

@@ -1,4 +0,0 @@
-- if text.present?
-  = render(Primer::MarkdownComponent.new(my: 4)) { text.try(:html_safe) }
-- else
-  = render Primer::BlankslateComponent.new(title: t(:'.no_information'), icon: 'info', my: 4)

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

@@ -1,8 +0,0 @@
-= render Primer::FlexItemComponent.new(m: 2, vertical_align: :middle) do
-  - 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
-    = render(Primer::LinkComponent.new(href: sponsor.content(:website) || '')) { sponsor.content(:name) }

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

@@ -1,6 +0,0 @@
-= render Primer::SubheadComponent.new(spacious: true) do |component|
-  = component.heading(tag: :h2) { t :'.title' }
-
-= render Primer::FlexComponent.new(flex_wrap: true, classes: dom_class(sponsors), ml: -2, mr: -2, mt: -2, mb: -2) do
-  = render partial: 'sponsor', collection: sponsors.structure_items.sorted_by_structure,
-           cached: -> sponsor { [sponsor, sponsor.structure_parts.collect(&:structure_partable)] }

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

@@ -1,36 +0,0 @@
-- cache [committee_bio, committee_bio.structure_parts.collect(&:structure_partable)] do
-  = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], align_items: :start) do
-    - cache partable_for(:profile_picture, parent: committee_bio) do
-      - if committee_bio.has_content?(:profile_picture) && committee_bio.content(:profile_picture).persisted? && committee_bio.content(:profile_picture).file.present?
-        = render Primer::AvatarComponent.new(src: main_app.url_for(committee_bio.content(:profile_picture).file.variant(resize_to_fill: [150, 150])),
-                                             srcset: srcset_string(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_shrink: 0)
-    = render Primer::FlexItemComponent.new(flex_auto: true) do
-      = render Primer::FlexComponent.new(direction: [:column, nil, :row, nil], mb: 1) do
-        - cache partable_for(:name, :role, :institution, parent: committee_bio) do
-          = render Primer::BoxComponent.new do
-            - if committee_bio.has_content?(:name)
-              = render(Primer::HeadingComponent.new(tag: :h3)) do
-                - if committee_bio.has_content?(:role)
-                  = t :'.name_and_role', name: committee_bio.content(:name), role: committee_bio.content(:role)
-                - else
-                  = committee_bio.content(:name)
-            - if committee_bio.has_content?(:institution)
-              = render(Primer::HeadingComponent.new(tag: :h4)) { committee_bio.content(:institution) }
-        = render Primer::ButtonGroupComponent.new(mt: [1, nil, 0, nil], ml: [nil, nil, 1, nil],
-                                                  aria: { label: t(:'.contact_buttons') }) do |component|
-          - cache partable_for(:twitter_profile, parent: committee_bio) do
-            - if committee_bio.has_content?(:twitter_profile)
-              = component.button(tag: :a, href: committee_bio.content(:twitter_profile)) do
-                = render Primer::OcticonComponent.new(icon: 'link-external')
-                = t(:'.twitter')
-          - cache partable_for(:facebook_profile, parent: committee_bio) do
-            - if committee_bio.has_content?(:facebook_profile)
-              = component.button(tag: :a, href: committee_bio.content(:facebook_profile)) do
-                = render Primer::OcticonComponent.new(icon: 'link-external')
-                = t(:'.facebook')
-      - cache partable_for(:bio, parent: committee_bio) do
-        - if committee_bio.has_content?(:bio)
-          = render(Primer::TextComponent.new(tag: :div, color: :gray_light)) { committee_bio.content(:bio).try(:html_safe) }

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

@@ -1,7 +0,0 @@
-- 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/_constitution.html.haml

@@ -1,12 +0,0 @@
-= render Primer::SubheadComponent.new do |component|
-  = component.heading { t :'.title' }
-
-- if constitution.present?
-  = render Primer::FlexComponent.new(align_items: :center, py: 1) do
-    = render Primer::FlexItemComponent.new(flex_auto: true, pr: 1) do
-      = t :'.uploaded', date: l(constitution.created_at.to_date, format: :long)
-    = render Primer::ButtonComponent.new(tag: :a, href: main_app.rails_blob_path(constitution, disposition: :attachment), ml: 2) do
-      = render Primer::OcticonComponent.new(icon: 'desktop-download')
-      = t :'.download'
-- else
-  = render Primer::BlankslateComponent.new(title: t(:'.no_constitution'), icon: 'law')