From c2e59428ac9970d70bb170b86ff84dc7129bfb2f Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:19:38 +0000 Subject: [PATCH 1/6] Fixes redirect bug where character quickselect would always return browser to character management page. --- evennia/web/website/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index a993a8258e..9a33fd0e6d 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -335,7 +335,7 @@ class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, Obje def get_redirect_url(self, *args, **kwargs): # Get the requested character, if it belongs to the authenticated user char = self.get_object() - next = self.kwargs.get('next', self.success_url) + next = self.request.GET.get('next', self.success_url) if char: self.request.session['puppet'] = int(char.pk) From 4b3f3bf74775c3a27cfe8681d2038658c93fc6de Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:26:27 +0000 Subject: [PATCH 2/6] Cosmetic fix. Adjusts margins on character management page to be consistent with index. --- .../website/character_manage_list.html | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html index ffb401e315..c8845f7165 100644 --- a/evennia/web/website/templates/website/character_manage_list.html +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -7,28 +7,26 @@ {% block content %} {% load addclass %} -
-
-
-
-
-

{{ view.page_title }}

-
+
+
+
+
+

{{ view.page_title }}

+
- {% for object in object_list %} -
- -
-

{{ object.db_date_created }} -
Delete -
Edit

-
{{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
-

{{ object.db.desc }}

-
+ {% for object in object_list %} +
+ +
+

{{ object.db_date_created }} +
Delete +
Edit

+
{{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
+

{{ object.db.desc }}

- {% endfor %} - -
+
+ {% endfor %} +
From 3a915f3bec16be00233806267d9f05c67009b12f Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:29:12 +0000 Subject: [PATCH 3/6] Adds padding to the Evennia Admin page to make layout more consistent with rest of site. --- evennia/web/website/templates/website/evennia_admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html index 8e88d9cc50..80e22e2f2a 100644 --- a/evennia/web/website/templates/website/evennia_admin.html +++ b/evennia/web/website/templates/website/evennia_admin.html @@ -6,7 +6,7 @@
-
+

Admin

Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game. From 8230dd75d051d3ec0e0dad8b2a122e2039896c6b Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:32:13 +0000 Subject: [PATCH 4/6] Adjusts margins to make layout more consistent with rest of site. --- evennia/web/website/templates/website/character_form.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/web/website/templates/website/character_form.html b/evennia/web/website/templates/website/character_form.html index 964f4e6aa4..20ad71e261 100644 --- a/evennia/web/website/templates/website/character_form.html +++ b/evennia/web/website/templates/website/character_form.html @@ -7,10 +7,10 @@ {% block content %} {% load addclass %} -

+
-
-
+
+

{{ view.page_title }}

@@ -47,5 +47,5 @@
-
+ {% endblock %} From 13d41a3bb4af391657560a2051411f8e1331b9ea Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:39:16 +0000 Subject: [PATCH 5/6] Adjusts margins and adds missing password change completion page. --- .../registration/password_change_done.html | 27 +++++++++++++++++++ .../registration/password_change_form.html | 3 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 evennia/web/website/templates/website/registration/password_change_done.html diff --git a/evennia/web/website/templates/website/registration/password_change_done.html b/evennia/web/website/templates/website/registration/password_change_done.html new file mode 100644 index 0000000000..8869d8d69c --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_change_done.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} + +{% block titleblock %} +Password Changed +{% endblock %} + +{% block body %} + +{% load addclass %} +
+
+
+
+
+

Password Changed

+
+ +

Your password was changed.

+ +

Click here to return to the index.

+ +
+
+
+
+
+{% endblock %} diff --git a/evennia/web/website/templates/website/registration/password_change_form.html b/evennia/web/website/templates/website/registration/password_change_form.html index bae8c90962..1911b83cf0 100644 --- a/evennia/web/website/templates/website/registration/password_change_form.html +++ b/evennia/web/website/templates/website/registration/password_change_form.html @@ -7,10 +7,9 @@ Password Change {% block content %} {% load addclass %} -
-
+

Password Change

From 70e9f4314bd48cc2a74d60e13ca61180f9c45c68 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:43:58 +0000 Subject: [PATCH 6/6] Fixes margins on paginator to be more consistent with rest of site. --- .../website/templates/website/pagination.html | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/evennia/web/website/templates/website/pagination.html b/evennia/web/website/templates/website/pagination.html index e2cb6bed73..c89d4ee473 100644 --- a/evennia/web/website/templates/website/pagination.html +++ b/evennia/web/website/templates/website/pagination.html @@ -1,32 +1,30 @@ {% if page_obj %} -