From ee75c525fc9333f2b4dce5ae0a8aebd734958b39 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 18 Dec 2019 13:30:51 +0100
Subject: [PATCH] Improve password reset

---
 eelo/core/js/eelo.js          |  6 ++++++
 eelo/core/l10n/de.json        |  3 ++-
 eelo/core/l10n/fr.json        |  3 ++-
 eelo/core/templates/login.php | 12 ++++++++++--
 4 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 eelo/core/js/eelo.js

diff --git a/eelo/core/js/eelo.js b/eelo/core/js/eelo.js
new file mode 100644
index 00000000..3a364725
--- /dev/null
+++ b/eelo/core/js/eelo.js
@@ -0,0 +1,6 @@
+$(document).ready(function () {
+    document.getElementById('lost-password').addEventListener('mouseup', e => {
+        document.getElementById('user').value = "";
+    });
+});
+
diff --git a/eelo/core/l10n/de.json b/eelo/core/l10n/de.json
index 9022036d..2648a04b 100755
--- a/eelo/core/l10n/de.json
+++ b/eelo/core/l10n/de.json
@@ -1,5 +1,6 @@
 {
   "translations": {
-    "Email (eg user@e.email)" : "Email (zB name@e.email)"
+    "Email (eg user@e.email)" : "Email (zB name@e.email)",
+    "Please enter your full username@e.email address in this field" : "Bitte gib deine vollständige nutzername@e.email Address ein"
   }
 }
diff --git a/eelo/core/l10n/fr.json b/eelo/core/l10n/fr.json
index 3bfb9470..fd1e3c04 100755
--- a/eelo/core/l10n/fr.json
+++ b/eelo/core/l10n/fr.json
@@ -1,5 +1,6 @@
 {
   "translations": {
-    "Email (eg user@e.email)" : "Email (ex: nom@e.email)"
+    "Email (eg user@e.email)" : "Email (ex: nom@e.email)",
+    "Please enter your full username@e.email address in this field" : "Veuillez saisir votre adresse complète nomdutilisateur@e.email dans ce champ"
   }
 }
diff --git a/eelo/core/templates/login.php b/eelo/core/templates/login.php
index 14d9ce0b..60c07ea0 100755
--- a/eelo/core/templates/login.php
+++ b/eelo/core/templates/login.php
@@ -2,6 +2,7 @@
 <?php
 vendor_script('jsTimezoneDetect/jstz');
 script('core', 'merged-login');
+script('core', 'eelo');
 
 use OC\Core\Controller\LoginController;
 ?>
@@ -78,8 +79,15 @@ use OC\Core\Controller\LoginController;
 
 		<?php if (!empty($_['canResetPassword'])) { ?>
 		<div id="reset-password-wrapper" style="display: none;">
-			<input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" />
-			<div class="submit-icon icon-confirm-white"></div>
+            <div style="display: block;"> <!-- sorry but i have no clue how flexbox works -->
+                <div class="warning">
+                    <?php p($l->t('Please enter your full username@e.email address in this field')); ?>
+                </div>
+                <div>
+                    <input type="submit" id="reset-password-submit" class="login primary" title="" value="<?php p($l->t('Reset password')); ?>" disabled="disabled" />
+                </div>
+                <div class="submit-icon icon-confirm-white"></div>
+            </div>
 		</div>
 		<?php } ?>
 
-- 
GitLab