From b0ee150e32c6edbd2946de327d552217a3e6be3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20S=C3=BC=C3=9Fenguth?=
 <christian.suessenguth@noreply.%(DOMAIN)s>
Date: Fri, 30 Apr 2021 18:33:04 +0200
Subject: [PATCH] Extended the explanations in the text, equalized the usage of
 terms like ECG account

---
 src/RequestReset.vue | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/RequestReset.vue b/src/RequestReset.vue
index 6e0ff9e..8aeaa2c 100644
--- a/src/RequestReset.vue
+++ b/src/RequestReset.vue
@@ -1,27 +1,28 @@
 <template>
     <div>
-        <h1>ECG user account</h1>
+        <h1>ECG account</h1>
         <h2>⚿ Password reset</h2>
-        <p>Here you can request a new password for your existing account.</p>
+        <p>Here you can request a new password for your ECG account.</p>
 
         <div class='mb-lg-5'>
             <div v-if="recentRequestTimestamp" class="alert alert-info" role="alert">
-                <p>A recent reset request has been sent on <mark>{{ recentRequestTimestamp }}</mark>.
-                    You can resend if the email didn't arrive.</p>
+                <p>A reset request has been sent recently at <mark>{{ recentRequestTimestamp }}</mark>.
+                    You can resend the request if you haven't got the email.</p>
 
                 <form method="POST" @submit.prevent="recentRequestTimestamp = null">
-                    <button class="btn btn-info" type="submit">⟳ Send again</button>
+                    <button class="btn btn-info" type="submit">⟳ Resend</button>
                 </form>
             </div>
             <template v-else>
                 <div v-if="requestFinished" class="alert alert-success" role="alert">
-                    Your request has been sent! You'll receive the email soon. 📬
+                    Your request has been sent! You should receive the email soon. 📬
+                    Please also check your spam mail folder.
                 </div>
                 <form v-else method="POST" class="col-md-10 mb-lg-5" @submit.prevent="onSubmit">
                     <fieldset :disabled="requestIsWorking">
                         <div class="row g-3">
                             <div class="col-auto">
-                                <label for="uid" class="col-form-label"><strong>ECG account ID:</strong></label>
+                                <label for="uid" class="col-form-label"><a href=""><strong>ECG account ID <a href="#faq-ecg-account-id">ℹ️</a>:</strong></label>
                             </div>
                             <div class="col-auto">
                                 <div class="input-group">
@@ -45,15 +46,24 @@
             </template>
         </div>
 
-        <h3 class="text-muted">How is it working?</h3>
+        <h3 class="text-muted">How it works?</h3>
         <p>
-            After submitting your ECG account ID you'll be sent an email to your private email address. It
-            contains a unique link to a web page where you can enter a new password for your account.
+            After submitting your request you'll get an email to your external email address <a href="#faq-external-email-address">ℹ️</a>, which is linked to your account. It contains an unique link to a web page where you can enter a new password for your account. This unique link will be valid for 48 hours.
         </p>
-        <h6>In the case of problems</h6>
+        <br />
+        <h5 class="text-muted" id="faq-ecg-account-id">What is my ECG account id?</h5>
         <p>
-            You can find <a href="https://wiki.ecogood.org/x/DYQjB" target="_blank">
-                a detailed explanation of the password reset process in the wiki</a>.
+            It's the part <strong>before</strong> "@ecogood.org" of your ECG account. Enter the ECG account ID in the format <cite>firstname.lastname</cite>. For a functional account like <cite>hamburg@ecogood.org</cite> it would be <cite>hamburg</cite>.
+        </p>
+        <br />
+        <h5 class="text-muted" id="faq-external-email-address">What is the external email address?</h5>
+        <p>
+            It was linked to your ECG account at the time of creation. Normally this is <strong>not</strong> your ECG email address as long as you aren't requesting access to a functional account like <cite>hamburg@ecogood.org</cite>. In case you want to alter this address please open a ticket at the <a href="https://wiki.ecogood.org/display/PUBLIC/IT-Support" target="_blank">IT support</a>.
+        </p>
+        <br />
+        <h5>In case of a problem</h5>
+        <p>
+            You find <a href="https://wiki.ecogood.org/x/DYQjB" target="_blank"> a detailed explanation of the whole password reset process</a> in the ECG Wiki.<br />For further help just open a ticket at the <a href="https://wiki.ecogood.org/display/PUBLIC/IT-Support" target="_blank">IT support</a>.
         </p>
     </div>
 </template>