spina-admin-journal 0.6.2 → 1.0.0.rc1

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

@@ -1,9 +1,3 @@
-.page-form
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Institution.human_attribute_name :name
-    .page-form-content
-      = f.text_field :name
+= render Spina::Forms::GroupComponent.new(label: Spina::Admin::Journal::Institution.human_attribute_name(:name)) do
+  = render Spina::Forms::TextFieldComponent.new(f, :name)
 
-- unless @institution.new_record?
-  .pull-right= link_to t('spina.permanently_delete'), admin_journal_institution_path(@institution), method: :delete, data: { confirm: t('.delete_confirmation', name: @institution.name) }, class: 'button button-link button-danger'

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

@@ -1,10 +1 @@
-.table-container
-  %table.table
-    %thead
-      %tr
-        %th= ::Spina::Admin::Journal::Affiliation.human_attribute_name :name
-        %th= ::Spina::Admin::Journal::Affiliation.human_attribute_name :institution
-        %th= t '.number_of_articles'
-        %th
-    %tbody
-      = render @institution.affiliations.any? ? @institution.affiliations : 'empty_list', message: t('.no_affiliations')
+= render Spina::Admin::Journal::AffiliationsListComponent.new(affiliations: @institution.affiliations.sorted)

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

@@ -1,16 +1,8 @@
-- content_for(:header_actions) do
-  = link_to new_admin_journal_institution_path, class: 'button button-primary' do
-    = icon 'plus'
-    = t '.new'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    .ml-3
+      = link_to new_admin_journal_institution_path, class: 'btn btn-primary w-full' do
+        = heroicon 'plus', style: :solid, class: 'w-7 h-7 -m1-2'
+        = t '.new'
 
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Institution.human_attribute_name :name
-          %th= t '.number_of_affiliations'
-          %th
-
-      %tbody
-        = render @institutions.any? ? @institutions : 'empty_list', message: t('.empty')
+= render Spina::Admin::Journal::InstitutionsListComponent.new(institutions: @institutions)

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

@@ -1,29 +1,29 @@
-- if @issue.errors.any?
-  - content_for :notifications do
-    .notification.notification-danger.animated.fadeInRight
-      = icon 'exclamation'
-      .notification-message
-        = t 'spina.notifications.alert'
-        %small= @issue.errors.full_messages.join('<br />').html_safe
-      = link_to '#', data: { close_notification: true } do
-        = icon 'cross'
+%div{ data: { controller: 'tabs',
+              tabs: { active: 'cursor-default text-gray-900 bg-spina-dark bg-opacity-10',
+                      inactive: 'cursor-pointer bg-transparent text-gray-400 border-transparent' } } }
+  = render Spina::UserInterface::HeaderComponent.new do |header|
+    - header.actions do
+      - if @issue.persisted?
+        = render Spina::UserInterface::DropdownComponent.new do |dropdown|
+          - dropdown.button(classes: "btn btn-default px-3") do
+            = heroicon('dots-horizontal', style: :solid, class: "w-5 h-5 text-gray-600")
 
-= form_for [:admin_journal, @issue], html: { autocomplete: 'off' } do |f|
-  %header#header
-    = render partial: 'spina/admin/shared/breadcrumbs'
+          - dropdown.menu do
+            = button_to t('spina.permanently_delete'), admin_journal_issue_path(@issue), method: :delete, class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100 hover:bg-opacity-50 hover:text-red-500 focus:outline-none focus:bg-gray-100 focus:text-gray-900", form: {data: { controller: 'confirm', confirm_message: t('.delete_confirmation', number: @issue.number) } }
 
-    #header_actions
-      %button.button.button-primary{ type: 'submit', style: 'margin-right: 0', data: { disable_with: t('spina.pages.saving') } }
-        = icon 'check'
+      = button_tag type: :submit, form: dom_id(@issue), class: 'btn btn-primary', data: { controller: 'button', action: 'button#loading', loading_message: t('spina.ui.saving')} do
+        = heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2')
         = t '.save'
 
-      .button{style: 'margin-right: 0'}= link_to t('spina.cancel'), admin_journal_institutions_path
+    - header.navigation do
+      %nav.-mb-3.mt-4
+        %ul.inline-flex.w-auto.rounded-md.bg-white
+          - @tabs.each do |tab|
+            %button.block.px-3.leading-relaxed.py-1.hover:text-gray-800.rounded-md.text-gray-400.font-medium.text-sm.flex.items-center.whitespace-nowrap{ type: 'button', data: { action: 'tabs#show', 'tabs-target': 'button', 'pane-id': "#{tab}" } }
+              = t ".#{tab}"
 
-    %nav#secondary.tabs
-      %ul
-        - @tabs.each_with_index do |tab, i|
-          %li{ class: ('active' if i == 0) }
-            = link_to t(".#{tab}"), "##{tab}"
+  .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}"
 
-  #details.tab-content.active= render 'form_details', f: f
-  #articles.tab-content= render 'form_articles', f: f

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

@@ -1,14 +1 @@
-.sort-message
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Volume.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Article.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :date
-          %th= ::Spina::Admin::Journal::Article.human_attribute_name :title
-          %th
-      %tbody.html5sortable{ data: { id: @issue.id, sorted_collection: 'admin_journal_articles', sort_url: !@issue.id.nil? && sort_admin_journal_articles_url(@issue) } }
-        = render @articles && @articles.any? ? @articles : 'empty_list', message: t('.no_articles')
+= render Spina::Admin::Journal::ArticlesListComponent.new(articles: @issue.articles, sortable: true)

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

@@ -1,32 +1,17 @@
-.page-form
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Volume.human_attribute_name :number
-    .page-form-content
-      = f.collection_select :volume_id, ::Spina::Admin::Journal::Volume.sorted_desc, :id, :number
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Issue.human_attribute_name :number
-      %small= t '.issue_unchangeable'
-    .page-form-content
-      = f.number_field :number, disabled: true
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Issue.human_attribute_name :title
-    .page-form-content
-      = f.text_field :title
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Issue.human_attribute_name :date
-    .page-form-content
-      = f.date_field :date
+= 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),
+                                            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
+    = 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
+
   = f.fields_for :"#{@locale}_content", @parts do |ff|
-    = ff.hidden_field :type, value: ff.object.class.name
+    = ff.hidden_field :type, value: ff.object.class
     = ff.hidden_field :title
     = ff.hidden_field :name
 
-    .page-form-group.page-part{ data: { name: ff.object.name } }
-      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.name)}/form", f: ff
-
-- unless @issue.new_record?
-  .pull-right= link_to t('spina.permanently_delete'), admin_journal_issue_path(@issue), method: :delete, data: { confirm: t('.delete_confirmation', number: @issue.number) }, class: 'button button-link button-danger'
+    = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff

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

@@ -1,18 +1,9 @@
-- content_for(:header_actions) do
-  = link_to new_admin_journal_issue_path, class: 'button button-primary' do
-    = icon 'plus'
-    = t '.new'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    .ml-3
+      = link_to new_admin_journal_issue_path, class: 'btn btn-primary w-full' do
+        = heroicon 'plus', style: :solid, class: 'w-7 h-7 -m1-2'
+        = t '.new'
 
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Volume.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :title
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :date
-          %th
+= render Spina::Admin::Journal::IssuesListComponent.new(issues: @issues, sortable: false)
 
-      %tbody
-        = render @issues.any? ? @issues : 'empty_list', message: t('.empty')

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

@@ -1,35 +1,25 @@
-- if @journal.errors.any?
-  - content_for :notifications do
-    .notification.notification-danger.animated.fadeInRight
-      = icon 'exclamation'
-      .notification-message
-        = t 'spina.notifications.alert'
-        %small= @journal.errors.full_messages.join('<br />').html_safe
-      = link_to '#', data: { close_notification: true } do
-        = icon 'cross'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    - if @journal.persisted?
+      = render Spina::UserInterface::DropdownComponent.new do |dropdown|
+        - dropdown.button(classes: "btn btn-default px-3") do
+          = heroicon('dots-horizontal', style: :solid, class: "w-5 h-5 text-gray-600")
 
-= form_for [:admin_journal, @journal], html: { autocomplete: "off" } do |f|
-  %header#header
-    .breadcrumbs
-      = render_breadcrumbs
-    #header_actions
-      %button.button.button-primary{ type: 'submit', style: 'margin-right: 0', data: { disable_with: t('spina.pages.saving') } }
-        = icon 'check'
-        = t '.save'
-  .tab-content.active
-    .page-form
-      .page-form-group
-        .page-form-label
-          = ::Spina::Admin::Journal::Journal.human_attribute_name :name
-        .page-form-content
-          = f.text_field :name
-      = f.fields_for :"#{@locale}_content", @parts do |ff|
-        = ff.hidden_field :type, value: ff.object.class.name
-        = ff.hidden_field :title
-        = ff.hidden_field :name
+        - dropdown.menu do
+          = button_to t('spina.permanently_delete'), admin_journal_journal_path(@journal), method: :delete, class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100 hover:bg-opacity-50 hover:text-red-500 focus:outline-none focus:bg-gray-100 focus:text-gray-900", form: {data: { controller: 'confirm', confirm_message: t('.delete_confirmation', name: @journal.name) } }
 
-        .page-form-group.page-part{ data: { name: ff.object.name } }
-          = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.name)}/form", f: ff
+    = button_tag type: :submit, form: dom_id(@journal), class: 'btn btn-primary', data: { controller: 'button', action: 'button#loading', loading_message: t('spina.ui.saving')} do
+      = heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2')
+      = t '.save'
 
-  - unless @journal.new_record?
-    .pull-right= link_to t('spina.permanently_delete'), admin_journal_journal_path(@journal), method: :delete, data: { confirm: t('.delete_confirmation', name: @journal.name) }, class: 'button button-link button-danger'
+.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)
+
+    = 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

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

@@ -1,43 +1,28 @@
-- if @licence.errors.any?
-  - content_for :notifications do
-    .notification.notification-danger.animated.fadeInRight
-      = icon 'exclamation'
-      .notification-message
-        = t 'spina.notifications.alert'
-        %small= @licence.errors.full_messages.join('<br />').html_safe
-      = link_to '#', data: { close_notification: true } do
-        = icon 'cross'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    - if @licence.persisted?
+      = render Spina::UserInterface::DropdownComponent.new do |dropdown|
+        - dropdown.button(classes: "btn btn-default px-3") do
+          = heroicon('dots-horizontal', style: :solid, class: "w-5 h-5 text-gray-600")
 
-= form_for [:admin_journal, @licence], html: { autocomplete: 'off' } do |f|
-  %header#header
-    = render partial: 'spina/admin/shared/breadcrumbs'
+        - dropdown.menu do
+          = button_to t('spina.permanently_delete'), admin_journal_licence_path(@licence), method: :delete, class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100 hover:bg-opacity-50 hover:text-red-500 focus:outline-none focus:bg-gray-100 focus:text-gray-900", form: {data: { controller: 'confirm', confirm_message: t('.delete_confirmation', name: @licence.name) } }
 
-    #header_actions
-      %button.button.button-primary{ type: 'submit', style: 'margin-right: 0', data: { disable_with: t('spina.pages.saving') } }
-        = icon 'check'
-        = t '.save'
+    = button_tag type: :submit, form: dom_id(@licence), class: 'btn btn-primary', data: { controller: 'button', action: 'button#loading', loading_message: t('spina.ui.saving')} do
+      = heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2')
+      = t '.save'
 
-      .button{ style: 'margin-right: 0' }= link_to t('spina.cancel'), admin_journal_licences_path
-
-  .page-form
-    .page-form-group
-      .page-form-label
-        = ::Spina::Admin::Journal::Licence.human_attribute_name :name
-      .page-form-content
-        = f.text_field :name
-    .page-form-group
-      .page-form-label
-        = ::Spina::Admin::Journal::Licence.human_attribute_name :abbreviated_name
-      .page-form-content
-        = f.text_field :abbreviated_name
+.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)
 
     = f.fields_for :"#{@locale}_content", @parts do |ff|
-      = ff.hidden_field :type, value: ff.object.class.name
+      = ff.hidden_field :type, value: ff.object.class
       = ff.hidden_field :title
       = ff.hidden_field :name
 
-      .page-form-group.page-part{ data: { name: ff.object.name } }
-        = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.name)}/form", f: ff
+      = render "spina/admin/parts/#{parts_partial_namespace(ff.object.class.to_s)}/form", f: ff
 
-  - unless @licence.new_record?
-    .pull-right= link_to t('spina.permanently_delete'), admin_journal_licence_path(@licence), method: :delete, data: { confirm: t('.delete_confirmation', name: @licence.name) }, class: 'button button-link button-danger'

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

@@ -1,17 +1,8 @@
-- content_for(:header_actions) do
-  = link_to new_admin_journal_licence_path, class: 'button button-primary' do
-    = icon 'plus'
-    = t '.new'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    .ml-3
+      = link_to new_admin_journal_licence_path, class: 'btn btn-primary w-full' do
+        = heroicon 'plus', style: :solid, class: 'w-7 h-7 -m1-2'
+        = t '.new'
 
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Licence.human_attribute_name :name
-          %th= ::Spina::Admin::Journal::Licence.human_attribute_name :abbreviated_name
-          %th= t '.num_articles'
-          %th
-
-      %tbody
-        = render @licences.any? ? @licences : 'empty_list', message: t('.empty')
+= render Spina::Admin::Journal::LicencesListComponent.new(licences: @licences)

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

@@ -1,15 +1,28 @@
-= form_for [:admin_journal, @volume], html: { autocomplete: 'off' } do |f|
-  %header#header
-    = render partial: 'spina/admin/shared/breadcrumbs'
+%div{ data: { controller: 'tabs',
+              tabs: { active: 'cursor-default text-gray-900 bg-spina-dark bg-opacity-10',
+                      inactive: 'cursor-pointer bg-transparent text-gray-400 border-transparent' } } }
+  = render Spina::UserInterface::HeaderComponent.new do |header|
+    - header.actions do
+      - if @volume.persisted?
+        = render Spina::UserInterface::DropdownComponent.new do |dropdown|
+          - dropdown.button(classes: "btn btn-default px-3") do
+            = heroicon('dots-horizontal', style: :solid, class: "w-5 h-5 text-gray-600")
 
-    #header_actions
-      .button{ style: 'margin-right: 0' }= link_to t('spina.cancel'), admin_journal_volumes_path
+          - dropdown.menu do
+            = button_to t('spina.permanently_delete'), admin_journal_volume_path(@volume), method: :delete, class: "block w-full text-left px-4 py-2 text-sm leading-5 font-medium text-red-500 cursor-pointer bg-white hover:bg-red-100 hover:bg-opacity-50 hover:text-red-500 focus:outline-none focus:bg-gray-100 focus:text-gray-900", form: {data: { controller: 'confirm', confirm_message: t('.delete_confirmation', number: @volume.number) } }
 
-    %nav#secondary.tabs
-      %ul
-        - @tabs.each_with_index do |tab, i|
-          %li{ class: ('active' if i == 0) }
-            = link_to t(".#{tab}"), "##{tab}"
+      = button_tag type: :submit, form: dom_id(@volume), class: 'btn btn-primary', data: { controller: 'button', action: 'button#loading', loading_message: t('spina.ui.saving')} do
+        = heroicon('check', style: :solid, class: 'w-5 h-5 mr-1 -ml-2')
+        = t '.save'
 
-  #details.tab-content.active= render 'form_details', f: f
-  #issues.tab-content= render 'form_issues', f: f
+    - header.navigation do
+      %nav.-mb-3.mt-4
+        %ul.inline-flex.w-auto.rounded-md.bg-white
+          - @tabs.each do |tab|
+            %button.block.px-3.leading-relaxed.py-1.hover:text-gray-800.rounded-md.text-gray-400.font-medium.text-sm.flex.items-center.whitespace-nowrap{ type: 'button', data: { action: 'tabs#show', 'tabs-target': 'button', 'pane-id': "#{tab}" } }
+              = t ".#{tab}"
+
+  .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}"

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

@@ -1,10 +1,4 @@
-.page-form
-  .page-form-group
-    .page-form-label
-      = ::Spina::Admin::Journal::Volume.human_attribute_name :number
-      %small= t '.unchangeable'
-    .page-form-content
-      = f.number_field :number, disabled: true
-
-- unless @volume.new_record?
-  .pull-right= link_to t('spina.permanently_delete'), admin_journal_volume_path(@volume), method: :delete, data: { confirm: t('.delete_confirmation', number: @volume.number) }, class: 'button button-link button-danger'
+= 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),
+                                            description: t('.unchangeable')) do
+    = f.number_field :number, disabled: true

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

@@ -1,13 +1 @@
-.sort-message
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Volume.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :number
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :title
-          %th= ::Spina::Admin::Journal::Issue.human_attribute_name :date
-          %th
-      %tbody.html5sortable{ data: { id: @volume.id, sorted_collection: 'admin_journal_issues', sort_url: sort_admin_journal_issues_url(@volume) } }
-        = render @volume.issues.any? ? @volume.issues.sorted_asc : 'empty_list', message: t('.no_issues')
+= render Spina::Admin::Journal::IssuesListComponent.new(issues: @volume.issues, sortable: true)

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

@@ -1,17 +1,8 @@
-- content_for(:header_actions) do
-  = link_to admin_journal_volumes_path, method: :post, class: 'button button-primary' do
-    = icon 'plus'
-    = t '.new'
+= render Spina::UserInterface::HeaderComponent.new do |header|
+  - header.actions do
+    .ml-3
+      = link_to new_admin_journal_volume_path, class: 'btn btn-primary w-full' do
+        = heroicon 'plus', style: :solid, class: 'w-7 h-7 -m1-2'
+        = t '.new'
 
-.sort-message
-.well
-  .table-container
-    %table.table
-      %thead
-        %tr
-          %th= ::Spina::Admin::Journal::Volume.human_attribute_name :number
-          %th= t '.date'
-          %th
-
-      %tbody.html5sortable{ data: { id: ::Spina::Admin::Journal::Journal.instance.id, sorted_collection: 'admin_journal_volumes', sort_url: sort_admin_journal_volumes_url(::Spina::Admin::Journal::Journal.instance.id) } }
-        = render @volumes.any? ? @volumes : 'empty_list', message: t('.empty')
+= render Spina::Admin::Journal::VolumesListComponent.new(volumes: @volumes)

data/config/locales/en.yml

@@ -4,12 +4,16 @@ en:
       journal:
         navigation_title: Journal settings
         unnamed_journal: Unnamed journal
+        edit: Edit
+        sort_info: "NB: item numbers will only update after you refresh the page."
+        empty_list: There are no items.
         journals:
           index:
             new: New journal
             no_journals: There are currently no journals saved.
           update:
             saved: Journal saved.
+            failed: Failed to save journal.
           destroy:
             deleted: Journal deleted.
           form:
@@ -26,13 +30,17 @@ en:
             date: Year
             view: View
             empty: There are no volumes.
+          new:
+            created: Volume %{number} created.
           create:
             created: Volume <strong>%{number}</strong> created.
           update:
             saved: Volume saved.
+          form:
+            save: Save
+            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.
-            delete_confirmation: "Are you sure you want to delete Volume <strong>#%{number}</strong>?"
           form_issues:
             volume_number: "Volume #"
             issue_number: "Issue #"
@@ -42,6 +50,7 @@ en:
             sort_success: Sorted successfully!
             sort_error: There was an error when sorting. Check the server logs for more information.
         issues:
+          volume_issue: "Volume %{volume_number} Issue %{issue_number}"
           issue_number: "Issue #%{number}"
           index:
             new: New issue
@@ -50,19 +59,23 @@ en:
             new: New issue
           create:
             saved: Issue saved.
+            failed: Failed to create issue.
           update:
             saved: Issue saved.
+            failed: Failed to save issue.
           destroy:
             deleted: Issue deleted.
           form:
             save: Save issue
+            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.
-            delete_confirmation: "Are you sure you want to delete Issue <strong>#%{number}</strong>?"
           sort:
             sort_success: Sorted successfully!
             sort_error: There was an error when sorting. Check the server logs for more information.
         articles:
+          article_number: "Vol. %{volume_number}(%{issue_number}) Article #%{article_number}"
+          title_author: "%{title} (%{author})"
           index:
             new: New article
             empty: There are no articles.
@@ -70,16 +83,18 @@ en:
             new: New article
           create:
             saved: Article saved.
+            failed: Failed to create article.
           update:
             saved: Article saved.
+            failed: Failed to save article.
           destroy:
             deleted: Article deleted.
           form:
             save: Save article
+            delete_confirmation: "Are you sure you want to delete '<strong>%{title}</strong>'?"
           form_details:
             volume_issue: "Volume %{volume_number} Issue %{issue_number}"
             unchangeable: Article order can be changed in the issue.
-            delete_confirmation: "Are you sure you want to delete '<strong>%{title}</strong>'?"
           form_authors:
             no_authors: There are no authors.
             number_of_articles: "# Articles"
@@ -89,6 +104,7 @@ en:
             sort_success: Sorted successfully!
             sort_error: There was an error when sorting. Check the server logs for more information.
         authors:
+          name_institution: "%{name} (%{institution})"
           index:
             new: New author
             number_of_articles: "# Articles"
@@ -96,8 +112,10 @@ en:
             new: New author
           create:
             saved: Author saved.
+            failed: Failed to create author.
           update:
             saved: Author saved.
+            failed: Failed to save author.
           destroy:
             deleted: Author deleted.
           sort:
@@ -121,8 +139,10 @@ en:
             new: New institution
           create:
             saved: Institution saved.
+            failed: Failed to create institution.
           update:
             saved: Institution saved.
+            failed: Failed to save institution.
           destroy:
             deleted: Institution deleted.
           form:
@@ -139,8 +159,10 @@ en:
             new: New licence
           create:
             saved: Licence saved.
+            failed: Failed to create licence.
           update:
             saved: Licence saved.
+            failed: Failed to save licence.
           destroy:
             deleted: Licence deleted.
           form:

data/config/routes.rb

@@ -4,17 +4,17 @@ Spina::Engine.routes.draw do
   namespace :admin, path: Spina.config.backend_path do
     namespace :journal do
       resources :journals, only: %i[edit update destroy]
-      resources :volumes, except: %i[show new update] do
-        patch 'sort/:journal_id' => 'volumes#sort', as: :sort, on: :collection
+      resources :volumes, except: %i[show update] do
+        post 'sort/:journal_id' => 'volumes#sort', as: :sort, on: :collection
       end
       resources :issues, except: %i[show] do
-        patch 'sort/:volume_id' => 'issues#sort', as: :sort, on: :collection
+        post 'sort/:volume_id' => 'issues#sort', as: :sort, on: :collection
       end
       resources :articles, except: %i[show] do
-        patch 'sort/:issue_id' => 'articles#sort', as: :sort, on: :collection
+        post 'sort/:issue_id' => 'articles#sort', as: :sort, on: :collection
       end
       resources :authors, except: %i[show] do
-        patch 'sort/:article_id' => 'authors#sort', as: :sort, on: :collection
+        post 'sort/:article_id' => 'authors#sort', as: :sort, on: :collection
       end
 
       resources :institutions, except: %i[show]

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

@@ -7,6 +7,18 @@ module Spina
       class Engine < ::Rails::Engine
         isolate_namespace Spina::Admin::Journal
 
+        initializer 'spina.admin.journal.assets' do
+          Spina.config.importmap.draw do
+            pin_all_from Spina::Admin::Journal::Engine.root.join('app/assets/javascripts/spina/admin/journal/controllers'), # rubocop:disable Layout/LineLength
+                         under: 'controllers', to: 'spina/admin/journal/controllers'
+          end
+
+          Spina.config.tailwind_content.concat(["#{Spina::Admin::Journal::Engine.root}/app/views/**/*.*",
+                                                "#{Spina::Admin::Journal::Engine.root}/app/components/**/*.*",
+                                                "#{Spina::Admin::Journal::Engine.root}/app/helpers/**/*.*",
+                                                "#{Spina::Admin::Journal::Engine.root}/app/assets/javascripts/**/*.js"])
+        end
+
         config.before_initialize do
           ::Spina::Plugin.register do |plugin|
             plugin.name = 'journal'

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

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

data/lib/spina/admin/journal.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'haml-rails'
 require 'spina'
 require 'spina/admin/journal/engine'
 require 'rails-i18n'