diff --git a/dist/javascript/async_upload.js b/dist/javascript/async_upload.js index 1d9417c1a7afbad5e0a946874d683d9c03763e40..bb6e1919c6264637a2c747f6817b647d52e0f2f3 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 e78f5e139ad093d2035c5c4449509868b3118950..9250167b0bc1464737323e1da47c0c70c953a0a4 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 997b4ae32831b2167057a0a89ed09986b06d9d56..fc5ac147b236986d30e78f8516910bf4b4d01e81 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; }