spina-conferences-primer_theme 0.3.3 → 0.5.0

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

@@ -1,9 +1,11 @@
-.Header.px-3.px-md-4.px-lg-5.flex-wrap.flex-lg-nowrap
-  .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
-  %details.details-reset.d-lg-none{ style: 'display: contents' }
-    %summary.Header-item.Header-link.btn-link
-      = render Primer::OcticonComponent.new('three-bars', height: 24)
-    .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
-      = render partial: 'mobile_navigation_items'
-  = render partial: 'navigation_item', collection: main_navigation_items, cached: true
-  .Header-item.d-none.d-lg-flex= link_to 'Conferences', frontend_conferences_url, class: %w[Header-link]
+- cache main_navigation_items do
+  .Header.px-3.px-md-4.px-lg-5.flex-wrap.flex-lg-nowrap
+    .Header-item.mt-n1.mb-n1= link_to render('logo'), root_path, class: 'Header-link'
+    %details.details-reset.d-lg-none{ style: 'display: contents' }
+      %summary.Header-item.Header-link.btn-link
+        = render Primer::OcticonComponent.new('three-bars', height: 24)
+      .Header-item.Header-item--full.flex-column.width-full.flex-order-1.mr-0.mt-3
+        = render partial: 'mobile_navigation_items'
+    = render partial: 'navigation_item', collection: main_navigation_items, cached: true
+    .Header-item.d-none.d-lg-flex= link_to 'Journal', frontend_issues_path, class: %w[Header-link]
+    .Header-item.d-none.d-lg-flex= link_to 'Conferences', frontend_conferences_path, class: %w[Header-link]

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

@@ -1,11 +1,12 @@
-.Header-item.position-relative.d-none.d-lg-flex
-  - if navigation_item.has_children? && navigation_item.children.regular_pages.in_menu.live.sorted.any?
-    %details.details-reset.details-overlay
-      %summary.Header-link{ role: 'button', aria: { haspopup: 'menu' } }
-        = navigation_item.menu_title
-        = render Primer::OcticonComponent.new('chevron-down')
-      %ul.dropdown-menu.dropdown-menu-sw
-        - navigation_item.children.regular_pages.in_menu.live.sorted.each do |child|
-          %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
-  - elsif navigation_item.is_root?
-    = link_to navigation_item.menu_title, navigation_item.materialized_path, class: %w[Header-link]
+- cache navigation_item do
+  .Header-item.position-relative.d-none.d-lg-flex
+    - if navigation_item.has_children? && navigation_item.children.regular_pages.in_menu.live.sorted.any?
+      %details.details-reset.details-overlay
+        %summary.Header-link{ role: 'button', aria: { haspopup: 'menu' } }
+          = navigation_item.menu_title
+          = render Primer::OcticonComponent.new('chevron-down')
+        %ul.dropdown-menu.dropdown-menu-sw
+          - navigation_item.children.regular_pages.in_menu.live.sorted.each do |child|
+            %li= link_to child.menu_title, child.materialized_path, class: 'dropdown-item'
+    - elsif navigation_item.is_root?
+      = link_to navigation_item.menu_title, navigation_item.materialized_path, class: %w[Header-link]

data/app/views/spina/conferences/primer_theme/conferences/{_presentation_type.html.haml → conferences/_presentation_type.html.haml}

@@ -1,5 +1,5 @@
 %li
-  = link_to frontend_conference_url(presentation_type.conference, presentation_type: presentation_type.id, tab: 'presentations'),
+  = link_to frontend_conference_path(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/{_presentations.html.haml → conferences/_presentations.html.haml}

@@ -4,7 +4,7 @@
       %ul.filter-list
         - cache [@conference.presentations, @presentation_type] do
           %li
-            = link_to frontend_conference_url(@conference, tab: 'presentations'),
+            = link_to frontend_conference_path(@conference, tab: 'presentations'),
                       class: 'filter-item', aria: { current: ('page' if @presentation_type.blank?) } do
               = t('.all_presentation_types')
               %span.count{ title: t(:'.results') }= @conference.presentations.count
@@ -22,7 +22,7 @@
           %ul{ data: { filter: { list: true } } }
             = render partial: 'presentation', collection: @presentations.sorted.reverse_order, layout: 'list_item',
                      locals: { conference: @conference }, cached: -> presentation { [presentation, presentation.presenters] }
-          = paginate @presentations.sorted, views_prefix: 'spina/conferences/primer_theme'
+          = paginate @presentations.sorted, views_prefix: 'spina/conferences/primer_theme/conferences'
         - else
           = render Primer::BlankslateComponent.new(title: t(:'.no_presentations'), icon: 'mortar-board')
         = render Primer::BlankslateComponent.new(title: t(:'.no_matching_presentations'), icon: 'mortar-board', hidden: true,

data/app/views/spina/conferences/primer_theme/conferences/{show.html.haml → conferences/show.html.haml}

@@ -5,13 +5,13 @@
 
 = turbo_frame_tag 'conference_tabs' do
   = render Primer::UnderlineNavComponent.new(label: t(:'.conference_navigation')) do |component|
-    - component.tab(href: frontend_conference_url(@conference, tab: 'information', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'information', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'information').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.information')
-    - component.tab(href: frontend_conference_url(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'presentations', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'presentations').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.presentations')
-    - component.tab(href: frontend_conference_url(@conference, tab: 'events', presentation_type: @presentation_type&.id),
+    - component.tab(href: frontend_conference_path(@conference, tab: 'events', presentation_type: @presentation_type&.id),
                     aria: { selected: (@tab == 'events').to_s }, classes: 'UnderlineNav-item', role: 'tab') do
       = t(:'.tabs.events')
     - component.actions do

data/app/views/spina/conferences/primer_theme/journal/articles/_authorship.html.haml

@@ -0,0 +1,6 @@
+= render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
+  = render(Primer::FlexItemComponent.new(mr: 2)) do
+    = render(Primer::OcticonComponent.new('person'))
+  = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
+    = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { authorship.affiliation.name }
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { authorship.affiliation.institution.name }

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

@@ -0,0 +1,50 @@
+= render(Primer::HeadingComponent.new) { @article.title }
+
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true, mr: [nil, nil, 4, nil])) do
+    %ul.list-style-none.d-flex.flex-column.flex-sm-row.my-2
+      - @article.affiliations.each do |affiliation|
+        = render(Primer::FlexComponent.new(tag: :li, mr: 4, align_items: :center)) do
+          = render(Primer::FlexItemComponent.new(mr: 2)) do
+            = render(Primer::OcticonComponent.new('person'))
+          = render(Primer::FlexComponent.new(tag: :address, direction: :column)) do
+            = render(Primer::TextComponent.new(tag: :div, font_weight: :bold)) { affiliation.name }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) { affiliation.institution.name }
+
+    - if @article.has_content?(:abstract)
+      = render(Primer::HeadingComponent.new(tag: :h2, mt: 4, font_size: 3)) { t '.abstract' }
+      = render(Primer::MarkdownComponent.new) { @article.content.html(:abstract) }
+
+  = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil])) do |sidebar|
+    - sidebar.body do
+      - if @article.issue.has_content?(:cover_img)
+        = render partial: 'spina/journal/primer_theme/issues/issue_cover', locals: { issue: @article.issue, cover_img: @article.issue.content(:cover_img), size: [200, 400] }
+      = render(Primer::BorderBoxComponent.new) do |component|
+        - if @article.has_content?(:attachment)
+          - component.row do
+            = render(Primer::ButtonComponent.new(tag: :a, href: main_app.url_for(@article.content(:attachment)), download: '', scheme: :primary)) do
+              = render Primer::OcticonComponent.new('download')
+              = t '.download'
+        - component.row do
+          = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.published' }
+          = render(Primer::TextComponent.new) do
+            = time_tag @article.issue.date, format: :long
+        - component.row do
+          = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.issue' }
+          = render(Primer::TextComponent.new) do
+            = link_to t('spina.journal.primer_theme.volume_issue',
+                        volume_number: @article.issue.volume.number,
+                        issue_number: @article.issue.number), frontend_issue_path(@article.issue)
+        - unless @article.doi.blank?
+          = component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.doi' }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = link_to nil, @article.doi
+        - unless @article.url.blank?
+          = component.row do
+            = render(Primer::HeadingComponent.new(tag: :h2, font_size: 4, color: :text_secondary)) { t '.url' }
+            = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 1)) do
+              = link_to nil, @article.url
+        - if @article.draft?
+          = component.row do
+            = render(Primer::TextComponent.new(tag: :div, color: :text_danger, font_weight: :bold)) { t '.draft' }

data/app/views/spina/conferences/primer_theme/journal/issues/_article.html.haml

@@ -0,0 +1,15 @@
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::HeadingComponent.new(tag: :h3, mb: 1)) do
+      = link_to article.title, frontend_issue_article_path(article.issue, article)
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+      = render(Primer::OcticonComponent.new(article.affiliations.many? ? 'people' : 'person'))
+      = render(Primer::BaseComponent.new(tag: :address, display: :inline)) do
+        = article.authorships.sorted_within_article.collect { |authorship| authorship.affiliation.name }.to_sentence
+    - unless article.doi.blank?
+      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary)) do
+        = link_to nil, article.doi
+    - if article.has_content?(:attachment)
+      = render(Primer::ButtonComponent.new(tag: :a, href: main_app.url_for(article.content(:attachment)), mt: 2, download: '')) do
+        = render Primer::OcticonComponent.new('download')
+        = t '.download'

data/app/views/spina/conferences/primer_theme/journal/issues/_issue.html.haml

@@ -0,0 +1,17 @@
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  - if issue.content(:cover_img).present?
+    = render(Primer::FlexItemComponent.new(mr: 4)) do
+      = render partial: 'issue_cover', locals: { issue: issue, cover_img: issue.content(:cover_img), size: [150, 300] }
+  = render(Primer::FlexItemComponent.new(flex_auto: true)) do
+    = render(Primer::HeadingComponent.new(tag: :h2, mb: 1)) do
+      = link_to t('spina.conferences.primer_theme.journal.volume_issue',
+                  volume_number: issue.volume.number,
+                  issue_number: issue.number), frontend_issue_path(issue)
+    - unless issue.title.blank?
+      = render(Primer::HeadingComponent.new(tag: :h3, color: :text_secondary, mb: 1)) do
+        = issue.title
+    = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, font_weight: :bold)) do
+      = time_tag issue.date, format: :long
+    - if issue.has_content?(:description)
+      = render(Primer::TextComponent.new(tag: :div, color: :text_secondary, mt: 2)) do
+        = issue.content.html(:description)

data/app/views/spina/conferences/primer_theme/journal/issues/_issue_cover.html.haml

@@ -0,0 +1,6 @@
+- cache cover_img do
+  = image_tag main_app.url_for(cover_img.variant(resize_to_limit: size)),
+              srcset: srcset(cover_img, variant: { resize_to_limit: size }),
+              alt_description: t('spina.conferences.primer_theme.journal.volume_issue', volume_number: issue.volume.number, issue_number: issue.number),
+              draggable: false,
+              class: 'p-1'

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

@@ -0,0 +1,10 @@
+= render(Primer::HeadingComponent.new) { @journal.name }
+
+- if @journal.content(:description).present?
+  = render(Primer::MarkdownComponent.new(mt: 4)) { @journal.content.html(:description) }
+
+%div#journal-issues-list.border-top
+  - if @issues.any?
+    %ul= render partial: 'issue', collection: @issues, layout: 'list_item'
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_issues'), icon: 'mortar-board')

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

@@ -0,0 +1,18 @@
+= render(Primer::HeadingComponent.new) do
+  = t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number)
+
+- unless @issue.title.blank?
+  = render(Primer::HeadingComponent.new(tag: :h2, color: :text_secondary, mb: 2)) { @issue.title }
+
+- if @issue.has_content?(:cover_img)
+  = render partial: 'issue_cover', locals: { issue: @issue, cover_img: @issue.content(:cover_img), size: [300, 600] }
+
+- if @issue.has_content?(:description)
+  = render(Primer::MarkdownComponent.new(my: 4)) do
+    = @issue.content.html(:description)
+
+%div#journal-articles-list.border-top
+  - if @articles.any?
+    %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item'
+  - else
+    = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')

data/config/initializers/themes/conferences_primer_theme.rb

@@ -75,7 +75,7 @@
     name: 'committee_bios',
     title: 'Committee bios',
     part_type: 'Spina::Parts::Repeater',
-    parts: %w[name role bio profile_picture]
+    parts: %w[name institution role bio profile_picture]
   }, {
     name: 'sponsors',
     title: 'Sponsors',
@@ -158,6 +158,18 @@
     name: 'url',
     title: 'Link',
     part_type: 'Spina::Parts::Admin::Conferences::Url'
+  }, {
+    name: 'embed_url',
+    title: 'Form embed URL',
+    part_type: 'Spina::Parts::Admin::Conferences::Url'
+  }, {
+    name: 'abstract',
+    title: 'Abstract',
+    part_type: 'Spina::Parts::Text'
+  }, {
+    name: 'cover_img',
+    title: 'Cover image',
+    part_type: 'Spina::Parts::Image'
   }]
 
   theme.view_templates = [{
@@ -184,6 +196,11 @@
     title: 'Events',
     description: 'Contains details of past and upcoming events',
     parts: %w[text events_list]
+  }, {
+    name: 'embedded_form',
+    title: 'Embedded form',
+    description: 'Contains an embedded form',
+    parts: %w[text embed_url]
   }, {
     name: 'show',
     title: 'Blank',
@@ -212,5 +229,5 @@
     label: 'Footer'
   }]
 
-  theme.plugins = ['conferences']
+  theme.plugins = %w[conferences journal]
 end

data/config/locales/en.yml

@@ -99,66 +99,87 @@ en:
     conferences:
       primer_theme:
         conferences:
-          index:
-            subscribe: Subscribe
-            no_conferences: No conferences have been added.
-            search: Search
-            no_matching_conferences: No matching conferences.
-          show:
-            information: Information
-            presentations: Presentations
-            events: Events
-            subscribe: Subscribe
-            tabs:
+          conferences:
+            index:
+              subscribe: Subscribe
+              no_conferences: No conferences have been added.
+              search: Search
+              no_matching_conferences: No matching conferences.
+            show:
               information: Information
               presentations: Presentations
               events: Events
-            no_tab: No tab.
-            tab_does_not_exist: "The tab '%{tab}' does not exist."
-            no_information: No information.
-            conference_navigation: Conference content
+              subscribe: Subscribe
+              tabs:
+                information: Information
+                presentations: Presentations
+                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
+              search: Search
+              no_matching_presentations: No matching presentations.
+              no_presentations: No presentations.
+            presentation_type:
+              results: Results
+            events:
+              search: Search
+              no_matching_events: No matching events.
+              no_events: No events.
+            event:
+              times_html: "%{start_time}–%{finish_time}"
+            conference:
+              dates_html: "%{start_date}–%{finish_date}"
+              locations: "%{institutions}, %{cities}"
+            submission_flash:
+              submit_by_html: Submit abstracts by %{date}
+              submit_abstract: Submit an abstract
+            header:
+              dates_html: "%{start_date}–%{finish_date}"
+              locations: "%{institutions}, %{cities}"
+              gallery:
+                previous: Previous
+                next: Next
+              sponsors:
+                title: Sponsors
+
           presentations:
-            all_presentation_types: All
-            results: Results
-            search: Search
-            no_matching_presentations: No matching presentations.
-            no_presentations: No presentations.
-          presentation_type:
-            results: Results
-          events:
-            search: Search
-            no_matching_events: No matching events.
-            no_events: No events.
-          event:
-            times_html: "%{start_time}–%{finish_time}"
-          conference:
-            dates_html: "%{start_date}–%{finish_date}"
-            locations: "%{institutions}, %{cities}"
-          submission_flash:
-            submit_by_html: Submit abstracts by %{date}
-            submit_abstract: Submit an abstract
-          header:
-            dates_html: "%{start_date}–%{finish_date}"
-            locations: "%{institutions}, %{cities}"
-            gallery:
-              previous: Previous
-              next: Next
-            sponsors:
-              title: Sponsors
+            show:
+              room_and_institution: "%{room}, %{institution}"
 
-        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}
 
-        kaminari:
-          next_page:
-            next: Next
-            next_page: Next page
-          prev_page:
-            previous: Previous
-            previous_page: Previous page
-          page:
-            page: Page %{number}
+        journal:
+          volume_issue: "Volume %{volume_number} (Issue %{issue_number})"
+          issues:
+            index:
+              no_issues: This journal has no issues.
+              logo: Journal logo
+            show:
+              no_articles: This issue has no articles.
+            article:
+              download: PDF
+          articles:
+            show:
+              download: PDF
+              doi: DOI
+              url: URL
+              abstract: Abstract
+              published: Published
+              issue: Issue
+              draft: THIS ARTICLE IS A DRAFT
 
   languages:
     en-GB: British English