diff --git a/apps/maarch_entreprise/js/angularFunctions.js b/apps/maarch_entreprise/js/angularFunctions.js index d0470e90f7efd4f1c01d05a261ed846a8792171d..4890936f45ce7a5f2d79c91c10113fcc037f2b14 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 567c882e8165fb0075a3eaa02c4d4d9adadd205d..f3e0248400d55488044110efdb8f80d1bf227106 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> </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> </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'])) {