Merge remote-tracking branch 'refs/remotes/origin/feature/user-manage…

…r-updates' into feature/user-manager-updates
SADiLaR · Jul 30, 2024 · 69b5fb3 · 69b5fb3
2 parents 2fd5a4b + 7bc0ac2
commit 69b5fb3
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 25 deletions.
diff --git a/app/templates/accounts/activate.html b/app/templates/accounts/activate.html
@@ -6,8 +6,14 @@
 
 {% block content %}
     <div class="container">
-        <h1>Account Activated</h1>
-        <p>Your account has been successfully activated. You can now log in using your credentials.</p>
-        <a href="{% url 'accounts:login' %}">Login</a>
+      <div class="section mt-3 mb-3">
+          <div class="card body-card">
+              <div class="user-account-body">
+                <h1>{% trans "Account Activated " %}</h1>
+                <p>{% trans "Your account has been successfully activated. You can now log in using your credentials. "%}</p>
+                <a href="{% url 'accounts:login' %}">{% trans "Login" %}</a>
+              </div>
+          </div>
+      </div>
     </div>
 {% endblock %}
diff --git a/app/templates/accounts/activation_invalid.html b/app/templates/accounts/activation_invalid.html
@@ -9,10 +9,10 @@
         <div class="section mt-3 mb-3">
             <div class="card body-card">
                 <div class="user-account-body">
-                    <h2>Activation Invalid</h2>
-                    <p>Sorry, but the activation link you used is invalid or has expired.</p>
-                    <p>Please request a new activation link or contact support for further assistance.</p>
-                    <a href="{% url 'accounts:accounts_register' %}">Register</a> | <a href="{% url 'accounts:login' %}">Login</a>
+                    <h2>{% trans "Activation Invalid" %}</h2>
+                    <p>{% trans "Sorry, but the activation link you used is invalid or has expired." %}</p>
+                    <p>{% trans "Please request a new activation link or contact support for further assistance." %}</p>
+                    <a href="{% url 'accounts:accounts_register' %}">{% trans "Register" %}</a> | <a href="{% url 'accounts:login' %}">{% trans "Login" %}</a>
                 </div>
             </div>
         </div>

diff --git a/app/templates/accounts/activation_sent.html b/app/templates/accounts/activation_sent.html
@@ -9,12 +9,12 @@
         <div class="section mt-3 mb-3">
             <div class="card body-card">
                 <div class="user-account-body">
-                    <h2>Activation Email Sent</h2>
-                    <p>Thank you for registering. An activation email has been sent to your email address.</p>
-                    <p>Please check your email and click on the activation link to activate your account.</p>
-                    <p>If you did not receive the email, please check your spam folder or
-                        <a href="{% url 'accounts:resend_activation' %}">resend the activation email</a>.</p>
-                    <a href="{% url 'accounts:login' %}">Login</a>
+                    <h2>{% trans "Activation Email Sent" %}</h2>
+                    <p>{% trans "Thank you for registering. An activation email has been sent to your email address." %}</p>
+                    <p>{% trans "Please check your email and click on the activation link to activate your account." %}</p>
+                    <p>{% trans "If you did not receive the email, please check your spam folder or" %}
+                        <a href="{% url 'accounts:resend_activation' %}">{% trans "resend the activation email" %}</a>.</p>
+                    <a href="{% url 'accounts:login' %}">{% trans "Login" %}</a>
                 </div>
             </div>
         </div>

diff --git a/app/templates/accounts/password_reset_complete.html b/app/templates/accounts/password_reset_complete.html
@@ -6,7 +6,7 @@
 
 {% block content %}
     <div class="section mt-3 mb-3">
-      <div class="card text-center body-card">
+      <div class="card body-card">
         <div class="user-account-body">
             <p>{% trans "Your password has been set. You may go ahead and log in now." %}</p>
             <br>

diff --git a/app/templates/accounts/password_reset_confirm.html b/app/templates/accounts/password_reset_confirm.html
@@ -9,11 +9,13 @@
     {% if validlink %}
 
     <div class="section mt-3 mb-3">
-      <div class="card text-center body-card">
+      <div class="card body-card">
         <div class="user-account-body">
             <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
 
-            <form method="post">{% csrf_token %}
+            <form method="post">
+              {% csrf_token %}
+              <div class="form-group login-form-group mb-4">
                 <fieldset class="module aligned">
                     <div class="form-row field-password1">
                         {{ form.new_password1.errors }}
@@ -22,6 +24,7 @@
                             {{ form.new_password1 }}
                         </div>
                     </div>
+                    <br>
                     <div class="form-row field-password2">
                         {{ form.new_password2.errors }}
                         <div class="flex-container">
@@ -30,19 +33,32 @@
                         </div>
                     </div>
                 </fieldset>
+              </div>
                 <br>
                 <br>
                 <div class="submit-row">
                     <input type="submit" class="btn btn-primary" value="{% trans 'Change my password' %}">
                 </div>
             </form>
 
+          </div>
+        </div>
+
         {% else %}
+          <div class="card body-card">
+            <div class="user-account-body">
+              <p class="card-text">
+                  {% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new
+                  password reset.{% endblocktrans %}
+              </p>
 
-            <p>{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new
-                password reset.{% endblocktrans %}</p>
+              <br>
+              <br>
+              <div class="submit-row">
+                  <input type="submit" class="btn btn-primary" value="{% trans 'Change my password' %}">
+              </div>
+            </div>
+          </div>
         {% endif %}
-      </div>
-    </div>
   </div>
 {% endblock %}
diff --git a/app/templates/accounts/password_reset_done.html b/app/templates/accounts/password_reset_done.html
@@ -6,7 +6,7 @@
 
 {% block content %}
   <div class="section mt-3 mb-3">
-    <div class="card text-center body-card">
+    <div class="card body-card">
       <div class="user-account-body">
         <p>{% blocktrans %}We’ve emailed you instructions for setting your password, if an account exists with the email you entered.
             You should receive them shortly.{% endblocktrans %}</p>

diff --git a/app/templates/accounts/resend_activation.html b/app/templates/accounts/resend_activation.html
@@ -9,15 +9,15 @@
         <div class="section mt-3 mb-3">
             <div class="card body-card">
                 <div class="user-account-body">
-                    <h2>Resend Activation Email</h2>
+                    <h2>{% trans "Resend Activation Email" %}</h2>
                     <form method="post">
                         {% csrf_token %}
-                        <p>Please enter your email address to resend the activation email.</p>
+                        <p>{% trans "Please enter your email address to resend the activation email." %]</p>
                         <div class="form-group">
                             <input class="form-control" type="email" name="email" required placeholder="Email">
                         </div>
                         <div class="submit-row">
-                            <button type="submit" class="btn btn-primary">Resend</button>
+                            <button type="submit" class="btn btn-primary">{% trans "Resend" %}</button>
                         </div>
                         <br>
                         {% if error %}
@@ -29,4 +29,3 @@ <h2>Resend Activation Email</h2>
         </div>
     </div>
 {% endblock %}
-