spina-conferences-primer_theme 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0f415891da36813f4af78fc54b98daf3e34d1b22853995c7887944757055c05
-  data.tar.gz: 6f8414d707ea3695ef12e342bb514f04fa667a5fa6f427a3679e9c465992527d
+  metadata.gz: a8a85cdf19e437cc1bcfbbac3a0410c9936c7937e0fad5cfd43b69d50e220142
+  data.tar.gz: e61eb65c953c3c0f960594b433bbc053a0d6e3c4f78968bd61cfb60f01e11d14
 SHA512:
-  metadata.gz: 62789ffa15b959d63a2a6d7cef661fcc3870d3437ca4e23de0dc55496a597a054bdab0de720ba067b59eeb7685108079717b6c7c335139298f3ddf784b03ddf2
-  data.tar.gz: bcbb08ea4e23752dc6bb8c7d90111701cd0c65ddd1139c549c42fae19b33b75c2391086578a9db9352fa536a4829ac3ddbf675d8b047907251dd3b5e8ee6323e
+  metadata.gz: e79f15190f9f206e35e50d073d88e1db00ee4b7b7fe68b890df6f0912e439a449a2ab74d14b1847b9d16348e4704778102b9391aa143d67366310ca7bae0598e
+  data.tar.gz: b7d8086273db0c61bf6734c3ef2bb299b46539f634e2b1dafcf2dd730c7e343baee10b1199bb3c7efdc766ef268b3451465b5c1b1c72c9aeb27259fcb0f75b4a

data/app/controllers/spina/conferences/primer_theme/journal/issues_controller.rb

@@ -13,6 +13,7 @@ module Spina
           def index
             # having multiple journals is not currently allowed anyway
             @issues = Admin::Journal::Issue.sorted_desc
+            @latest_issue = @issues.find_by 'date <= ?', Time.zone.today
           end
 
           def show

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

@@ -1,13 +1,12 @@
-- cache navigation_item do
-  .Header-item.mr-0.border-top.border-white-fade-15.flex-column.flex-items-stretch
-    - if navigation_item.has_children?
-      %details.details-reset
-        %summary.Header-link.py-2
-          = navigation_item.menu_title
-          = render Primer::OcticonComponent.new('chevron-down')
-        %ul.list-style-none
-          - 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 color-text-white]
-    - elsif navigation_item.is_root?
-      = link_to navigation_item.menu_title, navigation_item.materialized_path,
-                class: %w[Header-link py-2]
+.Header-item.mr-0.border-top.border-white-fade-15.flex-column.flex-items-stretch
+  - if navigation_item.has_children?
+    %details.details-reset
+      %summary.Header-link.py-2
+        = navigation_item.menu_title
+        = render Primer::OcticonComponent.new('chevron-down')
+      %ul.list-style-none
+        - 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 color-text-white]
+  - elsif navigation_item.is_root?
+    = link_to navigation_item.menu_title, navigation_item.materialized_path,
+              class: %w[Header-link py-2]

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

@@ -1,3 +1,3 @@
 %nav.d-flex.flex-column.flex-self-stretch
-  = render partial: 'mobile_navigation_item', collection: main_navigation_items, cached: true, as: :navigation_item
+  = render partial: 'mobile_navigation_item', collection: main_navigation_items, as: :navigation_item, cache: -> navigation_item { [navigation_item, navigation_item.children] }
   .Header-item.mr-0.border-top.border-white-fade-15= link_to 'Conferences', frontend_conferences_path, class: %w[Header-link py-2 py-lg-0]

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

@@ -6,6 +6,6 @@
         = 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
+    = render partial: 'navigation_item', collection: main_navigation_items, cache: -> navigation_item { [navigation_item, navigation_item.children] }
     .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,12 +1,11 @@
-- 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]
+.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/journal/articles/show.html.haml

@@ -1,50 +1,60 @@
-= render(Primer::HeadingComponent.new) { @article.title }
+- cache [@article, @article.authorships, @article.affiliations, @article.content(:abstract), @article.issue, @article.issue.volume, @article.issue.content(:cover_img)] do
+  = 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 }
+  = 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) }
+      - 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)
+    = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 20vw')) do |sidebar|
+      - sidebar.body do
+        - if @article.issue.has_content?(:cover_img)
+          = render partial: 'spina/conferences/primer_theme/journal/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::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' }
+            = 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.conferences.primer_theme.journal.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
+          - component.row do
+            -# TODO: allow user to select licence
+            = render(Primer::FlexComponent.new(direction: :column)) do
+              = render(Primer::TextComponent.new(mb: 2)) do
+                Copyright #{@article.issue.date.year} #{@article.affiliations.collect(&:name).to_sentence}
+              %a{ rel: 'licence', href: 'https://creativecommons.org/licenses/by/4.0/' }
+                %img{ alt: 'Creative Commons Attribution 4.0 International Licence', src: '//i.creativecommons.org/l/by/4.0/88x31.png' }
+            = render(Primer::TextComponent.new(mt: 1)) { t '.cc_by_licence_html' }
+
+          - 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/_issue.html.haml

@@ -3,12 +3,12 @@
     = 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
+    = render(Primer::HeadingComponent.new(tag: :h3, 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
+      = render(Primer::HeadingComponent.new(tag: :h4, 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

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

@@ -1,10 +1,30 @@
-= render(Primer::HeadingComponent.new) { @journal.name }
+= render(Primer::FlexComponent.new(direction: [:column, nil, :row, nil])) do
+  = render(Primer::FlexComponent.new(direction: :column, flex: :auto)) do
+    = render(Primer::HeadingComponent.new) { @journal.name }
+    - if @journal.has_content? :description
+      = render(Primer::MarkdownComponent.new(my: 4)) { @journal.content.html(:description) }
+  = render(Primer::BorderBoxComponent.new(ml: [nil, nil, 4, nil], style: 'min-width: 15vw;')) do |sidebar|
+    - if @journal.has_content? :logo
+      - sidebar.header(bg: :primary) do
+        = render(Primer::FlexItemComponent.new(mb: 4)) do
+          - cache @journal.content(:logo) do
+            = image_tag main_app.url_for(@journal.content(:logo).variant(resize_to_limit: [300, 150])),
+                        srcset: srcset(@journal.content(:logo), variant: { resize_to_limit: [300, 150] }),
+                        alt_description: t('.logo'),
+                        draggable: false,
+                        class: 'p-1'
+    - unless @latest_issue.nil?
+      - sidebar.row do
+        = render(Primer::HeadingComponent.new(tag: :h2, font_size: 3)) do
+          = link_to t('.latest_issue', volume_number: @latest_issue.volume.number, issue_number: @latest_issue.number), frontend_issue_path(@latest_issue)
+    - if @latest_issue.has_content?(:cover_img)
+      - sidebar.row do
+        = link_to(frontend_issue_path(@latest_issue)) do
+          = render partial: 'issue_cover', locals: { issue: @latest_issue, cover_img: @latest_issue.content(:cover_img), size: [150, 300] }
 
-- if @journal.content(:description).present?
-  = render(Primer::MarkdownComponent.new(mt: 4)) { @journal.content.html(:description) }
-
-%div#journal-issues-list.border-top
+#journal-issues-list
+  = render(Primer::HeadingComponent.new(tag: :h2, mt: 3)) { t '.all_issues' }
   - if @issues.any?
-    %ul= render partial: 'issue', collection: @issues, layout: 'list_item'
+    %ul= render partial: 'issue', collection: @issues, layout: 'list_item', cached: true
   - else
     = render Primer::BlankslateComponent.new(title: t(:'.no_issues'), icon: 'mortar-board')

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

@@ -1,18 +1,27 @@
-= render(Primer::HeadingComponent.new) do
-  = t('spina.conferences.primer_theme.journal.volume_issue', volume_number: @issue.volume.number, issue_number: @issue.number)
+- cache [@issue, @issue.volume, @issue.articles, @issue.content(:cover_img), @issue.content(:description)] do
+  - cache [@issue, @issue.volume] do
+    = 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 }
+    - 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?(: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)
+  - 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')
+  - if @issue.has_content?(:attachment)
+    = render(Primer::ButtonComponent.new(tag: :a, scheme: :primary, href: main_app.url_for(@issue.content(:attachment)), my: 2, download: '')) do
+      = render Primer::OcticonComponent.new('download')
+      = t '.download'
+
+  %div#journal-articles-list.border-top
+    - if @articles.any?
+      %ul= render partial: 'article', collection: @articles.sorted_asc, layout: 'list_item', cached: true
+    - else
+      = render Primer::BlankslateComponent.new(title: t(:'.no_articles'), icon: 'mortar-board')

data/config/locales/en.yml

@@ -167,8 +167,11 @@ en:
             index:
               no_issues: This journal has no issues.
               logo: Journal logo
+              all_issues: All Issues
+              latest_issue: "Latest Issue (Vol. %{volume_number} Issue %{issue_number})"
             show:
               no_articles: This issue has no articles.
+              download: Full Issue PDF
             article:
               download: PDF
           articles:
@@ -180,6 +183,7 @@ en:
               published: Published
               issue: Issue
               draft: THIS ARTICLE IS A DRAFT
+              cc_by_licence_html: This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
 
   languages:
     en-GB: British English

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

@@ -3,7 +3,7 @@
 module Spina
   module Conferences
     module PrimerTheme
-      VERSION = '0.5.0'
+      VERSION = '0.5.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-conferences-primer_theme
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Justin Malčić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: babel-transpiler
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement