From 99cb85789cd1e0f781b415721cb3a982f3687fea Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 13 Feb 2023 14:38:57 +0100
Subject: [PATCH] pub
---
.../stylesheets/admin/appstack/style.sass | 5 --
.../stylesheets/admin/commons/style.sass | 8 +++-
.../research/publications/_list.html.erb | 2 +
.../admin/research/publications/show.html.erb | 46 ++++++++++++++-----
config/locales/research/en.yml | 7 ++-
config/locales/research/fr.yml | 7 ++-
6 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/app/assets/stylesheets/admin/appstack/style.sass b/app/assets/stylesheets/admin/appstack/style.sass
index a168205a2..0c2a5337b 100644
--- a/app/assets/stylesheets/admin/appstack/style.sass
+++ b/app/assets/stylesheets/admin/appstack/style.sass
@@ -89,11 +89,6 @@ p
.nav-link--last
padding-right: 0
-.img-circle
- aspect-ratio: 1/1
- object-fit: cover
- width: 100%
-
.img-fill
width: 100%
diff --git a/app/assets/stylesheets/admin/commons/style.sass b/app/assets/stylesheets/admin/commons/style.sass
index 7b0183f49..20dbffc26 100644
--- a/app/assets/stylesheets/admin/commons/style.sass
+++ b/app/assets/stylesheets/admin/commons/style.sass
@@ -9,4 +9,10 @@
.a11y
&__status
&__icon
- vertical-align: sub
\ No newline at end of file
+ vertical-align: sub
+
+.img-circle
+ aspect-ratio: 1/1
+ border-radius: 100%
+ object-fit: cover
+ width: 100%
\ No newline at end of file
diff --git a/app/views/admin/research/publications/_list.html.erb b/app/views/admin/research/publications/_list.html.erb
index b03ba3261..a322967bc 100644
--- a/app/views/admin/research/publications/_list.html.erb
+++ b/app/views/admin/research/publications/_list.html.erb
@@ -3,6 +3,7 @@
<thead>
<tr>
<th><%= Research::Publication.human_attribute_name('title') %></th>
+ <th><%= Research::Publication.human_attribute_name('publication_date') %></th>
<th><%= t('research.researchers', count: 2) %></th>
</tr>
</thead>
@@ -10,6 +11,7 @@
<% publications.each do |publication| %>
<tr>
<td><%= link_to publication, admin_research_publication_path(publication) %></td>
+ <td><%= l publication.publication_date %></td>
<td>
<% publication.researchers.each do |researcher| %>
<%= link_to_if researcher.university == current_university,
diff --git a/app/views/admin/research/publications/show.html.erb b/app/views/admin/research/publications/show.html.erb
index df80cefda..8662fabbe 100644
--- a/app/views/admin/research/publications/show.html.erb
+++ b/app/views/admin/research/publications/show.html.erb
@@ -1,16 +1,40 @@
<% content_for :title, @publication %>
-<% @publication.research_people.each do |person| %>
- <%= link_to person, admin_research_researcher_path(person) %>
-<% end %>
-
-<p><%= @publication.docid %></p>
-
-<div><%= sanitize @publication.ref %></div>
-
-<%= link_to 'url', @publication.url, target: :_blank if @publication.url %>
-<%= link_to 'HAL', @publication.hal_url, target: :_blank if @publication.hal_url %>
-<%= link_to 'DOI', @publication.doi_url, target: :_blank if @publication.doi_url %>
+<div class="row">
+ <div class="col-lg-8">
+ <p class="lead mb-4"><%= sanitize @publication.ref %></p>
+ <div class="row">
+ <div class="col-lg-6">
+ <%= osuny_label Research::Publication.human_attribute_name('docid') %>
+ <p><%= @publication.docid %></p>
+ </div>
+ <div class="col-lg-6">
+ <%= osuny_label Research::Publication.human_attribute_name('publication_date') %>
+ <p><%= l @publication.publication_date %></p>
+ </div>
+ <% [:url, :hal_url, :doi_url].each do |key| %>
+ <% value = @publication.send key %>
+ <% next if value.blank? %>
+ <div class="col-lg-6">
+ <%= osuny_label Research::Publication.human_attribute_name(key) %>
+ <p><%= link_to value, value, target: :_blank %></p>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ <div class="col-lg-4">
+ <% @publication.research_people.each do |person| %>
+ <article class="mb-4 d-flex align-items-center position-relative">
+ <div style="width: 80px">
+ <%= kamifusen_tag person.best_picture, width: 80, class: 'img-circle' if person.best_picture.attached? %>
+ </div>
+ <div class="ms-3">
+ <%= link_to person, admin_research_researcher_path(person), class: 'stretched-link' %>
+ </div>
+ </article>
+ <% end %>
+ </div>
+</div>
<% content_for :action_bar_left do %>
<% if current_user.server_admin? %>
diff --git a/config/locales/research/en.yml b/config/locales/research/en.yml
index 1788650bb..309b6ec33 100644
--- a/config/locales/research/en.yml
+++ b/config/locales/research/en.yml
@@ -70,8 +70,13 @@ en:
short_name: Short name
text: Text
research/publication:
- title: Title
description: Publications scientifiques importées automatiquement de HAL
+ docid: Identifier
+ doi_url: URL DOI
+ publication_date: Publication date
+ title: Title
+ url: URL
+ hal_url: URL HAL
research/thesis:
abstract: Abstract
author: Author
diff --git a/config/locales/research/fr.yml b/config/locales/research/fr.yml
index 793af9b89..74bde5489 100644
--- a/config/locales/research/fr.yml
+++ b/config/locales/research/fr.yml
@@ -70,8 +70,13 @@ fr:
short_name: Nom court
text: Texte
research/publication:
- title: Titre
description: Publications scientifiques importées automatiquement de HAL
+ docid: Identifiant
+ doi_url: URL DOI
+ publication_date: Date de publication
+ title: Titre
+ url: URL
+ hal_url: URL HAL
research/thesis:
abstract: Résumé
author: Auteur·rice
--
GitLab