From 43ff79179c65e075f81ada269c57148caf49064a Mon Sep 17 00:00:00 2001 From: Rooty Date: Sat, 17 Dec 2022 11:46:20 +0100 Subject: [PATCH] Fixed issue #99 --- lib/object_coordination/home/home.php | 5 +++++ lib/package/package.template.php | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/object_coordination/home/home.php b/lib/object_coordination/home/home.php index f8b74e8..3837854 100755 --- a/lib/object_coordination/home/home.php +++ b/lib/object_coordination/home/home.php @@ -151,6 +151,11 @@ Class Home extends CoordinationObj } else { if( recupCommunity() == 2 ) $currentCommunity = "Qware"; else $currentCommunity = recupCommunity(false, "lib"); mxPageTitle("methodActionLectureHomeTitlePage", $currentCommunity); + + /* None CSS or JS added */ + mxCallCss(''); + mxCallJs(''); + mxRawJs(''); /* On inclus la template (voir package.template.php) */ withBlocPath("Home", "actionLectureInfo"); diff --git a/lib/package/package.template.php b/lib/package/package.template.php index 58f81a9..323861f 100755 --- a/lib/package/package.template.php +++ b/lib/package/package.template.php @@ -305,10 +305,10 @@ function mxPageHeaders($title, $keywords, $description, $classification, $author */ function mxCallCss($arrayCallCss) { -// if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("CSSLOAD") && is_array($arrayCallCss) && count($arrayCallCss)>0 ) - if ( is_array($arrayCallCss) && count($arrayCallCss)>0 ) + if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("CSSLOAD") && is_array($arrayCallCss) && count($arrayCallCss)>0 ) + // if ( is_array($arrayCallCss) && count($arrayCallCss)>0 ) { - $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt"); + $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/css.mxt"); $GLOBALS["SYSTEM_TEMPLATE"]->WithMxPath("CSSLOAD", "appe"); for ($j=0; $jWithMxPath(""); return true; } else { - $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."css.mxt"); + $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("CSSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."headers/css.mxt"); $GLOBALS['SYSTEM_TEMPLATE']->MxBloc("CSSLOAD", "delete"); return false; } @@ -343,8 +343,8 @@ function mxCallCss($arrayCallCss) */ function mxCallJs($arrayCallJs) { -// if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSLOAD") && is_array($arrayCallJs) && count($arrayCallJs)>0 ) - if ( is_array($arrayCallJs) && count($arrayCallJs)>0 ) + if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSLOAD") && is_array($arrayCallJs) && count($arrayCallJs)>0 ) + // if ( is_array($arrayCallJs) && count($arrayCallJs)>0 ) { // var_dump($arrayCallJs); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."js.mxt"); @@ -383,8 +383,8 @@ function mxCallJs($arrayCallJs) function mxRawJs($arrayRawJs) { // var_dump($arrayRawJs); -// if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSRAWLOAD") && is_array($arrayRawJs) && count($arrayRawJs)>0 ) - if ( is_array($arrayRawJs) && count($arrayRawJs)>0 ) + if ( $GLOBALS["SYSTEM_TEMPLATE"]->isMxBloc("JSRAWLOAD") && is_array($arrayRawJs) && count($arrayRawJs)>0 ) + // if ( is_array($arrayRawJs) && count($arrayRawJs)>0 ) { // var_dump($arrayRawJs); $GLOBALS["SYSTEM_TEMPLATE"]->MxBloc("JSRAWLOAD", "modify", $GLOBALS['SYSTEM_TEMPLATE_PATH'].$GLOBALS['SYSTEM_TEMPLATE_DIR']."jsraw.mxt");