spina-admin-journal 1.0.0.rc1 → 1.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e696fd8633a8dc7ab2b57166808c7e989792307f0d3481a0eb5e73b0d05d175
-  data.tar.gz: bb15a7e5c115a2302e95f3224d85840dcfc6f46d8ec88b1c18bd67b4d0ba02b6
+  metadata.gz: e9dfe8f35c6a45f02481c7259fb3a6d5eba37cae6c7725c5e82f7a5658a340a7
+  data.tar.gz: 4daa82dba66f3f02c473db5d8a165934b68241af3069ddae1c509b246e6ae936
 SHA512:
-  metadata.gz: 0e1f1e24116d3955595ef1fc705f4e93a25028daeaac15b42a147d4cadeec0b2bb5c6176d4d9c98dbb104f66dd325a006a156eea6d8afab270cb096cb386772f
-  data.tar.gz: d6541162de0b4e925c3c6dda25ac08d4e5292c6f3b2c8ac4306f933000aee56dfbc8cbcd2ee0704a0499a5a512e1179d429b47cbe8a17ea205a47324eaf2c382
+  metadata.gz: 56e6ce7ac600354e6dd0c2bfba6d7b702661ecd6da9ac6666f44890f62805f3853bfa14c81475a33cf4e84350ed20f446d7e6e3beb2833ea73e1133057acc036
+  data.tar.gz: f6ae39891fe012f049cfedb9517ec2a386de90b82c947db39f46e24eb783c94bee25cbc0caf37a52c0f5b9925a6d7318d79ef2aab27aecf7da23acb89872576b

data/app/assets/config/spina_admin_journal_manifest.js

@@ -1,6 +1,2 @@
 //= link spina/admin/journal/application.css
-
-//= link_directory ../javascripts/spina/admin/journal/controllers
-//= link_directory ../javascripts/spina/admin/journal/libraries
-
 //= link spina/admin/journal/application.js

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

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

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

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

data/app/components/spina/admin/journal/list_component.html.haml

@@ -1,10 +1,11 @@
-- if sortable?
-  .ml-8.mt-8.text-gray-600.text-sm= t 'spina.admin.journal.sort_info'
-.my-6.md:m-8.bg-white.md:rounded-lg.border-l-0.border-r-0.border.md:border-r.md:border-l.border-gray-200.border-b-0.shadow-sm{ data: { controller: 'sortable' } }
-  = form_with(url: @sort_path, data: { sortable_target: 'form' }) { |f| }
-  %ul{ data: { sortable_target: 'list' } }
-    - if @list_items.any?
-      - @list_items.each do |item|
-        = render Spina::Admin::Journal::ListItemComponent.new(id: item[:id], label: item[:label], path: item[:path], sortable: sortable?)
-    - else
-      = render Spina::Admin::Journal::EmptyListComponent.new
+.my-6.md:m-8
+  - if sortable?
+    .mb-4.text-gray-600.text-sm= t 'spina.admin.journal.sort_info'
+  .bg-white.md:rounded-lg.border-l-0.border-r-0.border.md:border-r.md:border-l.border-gray-200.border-b-0.shadow-sm{ data: { controller: 'sortable' } }
+    = form_with(url: @sort_path, data: { sortable_target: 'form' }) { |f| }
+    %ul{ data: { sortable_target: 'list' } }
+      - if @list_items.any?
+        - @list_items.each do |item|
+          = render Spina::Admin::Journal::ListItemComponent.new(id: item[:id], label: item[:label], path: item[:path], sortable: sortable?)
+      - else
+        = render Spina::Admin::Journal::EmptyListComponent.new

data/app/controllers/spina/admin/journal/articles_controller.rb

@@ -29,6 +29,8 @@ module Spina
         before_action :set_parts_attributes, only: %i[new edit]
         before_action :build_parts, only: %i[edit]
 
+        admin_section :journal
+
         def index
           @articles = Article.sorted_desc
         end

data/app/controllers/spina/admin/journal/authors_controller.rb

@@ -9,6 +9,8 @@ module Spina
         before_action :set_tabs, except: %i[index destroy]
         before_action :set_author, only: %i[edit update destroy]
 
+        admin_section :journal_settings
+
         def index
           @authors = Author.all
         end
@@ -60,7 +62,7 @@ module Spina
         private
 
         def author_params
-          params.require(:author).permit(:primary_affiliation_index,
+          params.require(:author).permit(:primary_affiliation_index, :orcid,
                                          affiliations_attributes: %i[id institution_id first_name
                                                                      surname])
         end

data/app/controllers/spina/admin/journal/institutions_controller.rb

@@ -9,6 +9,8 @@ module Spina
         before_action :set_tabs, except: %i[index destroy]
         before_action :set_institution, only: %i[edit update destroy]
 
+        admin_section :journal_settings
+
         def index
           @institutions = Institution.all
         end

data/app/controllers/spina/admin/journal/issues_controller.rb

@@ -30,6 +30,8 @@ module Spina
         before_action :set_parts_attributes, only: %i[new edit]
         before_action :build_parts, only: %i[edit]
 
+        admin_section :journal
+
         def index
           @issues = Issue.sorted_desc
         end

data/app/controllers/spina/admin/journal/journals_controller.rb

@@ -27,6 +27,8 @@ module Spina
         before_action :set_parts_attributes
         before_action :build_parts, only: %i[edit]
 
+        admin_section :journal_settings
+
         def edit
           add_breadcrumb @journal.name
         end

data/app/controllers/spina/admin/journal/licences_controller.rb

@@ -27,6 +27,8 @@ module Spina
         before_action :set_parts_attributes, only: %i[new edit]
         before_action :build_parts, only: %i[edit]
 
+        admin_section :journal_settings
+
         def index
           @licences = Licence.sorted
         end

data/app/controllers/spina/admin/journal/volumes_controller.rb

@@ -9,6 +9,8 @@ module Spina
         before_action :set_tabs, except: %i[index destroy]
         before_action :set_volume, only: %i[edit destroy]
 
+        admin_section :journal
+
         def index
           @volumes = Volume.sorted_asc
         end

data/app/models/spina/admin/journal/author.rb

@@ -26,6 +26,7 @@ module Spina
         has_many :articles, through: :affiliations
 
         validate :must_have_one_primary_affiliation
+        validates :orcid, format: { with: /\A((\d{4}-){3}\d{3}(\d|X))?\z/ }
 
         # @!attribute [r] primary_affiliation
         #   @return [ActiveRecord::Relation] The author's primary affiliation.

data/app/models/spina/admin/journal/authorship.rb

@@ -16,9 +16,18 @@ module Spina
         # @!attribute [rw] position
         #   @return [Integer] used to order the affiliations for each article
 
+        before_validation :set_default_position, unless: :persisted?
         validates :position, presence: true, uniqueness: { scope: :article_id }
 
         scope :sorted_within_article, -> { order(position: :asc) }
+
+        private
+
+        def set_default_position
+          return if article.authorships.sorted_within_article.last.nil?
+
+          self.position = article.authorships.sorted_within_article.last.position + 1
+        end
       end
     end
   end

data/app/views/spina/admin/hooks/journal/_primary_navigation.html.haml

@@ -1,8 +1,8 @@
-= render Spina::MainNavigation::SubNavComponent.new(:journal_content) do |nav|
+= render Spina::MainNavigation::SubNavComponent.new(:journal) do |nav|
   - nav.icon do
-    = heroicon 'document-add', style: :solid, class: 'w-8 h-8 text-white md:mr-3'
+    = heroicon 'document-duplicate', style: :solid, class: 'w-8 h-8 text-white md:mr-3'
     .text-white.font-semibold.hidden{class: 'md:block transform -translate-x-2 ease-in-out duration-300 absolute md:relative opacity-0 transition-all', 'data-navigation-target': 'label'}
-      = Spina::Admin::Journal::Journal.instance.name
+      = Spina::Admin::Journal::Journal.instance.has_content?(:journal_abbreviation) ? Spina::Admin::Journal::Journal.instance.content(:journal_abbreviation) : Spina::Admin::Journal::Journal.instance.name
 
   - nav.links do
     = render Spina::MainNavigation::LinkComponent.new(Spina::Admin::Journal::Volume.model_name.human(count: :many),
@@ -18,7 +18,7 @@
 
 = render Spina::MainNavigation::SubNavComponent.new(:journal_settings) do |nav|
   - nav.icon do
-    = heroicon 'dots-horizontal', style: :solid, class: 'w-8 h-8 text-white md:mr-3'
+    = heroicon 'view-grid', style: :solid, class: 'w-8 h-8 text-white md:mr-3'
     .text-white.font-semibold.hidden{class: 'md:block transform -translate-x-2 ease-in-out duration-300 absolute md:relative opacity-0 transition-all', 'data-navigation-target': 'label'}
       = t 'spina.admin.journal.navigation_title'
 

data/app/views/spina/admin/journal/articles/_form.html.haml

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

data/app/views/spina/admin/journal/articles/_form_authors.html.haml

@@ -1 +1,2 @@
+.-mt-4.md:-mt-8
 = render Spina::Admin::Journal::AuthorshipsListComponent.new(authorships: @article.authorships.sorted_within_article, sortable: true)

data/app/views/spina/admin/journal/articles/_form_details.html.haml

@@ -1,27 +1,37 @@
 = form_with model: [spina, :admin_journal, @article], id: dom_id(@article), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Issue.model_name.human(count: :one)) do
-    = f.collection_select :issue_id, ::Spina::Admin::Journal::Issue.sorted_desc, :id, ->(issue) { t '.volume_issue', volume_number: issue.volume.number, issue_number: issue.number }
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:number),
-                                            description: t('.unchangeable')) do
-    = f.number_field :number, disabled: true
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:title)) do
+  .-mt-6
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Issue.model_name.human(count: :one)) do
+    = f.collection_select(:issue_id,
+                          ::Spina::Admin::Journal::Issue.sorted_desc,
+                          :id,
+                          ->(issue) { t '.volume_issue', volume_number: issue.volume.number, issue_number: issue.number },
+                          {},
+                          class: 'form-select')
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:number),
+                                                         description: t('.unchangeable')) do
+    = f.number_field :number, disabled: true, class: 'form-input'
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:title)) do
     = render Spina::Forms::TextFieldComponent.new(f, :title)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:status)) do
-    = f.select :status, Spina::Admin::Journal::Article.statuses.keys.map { |key| [key.humanize, key] }
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:licence)) do
-    = f.collection_select :licence_id, Spina::Admin::Journal::Licence.sorted, :id, :name, prompt: true
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Author.model_name.human(count: :many)) do
-    %table.table{ style: 'margin: 0' }
-      %tbody.collection-check-boxes
-        = f.collection_check_boxes :affiliation_ids, Spina::Admin::Journal::Affiliation.sorted, :id, :name do |builder|
-          %tr
-            %td{ style: "padding-left: 16px" }
-              .form-checkbox
-                = builder.check_box
-                = builder.label
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:url)) do
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:status)) do
+    = f.select :status, Spina::Admin::Journal::Article.statuses.keys.map { |key| [key.humanize, key] }, {}, class: 'form-select'
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:licence)) do
+    = f.collection_select :licence_id, Spina::Admin::Journal::Licence.sorted, :id, :name, { prompt: true }, { class: 'form-select' }
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Author.model_name.human(count: :many),
+                                                         description: t('.affiliation_info')) do
+    %ul.list-none.ml-4
+      = f.collection_check_boxes(:affiliation_ids,
+                                 Spina::Admin::Journal::Affiliation.sorted,
+                                 :id,
+                                 ->(affiliation) { t '.name_institution', name: affiliation.name, institution: affiliation.institution.name },
+                                 {},
+                                 class: 'form-checkbox rounded') do |builder|
+        %li
+          .form-checkbox
+            = builder.check_box
+            %span.text-sm.font-medium.text-gray-600= builder.label
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:url)) do
     = render Spina::Forms::TextFieldComponent.new(f, :url)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:doi)) do
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Article.human_attribute_name(:doi)) do
     = render Spina::Forms::TextFieldComponent.new(f, :doi)
 
   = f.fields_for :"#{@locale}_content", @parts do |ff|

data/app/views/spina/admin/journal/authors/_form.html.haml

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

data/app/views/spina/admin/journal/authors/_form_affiliation.html.haml

@@ -1,8 +1,12 @@
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:first_name)) do
-  = render Spina::Forms::TextFieldComponent.new(ff, :first_name)
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:surname)) do
-  = render Spina::Forms::TextFieldComponent.new(ff, :surname)
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:institution)) do
-  = ff.collection_select :institution_id, Spina::Admin::Journal::Institution.sorted, :id, :name
-= render Spina::Forms::GroupComponent.new(label: t('.primary')) do
-  = radio_button_tag 'author[primary_affiliation_index]', ff.index, ff.object.status == 'primary'
+%div{ data: { 'part-id': "#{f.object.object_id}", 'tabs-target': 'pane' }, id: "pane_#{f.object.object_id}" }
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:first_name)) do
+    = render Spina::Forms::TextFieldComponent.new(f, :first_name)
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:surname)) do
+    = render Spina::Forms::TextFieldComponent.new(f, :surname)
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Affiliation.human_attribute_name(:institution)) do
+    = f.collection_select :institution_id, Spina::Admin::Journal::Institution.sorted, :id, :name, {}, class: 'form-select'
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: t('.primary'), description: t('.primary_explanation')) do
+    = radio_button_tag 'author[primary_affiliation_index]', f.index, f.object.status == 'primary', class: 'form-radio'
+
+  .text-right
+    = button_tag t('spina.ui.delete'), type: :button, class: 'btn btn-default bg-transparent hover:bg-white hover:text-red-500 h-8 px-3 inline-block mt-3', data: { action: 'repeater#removeFields', id: "pane_#{f.object.object_id}" }

data/app/views/spina/admin/journal/authors/_form_articles.html.haml

@@ -1 +1,2 @@
+.-mt-4.md:-mt-8
 = render Spina::Admin::Journal::ArticlesListComponent.new(articles: @author.affiliations.reduce([]) { |memo, affiliation| memo << affiliation.articles.to_a }.flatten )

data/app/views/spina/admin/journal/authors/_form_details.html.haml

@@ -1,2 +1,28 @@
-= f.fields_for :affiliations, @author.affiliations do |ff|
-  .well= render 'form_affiliation', ff: ff
+.text-gray-700.text-sm.font-light= t '.explanation'
+.mt-6{ 'data-controller': 'repeater' }
+  %label.block.text-sm.leading-5.font-medium.text-gray-700= Spina::Admin::Journal::Author.human_attribute_name :affiliations
+  .-mt-4.flex.flex-col.md:flex-row{ data: { 'controller': 'tabs', 'tabs-active': 'bg-spina-dark bg-opacity-10 text-gray-900', 'tabs-inactive': 'text-gray-500' }  }
+    .md:w-64.md:pr-6
+
+      -# Fields for new affiliation
+      - new_affiliation = Spina::Admin::Journal::Affiliation.new
+      - fields = f.fields_for(:affiliations, [new_affiliation], child_index: new_affiliation.object_id) { |ff| render('form_affiliation', f: ff) }.gsub('\n', '')
+
+      -# Tabs
+      .pt-6.-ml-3
+        %div{ data: { action: 'exists->tabs#added', 'repeater-target' => 'list', 'tabs-target' => 'list' } }
+          - (f.object.affiliations || []).each.with_index do |affiliation, index|
+            %button.text-gray-500.hover:text-gray-900.rounded-md.px-3.truncate.text-sm.font-medium.flex.items-center.w-full.h-9{ data: { 'action': 'tabs#show', 'pane-id': "pane_#{affiliation.object_id}", 'repeater-target': 'listItem', 'tabs-target': 'button' }, type: 'button' }
+              = affiliation&.name
+        %button.text-gray-400.pl-2.hover:text-gray-900.rounded-md.truncate.text-sm.font-medium.flex.items-center.w-full.h-10{ data: { 'action': 'repeater#addFields', 'child-index': "#{new_affiliation.object_id}", 'fields': fields }, type: 'button' }
+          = heroicon 'plus', style: :solid, class: 'w-6 h-6 mr-1'
+          = t 'spina.ui.new_entry'
+
+    -# Content
+    .flex-1.pl-6.md:pl-0{ 'data-repeater-target': 'content' }
+      = f.fields_for :affiliations do |affiliation_fields|
+        = render 'form_affiliation', f: affiliation_fields
+
+= render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Author.human_attribute_name(:orcid),
+                                                       description: t('.orcid_info')) do
+  = render Spina::Forms::TextFieldComponent.new(f, :orcid)

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

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

data/app/views/spina/admin/journal/institutions/_form_details.html.haml

@@ -1,3 +1,4 @@
-= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Institution.human_attribute_name(:name)) do
+.-mt-6
+= render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Institution.human_attribute_name(:name)) do
   = render Spina::Forms::TextFieldComponent.new(f, :name)
 

data/app/views/spina/admin/journal/institutions/_form_view_affiliations.html.haml

@@ -1 +1,2 @@
+.-mt-4.md:-mt-8
 = render Spina::Admin::Journal::AffiliationsListComponent.new(affiliations: @institution.affiliations.sorted)

data/app/views/spina/admin/journal/issues/_form.html.haml

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

data/app/views/spina/admin/journal/issues/_form_articles.html.haml

@@ -1 +1,2 @@
+.-mt-4.md:-mt-8
 = render Spina::Admin::Journal::ArticlesListComponent.new(articles: @issue.articles, sortable: true)

data/app/views/spina/admin/journal/issues/_form_details.html.haml

@@ -1,13 +1,14 @@
 = form_with model: [spina, :admin_journal, @issue], id: dom_id(@issue), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Volume.human_attribute_name(:number)) do
-    = f.collection_select :volume_id, ::Spina::Admin::Journal::Volume.sorted_desc, :id, :number
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:number),
+  .-mt-6
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Volume.human_attribute_name(:number)) do
+    = f.collection_select :volume_id, ::Spina::Admin::Journal::Volume.sorted_desc, :id, :number, {}, class: 'form-select'
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:number),
                                             description: t('.issue_unchangeable')) do
-    = f.number_field :number, disabled: true
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:title)) do
+    = f.number_field :number, disabled: true, class: 'form-input'
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:title)) do
     = render Spina::Forms::TextFieldComponent.new(f, :title)
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:date)) do
-    = f.date_field :date
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Issue.human_attribute_name(:date)) do
+    = f.date_field :date, class: 'form-input'
 
   = f.fields_for :"#{@locale}_content", @parts do |ff|
     = ff.hidden_field :type, value: ff.object.class

data/app/views/spina/admin/journal/journals/_form.html.haml

@@ -13,13 +13,15 @@
       = t '.save'
 
 .p-4.md:p-8
-  = form_with model: [spina, :admin_journal, @journal], id: dom_id(@journal), html: { autocomplete: 'off' } do |f|
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Journal.human_attribute_name(:name)) do
-      = render Spina::Forms::TextFieldComponent.new(f, :name)
+  .max-w-5xl
+    = form_with model: [spina, :admin_journal, @journal], id: dom_id(@journal), html: { autocomplete: 'off' } do |f|
+      .-mt-6
+      = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Journal.human_attribute_name(:name)) do
+        = render Spina::Forms::TextFieldComponent.new(f, :name)
 
-    = f.fields_for :"#{@locale}_content", @parts do |ff|
-      = ff.hidden_field :type, value: ff.object.class
-      = ff.hidden_field :title
-      = ff.hidden_field :name
+      = f.fields_for :"#{@locale}_content", @parts do |ff|
+        = ff.hidden_field :type, value: ff.object.class
+        = ff.hidden_field :title
+        = ff.hidden_field :name
 
-      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff
+        = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff

data/app/views/spina/admin/journal/licences/_form.html.haml

@@ -13,16 +13,18 @@
       = t '.save'
 
 .p-4.md:p-8
-  = form_with model: [spina, :admin_journal, @licence], id: dom_id(@licence), html: { autocomplete: 'off' } do |f|
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Licence.human_attribute_name(:name)) do
-      = render Spina::Forms::TextFieldComponent.new(f, :name)
-    = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Licence.human_attribute_name(:abbreviated_name)) do
-      = render Spina::Forms::TextFieldComponent.new(f, :abbreviated_name)
+  .max-w-5xl
+    = form_with model: [spina, :admin_journal, @licence], id: dom_id(@licence), html: { autocomplete: 'off' } do |f|
+      .-mt-6
+      = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Licence.human_attribute_name(:name)) do
+        = render Spina::Forms::TextFieldComponent.new(f, :name)
+      = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Licence.human_attribute_name(:abbreviated_name)) do
+        = render Spina::Forms::TextFieldComponent.new(f, :abbreviated_name)
 
-    = f.fields_for :"#{@locale}_content", @parts do |ff|
-      = ff.hidden_field :type, value: ff.object.class
-      = ff.hidden_field :title
-      = ff.hidden_field :name
+      = f.fields_for :"#{@locale}_content", @parts do |ff|
+        = ff.hidden_field :type, value: ff.object.class
+        = ff.hidden_field :title
+        = ff.hidden_field :name
 
-      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff
+        = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff
 

data/app/views/spina/admin/journal/volumes/_form.html.haml

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

data/app/views/spina/admin/journal/volumes/_form_details.html.haml

@@ -1,4 +1,5 @@
 = form_with model: [spina, :admin_journal, @volume], id: dom_id(@volume), html: { autocomplete: 'off' } do |f|
-  = render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Volume.human_attribute_name(:number),
+  .-mt-6
+  = render Spina::Admin::Journal::FormGroupComponent.new(label: Spina::Admin::Journal::Volume.human_attribute_name(:number),
                                             description: t('.unchangeable')) do
-    = f.number_field :number, disabled: true
+    = f.number_field :number, disabled: true, class: 'form-input'

data/app/views/spina/admin/journal/volumes/_form_issues.html.haml

@@ -1 +1,2 @@
+.-mt-4.md:-mt-8
 = render Spina::Admin::Journal::IssuesListComponent.new(issues: @volume.issues, sortable: true)

data/app/views/spina/admin/parts/admin/journal/page_ranges/_form.html.haml

@@ -1,6 +1,5 @@
-.page-form-label= f.object.title
-.page-form-control
-  = f.number_field :first_page, style: 'width: 10%;'
+= render Spina::Admin::Journal::FormGroupComponent.new(label: f.object.title) do
+  = f.number_field :first_page, style: 'width: 10%;', class: 'form-input'
   –
-  = f.number_field :last_page, style: 'width: 10%;'
+  = f.number_field :last_page, style: 'width: 10%;', class: 'form-input'
 

data/config/locales/en.yml

@@ -1,11 +1,15 @@
 en:
   spina:
+    languages:
+      en-GB: British English
     admin:
       journal:
         navigation_title: Journal settings
         unnamed_journal: Unnamed journal
         edit: Edit
-        sort_info: "NB: item numbers will only update after you refresh the page."
+        sort_info:
+          "Click and drag items by the handles to reorder. NB: item names will only update after
+          you refresh the page."
         empty_list: There are no items.
         journals:
           index:
@@ -38,6 +42,8 @@ en:
             saved: Volume saved.
           form:
             save: Save
+            details: Details
+            issues: Issues
             delete_confirmation: "Are you sure you want to delete Volume <strong>#%{number}</strong>?"
           form_details:
             unchangeable: The volume number can be changed by clicking 'Change Order' in the index view.
@@ -67,6 +73,8 @@ en:
             deleted: Issue deleted.
           form:
             save: Save issue
+            details: Details
+            articles: Articles
             delete_confirmation: "Are you sure you want to delete Issue <strong>#%{number}</strong>?"
           form_details:
             issue_unchangeable: The issue order can be changed in the 'Volumes' tab.
@@ -91,10 +99,16 @@ en:
             deleted: Article deleted.
           form:
             save: Save article
+            details: Details
+            authors: Authors
             delete_confirmation: "Are you sure you want to delete '<strong>%{title}</strong>'?"
           form_details:
             volume_issue: "Volume %{volume_number} Issue %{issue_number}"
+            name_institution: "%{name} (%{institution})"
             unchangeable: Article order can be changed in the issue.
+            affiliation_info:
+              All affiliations are listed here. You can select multiple affiliations for co-authored
+              articles, but these must be from different authors.
           form_authors:
             no_authors: There are no authors.
             number_of_articles: "# Articles"
@@ -123,10 +137,24 @@ en:
             sort_error: There was an error when sorting. Check the server logs for more information.
           form:
             save: Save author
-          form_details:
+            details: Details
+            articles: Articles
             delete_confirmation: "Are you sure you want to delete the author %{name}?"
+          form_details:
+            explanation:
+              "An author represents an individual person. A person may change names and/or
+              institutions over time. This is represented in Journal with
+              'affiliations'. An affiliation consists of an author's name and institution at a
+              particular time, or generally within a particular context."
+            orcid_info:
+              It is highly recommended to provide an ORCID iD for each author. Find out more at
+              orcid.org.
           form_affiliation:
             primary: Primary?
+            primary_explanation:
+              If checked, this affiliation will be marked as the author's primary affiliation. An
+              author can only have one primary affiliation. It is the primary affiliation that will
+              be shown most prominently on the author's page.
           form_articles:
             no_articles: There are no articles.
         institutions:
@@ -147,14 +175,18 @@ en:
             deleted: Institution deleted.
           form:
             save: Save institution
+            details: Details
+            view_affiliations: Affiliations
+            delete_confirmation:
+              "Are you sure you want to delete the institution <strong>%{name}</strong>?
+              This action is irreversible, and will delete all associated affiliations. Authors
+              will not be deleted."
           form_view_affiliations:
             no_affiliations: This institution has no associated affiliations.
             number_of_articles: "# articles"
-          form_details:
-            delete_confirmation:
-              "Are you sure you want to delete the institution <strong>%{name}</strong>?
-              This action is irreversible, and will delete all associated affiliations. Authors will not be deleted."
         licences:
+          index:
+            new: New licence
           new:
             new: New licence
           create:
@@ -217,11 +249,19 @@ en:
       spina/admin/journal/authorship:
         position: Position
       spina/admin/journal/author:
+        affiliations: Affiliations
+        orcid: ORCID iD
       spina/admin/journal/institution:
         name: Institution Name
       spina/admin/journal/licence:
         name: Licence Name
         abbreviated_name: Short Name
+    errors:
+      models:
+        author:
+          attributes:
+            orcid:
+              invalid: Invalid format for ORCID iD
 
   date:
     formats:

data/db/migrate/20220130171603_add_orcid_to_spina_admin_journal_author.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddOrcidToSpinaAdminJournalAuthor < ActiveRecord::Migration[7.0] # :nodoc:
+  def change
+    add_column :spina_admin_journal_authors, :orcid, :string, null: false, default: ''
+  end
+end

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

@@ -3,7 +3,7 @@
 module Spina
   module Admin
     module Journal
-      VERSION = '1.0.0.rc1'
+      VERSION = '1.0.0.rc2'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spina-admin-journal
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0.rc2
 platform: ruby
 authors:
 - Louis Van Steene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml-rails
@@ -266,6 +266,8 @@ files:
 - app/components/spina/admin/journal/authorships_list_component.rb
 - app/components/spina/admin/journal/empty_list_component.html.haml
 - app/components/spina/admin/journal/empty_list_component.rb
+- app/components/spina/admin/journal/form_group_component.html.haml
+- app/components/spina/admin/journal/form_group_component.rb
 - app/components/spina/admin/journal/institutions_list_component.rb
 - app/components/spina/admin/journal/issues_list_component.rb
 - app/components/spina/admin/journal/licences_list_component.rb
@@ -355,6 +357,7 @@ files:
 - db/migrate/20210618090155_create_spina_admin_journal_licences.rb
 - db/migrate/20210618094533_add_licence_to_spina_admin_journal_articles.rb
 - db/migrate/20210626153728_create_spina_parts_admin_journal_page_ranges.rb
+- db/migrate/20220130171603_add_orcid_to_spina_admin_journal_author.rb
 - lib/spina/admin/journal.rb
 - lib/spina/admin/journal/engine.rb
 - lib/spina/admin/journal/version.rb