From c0986a8ec280258665184b23ddf33d5d165796c6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Tue, 19 Feb 2019 20:21:45 +0100
Subject: [PATCH 1/2] Make sure website extends website/base.html to avoid
 override collision

---
 evennia/web/website/templates/website/evennia_admin.html | 2 +-
 evennia/web/website/templates/website/index.html         | 2 +-
 evennia/web/website/templates/website/tbi.html           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html
index d490bf9155..e01aee2380 100644
--- a/evennia/web/website/templates/website/evennia_admin.html
+++ b/evennia/web/website/templates/website/evennia_admin.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}Admin{% endblock %}
 
diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html
index 1215e6bf08..9ed2486605 100644
--- a/evennia/web/website/templates/website/index.html
+++ b/evennia/web/website/templates/website/index.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}Home{% endblock %}
 
diff --git a/evennia/web/website/templates/website/tbi.html b/evennia/web/website/templates/website/tbi.html
index 3b5bf9765a..ea3669ffce 100644
--- a/evennia/web/website/templates/website/tbi.html
+++ b/evennia/web/website/templates/website/tbi.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}To Be Implemented{% endblock %}
 

From db4c33d539afdc55210cc3e515e0caf67f823494 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 20 Feb 2019 22:24:52 +0100
Subject: [PATCH 2/2] Add website/ to more base.html imports

---
 evennia/web/website/templates/website/404.html                  | 2 +-
 evennia/web/website/templates/website/500.html                  | 2 +-
 evennia/web/website/templates/website/flatpages/default.html    | 2 +-
 .../web/website/templates/website/registration/logged_out.html  | 2 +-
 evennia/web/website/templates/website/registration/login.html   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/evennia/web/website/templates/website/404.html b/evennia/web/website/templates/website/404.html
index 5c10522423..562e9b8bb7 100644
--- a/evennia/web/website/templates/website/404.html
+++ b/evennia/web/website/templates/website/404.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}404 - Not Found{% endblock %}
 
diff --git a/evennia/web/website/templates/website/500.html b/evennia/web/website/templates/website/500.html
index 0011dc0030..063cd3e3ab 100644
--- a/evennia/web/website/templates/website/500.html
+++ b/evennia/web/website/templates/website/500.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}500 - Internal Server Error{% endblock %}
 
diff --git a/evennia/web/website/templates/website/flatpages/default.html b/evennia/web/website/templates/website/flatpages/default.html
index c15a7011ec..cc9b03a670 100644
--- a/evennia/web/website/templates/website/flatpages/default.html
+++ b/evennia/web/website/templates/website/flatpages/default.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block header_ext %}
 {% endblock %}
diff --git a/evennia/web/website/templates/website/registration/logged_out.html b/evennia/web/website/templates/website/registration/logged_out.html
index 0ee9cdcfe4..2eadfd61ec 100644
--- a/evennia/web/website/templates/website/registration/logged_out.html
+++ b/evennia/web/website/templates/website/registration/logged_out.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block header_ext %}
 <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html
index 8b2213a251..ba66680ed6 100644
--- a/evennia/web/website/templates/website/registration/login.html
+++ b/evennia/web/website/templates/website/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "website/base.html" %}
 
 {% block titleblock %}
 Login