From e2f2800942b44d04af22f92215cc147b845a0a73 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Thu, 13 Dec 2007 10:31:37 +0000
Subject: [PATCH] =?UTF-8?q?Incrustation=20automatique=20d'une=20pi=C3=A8ce?=
=?UTF-8?q?=20jointe=20lorsque=20l'article=20est=20vide=20et=20la=20pi?=
=?UTF-8?q?=C3=A8ce=20jointe=20est=20unique=20(images=20mises=20=C3=A0=20p?=
=?UTF-8?q?art).=20Autrement=20dit,=20afficher=20le=20contenu=20d'un=20doc?=
=?UTF-8?q?ument=20sous=20SPIP=20peut=20se=20faire=20simplement=20en=20pub?=
=?UTF-8?q?liant=20un=20article=20auquel=20on=20associe=20le=20document,?=
=?UTF-8?q?=20sans=20avoir=20=C3=A0=20apprendre=20la=20syntaxe=20des=20mod?=
=?UTF-8?q?=C3=A8les.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitattributes | 1 +
dist/article.html | 26 +++++++++++++++-----------
dist/inc-documents.html | 3 +++
3 files changed, 19 insertions(+), 11 deletions(-)
create mode 100644 dist/inc-documents.html
diff --git a/.gitattributes b/.gitattributes
index 73bdd17bc5..e42e3a7f0c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -227,6 +227,7 @@ dist/images/warning-24.gif -text
dist/images/warning.gif -text
dist/images/wrapper.php -text
dist/images/xml.gif -text
+dist/inc-documents.html -text
dist/inc-entete.html -text
dist/inc-forum.html -text
dist/inc-head.html -text
diff --git a/dist/article.html b/dist/article.html
index c8396975f2..cfa020c2b9 100644
--- a/dist/article.html
+++ b/dist/article.html
@@ -40,14 +40,12 @@ href="[(#URL_PAGE{backend})]<BOUCLE_URLAUTEURS(AUTEURS){id_article}>&id_aute
#MODELE{article_traductions}
</div>
-
- <div class="surlignable">
- [<div class="#EDIT{chapo} chapo">(#CHAPO|image_reduire{500,0})</div>]
- [<div class="#EDIT{texte} texte entry-content">(#TEXTE|image_reduire{500,0})</div>]
- </div>
-
- [(#REM) Portfolio : album d'images ]
- <B_documents_portfolio>
+ <div class="surlignable">[
+ <div class="#EDIT{chapo} chapo">(#CHAPO|image_reduire{500,0})</div>
+ ][<div class="#EDIT{texte} texte entry-content">(#TEXTE|image_reduire{500,0})</div>
+ ]</div>[
+ (#REM) Portfolio : album d'images
+ ]<B_documents_portfolio>
<div id="documents_portfolio">
<h2><:info_portfolio:></h2>
<BOUCLE_documents_portfolio(DOCUMENTS) {id_article} {mode=document} {extension IN png,jpg,gif} {par num titre, date} {doublons}>
@@ -65,14 +63,20 @@ href="[(#URL_PAGE{backend})]<BOUCLE_URLAUTEURS(AUTEURS){id_article}>&id_aute
[<p class="#EDIT{hyperlien} hyperlien"><:voir_en_ligne:> : <a href="(#URL_SITE)" class="spip_out">[(#NOM_SITE|sinon{[(#URL_SITE|couper{80})]})]</a></p>]
- [<div class="ps surlignable"><h2 class="pas_surlignable"><:info_ps:></h2><div class="#EDIT{ps}">(#PS|image_reduire{500,0})</div></div>]
+ [<div class="ps surlignable"><h2 class="pas_surlignable"><:info_ps:></h2><div class="#EDIT{ps}">(#PS|image_reduire{500,0})</div></div>][
+
+ (#REM) Autres documents joints a l'article.
+ Si un seul et texte vide, incrustation automatique
- [(#REM) Autres documents joints a l'article ]
+ ]<BOUCLE_documents_decompte(DOCUMENTS) {id_article} {mode=document} {par num titre, date}{doublons}{doublons A}></BOUCLE_documents_decompte>[
+ (#TOTAL_BOUCLE|<>{1}|?{' ',#TEXTE}|?{'',' '})
+ <INCLURE{fond=inc-documents}{id_article}>]
+ <//B_documents_decompte>
<B_documents_joints>
<div class="menu" id="documents_joints">
<h2><:titre_documents_joints:></h2>
<ul>
- <BOUCLE_documents_joints(DOCUMENTS) {id_article} {mode=document} {par num titre, date} {doublons}>
+ <BOUCLE_documents_joints(DOCUMENTS){!doublons A}>
<li>
<strong><a href="#URL_DOCUMENT" title="<:bouton_telecharger:>" type="#MIME_TYPE">[(#TITRE|sinon{<:info_document:>})]</a></strong>
<small>(#TYPE_DOCUMENT[ – (#TAILLE|taille_en_octets)])</small>
diff --git a/dist/inc-documents.html b/dist/inc-documents.html
new file mode 100644
index 0000000000..21fa7d4dcc
--- /dev/null
+++ b/dist/inc-documents.html
@@ -0,0 +1,3 @@
+<BOUCLE1 (DOCUMENTS){id_article}{extension !IN png,jpg,gif}>
+<INCLURE{fond=modeles/emb}{id_document}>
+</BOUCLE1>
--
GitLab