From 865f680838805116bf8aeba3220fd513960df2f8 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 8 Mar 2002 11:51:31 +0000
Subject: [PATCH] icone par defaut, diverses babioles cosmetiques sur les docs
attaches.
---
.gitattributes | 1 +
IMG/type_defaut-dist.png | Bin 0 -> 3213 bytes
ecrire/article_documents.php3 | 26 +++++++++++++++++---------
ecrire/inc_texte.php3 | 25 ++++++++++++++-----------
4 files changed, 32 insertions(+), 20 deletions(-)
create mode 100644 IMG/type_defaut-dist.png
diff --git a/.gitattributes b/.gitattributes
index bf566a5ecc..0470abbe29 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
* text=auto !eol
IMG/document-vierge.gif -text
+IMG/type_defaut-dist.png -text
IMG/type_ram.png -text
IMG/type_rm.png -text
NAVPICS/big-logo-spip.gif -text
diff --git a/IMG/type_defaut-dist.png b/IMG/type_defaut-dist.png
new file mode 100644
index 0000000000000000000000000000000000000000..af26d0649687084d682a51fdd9477fec464eb2cb
GIT binary patch
literal 3213
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
literal 0
HcmV?d00001
diff --git a/ecrire/article_documents.php3 b/ecrire/article_documents.php3
index 2e3766a221..eb40879e17 100644
--- a/ecrire/article_documents.php3
+++ b/ecrire/article_documents.php3
@@ -26,13 +26,23 @@ if ($modif_document == 'oui') {
mysql_query("UPDATE spip_documents SET titre=\"$titre\", descriptif=\"$descriptif\" WHERE id_document=$id_document");
}
+$query = "SELECT titre FROM spip_articles WHERE id_article = $id_article";
+$result = mysql_query($query);
+if ($art = mysql_fetch_object($result)) {
+ $titre_art = "« ".typo($art->titre)." »";
+ $lien_art = " <a href='articles.php3?id_article=$id_article' target='spip_normal'><font color='ffffff'>$titre_art</font></a>";
+} else {
+ $titre_art = '';
+ $lien_art = '';
+}
+
debut_html("Images et documents");
echo "<table width='100%' border='0' cellpadding='6' cellspacing='0'>\n";
echo "<tr bgcolor='$couleur_foncee'>\n";
echo "<td width='100%'><font face='Verdana,Arial,Helvetica,sans-serif' size='4' color='#FFFFFF'>";
-echo "Documents liés à l'article";
+echo "Documents liés à l'article".$lien_art;
echo "</td></tr>\n";
$docs_affiches = "";
@@ -81,13 +91,11 @@ while ($row = mysql_fetch_array($result)) {
echo "<tr><td height='15'> </td></tr>\n";
-echo "<tr bgcolor='#EEEECC'>\n";
-echo "<td width='100%'><font face='Verdana,Arial,Helvetica,sans-serif' size='4' color='#000000'>";
-echo "Ajouter un nouveau document";
+echo "<tr bgcolor='$couleur_foncee'>\n";
+echo "<td><font face='Verdana,Arial,Helvetica,sans-serif' size='4' color='#FFFFFF'>";
+echo "Ajouter une image ou un document";
echo "</td></tr>\n";
-
-
-echo "<tr><td>\n";
+echo debut_boite_info();
$hash = calculer_action_auteur("ajout_doc");
@@ -98,7 +106,7 @@ echo "<INPUT NAME='id_article' TYPE=Hidden VALUE=$id_article>\n";
echo "<INPUT NAME='hash_id_auteur' TYPE=Hidden VALUE=$connect_id_auteur>\n";
echo "<INPUT NAME='hash' TYPE=Hidden VALUE=$hash>\n";
echo "<INPUT NAME='ajout_doc' TYPE=Hidden VALUE='oui'>\n";
-echo "Ajouter une image ou un document :";
+// echo "Ajouter une image ou un document :";
echo aide("artimg");
if (tester_upload() AND ($connect_statut == '0minirezo')) {
$texte_upload = texte_upload("");
@@ -118,7 +126,7 @@ echo "</FORM>";
echo "</div>";
echo "</font>\n";
-echo "</td></tr>\n";
+echo fin_boite_info();
echo "</table></body></html>\n";
flush();
diff --git a/ecrire/inc_texte.php3 b/ecrire/inc_texte.php3
index 3eccc156bb..2572b2f6af 100644
--- a/ecrire/inc_texte.php3
+++ b/ecrire/inc_texte.php3
@@ -72,19 +72,22 @@ function vignette_par_defaut ($type_extension) {
$img = "IMG2";
else
$img = "IMG";
- $filename = "$img/type_$type_extension.png";
-
- if (file_exists($filename)) {
- $vig = "<img src='$filename'>";
- } else {
- $vig = "<table cellpadding=0 cellspacing=0 border=0 width=35 height=32 align='left' valign='bottom'>\n";
- $vig .= "<tr width=35 height=32>\n";
- $vig .= "<td width=35 height=32 background='$img/document-vierge.gif' align='left'>\n";
- $vig .= "<table bgcolor='#666666' style='border: solid 1px black; margin-top: 10px; padding-top: 0px; padding-bottom: 0px; padding-left: 3px; padding-right: 3px;' cellspacing=0 border=0>\n";
- $vig .= "<tr><td><font face='verdana,arial,helvetica,sans-serif' color='white' size='1'>$type_extension</font></td></tr></table>\n";
- $vig .= "</td></tr></table>\n ";
+
+ $filename = "$img/type_$type_extension";
+
+ if (file_exists($filename.'.png')) {
+ $vig = "$filename.png";
+ } else if (file_exists($filename.'-dist.png')) {
+ $vig = "$filename-dist.png";
+ } else if (file_exists("$img/type_defaut.png")) {
+ $vig = "$img/type_defaut.png";
+ } else if (file_exists("$img/type_defaut-dist.png")) {
+ $vig = "$img/type_defaut-dist.png";
}
+ $image = getimagesize($vig);
+ $vig = "<img src='$vig' alt='$type_extension' border='0' ".$image[3]." >";
+
return $vig;
}
--
GitLab