diff --git a/ecrire/action/joindre.php b/ecrire/action/joindre.php index e187efc936e8b2e5802705c66a6335dddaeb8a12..4ea227d27e233e7ff83aa5295d5480df2248fab2 100644 --- a/ecrire/action/joindre.php +++ b/ecrire/action/joindre.php @@ -60,7 +60,7 @@ function action_joindre_dist() $redirect = urldecode($redirect); if ($documents_actifs) { - $redirect = parametre_url($redirect,'show_docs',join(',',$documents_actifs)); + $redirect = parametre_url($redirect,'show_docs',join(',',$documents_actifs),'&'); } if (!$ancre) { diff --git a/ecrire/inc/dater.php b/ecrire/inc/dater.php index 1afeef63da7f5d77cb8bd42daef5269444d28c76..cc94e1ab2fcacf46ff5dd4e22c3d5d114c184d1b 100644 --- a/ecrire/inc/dater.php +++ b/ecrire/inc/dater.php @@ -138,6 +138,7 @@ onchange=\"findObj_forcer('valider_date').style.visibility='visible';\""; _T('bouton_changer'), " style='float: $spip_lang_right; margin-top: 20px;' class='fondo visible_au_chargement' id='valider_date_redac'", "&id=$id&type=$type") + ."<br class='nettoyeur' />" . '</div>'; $res .= block_parfois_visible('dateredac', $invite, $masque, 'text-align: left'); diff --git a/ecrire/inc/documents.php b/ecrire/inc/documents.php index f88aaea9d8cbe1251ee10ab2137ee13b6f5fd713..f70448f33f81371bd6767069b68dd7f0cbf5b50a 100644 --- a/ecrire/inc/documents.php +++ b/ecrire/inc/documents.php @@ -130,7 +130,7 @@ function afficher_documents_colonne($id, $type="article",$script=NULL) { if (_DIR_RESTREINT) $script = parametre_url(self(),"show_docs",''); } - + $id_document_actif = _request('show_docs'); /// Ajouter nouvelle image $ret .= "<a name='images'></a>\n"; @@ -182,7 +182,9 @@ function afficher_documents_colonne($id, $type="article",$script=NULL) { $ret .= "<p></p><div id='liste_documents'>\n"; foreach($documents_lies as $doc) { - $ret .= afficher_case_document($doc, $id, $script, $type, false); + $id_document = $doc['id_document']; + $deplier = $id_document_actif==$id_document; + $ret .= afficher_case_document($doc, $id, $script, $type, $deplier); } $ret .= "</div>"; if (!_DIR_RESTREINT){ @@ -365,7 +367,7 @@ function afficher_case_document($id_document, $id, $script, $type, $deplier=fals $ret .= $raccourci_doc; $legender = charger_fonction('legender', 'inc'); - $ret .= $legender($id_document, $document, $script, $type, $id, "document$id_document"); + $ret .= $legender($id_document, $document, $script, $type, $id, "document$id_document", $deplier); $ret .= fin_cadre_relief(true); } diff --git a/ecrire/inc/instituer_auteur.php b/ecrire/inc/instituer_auteur.php index 83cbd7ee45915f90a032c11edea7f1b2d59bf94b..e522a52b6c014bcb01bd6ac7ffeb2da945741787 100644 --- a/ecrire/inc/instituer_auteur.php +++ b/ecrire/inc/instituer_auteur.php @@ -103,7 +103,7 @@ function inc_instituer_auteur_dist($id_auteur, $statut, $url_self) . $res . "</div>"; - $res = ajax_action_post('instituer_auteur', $id_auteur, $url_self, (!$id_auteur ? "" : "id_auteur=$id_auteur"), $res, _T('bouton_valider'), " style='float: $spip_lang_right' class='fondo'"); + $res = ajax_action_post('instituer_auteur', $id_auteur, $url_self, (!$id_auteur ? "" : "id_auteur=$id_auteur"), $res, _T('bouton_valider'), " style='float: $spip_lang_right' class='fondo'")."<br class='nettoyeur' />"; } return (_request('var_ajaxcharset')) diff --git a/ecrire/inc/legender.php b/ecrire/inc/legender.php index 22e1b2c92340193fa4306bbd9665a5f0c9e26ba5..d3402ebda7b345f7268cce43281fd8194cbaf3c6 100644 --- a/ecrire/inc/legender.php +++ b/ecrire/inc/legender.php @@ -97,15 +97,38 @@ function inc_legender_dist($id_document, $document, $script, $type, $id, $ancre, . $GLOBALS['spip_lang_right'] . "'"; - $corps = ajax_action_post("legender", $id_document, $script, "show_docs=$id_document&id_$type=$id#legender-$id_document", $corps, _T('bouton_enregistrer'), $att, "&id_document=$id_document&id=$id&type=$type&ancre=$ancre") - . $vignette . "\n\n"; + if (!_DIR_RESTREINT) + $corps = ajax_action_post("legender", $id_document, $script, "show_docs=$id_document&id_$type=$id#legender-$id_document", $corps, _T('bouton_enregistrer'), $att, "&id_document=$id_document&id=$id&type=$type&ancre=$ancre") + . "<br class='nettoyeur' />"; + else { + $corps = "<div>" + . $corps + . "<span" + . $att + . "><input type='submit' class='fondo' value='" + . _T('bouton_enregistrer') + ."' /></span><br class='nettoyeur' /></div>"; + $redirect = parametre_url($script,'show_docs',$id_document,'&'); + $redirect = parametre_url($redirect,"id_$type",$id,'&'); + $redirect = parametre_url($redirect,"id_$type",$id,'&'); + $redirect = ancre_url($redirect,"legender-$id_document"); + $corps = generer_action_auteur("legender", $id_document, $redirect, $corps, "\nmethod='post'"); + } + + $corps .= $vignette . "\n\n"; $texte = _T('icone_supprimer_document'); if (preg_match('/_edit$/', $script)) $action = redirige_action_auteur('supprimer', "document-$id_document", $script, "id_$type=$id#$ancre"); else { $s = ($ancre =='documents' ? '': '-'); - $action = ajax_action_auteur('documenter', "$s$id/$type/$id_document", $script, "id_$type=$id&type=$type&s=$s#$ancre", array($texte)); + if (!_DIR_RESTREINT) + $action = ajax_action_auteur('documenter', "$s$id/$type/$id_document", $script, "id_$type=$id&type=$type&s=$s#$ancre", array($texte)); + else{ + $redirect = str_replace('&','&',$script); + $action = generer_action_auteur('documenter', "$s$id/$type/$id_document", $redirect); + $action = "<a href='$action'>$texte</a>"; + } } // le cas $id<0 correspond a un doc charge dans un article pas encore cree, diff --git a/ecrire/inc/virtualiser.php b/ecrire/inc/virtualiser.php index ed60828c507c55334ffb913f8fbf4a8dcf6be5f5..53db528eeb1879bc9f7046f3cb9ff8c94b86edb8 100644 --- a/ecrire/inc/virtualiser.php +++ b/ecrire/inc/virtualiser.php @@ -31,7 +31,8 @@ function inc_virtualiser_dist($id_article, $flag, $virtuel, $script, $args) . _T('texte_reference_mais_redirige') . ")</span><br />"; - $res = ajax_action_post('virtualiser', $id_article, $script, $args, $res, _T('bouton_changer'), " class='fondo spip_xx-small' style='float: $spip_lang_right'"); + $res = ajax_action_post('virtualiser', $id_article, $script, $args, $res, _T('bouton_changer'), " class='fondo spip_xx-small' style='float: $spip_lang_right'") + . "<br class='nettoyeur' />"; return ajax_action_greffe("virtualiser-$id_article", $res); } ?>