From 6520f7109a20021745eff2176e5d6bb76d0c46ff Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 00:33:42 +0000
Subject: [PATCH 1/6] Fixes spelling error.

---
 evennia/web/webclient/static/webclient/js/evennia.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/web/webclient/static/webclient/js/evennia.js b/evennia/web/webclient/static/webclient/js/evennia.js
index 501a04021d..ddc6b792e4 100644
--- a/evennia/web/webclient/static/webclient/js/evennia.js
+++ b/evennia/web/webclient/static/webclient/js/evennia.js
@@ -102,7 +102,7 @@ An "emitter" object must have a function
                 return;
             }
             this.connection.connect();
-            log('Evenna reconnecting.')
+            log('Evennia reconnecting.')
         },
 
         // Returns true if the connection is open.

From 24643b1d3e889209f534a7c507cba27b92b16e9d Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 00:34:12 +0000
Subject: [PATCH 2/6] Fixes alignment inconsistency in Accounts column.

---
 evennia/web/website/templates/website/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html
index 1215e6bf08..06ece50f3c 100644
--- a/evennia/web/website/templates/website/index.html
+++ b/evennia/web/website/templates/website/index.html
@@ -52,7 +52,7 @@
 <div class="row">
   <div class="col-12 col-md-4 mb-3">
     <div class="card">
-      <h4 class="card-header">Accounts</h4>
+      <h4 class="card-header text-center">Accounts</h4>
 
       <div class="card-body">
         <p>

From 2eb04dcd2049a9e62923eccb57a22e6c8fba000d Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 00:34:38 +0000
Subject: [PATCH 3/6] Fixes incorrect label on button.

---
 .../templates/website/registration/password_reset_form.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/web/website/templates/website/registration/password_reset_form.html b/evennia/web/website/templates/website/registration/password_reset_form.html
index f13c532a58..eb73118856 100644
--- a/evennia/web/website/templates/website/registration/password_reset_form.html
+++ b/evennia/web/website/templates/website/registration/password_reset_form.html
@@ -34,7 +34,7 @@ Forgot Password
             
             <hr />
             <div class="form-group">
-              <input class="form-control btn btn-outline-secondary" type="submit" value="Login" />
+              <input class="form-control btn btn-outline-secondary" type="submit" value="Submit" />
               <input type="hidden" name="next" value="{{ next }}" />
             </div>
           </form>

From d6879c3ceffcae360e80d4eee98cb98b83eb2005 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 00:35:15 +0000
Subject: [PATCH 4/6] Adds link to return to index after forgot-password
 request.

---
 .../templates/website/registration/password_reset_done.html   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/evennia/web/website/templates/website/registration/password_reset_done.html b/evennia/web/website/templates/website/registration/password_reset_done.html
index d248c56d0f..8de85a5ba3 100644
--- a/evennia/web/website/templates/website/registration/password_reset_done.html
+++ b/evennia/web/website/templates/website/registration/password_reset_done.html
@@ -25,6 +25,10 @@ Forgot Password - Reset Link Sent
           <p>Please allow up to to a few hours for the email to transmit, and be 
           sure to check your spam folder if it doesn't show up in a timely manner.</p>
           
+          <hr />
+          
+          <p><a href="{% url 'index' %}">Click here</a> to return to the main page.</p>
+          
           {% endif %}
         </div>
       </div>

From de14d8621fc4d1e690d3dc26a4e67aa3b7ae6545 Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 04:02:30 +0000
Subject: [PATCH 5/6] Modifies the login link to redirect the user to the
 current page after authentication.

---
 evennia/web/website/templates/website/_menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html
index 69c06009d0..9f95ebb67f 100644
--- a/evennia/web/website/templates/website/_menu.html
+++ b/evennia/web/website/templates/website/_menu.html
@@ -72,7 +72,7 @@ folder and edit it to add/remove links to the menu.
             </li>
             {% else %}
             <li>
-                <a class="nav-link" href="{% url 'login' %}">Log In</a>
+                <a class="nav-link" href="{% url 'login' %}?next={{ request.path }}">Log In</a>
             </li>
             <li>
                 <a class="nav-link" href="{% url 'register' %}">Register</a>

From 77f46b54e2168095db0d6e4323d212cf781cb07c Mon Sep 17 00:00:00 2001
From: Johnny <strikax@gmail.com>
Date: Mon, 29 Oct 2018 09:12:55 +0000
Subject: [PATCH 6/6] Changes admin link.

---
 evennia/web/website/templates/website/help_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evennia/web/website/templates/website/help_list.html b/evennia/web/website/templates/website/help_list.html
index 99f1a27eef..d3075cd456 100644
--- a/evennia/web/website/templates/website/help_list.html
+++ b/evennia/web/website/templates/website/help_list.html
@@ -54,7 +54,7 @@
           <div class="col-lg-3 col-sm-12">
             {% if user.is_staff %}
             <!-- admin button -->
-            <a class="btn btn-info btn-block mb-3" href="/admin/help/helpentry/add/">Admin</a>
+            <a class="btn btn-info btn-block mb-3" href="/admin/help/helpentry/">Admin</a>
             <!-- end admin button -->
             <hr />
             {% endif %}