diff --git a/ecrire/exec/articles.php b/ecrire/exec/articles.php index 4cff5b6aa45f0ca2af945937eed1c31380b7f375..7d29f1b7212637aefae48d15c8728acae938b211 100644 --- a/ecrire/exec/articles.php +++ b/ecrire/exec/articles.php @@ -172,7 +172,6 @@ function articles_documents($flag_editable, $type, $id) { global $spip_lang_left; - $multi_js = ""; if ($GLOBALS['meta']["documents_$type"]!='non' AND $flag_editable) { $joindre = charger_fonction('joindre', 'inc'); @@ -196,22 +195,11 @@ function articles_documents($flag_editable, $type, $id) $("form.form_upload").async_upload(async_upload_portfolio_documents); </script> EOF; - if($GLOBALS['meta']['multi_rubriques']=="oui" || $GLOBALS['meta']['multi_articles']=="oui" || $GLOBALS['meta']['multi_secteurs']=="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'#portfolio,#documents','forms':'form:not(.form_upload)','fields':'input,textarea'});\n". - "onAjaxLoad(function(){forms_init_multi({'target':this})});\n". - "});\n". - "</script>\n"; - } } else $res = ''; $documenter = charger_fonction('documenter', 'inc'); - return $multi_js."<div id='portfolio'>" . $documenter($id, 'article', 'portfolio', $flag_editable) . "</div>" + return "<div id='portfolio'>" . $documenter($id, 'article', 'portfolio', $flag_editable) . "</div>" . "<div id='documents'>" . $documenter($id, 'article', 'documents', $flag_editable) . "</div>" . $res; } diff --git a/ecrire/exec/articles_edit.php b/ecrire/exec/articles_edit.php index ba20c3298a6f7af6e64c86ce165a5fc4e1bb604a..f84d534d74fd7861aaaa15a83daffa505e10f118 100644 --- a/ecrire/exec/articles_edit.php +++ b/ecrire/exec/articles_edit.php @@ -57,19 +57,6 @@ function articles_edit($id_article, $id_rubrique,$lier_trad, $id_version, $new, debut_gauche(); // Pave "documents associes a l'article" - $multi_js = ""; - if($GLOBALS['meta']['multi_rubriques']=="oui" || $GLOBALS['meta']['multi_articles']=="oui" || $GLOBALS['meta']['multi_secteurs']=="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'#page','forms':'#liste_images form,#liste_documents form','fields':'input,textarea'});\n". - "onAjaxLoad(function(){forms_init_multi({'target':this})});\n". - "});\n". - "</script>\n"; - } - echo $multi_js; if (!$new){ # affichage sur le cote des pieces jointes, en reperant les inserees diff --git a/ecrire/exec/mots_edit.php b/ecrire/exec/mots_edit.php index fd91f61ab50eb9e07c5259baeea9409d3b04f221..21e16c0f8f274ac5d3576a34775c995b3580a061 100644 --- a/ecrire/exec/mots_edit.php +++ b/ecrire/exec/mots_edit.php @@ -59,19 +59,6 @@ global $commencer_page = charger_fonction('commencer_page', 'inc'); $out .= $commencer_page("« $titre_mot »", "naviguer", "mots"); - $multi_js = ""; - if($GLOBALS['meta']['multi_rubriques']=="oui" || $GLOBALS['meta']['multi_articles']=="oui" || $GLOBALS['meta']['multi_secteurs']=="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'.cadre-formulaire','fields':'input[@name=\'titre\'],textarea'});\n". - "});\n". - "</script>\n"; - } - $out .= $multi_js; - $out .= debut_gauche('',true); diff --git a/ecrire/exec/mots_type.php b/ecrire/exec/mots_type.php index a70fcea0e7fbd3c605f67219f4c498dbf693cd6a..e849745aa413e9610d07e2315149b724a9abcc17 100644 --- a/ecrire/exec/mots_type.php +++ b/ecrire/exec/mots_type.php @@ -60,20 +60,6 @@ function exec_mots_type_dist() $commencer_page = charger_fonction('commencer_page', 'inc'); echo $commencer_page("« $titre »", "naviguer", "mots"); - $multi_js = ""; - if($GLOBALS['meta']['multi_rubriques']=="oui" || $GLOBALS['meta']['multi_articles']=="oui" || $GLOBALS['meta']['multi_secteurs']=="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'#page','form_menu':'div.cadre-formulaire:eq(0)','fields':'input[@name=\'change_type\'],textarea'});\n". - "});\n". - "</script>\n"; - } - echo $multi_js; - - debut_gauche(); echo pipeline('affiche_gauche',array('args'=>array('exec'=>'mots_types','id_groupe'=>$id_groupe),'data'=>'')); diff --git a/ecrire/exec/naviguer.php b/ecrire/exec/naviguer.php index cf0dfbb20034ef599bf87f6e33171497bc8e3462..3fba3530e9ddb691b313fce078467bc15a8bd1ea 100644 --- a/ecrire/exec/naviguer.php +++ b/ecrire/exec/naviguer.php @@ -365,7 +365,6 @@ function contenu_naviguer($id_rubrique, $id_parent) { function naviguer_doc ($id, $type = "article", $script, $flag_editable) { global $spip_lang_left; - $multi_js = ""; if ($GLOBALS['meta']["documents_$type"]!='non' AND $flag_editable) { $joindre = charger_fonction('joindre', 'inc'); @@ -387,22 +386,11 @@ function naviguer_doc ($id, $type = "article", $script, $flag_editable) { $(".form_upload").async_upload(async_upload_portfolio_documents); </script> EOF; - if($GLOBALS['meta']['multi_rubriques']!="oui" && $GLOBALS['meta']['multi_secteurs']!="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'#portfolio,#documents','forms':'form:not(.form_upload)','fields':'input,textarea'});\n". - "onAjaxLoad(function(){forms_init_multi({'target':this})});\n". - "});\n". - "</script>\n"; - } } else $res =''; $documenter = charger_fonction('documenter', 'inc'); - return $multi_js."<div id='portfolio'>".$documenter($id, $type, 'portfolio', $flag_editable)."</div>" + return "<div id='portfolio'>".$documenter($id, $type, 'portfolio', $flag_editable)."</div>" ."<div id='documents'>". $documenter($id, $type, 'documents', $flag_editable)."</div>" . $res; } diff --git a/ecrire/exec/rubriques_edit.php b/ecrire/exec/rubriques_edit.php index 1d91e76d04c94dab4c1e544d934ac40ba0ef69f1..cc497986d5251843dc22c37b28f5dbdbd28dbfdd 100644 --- a/ecrire/exec/rubriques_edit.php +++ b/ecrire/exec/rubriques_edit.php @@ -82,19 +82,6 @@ function exec_rubriques_edit_dist() debut_gauche(); // Pave "documents associes a la rubrique" - $multi_js = ""; - if($GLOBALS['meta']['multi_rubriques']!="oui" && $GLOBALS['meta']['multi_secteurs']!="oui") { - $active_langs = "'".str_replace(",","','",$GLOBALS['meta']['langues_multilingue'])."'"; - $multi_js = "<script type='text/javascript' src='"._DIR_JAVASCRIPT."multilang.js'></script>\n". - "<script type='text/javascript'>\n". - "var multilang_def_lang='".$GLOBALS["spip_lang"]."';var multilang_avail_langs=[$active_langs];\n". - "$(function(){\n". - "multilang_init_lang({'root':'#page','forms':'#liste_images form,#liste_documents form:not(.form_upload) , div.cadre-formulaire form','fields':'input,textarea'});\n". - "onAjaxLoad(function(){forms_init_multi({'target':this})});\n". - "});\n". - "</script>\n"; - } - echo $multi_js; if (!$new){ # affichage sur le cote des pieces jointes, en reperant les inserees