diff --git a/app/controllers/admin/communication/application_controller.rb b/app/controllers/admin/communication/application_controller.rb
index 0468b4e777de2a83cce2d7743c399a34ca0db1a6..f26a9a0f7552608dd5850f36362fcaa9457d4018 100644
--- a/app/controllers/admin/communication/application_controller.rb
+++ b/app/controllers/admin/communication/application_controller.rb
@@ -1,4 +1,7 @@
class Admin::Communication::ApplicationController < Admin::ApplicationController
+
+ protected
+
def breadcrumb
if @website
short_breadcrumb
diff --git a/app/controllers/admin/research/application_controller.rb b/app/controllers/admin/research/application_controller.rb
index 9ef7b886138ccb1a80d7503f6913068dc0dde0a9..438eafb32ce50d10cbe3e8fdcad708068b161555 100644
--- a/app/controllers/admin/research/application_controller.rb
+++ b/app/controllers/admin/research/application_controller.rb
@@ -3,7 +3,12 @@ class Admin::Research::ApplicationController < Admin::ApplicationController
protected
def breadcrumb
- super
- add_breadcrumb Research.model_name.human
+ if @journal
+ short_breadcrumb
+ breadcrumb_for @journal
+ else
+ super
+ add_breadcrumb Research.model_name.human
+ end
end
end
diff --git a/app/controllers/admin/research/journal/application_controller.rb b/app/controllers/admin/research/journal/application_controller.rb
index a4365619e623fa21d840e35e3e709942f152c64c..2702de20d5ab1cfc010d72c70887ffa6de070a0f 100644
--- a/app/controllers/admin/research/journal/application_controller.rb
+++ b/app/controllers/admin/research/journal/application_controller.rb
@@ -3,11 +3,6 @@ class Admin::Research::Journal::ApplicationController < Admin::Research::Applica
protected
- def breadcrumb
- short_breadcrumb
- breadcrumb_for @journal, journal_id: nil
- end
-
def default_url_options
return {} unless params.has_key? :journal_id
{
diff --git a/app/controllers/admin/research/journals_controller.rb b/app/controllers/admin/research/journals_controller.rb
index 8c9a16327a6aaaa441e886845789009fb78930b4..0ea7bd97ee5e74f6afc7749cfcfb5cf381323d82 100644
--- a/app/controllers/admin/research/journals_controller.rb
+++ b/app/controllers/admin/research/journals_controller.rb
@@ -45,12 +45,6 @@ class Admin::Research::JournalsController < Admin::Research::ApplicationControll
protected
- def breadcrumb
- super
- add_breadcrumb Research::Journal.model_name.human(count: 2), admin_research_journals_path(journal_id: nil)
- breadcrumb_for @journal
- end
-
def journal_params
params.require(:research_journal).permit(:title, :description, :issn, :access_token, :repository)
end
diff --git a/app/views/admin/research/journal/articles/_list.html.erb b/app/views/admin/research/journal/articles/_list.html.erb
index 1c089777464f258bd43c7501dabcaf388a6e3c2c..3d8425c402f71789117f21e81b67e27bda38eb99 100644
--- a/app/views/admin/research/journal/articles/_list.html.erb
+++ b/app/views/admin/research/journal/articles/_list.html.erb
@@ -1,7 +1,7 @@
<table class="table">
<thead>
<tr>
- <th class="ps-0"><%= Research::Journal::Article.model_name.human %></th>
+ <th><%= Research::Journal::Article.model_name.human %></th>
<th><%= Research::Journal::Article.human_attribute_name('published_at') %></th>
<th></th>
</tr>
@@ -9,17 +9,19 @@
<tbody>
<% articles.each do |article| %>
<tr>
- <td class="ps-0"><%= link_to article, admin_research_journal_article_path(journal_id: @journal, id: article) %></td>
+ <td><%= link_to article, admin_research_journal_article_path(journal_id: @journal, id: article) %></td>
<td><%= article.published_at %></td>
- <td class="text-end pe-0">
- <%= link_to t('edit'),
- edit_admin_research_journal_article_path(journal_id: @journal, id: article),
- class: button_classes %>
- <%= link_to t('delete'),
- admin_research_journal_article_path(journal_id: @journal, id: article),
- method: :delete,
- data: { confirm: t('please-confirm') },
- class: button_classes_danger %>
+ <td class="text-end">
+ <div class="btn-group" role="group">
+ <%= link_to t('edit'),
+ edit_admin_research_journal_article_path(journal_id: @journal, id: article),
+ class: button_classes %>
+ <%= link_to t('delete'),
+ admin_research_journal_article_path(journal_id: @journal, id: article),
+ method: :delete,
+ data: { confirm: t('please-confirm') },
+ class: button_classes_danger %>
+ </div>
</td>
</tr>
<% end %>
diff --git a/app/views/admin/research/journal/volumes/index.html.erb b/app/views/admin/research/journal/volumes/index.html.erb
index 6998ad87a3d0dd48d11dbb6404e4f9ad161b4568..34a38c7259885dacd18d488585a6a091d1d70232 100644
--- a/app/views/admin/research/journal/volumes/index.html.erb
+++ b/app/views/admin/research/journal/volumes/index.html.erb
@@ -4,7 +4,8 @@
<thead>
<tr>
<th><%= Research::Journal::Volume.model_name.human %></th>
- <th>Published at</th>
+ <th><%= Research::Journal::Volume.human_attribute_name('cover') %></th>
+ <th><%= Research::Journal::Volume.human_attribute_name('published_at') %></th>
<th></th>
</tr>
</thead>
@@ -12,6 +13,8 @@
<% @volumes.each do |volume| %>
<tr>
<td><%= link_to volume, admin_research_journal_volume_path(journal_id: @journal, id: volume) %></td>
+ <td><%= image_tag volume.cover.variant(resize: 'x200'),
+ height: 100 if volume.cover.attached? %></td>
<td><%= volume.published_at %></td>
<td class="text-end">
<%= edit_link volume, { journal_id: @journal.id } %>
diff --git a/app/views/admin/research/journal/volumes/show.html.erb b/app/views/admin/research/journal/volumes/show.html.erb
index dcdaedf03db2db5814edf8e941107625465df612..e5eb67fa85b902e78aae48cbbe701604f1acf38a 100644
--- a/app/views/admin/research/journal/volumes/show.html.erb
+++ b/app/views/admin/research/journal/volumes/show.html.erb
@@ -1,7 +1,17 @@
<% content_for :title, @volume %>
<div class="row">
- <div class="col-md-3">
+ <div class="col-md-8">
+ <div class="card flex-fill w-100">
+ <div class="card-header">
+ <h2 class="card-title mb-0 h5">Articles</h2>
+ </div>
+ <div class="card-body">
+ <%= render 'admin/research/journal/articles/list', articles: @volume.articles %>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-4">
<% if @volume.cover.attached? %>
<%= image_tag @volume.cover, class: 'img-fluid img-thumbnail bg-light mb-4' %>
<% end %>
@@ -15,16 +25,6 @@
</p>
<%= @volume.description %>
</div>
- <div class="col-md-9">
- <div class="card flex-fill w-100">
- <div class="card-header">
- <h2 class="card-title mb-0 h5">Articles</h2>
- </div>
- <div class="card-body">
- <%= render 'admin/research/journal/articles/list', articles: @volume.articles %>
- </div>
- </div>
- </div>
</div>
<% content_for :action_bar_right do %>
diff --git a/app/views/admin/research/journals/show.html.erb b/app/views/admin/research/journals/show.html.erb
index 8517584e362c995152997f1c3bbb18f3b3038b8d..5104e350588650535d6b1d337d9166bda46675a7 100644
--- a/app/views/admin/research/journals/show.html.erb
+++ b/app/views/admin/research/journals/show.html.erb
@@ -9,38 +9,46 @@
</p>
<% end %>
-<h2 class="mt-5"><%= Research::Journal::Volume.model_name.human(count: 2) %></h2>
-
-<%= link_to t('create'),
- new_admin_research_journal_volume_path(journal_id: @journal),
- class: button_classes('me-3') %>
-
-<%= link_to 'Tous les volumes',
- admin_research_journal_volumes_path(journal_id: @journal) %>
-
-<div class="row">
- <% @journal.volumes.ordered.limit(4).each do |volume| %>
- <div class="col-md-3 mt-4">
- <div class="card">
- <%= image_tag volume.cover, class: 'img-fluid' if volume.cover.attached? %>
- <div class="card-body">
- <%= link_to volume, admin_research_journal_volume_path(journal_id: @journal, id: volume), class: 'stretched-link' %>
+<div class="card mt-5">
+ <div class="card-header">
+ <div class="float-end">
+ <%= link_to t('create'),
+ new_admin_research_journal_volume_path(journal_id: @journal),
+ class: button_classes %>
+ </div>
+ <h2 class="card-title">
+ <%= link_to Research::Journal::Volume.model_name.human(count: 2),
+ admin_research_journal_volumes_path(journal_id: @journal) %></h2>
+ </div>
+ <div class="card-body">
+ <div class="row">
+ <% @journal.volumes.ordered.limit(4).each do |volume| %>
+ <div class="col-md-3 mt-4">
+ <div class="card">
+ <%= image_tag volume.cover, class: 'img-fluid' if volume.cover.attached? %>
+ <div class="card-body">
+ <%= link_to volume, admin_research_journal_volume_path(journal_id: @journal, id: volume), class: 'stretched-link' %>
+ </div>
+ </div>
</div>
- </div>
+ <% end %>
</div>
- <% end %>
+ </div>
</div>
-<h2 class="mt-5"><%= Research::Journal::Article.model_name.human(count: 2) %></h2>
-
-<%= link_to t('create'),
- new_admin_research_journal_article_path(journal_id: @journal),
- class: button_classes('me-3') %>
-
-<%= link_to 'Tous les articles',
- admin_research_journal_articles_path(journal_id: @journal) %>
-
-<%= render 'admin/research/journal/articles/list', articles: @journal.articles.ordered.limit(10) %>
+<div class="card mt-5">
+ <div class="card-header">
+ <div class="float-end">
+ <%= link_to t('create'),
+ new_admin_research_journal_article_path(journal_id: @journal),
+ class: button_classes %>
+ </div>
+ <h2 class="card-title">
+ <%= link_to Research::Journal::Article.model_name.human(count: 2),
+ admin_research_journal_articles_path(journal_id: @journal) %></h2>
+ </div>
+ <%= render 'admin/research/journal/articles/list', articles: @journal.articles.ordered.limit(10) %>
+</div>
<% content_for :action_bar_right do %>
<%= edit_link @journal %>