From 335314756bd6a56b1dde67cf4d0a22e7bb4c1e09 Mon Sep 17 00:00:00 2001
From: "cedric@yterium.com" <>
Date: Mon, 15 Aug 2011 13:02:13 +0000
Subject: [PATCH] http://core.spip.org/issues/2194 collision entre le mode
d'upload et le mode du document que l'on edite qui faussait le label 'Titre
du document' sur les documents non image + correction style margin bottom
---
formulaires/joindre_document.html | 6 +++---
formulaires/joindre_document.php | 2 +-
paquet.xml | 2 +-
prive/style_prive_plugin_medias.html | 1 +
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/formulaires/joindre_document.html b/formulaires/joindre_document.html
index 96f8738b..fd19b80b 100644
--- a/formulaires/joindre_document.html
+++ b/formulaires/joindre_document.html
@@ -1,10 +1,10 @@
[(#ENV{editable})
<div class='formulaire_spip formulaire_joindre formulaire_joindre_document' id='formulaire_joindre_document-#ENV{id,new}'>
- [(#ENV{mode}|=={image}|oui)
+ [(#ENV{_mode}|=={image}|oui)
<h3 class='titrem'>[(#CHEMIN_IMAGE{image-24.png}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image:>,<:medias:bouton_ajouter_image:>}) #AIDER{ins_img}]</h3>
- ][(#ENV{mode}|=={document}|oui)
+ ][(#ENV{_mode}|=={document}|oui)
<h3 class='titrem'>[(#CHEMIN_IMAGE{doc-24.png}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_document:>,<:medias:bouton_ajouter_document:>}) #AIDER{ins_doc}]</h3>
- ][(#ENV{mode}|=={choix}|oui)
+ ][(#ENV{_mode}|=={choix}|oui)
<h3 class='titrem'>[(#CHEMIN_IMAGE{doc-24.png}|balise_img{'',cadre-icone})][(#ENV{id,new}|intval|?{<:medias:bouton_remplacer_image_document:>,<:medias:bouton_ajouter_image_document:>}) #AIDER{ins_doc}]</h3>
]
<span class="image_loading"></span>
diff --git a/formulaires/joindre_document.php b/formulaires/joindre_document.php
index e420d01a..d3811fc9 100644
--- a/formulaires/joindre_document.php
+++ b/formulaires/joindre_document.php
@@ -30,7 +30,7 @@ function formulaires_joindre_document_charger_dist($id_document='new',$id_objet=
$mode = joindre_determiner_mode($mode,$id_document,$objet);
$valeurs['id'] = $id_document;
- $valeurs['mode'] = $mode;
+ $valeurs['_mode'] = $mode;
$valeurs['url'] = 'http://';
$valeurs['fichier_upload'] = '';
diff --git a/paquet.xml b/paquet.xml
index 65c2b6e5..3658af82 100644
--- a/paquet.xml
+++ b/paquet.xml
@@ -1,7 +1,7 @@
<paquet
prefix="medias"
categorie="multimedia"
- version="2.2.1"
+ version="2.2.2"
etat="test"
compatibilite="[3.0.0-alpha2;["
logo="prive/themes/spip/images/portfolio-32.png"
diff --git a/prive/style_prive_plugin_medias.html b/prive/style_prive_plugin_medias.html
index 357d0a1a..573bf1c9 100644
--- a/prive/style_prive_plugin_medias.html
+++ b/prive/style_prive_plugin_medias.html
@@ -20,6 +20,7 @@
#SET{left,#ENV{ltr}|choixsiegal{left,left,right}}
#SET{right,#ENV{ltr}|choixsiegal{left,right,left}}
+.formulaire_editer_document {margin-bottom: 0;}
.formulaire_editer_document .editer_dimensions input {width:7em;}
.formulaire_editer_document .editer_parent {padding-#GET{left}:10px;}
.formulaire_editer_document .editer_parent label {margin-#GET{left}:0;display:block;float:left;padding:2px 0;}
--
GitLab