diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php index 8bfc70e6e4ce77bd1eb2681a2dd9eb53bad7d157..1f55edb9b026d7ac30fd2dfc73648972a87cf19c 100755 --- a/apps/maarch_entreprise/index.php +++ b/apps/maarch_entreprise/index.php @@ -208,10 +208,10 @@ if ($_REQUEST['page'] && empty($_REQUEST['triggerAngular'])) { unset($_SESSION['HTTP_REFERER']); header('location: '.$url); } - $core->load_lang(); $core->load_html(); $core->load_header(); + echo '<my-app></my-app>'; $time = $core->get_session_time_expire(); /** @@ -311,8 +311,6 @@ if ($_REQUEST['page'] && empty($_REQUEST['triggerAngular'])) { $core->insert_page(); - echo '<my-app></my-app>'; - //FOOTER echo '<p id="footer">'; if (isset($_SESSION['config']['showfooter']) && $_SESSION['config']['showfooter'] == 'true') { diff --git a/src/frontend/app/app.component.ts b/src/frontend/app/app.component.ts index daa7eba11535e32619ffbca40ec135b4a57d5124..55589dafd8c92c34dfc364dff6d7aaa053f2b3a2 100755 --- a/src/frontend/app/app.component.ts +++ b/src/frontend/app/app.component.ts @@ -41,6 +41,7 @@ export class AppComponent { } /*REMOVE AFTER FULL MAARCH V2*/ + $j('#maarch_content').remove(); $j('#loadingAngularContent').remove(); $j('#header').remove(); $j('#inner_content').remove();