From 1fa534060f81483e75943b4c37f094cf59257616 Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Fri, 8 Mar 2002 01:27:27 +0000
Subject: [PATCH] gestion des docs attaches : l'interface commence a etre
potable, les icones par defaut fonctionnent (dans le principe : je n'ai mis
pour l'instant que type_rm.png et type_ram.png dans les dossiers IMG/ et
ecrire/IMG2/
---
.gitattributes | 2 +
IMG/type_ram.png | Bin 0 -> 3206 bytes
IMG/type_rm.png | Bin 0 -> 3206 bytes
ecrire/inc_documents.php3 | 125 +++++++++++++++++---------------------
ecrire/inc_texte.php3 | 32 +++++++++-
spip_image.php3 | 2 +
6 files changed, 92 insertions(+), 69 deletions(-)
create mode 100644 IMG/type_ram.png
create mode 100644 IMG/type_rm.png
diff --git a/.gitattributes b/.gitattributes
index fcd7e6e459..15484c01c2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,6 @@
* text=auto !eol
+IMG/type_ram.png -text
+IMG/type_rm.png -text
NAVPICS/big-logo-spip.gif -text
NAVPICS/logo-spip.gif -text
NAVPICS/medium-logo-spip.gif -text
diff --git a/IMG/type_ram.png b/IMG/type_ram.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd1f71387c86f6bd0516bd39ee1068459f50ce6
GIT binary patch
literal 3206
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
literal 0
HcmV?d00001
diff --git a/IMG/type_rm.png b/IMG/type_rm.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd1f71387c86f6bd0516bd39ee1068459f50ce6
GIT binary patch
literal 3206
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
literal 0
HcmV?d00001
diff --git a/ecrire/inc_documents.php3 b/ecrire/inc_documents.php3
index d50013d5f7..5946fe1fae 100644
--- a/ecrire/inc_documents.php3
+++ b/ecrire/inc_documents.php3
@@ -5,7 +5,6 @@
if (defined("_ECRIRE_INC_DOCUMENTS")) return;
define("_ECRIRE_INC_DOCUMENTS", "1");
-
function texte_upload($inclus){
$myDir = opendir("upload");
while($entryName = readdir($myDir)) {
@@ -114,6 +113,53 @@ function afficher_document($id_document, $id_doc_actif=0) {
"<div align='right'><doc$id_document|right></div>\n".
"</font>\n". "<br>".$raccourci_img;
+ //
+ // Afficher un apercu (pour les images)
+ //
+ if ($type_inclus == 'image') {
+ echo "<td width='150' align='center' valign='top' rowspan='2'>\n";
+ echo "<div style='border: 1px solid #808080; padding: 4px; background-color: #e0f080;'>\n";
+ echo "<font size='2'><b>IMAGE</b></font><br>";
+ echo vignette($largeur, $hauteur, $fichier);
+ echo "<font face='verdana, arial, helvetica, sans-serif' size='1'><br>$largeur x $hauteur pixels<br><br></font>";
+ echo $raccourci_doc; $raccourci_doc='';
+ }
+
+ //
+ // Afficher le document en tant que tel
+ //
+
+ echo "<td width='100%' align='left' valign='top' colspan='2'>\n";
+
+ if ($descriptif) {
+ echo debut_cadre_relief();
+ echo "<font face='Georgia, Garamond, Times, sans-serif' size='2'>\n";
+ echo propre($descriptif);
+ echo "</font>";
+ echo fin_cadre_relief();
+ }
+ echo "<font face=\"Georgia, Garamond, Times, serif\" size=\"3\">";
+
+ echo "<form action='article_documents.php3' method='post'>";
+ echo "<input type='hidden' name='id_article' value='$id_article'>";
+ echo "<input type='hidden' name='id_document' value='$id_document'>";
+ echo "<input type='hidden' name='modif_document' value='oui'>";
+
+ echo "<b>Titre :</b><br>\n";
+ echo "<INPUT TYPE='text' NAME='titre' CLASS='formo' VALUE=\"".htmlspecialchars($titre)."\" SIZE='40'><br>";
+
+ echo "<b>Description :</b><br>\n";
+ echo "<textarea name='descriptif' CLASS='forml' ROWS='5' COLS='*' wrap='soft'>";
+ echo htmlspecialchars($descriptif);
+ echo "</textarea>\n";
+
+ echo "<p align='right'>";
+ echo "<input class='fondo' TYPE='submit' NAME='Valider' VALUE='Valider'>";
+ echo "</p>";
+ echo "</form>";
+ echo "</font>";
+
+
//
// Affichage de la vignette
//
@@ -128,7 +174,10 @@ function afficher_document($id_document, $id_doc_actif=0) {
$taille_vignette = $row_vignette['taille'];
}
- echo "<td width='150' align='center' valign='top'>\n";
+ if ($type_inclus == 'image')
+ echo "<tr><td width='100%'> <td align='right' valign='top'>\n";
+ else
+ echo "<td width='150' align='right' valign='top'>\n";
echo "<div style='border: 1px dashed black; padding: 4px; background-color: #fdf4e8;'>\n";
echo "<font size='2'><b>VIGNETTE DE PRÉVISUALISATION</b></font><br>";
@@ -139,22 +188,10 @@ function afficher_document($id_document, $id_doc_actif=0) {
echo "[<a href='../spip_image.php3?redirect=".urlencode("article_documents.php3")."&id_document=$id_document&id_article=$id_article&hash_id_auteur=$connect_id_auteur&hash=$hash&doc_supp=$id_vignette'>";
echo "supprimer la vignette";
echo "</a>]</font><br>\n";
-
- echo $raccourci_doc; $raccourci_img='';
}
else {
-
- //
- // joli icone a la main
- //
- echo "<table cellpadding=0 cellspacing=0 border=0 width=35 height=32 align='left' valign='bottom'>\n";
- echo "<tr width=35 height=32>\n";
- echo "<td width=35 height=32 background='IMG2/document-vierge.gif' align='left'>\n";
- echo "<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";
- echo "<tr><td><font face='verdana,arial,helvetica,sans-serif' color='white' size='1'>$type_extension</font></td></tr></table>\n";
- echo "</td></tr></table>\n ";
-
- // retour aux choses serieuses
+ // pas de vignette
+ echo vignette_par_defaut ($type_extension);
echo "<font face='verdana, arial, helvetica, sans-serif' size='1'>\n";
$hash = calculer_action_auteur("ajout_doc");
echo "<form action='../spip_image.php3' METHOD='POST' ENCTYPE='multipart/form-data'>";
@@ -167,10 +204,10 @@ function afficher_document($id_document, $id_doc_actif=0) {
echo "<input name='hash' type='Hidden' VALUE='$hash'>";
if (tester_upload()) {
- echo "<small><b>Télécharger une nouvelle image :</b></small>";
+ echo "<small><b>Nouvelle vignette :</b></small>";
echo aide ("artimg");
echo "<small><br><INPUT NAME='image' TYPE='File'>\n";
- echo " <INPUT NAME='ok' TYPE=Submit VALUE='Télécharger' CLASS='fondo'></small>\n";
+ echo "<div align='right'><INPUT NAME='ok' TYPE=Submit VALUE='Télécharger' CLASS='fondo'></div></small>\n";
}
if ($GLOBALS['connect_statut'] == '0minirezo') {
echo "<br>";
@@ -191,61 +228,13 @@ function afficher_document($id_document, $id_doc_actif=0) {
echo "</font>\n";
}
+ echo $raccourci_doc;
echo "</div>\n";
echo "</td>\n";
//
- // Afficher un apercu (pour les images)
- //
- if ($type_inclus == 'image') {
- echo "<td width='150' align='center' valign='top'>\n";
- echo "<div style='border: 1px solid #808080; padding: 4px; background-color: #e0f080;'>\n";
- echo "<font size='2'><b>IMAGE</b></font><br>";
-
- $fichier_vignette = $row['fichier'];
- $largeur_vignette = $row['largeur'];
- $hauteur_vignette = $row['hauteur'];
- echo vignette($largeur_vignette, $hauteur_vignette, $fichier_vignette);
- echo "<font face='verdana, arial, helvetica, sans-serif' size='1'><br>$largeur x $hauteur pixels<br><br></font>";
- echo $raccourci_img;
- }
-
+ // fin de la boite document
//
- // Afficher le document en tant que tel
- //
-
- echo "<td width='100%' align='left' valign='top'>\n";
-
- if ($descriptif) {
- echo debut_cadre_relief();
- echo "<font face='Georgia, Garamond, Times, sans-serif' size='2'>\n";
- echo propre($descriptif);
- echo "</font>";
- echo fin_cadre_relief();
- }
- echo "<font face=\"Georgia, Garamond, Times, serif\" size=\"3\">";
-
- echo "<form action='article_documents.php3' method='post'>";
- echo "<input type='hidden' name='id_article' value='$id_article'>";
- echo "<input type='hidden' name='id_document' value='$id_document'>";
- echo "<input type='hidden' name='modif_document' value='oui'>";
-
- echo "<b>Titre :</b><br>\n";
- echo "<INPUT TYPE='text' NAME='titre' CLASS='formo' VALUE=\"".htmlspecialchars($titre)."\" SIZE='40'><br>";
-
- echo "<b>Description :</b><br>\n";
- echo "<textarea name='descriptif' CLASS='forml' ROWS='5' COLS='*' wrap='soft'>";
- echo htmlspecialchars($descriptif);
- echo "</textarea>\n";
-
- echo "<p align='right'>";
- echo "<input class='fondo' TYPE='submit' NAME='Valider' VALUE='Valider'>";
- echo "</p>";
- echo "</form>";
- echo "</font>";
-
-
- echo "</td>\n";
echo "</tr></table>\n";
diff --git a/ecrire/inc_texte.php3 b/ecrire/inc_texte.php3
index 445081feed..3eccc156bb 100644
--- a/ecrire/inc_texte.php3
+++ b/ecrire/inc_texte.php3
@@ -64,6 +64,29 @@ function ereg_remplace($cherche_tableau, $remplace_tableau, $texte) {
return $texte;
}
+//
+// vignette pour les documents lies
+//
+function vignette_par_defaut ($type_extension) {
+ if ($GLOBALS['flag_ecrire'])
+ $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 ";
+ }
+
+ return $vig;
+}
// Mise de cote des echappements
function echappe_html($letexte,$source) {
@@ -208,6 +231,12 @@ function integre_image($id_document, $align, $affichage_detaille = false) {
$mode = $row['mode'];
$id_vignette = $row['id_vignette'];
+ // on construira le lien en fonction du type de doc
+ $result_type = mysql_query("SELECT * FROM spip_types_documents WHERE id_type = $id_type");
+ if ($type = @mysql_fetch_object($result_type)) {
+ $extension = $type->extension;
+ }
+
if ($id_vignette) {
$query_vignette = "SELECT * FROM spip_documents WHERE id_document = $id_vignette";
$result_vignette = mysql_query($query_vignette);
@@ -222,6 +251,7 @@ function integre_image($id_document, $align, $affichage_detaille = false) {
$largeur_vignette = $largeur;
$hauteur_vignette = $hauteur;
}
+
if ($GLOBALS['flag_ecrire']) {
if ($fichier) $fichier = "../$fichier";
if ($fichier_vignette) $fichier_vignette = "../$fichier_vignette";
@@ -241,7 +271,7 @@ function integre_image($id_document, $align, $affichage_detaille = false) {
$vignette .= " hspace='5' vspace='3'>";
}
else {
- $vignette = "pas de prévisualisation";
+ $vignette = vignette_par_defaut($extension);
}
if ($mode == 'document' OR $affichage_detaille)
diff --git a/spip_image.php3 b/spip_image.php3
index de8c114972..834806b095 100644
--- a/spip_image.php3
+++ b/spip_image.php3
@@ -112,6 +112,8 @@ function ajout_doc($orig, $source, $dest, $mode, $id_document) {
if ($mode == 'vignette') {
$id_document_lie = $id_document;
+ $query = "UPDATE spip_documents SET mode='document' where id_document=$id_document";
+ mysql_query($query);
$id_document = 0;
}
if (!$id_document) {
--
GitLab