Merge branch 'develop' into detailviews

evennia/web/website/templates/website/character_form.html

@@ -7,10 +7,10 @@
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
+
   <div class="row">
-    <div class="col-lg-12 col-sm-12">
-      <div class="card mt-3">
+    <div class="col">
+      <div class="card">
         <div class="card-body">
           <h1 class="card-title">{{ view.page_title }}</h1>
           <hr />
@@ -47,5 +47,5 @@
       </div>
     </div>
   </div>
-</div>
+
 {% endblock %}

evennia/web/website/templates/website/character_manage_list.html

@@ -7,10 +7,9 @@
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
 <div class="row">
   <div class="col">
-      <div class="card mt-3">
+    <div class="card">
       <div class="card-body">
         <h1 class="card-title">{{ view.page_title }}</h1>
         <hr />
@@ -32,7 +31,6 @@
     </div>
   </div>
 </div>
-</div>
 {% endblock %}
 
 

evennia/web/website/templates/website/evennia_admin.html

@@ -6,7 +6,7 @@
 <div class="row">
   <div class="col">
     <div class="card">
-      <div class="card-block">
+      <div class="card-block p-4">
         <h1 class="card-title">Admin</h1>
         <p class="card-text">
           Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.

evennia/web/website/templates/website/pagination.html

@@ -1,5 +1,4 @@
 {% if page_obj %}
-<div class="container main-content mt-2" id="pagination">
 <div class="row">
   <div class="col">
     <div class="card mt-3">
@@ -30,5 +29,4 @@
     </div>
   </div>
 </div>
-</div>
 {% endif %}

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 %}
+<div class="container main-content mt-4" id="main-copy">
+  <div class="row">
+    <div class="col-lg-5 offset-lg-3 col-sm-12">
+      <div class="card mt-3">
+        <div class="card-body">
+          <h1 class="card-title">Password Changed</h1>
+          <hr />
+          
+          <p>Your password was changed.</p>
+          
+          <p>Click <a href="{% url 'index' %}">here</a> to return to the index.</p>
+          
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}

evennia/web/website/templates/website/registration/password_change_form.html

@@ -7,10 +7,9 @@ Password Change
 {% block content %}
 
 {% load addclass %}
-<div class="container main-content mt-4" id="main-copy">
   <div class="row">
     <div class="col-lg-6 offset-lg-3 col-sm-12">
-      <div class="card mt-3">
+      <div class="card">
         <div class="card-body">
           <h1 class="card-title">Password Change</h1>
           <hr />

evennia/web/website/views.py

@@ -369,7 +369,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)