diff --git a/formulaires/joindre_document.php b/formulaires/joindre_document.php index b385ba702326e785b83a46b6fbc9106aa4868c58..bba8e121c566f0d2f68df89fdaab6b8c99ccdd2c 100644 --- a/formulaires/joindre_document.php +++ b/formulaires/joindre_document.php @@ -201,9 +201,9 @@ function formulaires_joindre_document_traiter_dist($id_document='new',$id_objet= $callback .= "jQuery('#doc$ancre a.editbox').get(0).focus();"; if (count($sel)){ $sel = "#doc".implode(",#doc",$sel); - $callback .= "jQuery('$sel').addClass('append').animeAppend();"; + $callback .= "jQuery('$sel').animateAppend();"; } - $js = "if (window.jQuery) jQuery(function(){ajaxReload('documents',function(){ $callback });});"; + $js = "if (window.jQuery) jQuery(function(){ajaxReload('documents',{callback:function(){ $callback }});});"; $js = "<script type='text/javascript'>$js</script>"; $res['message_ok'] .= $js; } @@ -265,7 +265,7 @@ function joindre_options_upload_ftp($dir, $mode = 'document') { $lefichier . "</option>"; } - } + } $texte = join('', $texte_upload); if (count($texte_upload)>1) { diff --git a/modeles/document_case.html b/modeles/document_case.html index 0929d8cafc08b890b4097b4f927cf24e79247777..59fa3f8b1be3416672ef137b683b6f765eea5a3e 100644 --- a/modeles/document_case.html +++ b/modeles/document_case.html @@ -36,7 +36,6 @@ ] </div>] <div class="actions"> - <a href="[(#SELF|parametre_url{timestamp,#REM|time})]" class="refresh none ajax"><:medias:bouton_refresh_document:></a> <BOUCLE_compte(documents_liens){id_document}{0,2} /> [(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{modifier,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>})]<span>|</span>] [(#AUTORISER{modifier,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax})]<span>|</span>] diff --git a/modeles/document_desc.html b/modeles/document_desc.html index 33b6038b7c25804aa9b377d903ca6ca999467c8f..a52f10bb3876ef929f73a1e94b799652ec7f9e3e 100644 --- a/modeles/document_desc.html +++ b/modeles/document_desc.html @@ -32,7 +32,6 @@ ] </div>] <div class="actions"> - <a href="[(#SELF|parametre_url{timestamp,#REM|time})]" class="refresh none ajax"><:medias:bouton_refresh_document:></a> <BOUCLE_compte(documents_liens){id_document}{0,2} /> [(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{modifier,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){$("#doc(#ID_DOCUMENT)").animeRemove();return true;})()]})]<span>|</span>] [(#AUTORISER{modifier,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax,'','',[(function(){$("#doc(#ID_DOCUMENT)").animeRemove();return true;})()]})]<span>|</span>] diff --git a/prive/squelettes/inclure/colonne-documents.html b/prive/squelettes/inclure/colonne-documents.html index 19177ed4b46dccfdb3c1f068e8bc4b8afb9d8920..ec3d3aa8d50cbb9cc1744bca416cf61e5fd3f425 100644 --- a/prive/squelettes/inclure/colonne-documents.html +++ b/prive/squelettes/inclure/colonne-documents.html @@ -14,10 +14,10 @@ function editbox_init(){ jQuery('a.editbox:not(.nobox)') .attr("onclick","").addClass('nobox').click(function(){ - var casedoc = jQuery(this).parents('div.item.document,div.item.image').eq(0); - jQuery(casedoc).animeajax(); - jQuery.modalboxload(jQuery(this).attr('href'),{ - onClose: function (dialog) {var a = jQuery(casedoc).find('a.refresh');if (a.length) a.click();} + var casedoc = jQuery(this).parents('div.item').eq(0); + jQuery(casedoc).animateLoading(); + jQuery.modalboxload(parametre_url(jQuery(this).attr('href'),'var_zajax','contenu'),{ + onClose: function (dialog) {jQuery(casedoc).ajaxReload();} }); return false; }); diff --git a/prive/squelettes/inclure/portfolio-documents.html b/prive/squelettes/inclure/portfolio-documents.html index fb5d9dbdd845b9f6cf6312f2731320dd924ff7d5..a57c7f59864700bef200e43af22786ed4385c552 100644 --- a/prive/squelettes/inclure/portfolio-documents.html +++ b/prive/squelettes/inclure/portfolio-documents.html @@ -43,17 +43,17 @@ </B_documents> <script type="text/javascript"> -function editbox_init(){ - jQuery('a.editbox:not(.nobox)') - .attr("onclick","").addClass('nobox').click(function(){ - var casedoc = jQuery(this).parents('div.item').eq(0); - jQuery(casedoc).animeajax(); - jQuery.modalboxload(jQuery(this).attr('href'),{ - onClose: function (dialog) {var a = jQuery(casedoc).find('a.refresh');if (a.length) a.click();} + function editbox_init(){ + jQuery('a.editbox:not(.nobox)') + .attr("onclick","").addClass('nobox').click(function(){ + var casedoc = jQuery(this).parents('div.item').eq(0); + jQuery(casedoc).animateLoading(); + jQuery.modalboxload(parametre_url(jQuery(this).attr('href'),'var_zajax','contenu'),{ + onClose: function (dialog) {jQuery(casedoc).ajaxReload();} + }); + return false; }); - return false; - }); -} + } if (window.jQuery) (function($){if(typeof onAjaxLoad == "function") onAjaxLoad(editbox_init); $(editbox_init);