From e08685ac4edf1f9a053de58cdd7336a4c1d92af5 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 15 Nov 2019 15:29:37 +0100
Subject: [PATCH] FEAT #12163 TIME 0:15 css forgot password on v1

---
 apps/maarch_entreprise/js/angularFunctions.js | 1 +
 apps/maarch_entreprise/standard_connect.php   | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/maarch_entreprise/js/angularFunctions.js b/apps/maarch_entreprise/js/angularFunctions.js
index d0470e90f7e..4890936f45c 100755
--- a/apps/maarch_entreprise/js/angularFunctions.js
+++ b/apps/maarch_entreprise/js/angularFunctions.js
@@ -10,6 +10,7 @@ function triggerAngular(locationToGo) {
     $j('body').removeAttr("id");
     $j('body').removeAttr("style");
     $j('body').removeAttr("onload");
+    $j('#bodyloginCustom').remove();
     $j.ajax({
         url: '../../rest/initialize',
         type: 'GET',
diff --git a/apps/maarch_entreprise/standard_connect.php b/apps/maarch_entreprise/standard_connect.php
index 567c882e816..f3e0248400d 100755
--- a/apps/maarch_entreprise/standard_connect.php
+++ b/apps/maarch_entreprise/standard_connect.php
@@ -31,13 +31,13 @@ echo '<form id="formlogin" method="post" action="'
                     echo '<label for="pass">'._PASSWORD.'</label>';
                     echo '<input name="pass" id="pass" value="" type="password"  />';
                 echo '</p>';
-                echo '<p>';
+                echo '<p style="cursor: pointer;font-size: 11px;">';
                 echo '<label>&nbsp;</label>';
-                    echo '<input type="submit" class="button" name="submit" value="'._CONNECT.'" />';
-                echo '</p>';
+                    echo '<span onclick="triggerAngular(\'#/forgot-password\')">'._FORGOT_PASSWORD.'</span>';
+                echo '</p><br>';
                 echo '<p>';
                 echo '<label>&nbsp;</label>';
-                    echo '<span onclick="triggerAngular(\'#/forgot-password\')">'._FORGOT_PASSWORD.'</span>';
+                    echo '<input type="submit" class="button" name="submit" value="'._CONNECT.'" />';
                 echo '</p>';
             echo '<div class="error">';
             if (isset($_SESSION['error'])) {
-- 
GitLab