diff --git a/apps/maarch_entreprise/css/styles.css b/apps/maarch_entreprise/css/styles.css
index 73be7024f598b1ad1f3ffb6002d604746e180ea2..3bbf26cf027e231a90434f10bbd04c1b17317088 100644
--- a/apps/maarch_entreprise/css/styles.css
+++ b/apps/maarch_entreprise/css/styles.css
@@ -1053,6 +1053,10 @@ th.ref {
padding-top: 0px;
}
+#logo img{
+ width: 100%;
+}
+
#nav #logo{
float: right;
right: 0px;
@@ -1525,19 +1529,18 @@ vertical-align: middle;
#bodylogin {
background: White url(static.php?filename=bg_home_home.gif) center center no-repeat;
- height: 100%;
+ height: auto;
text-align: left;
}
#loginpage {
width: 300px;
- height: 350px;
- margin-left: -150px;
- margin-top: -175px;
- left: 50%;
- top: 72%;
- position: absolute;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 50vh; /* poussé de la moitié de hauteur de viewport */
+ transform: translateY(-25%); /* tiré de la moitié de sa propre hauteur */
+
}
#formlogin {
diff --git a/apps/maarch_entreprise/img/default_maarch.gif b/apps/maarch_entreprise/img/default_maarch.gif
index 879a00a9dae13f623d2c9a7711b589c27b49599c..c9326e6ea7a23758e0da8c0164930a8fa71194f2 100644
Binary files a/apps/maarch_entreprise/img/default_maarch.gif and b/apps/maarch_entreprise/img/default_maarch.gif differ
diff --git a/apps/maarch_entreprise/img/default_nav_logo_maarch.gif b/apps/maarch_entreprise/img/default_nav_logo_maarch.gif
index 879a00a9dae13f623d2c9a7711b589c27b49599c..c9326e6ea7a23758e0da8c0164930a8fa71194f2 100644
Binary files a/apps/maarch_entreprise/img/default_nav_logo_maarch.gif and b/apps/maarch_entreprise/img/default_nav_logo_maarch.gif differ
diff --git a/apps/maarch_entreprise/login.php b/apps/maarch_entreprise/login.php
index eca6d0cc628914dbde05bfbdae3933f0b73f31ad..dd3eb193a9783bc9fdd93e585270597a231ae5e5 100644
--- a/apps/maarch_entreprise/login.php
+++ b/apps/maarch_entreprise/login.php
@@ -121,6 +121,27 @@ if (isset($_SESSION['error'])) {
?>
<?php $core->load_js();?>
<body id="bodylogin" onload="session_expirate(<?php echo $time;?>, '<?php echo $_SESSION['config']['coreurl'];?>');">
+ <?php
+ if(isset($_SESSION['error'])) {
+ ?>
+ <div class="error" id="main_error_popup" onclick="this.hide();">
+ <?php
+ functions::xecho($_SESSION['error']);
+ ?>
+ </div>
+ <?php
+ }
+
+ if(isset($_SESSION['info'])) {
+ ?>
+ <div class="info" id="main_info" onclick="this.hide();">
+ <?php
+ functions::xecho($_SESSION['info']);
+ ?>
+ </div>
+ <?php
+ }
+ ?>
<div id="loginpage">
<p id="logo"><img src="<?php
echo $_SESSION['config']['businessappurl'];
@@ -131,25 +152,6 @@ if (isset($_SESSION['error'])) {
</h3>
</div>
<?php
- if(isset($_SESSION['error'])) {
- ?>
- <div class="error" id="main_error_popup" onclick="this.hide();">
- <?php
- functions::xecho($_SESSION['error']);
- ?>
- </div>
- <?php
- }
-
- if(isset($_SESSION['info'])) {
- ?>
- <div class="info" id="main_info" onclick="this.hide();">
- <?php
- functions::xecho($_SESSION['info']);
- ?>
- </div>
- <?php
- }
if(isset($_SESSION['error']) && $_SESSION['error'] <> '') {
?>
diff --git a/modules/visa/xml/config.xml.default b/modules/visa/xml/config.xml.default
deleted file mode 100644
index c51c63be4de712846e38f8b8b7db8420f0e7226f..0000000000000000000000000000000000000000
--- a/modules/visa/xml/config.xml.default
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <CONFIG>
- <name>visa</name>
- <comment>_VISA_WORKFLOW_COMMENT</comment>
- <loaded>true</loaded>
- <routing_template>modules/visa/Bordereau_visa_modele.pdf</routing_template>
-
- <exeSign>C:\Program Files (x86)\Maarch\DIS\DISPDFSigner.exe</exeSign>
- <showAppletSign>false</showAppletSign>
- <reason>Signé et approuvé par </reason>
- <location>Miviludes, Services du Premier Ministre</location>
-
- <licence_number>40dd49384bf59e98d10d</licence_number>
-
- <width_blocsign>150</width_blocsign>
- <height_blocsign>100</height_blocsign>
- </CONFIG>
-</root>
\ No newline at end of file