From 88c87491a75ddae4a783a69e844c4344e612fd33 Mon Sep 17 00:00:00 2001
From: tcharlss <tcharlss@bravecassine.com>
Date: Thu, 8 Jul 2021 10:18:25 +0200
Subject: [PATCH] =?UTF-8?q?M=C3=A9diath=C3=A8que=20:=20l'id=20passe=20en?=
 =?UTF-8?q?=201=C3=A8re=20colonne=20+=20labels=20propres=20pour=20le=20alt?=
 =?UTF-8?q?=20et=20les=20cr=C3=A9dits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 prive/squelettes/inclure/mediatheque-choisir.html | 10 ++++------
 prive/squelettes/inclure/mediatheque-galerie.html | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/prive/squelettes/inclure/mediatheque-choisir.html b/prive/squelettes/inclure/mediatheque-choisir.html
index 9bc14f3f..16172582 100644
--- a/prive/squelettes/inclure/mediatheque-choisir.html
+++ b/prive/squelettes/inclure/mediatheque-choisir.html
@@ -35,9 +35,9 @@
 			</th>
 		</tr>]
 		<tr class="first_row">
+			<th class="id"><:medias:id:></th>
 			<th class="logo"><:medias:logo:></th>
 			<th class="infos"></th>
-			<th class="id"><:medias:id:></th>
 			<th class="statut"></th>
 			<th class="exif"><:medias:infos:></th>
 			<th class="editorial"><:medias:descriptif:></th>
@@ -47,6 +47,7 @@
 	<tbody>
 		<BOUCLE_galerie(DOCUMENTS) {id_rubrique ?}{id_article ?}{id_breve ?}{id_document ?}{recherche ?} {tri id_document,inverse}{media?}{extension?}{distant?}{brise?}{statut==#ENV{statut,.*}}{orphelins?}{titre==(#ENV{sanstitre}|?{'^$','.*'})}{pagination 10}>
 		<tr class="[(#ENV{media}|non)[ media-(#MEDIA)]]" id="#ENV{iddoc,media}#ID_DOCUMENT">
+			<td class="id">#ID_DOCUMENT</td>
 			<td class="logo">
 				#SET{fichier,#DISTANT|=={oui}|?{#FICHIER,#FICHIER|basename}}
 				[(#MEDIA|=={image}|oui)[
@@ -63,9 +64,6 @@
 				[(#GET{missing}|oui)<img src='#CHEMIN_IMAGE{document-manquant-24.png}' width='24' height='24' alt='<:medias:fichier_manquant:>' />]
 				[(#DISTANT|=={oui}|oui)<img src='#CHEMIN_IMAGE{document-distant-24.png}' width='24' height='24' alt='<:medias:fichier_distant:>' />]
 			</td>
-			<td class="id">
-				<strong>#ID_DOCUMENT</strong>
-			</td>
 			<td class='statut'>
 				[(#ID_DOCUMENT|medias_puce_statut_document{#STATUT})]
 			</td>
@@ -123,8 +121,8 @@
 			<td class="editorial">
 				[<strong class="titre #EDIT{titre}">(#TITRE|sinon{#VAL{<i class="sans-titre">}|concat{<:info_sans_titre:>,'</i>'}})</strong>]
 				[<div class="descriptif #EDIT{descriptif}">(#DESCRIPTIF)</div>]
-				[<p class="credits #EDIT{credits}"><span class="label"><:medias:label_credits:></span><span class="sep"> &ndash; </span><span class="valeur">(#CREDITS)</span></p>]
-				[<p class="alt #EDIT{alt}"><span class="label"><:medias:label_alt:></span><span class="sep"> &ndash; </span><span class="valeur">(#ALT)</span></p>]
+				[<p class="credits #EDIT{credits}">[<span class="label">(#VAL{medias:label_credits}|_T|label_nettoyer|label_ponctuer)</span> ]<span class="valeur">(#CREDITS)</span></p>]
+				[<p class="alt #EDIT{alt}">[<span class="label">(#VAL{medias:label_alt}|_T|label_nettoyer|label_ponctuer)</span> ]<span class="valeur">(#ALT)</span></p>]
 			</td>
 			<td class="action">
 				[(#REM) Utilisation de la galerie en mode selecteur, avec un bouton choix qui appelle une fonction js passee en argument]
diff --git a/prive/squelettes/inclure/mediatheque-galerie.html b/prive/squelettes/inclure/mediatheque-galerie.html
index aafa6829..8e637deb 100644
--- a/prive/squelettes/inclure/mediatheque-galerie.html
+++ b/prive/squelettes/inclure/mediatheque-galerie.html
@@ -37,9 +37,9 @@
 			</th>
 		</tr>]
 		<tr class="first_row">
+			<th class="id"><:medias:id:></th>
 			<th class="logo"><:medias:logo:></th>
 			<th class="infos"></th>
-			<th class="id"><:medias:id:></th>
 			<th class="statut"></th>
 			<th class="exif"><:medias:infos:></th>
 			<th class="editorial"><:medias:descriptif:></th>
@@ -51,6 +51,7 @@
 		#SET{titre_mimetype,''}
 		<BOUCLE_type(types_documents) {extension}>#SET{titre_mimetype,#TITRE}</BOUCLE_type>
 		<tr class="[(#COMPTEUR_BOUCLE|alterner{row_odd,row_even})][ (#ENV{media}|non)[ media-(#MEDIA)]]" id="#ENV{iddoc,media}#ID_DOCUMENT">
+			<td class="id">#ID_DOCUMENT</td>
 			<td class="logo">
 				#SET{fichier,#DISTANT|=={oui}|?{#FICHIER,#FICHIER|basename}}
 				[(#MEDIA|=={image}|oui)[
@@ -67,9 +68,6 @@
 				[(#GET{missing}|oui)[(#CHEMIN_IMAGE{document-manquant-32.png}|balise_img{<:medias:fichier_manquant:>}|inserer_attribut{title,<:medias:fichier_manquant:>})]]
 				[(#DISTANT|=={oui}|oui)[(#CHEMIN_IMAGE{document-distant-32.png}|balise_img{<:medias:fichier_distant:>}|inserer_attribut{title,<:medias:fichier_distant:>})]]
 			</td>
-			<td class="id">
-				<strong>#ID_DOCUMENT</strong>
-			</td>
 			<td class='statut'>
 				[(#ID_DOCUMENT|medias_puce_statut_document{#STATUT})]
 			</td>
@@ -129,8 +127,8 @@
 			<td class="editorial">
 				[<strong class="titre #EDIT{titre}">(#TITRE|sinon{#VAL{<i class="sans-titre">}|concat{<:info_sans_titre:>,'</i>'}})</strong>]
 				[<div class="descriptif #EDIT{descriptif}">(#DESCRIPTIF)</div>]
-				[<p class="credits #EDIT{credits}"><span class="label"><:medias:label_credits:></span><span class="sep"> &ndash; </span><span class="valeur">(#CREDITS)</span></p>]
-				[<p class="alt #EDIT{alt}"><span class="label"><:medias:label_alt:></span><span class="sep"> &ndash; </span><span class="valeur">(#ALT)</span></p>]
+				[<p class="credits #EDIT{credits}">[<span class="label">(#VAL{medias:label_credits}|_T|label_nettoyer|label_ponctuer)</span> ]<span class="valeur">(#CREDITS)</span></p>]
+				[<p class="alt #EDIT{alt}">[<span class="label">(#VAL{medias:label_alt}|_T|label_nettoyer|label_ponctuer)</span> ]<span class="valeur">(#ALT)</span></p>]
 			</td>
 			<td class="action">
 				[(#REM) Utilisation de la galerie en mode portfolio, avec renvoi vers l'edition]
-- 
GitLab