FEAT change logo

d20db618 · Alex ORLUC · e07380d3 · d20db618 · e07380d3 · d20db618
Commit d20db618 authored 8 years ago by Alex ORLUC
--- 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 {

--- a/apps/maarch_entreprise/img/default_maarch.gif
+++ b/apps/maarch_entreprise/img/default_maarch.gif
--- a/apps/maarch_entreprise/img/default_nav_logo_maarch.gif
+++ b/apps/maarch_entreprise/img/default_nav_logo_maarch.gif
--- 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'] <> '') {
                ?>

--- a/modules/visa/xml/config.xml.default
+++ b/modules/visa/xml/config.xml.default
-<?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