From 21abbfc16a814f8e9c413d9f73981eaa3a36d973 Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Thu, 22 Dec 2011 08:26:18 +0000
Subject: [PATCH] =?UTF-8?q?R=C3=A9soud=20http://core.spip.org/issues/2453?=
 =?UTF-8?q?=20:=20informer=20quand=20SPIP=20g=C3=A9n=C3=A8rera=20automatiq?=
 =?UTF-8?q?uement=20une=20miniature=20d'une=20image=20en=20guise=20de=20vi?=
 =?UTF-8?q?gnette?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 formulaires/illustrer_document.html | 4 +++-
 formulaires/illustrer_document.php  | 2 +-
 lang/medias_fr.php                  | 1 +
 paquet.xml                          | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/formulaires/illustrer_document.html b/formulaires/illustrer_document.html
index 651b1e1e..71f33ec3 100644
--- a/formulaires/illustrer_document.html
+++ b/formulaires/illustrer_document.html
@@ -10,7 +10,9 @@
 				<span class='erreur_message'>(#ENV**{erreurs}|table_valeur{fichier})</span>
 				][
 				(#CONFIG{taille_preview}|intval|?{#ENV*{vignette}|image_reduire{#CONFIG{taille_preview}},#ENV*{vignette}|balise_img})
-				][(#ENV*{vignette}|non)<:medias:aucune_vignette:>]
+				][(#ENV*{vignette}|non)<:medias:aucune_vignette:>
+				[(#CONFIG{creer_preview}|=={oui}|et{#ENV{media}|=={image}})<br /><:medias:miniature_automatique_active:>]
+				]
 				<p class='actions'>
 				[(#ENV{id_vignette}|oui|et{#AUTORISER{supprimer,document,#ENV{id_vignette}}})  <input type='submit' class='submit' name='supprimer' value='<:medias:bouton_supprimer|attribut_html:>' />]
 				[(#ENV{id_vignette}|non|ou{#AUTORISER{modifier,document,#ENV{id_vignette}}}) &#91;<a href='#' onclick='jQuery("#illustrer_document").toggle("fast");return false;'><:bouton_changer:></a>&#93;]
diff --git a/formulaires/illustrer_document.php b/formulaires/illustrer_document.php
index d1ca326c..9f47f12f 100644
--- a/formulaires/illustrer_document.php
+++ b/formulaires/illustrer_document.php
@@ -14,7 +14,7 @@ if (!defined("_ECRIRE_INC_VERSION")) return;
 
 function formulaires_illustrer_document_charger_dist($id_document){
 	include_spip('inc/documents');
-	$valeurs = sql_fetsel('id_document,mode,id_vignette,extension','spip_documents','id_document='.intval($id_document));
+	$valeurs = sql_fetsel('id_document,mode,id_vignette,extension,media','spip_documents','id_document='.intval($id_document));
 	if (!$valeurs /*OR in_array($valeurs['extension'],array('jpg','gif','png'))*/)
 		return array('editable'=>false,'id'=>$id_document);
 
diff --git a/lang/medias_fr.php b/lang/medias_fr.php
index 0ee3c01e..9acd2c40 100644
--- a/lang/medias_fr.php
+++ b/lang/medias_fr.php
@@ -133,6 +133,7 @@ $GLOBALS[$GLOBALS['idx_lang']] = array(
 	'media_file' => 'Autres',
 	'media_image' => 'Images',
 	'media_video' => 'Séquences',
+	'miniature_automatique_active' => 'SPIP génèrera automatiquement une miniature de l\'image',
 
 	// N
 	'nb_documents_attache_succes' => '@nb@ documents ont bien été ajoutés',
diff --git a/paquet.xml b/paquet.xml
index 1c67e7fc..75c0e648 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
 <paquet
 	prefix="medias"
 	categorie="multimedia"
-	version="2.7.6"
+	version="2.7.7"
 	etat="test"
 	compatibilite="[3.0.0-alpha2;["
 	logo="prive/themes/spip/images/portfolio-32.png"
-- 
GitLab