From 0729bf10b7540444d33e9e6dd4b69e883b02ea0d Mon Sep 17 00:00:00 2001
From: Kelketek Rritaa <kelketek@gmail.com>
Date: Sun, 29 Jun 2014 10:55:29 -0500
Subject: [PATCH] More consistent arrangement of base templates.

---
 .../{prosimii => evennia_general}/evennia_admin.html       | 0
 src/web/templates/{prosimii => evennia_general}/index.html | 0
 src/web/templates/{prosimii => evennia_general}/tbi.html   | 0
 src/web/views.py                                           | 7 +++----
 4 files changed, 3 insertions(+), 4 deletions(-)
 rename src/web/templates/{prosimii => evennia_general}/evennia_admin.html (100%)
 rename src/web/templates/{prosimii => evennia_general}/index.html (100%)
 rename src/web/templates/{prosimii => evennia_general}/tbi.html (100%)

diff --git a/src/web/templates/prosimii/evennia_admin.html b/src/web/templates/evennia_general/evennia_admin.html
similarity index 100%
rename from src/web/templates/prosimii/evennia_admin.html
rename to src/web/templates/evennia_general/evennia_admin.html
diff --git a/src/web/templates/prosimii/index.html b/src/web/templates/evennia_general/index.html
similarity index 100%
rename from src/web/templates/prosimii/index.html
rename to src/web/templates/evennia_general/index.html
diff --git a/src/web/templates/prosimii/tbi.html b/src/web/templates/evennia_general/tbi.html
similarity index 100%
rename from src/web/templates/prosimii/tbi.html
rename to src/web/templates/evennia_general/tbi.html
diff --git a/src/web/views.py b/src/web/views.py
index 078af83045..127b61360b 100644
--- a/src/web/views.py
+++ b/src/web/views.py
@@ -23,7 +23,6 @@ def page_index(request):
     # Some misc. configurable stuff.
     # TODO: Move this to either SQL or settings.py based configuration.
     fpage_player_limit = 4
-    fpage_news_entries = 2
 
     # A QuerySet of the most recently connected players.
     recent_users = PlayerDB.objects.get_recently_connected_players()[:fpage_player_limit]
@@ -52,7 +51,7 @@ def page_index(request):
         "num_others": nothers or "no"
     }
 
-    return render(request, 'index.html', pagevars)
+    return render(request, 'evennia_general/index.html', pagevars)
 
 
 def to_be_implemented(request):
@@ -65,7 +64,7 @@ def to_be_implemented(request):
         "page_title": "To Be Implemented...",
     }
 
-    return render(request, 'tbi.html', pagevars)
+    return render(request, 'evennia_general/tbi.html', pagevars)
 
 
 @staff_member_required
@@ -74,7 +73,7 @@ def evennia_admin(request):
     Helpful Evennia-specific admin page.
     """
     return render(
-        request, 'evennia_admin.html', {
+        request, 'evennia_general/evennia_admin.html', {
             'playerdb': PlayerDB})