From 9bf98feed497358aa164e40a7dfbfc5520518ab0 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 3 Oct 2018 22:07:19 +0200
Subject: [PATCH] FEAT move <my-app> outside maarch v1
---
apps/maarch_entreprise/index.php | 4 +---
src/frontend/app/app.component.ts | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index 8bfc70e6e4c..1f55edb9b02 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 daa7eba1153..55589dafd8c 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();
--
GitLab