Skip to content
Snippets Groups Projects
Commit ec9146b8 authored by Florian Azizian's avatar Florian Azizian
Browse files

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

parents c68f4800 5105279f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/maarch_entreprise/index.php
+ 14
− 12
View file @ ec9146b8
...@@ -222,18 +222,6 @@ if(empty($_SESSION['current_basket'])){ ...@@ -222,18 +222,6 @@ if(empty($_SESSION['current_basket'])){
$_SESSION['save_list']['order_field'] = ""; $_SESSION['save_list']['order_field'] = "";
$_SESSION['save_list']['template'] = ""; $_SESSION['save_list']['template'] = "";
} }
if (PROD_MODE) {
?>
<script src="js/angular/main.bundle.min.js"></script>
<?php
} else {
?>
<script>
System.import('js/angular/main.js').catch(function(err){ console.error(err); });
</script>
<?php
}
?> ?>
<body style="background: url('static.php?filename=loading_big.gif') no-repeat fixed center;" onload="$('maarch_body').style.background='f2f2f2';$('maarch_body').style.backgroundImage='';$('maarch_body').style.backgroundUrl='';$('maarch_content').style.display='block';session_expirate(<?php echo $time;?>, '<?php <body style="background: url('static.php?filename=loading_big.gif') no-repeat fixed center;" onload="$('maarch_body').style.background='f2f2f2';$('maarch_body').style.backgroundImage='';$('maarch_body').style.backgroundUrl='';$('maarch_content').style.display='block';session_expirate(<?php echo $time;?>, '<?php
...@@ -396,4 +384,18 @@ if (file_exists($path)) { ...@@ -396,4 +384,18 @@ if (file_exists($path)) {
</div> </div>
</div> </div>
</body> </body>
<?php
if (PROD_MODE) {
?>
<script src="js/angular/main.bundle.min.js"></script>
<?php
} else {
?>
<script>
System.import('js/angular/main.js').catch(function(err){ console.error(err); });
</script>
<?php
}
?>
</html> </html>
\ No newline at end of file
apps/maarch_entreprise/redirect_to_action.php
+ 1
− 1
View file @ ec9146b8
...@@ -5,7 +5,7 @@ $security = new security(); ...@@ -5,7 +5,7 @@ $security = new security();
$core_tools = new core_tools(); $core_tools = new core_tools();
$core_tools->load_lang(); $core_tools->load_lang();
$core_tools->load_html(); $core_tools->load_html();
$core_tools->load_header(); $core_tools->load_header('', false, false);
require_once("modules".DIRECTORY_SEPARATOR."basket".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php"); require_once("modules".DIRECTORY_SEPARATOR."basket".DIRECTORY_SEPARATOR."class".DIRECTORY_SEPARATOR."class_modules_tools.php");
$bask = new basket(); $bask = new basket();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment