Skip to content
Snippets Groups Projects
Commit 55be3dde authored by Arnaud Levy's avatar Arnaud Levy
Browse files

clean journals

parent 413d0200
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 74 additions and 64 deletions
app/controllers/admin/communication/application_controller.rb
+ 3
− 0
View file @ 55be3dde
class Admin::Communication::ApplicationController < Admin::ApplicationController
protected
def breadcrumb
if @website
short_breadcrumb
......
app/controllers/admin/research/application_controller.rb
+ 7
− 2
View file @ 55be3dde
......@@ -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
app/controllers/admin/research/journal/application_controller.rb
+ 0
− 5
View file @ 55be3dde
......@@ -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
{
......
app/controllers/admin/research/journals_controller.rb
+ 0
− 6
View file @ 55be3dde
......@@ -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
......
app/views/admin/research/journal/articles/_list.html.erb
+ 13
− 11
View file @ 55be3dde
<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 %>
......
app/views/admin/research/journal/volumes/index.html.erb
+ 4
− 1
View file @ 55be3dde
......@@ -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 } %>
......
app/views/admin/research/journal/volumes/show.html.erb
+ 11
− 11
View file @ 55be3dde
<% 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 %>
......
app/views/admin/research/journals/show.html.erb
+ 36
− 28
View file @ 55be3dde
......@@ -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 %>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment