From aa0a172f737ab18e0eb41ea6c043d4927bc77451 Mon Sep 17 00:00:00 2001
From: renato <renato@rezo.net>
Date: Wed, 1 Nov 2006 22:21:09 +0000
Subject: [PATCH] documents, images and icons are uploaded without reloading
the section page
---
dist/javascript/async_upload.js | 2 +-
ecrire/exec/articles.php | 2 +-
ecrire/exec/naviguer.php | 14 ++++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/dist/javascript/async_upload.js b/dist/javascript/async_upload.js
index 1d9417c1a7..bb6e1919c6 100644
--- a/dist/javascript/async_upload.js
+++ b/dist/javascript/async_upload.js
@@ -102,7 +102,7 @@ function async_upload_icon(res) {
return true;
}
-function async_upload_article(res){
+function async_upload_portfolio_documents(res){
res.find(">div").each(function(){
var cont = $("#"+this.id);
var self = $(this);
diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php
index e78f5e139a..9250167b0b 100644
--- a/ecrire/exec/articles.php
+++ b/ecrire/exec/articles.php
@@ -191,7 +191,7 @@ function articles_documents($flag_editable, $type, $id)
$res .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n";
$res .= <<<EOF
<script type='text/javascript'>
- $(".form_upload").async_upload(async_upload_article);
+ $(".form_upload").async_upload(async_upload_portfolio_documents);
</script>
EOF;
diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php
index 997b4ae328..fc5ac147b2 100644
--- a/ecrire/exec/naviguer.php
+++ b/ecrire/exec/naviguer.php
@@ -72,7 +72,7 @@ function exec_naviguer_dist()
//
if ($flag_editable AND ($spip_display != 4)) {
$iconifier = charger_fonction('iconifier', 'inc');
- echo $iconifier('id_rubrique', $id_rubrique, 'naviguer');
+ echo $iconifier('id_rubrique', $id_rubrique, 'naviguer','iconifier');
}
//
@@ -378,7 +378,7 @@ function naviguer_doc ($id, $type = "article", $script, $flag_editable) {
$f = charger_fonction('joindre', 'inc');
$res = debut_cadre_relief("image-24.gif", true, "", _T('titre_joindre_document'))
- . $f($script, "id_$type=$id", $id, _T('info_telecharger_ordinateur'), 'document', $type)
+ . $f($script, "id_$type=$id", $id, _T('info_telecharger_ordinateur'), 'document', $type,'',0,generer_url_ecrire("documenter","id_rubrique=$id&type=$type",true))
. fin_cadre_relief(true);
// eviter le formulaire upload qui se promene sur la page
@@ -389,12 +389,18 @@ function naviguer_doc ($id, $type = "article", $script, $flag_editable) {
$align = " align='right'";
}
$res = "<div$align>$res</div>";
+ $res .= "<script src='"._DIR_JAVASCRIPT."async_upload.js' type='text/javascript'></script>\n";
+ $res .= <<<EOF
+ <script type='text/javascript'>
+ $(".form_upload").async_upload(async_upload_portfolio_documents);
+ </script>
+EOF;
} else $res ='';
$f = charger_fonction('documenter', 'inc');
- return $f($id, $type, 'portfolio', $flag_editable)
- . $f($id, $type, 'documents', $flag_editable)
+ return "<div id='portfolio'>".$f($id, $type, 'portfolio', $flag_editable)."</div>"
+ ."<div id='documents'>". $f($id, $type, 'documents', $flag_editable)."</div>"
. $res;
}
--
GitLab