From 75c38ada19d4c4be1930d7c0db8d434ebfd7f5bf Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Wed, 5 Nov 2008 18:08:51 +0000
Subject: [PATCH] Evennia once again runs on the latest trunk. Admin interface
 is still broken pending transition to newforms-admins stuff.

---
 settings_common.py              |  5 +++--
 urls.py                         |  6 +++---
 webapps/website/views.py        | 14 +++++++-------
 webapps/website/webcontext.py   |  4 ++--
 webtemplates/prosimii/base.html |  8 ++++----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/settings_common.py b/settings_common.py
index f21a048ce5..a41e5ca97b 100644
--- a/settings_common.py
+++ b/settings_common.py
@@ -13,10 +13,11 @@ TEMPLATE_LOADERS = (
 # Context processors define context variables, generally for the template
 # system to use.
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',
-    'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
+    'django.core.context_processors.request',
+    'django.core.context_processors.auth',
     'django.core.context_processors.media',
+    'django.core.context_processors.debug',
     'webapps.website.webcontext.general_context',
 )
 
diff --git a/urls.py b/urls.py
index 3b28468609..7ef5bb29bc 100755
--- a/urls.py
+++ b/urls.py
@@ -18,13 +18,13 @@ urlpatterns = patterns('',
     (r'^admin/', include('django.contrib.admin.urls')),
 
     # Front page
-    (r'^', include('apps.website.urls')),
+    (r'^', include('webapps.website.urls')),
 
     # News stuff
-    (r'^news/', include('apps.news.urls')),
+    (r'^news/', include('webapps.news.urls')),
 
     # Page place-holder for things that aren't implemented yet.
-    (r'^tbi/', 'apps.website.views.to_be_implemented'),
+    (r'^tbi/', 'webapps.website.views.to_be_implemented'),
 )
 
 # If you'd like to serve media files via Django (strongly not recommended!),
diff --git a/webapps/website/views.py b/webapps/website/views.py
index 473d4a3c5b..cc3a52b7a2 100644
--- a/webapps/website/views.py
+++ b/webapps/website/views.py
@@ -2,8 +2,8 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 from django.contrib.auth.models import User
 
+from apps.objects.models import Object
 from webapps.news.models import NewsEntry
-import functions_db
 
 """
 This file contains the generic, assorted views that don't fall under one of
@@ -22,18 +22,18 @@ def page_index(request):
     # A QuerySet of recent news entries.
     news_entries = NewsEntry.objects.all().order_by('-date_posted')[:fpage_news_entries]
     # Dictionary containing database statistics.
-    objstats = functions_db.object_totals()
+    objstats = Object.objects.object_totals()
     # A QuerySet of the most recently connected players.
-    recent_players = functions_db.get_recently_connected_players()[:fpage_player_limit]
+    recent_players = Object.objects.get_recently_connected_users()[:fpage_player_limit]
     
     pagevars = {
         "page_title": "Front Page",
         "news_entries": news_entries,
         "players_connected_recent": recent_players,
-        "num_players_connected": functions_db.get_connected_players().count(),
-        "num_players_registered": functions_db.num_total_players(),
-        "num_players_connected_recent": functions_db.get_recently_connected_players().count(),
-        "num_players_registered_recent": functions_db.get_recently_created_players().count(),
+        "num_players_connected": Object.objects.get_connected_players().count(),
+        "num_players_registered": Object.objects.num_total_players(),
+        "num_players_connected_recent": Object.objects.get_recently_connected_users().count(),
+        "num_players_registered_recent": Object.objects.get_recently_created_users().count(),
         "num_players": objstats["players"],
         "num_rooms": objstats["rooms"],
         "num_things": objstats["things"],
diff --git a/webapps/website/webcontext.py b/webapps/website/webcontext.py
index de77a1c69e..b26fe9470a 100644
--- a/webapps/website/webcontext.py
+++ b/webapps/website/webcontext.py
@@ -1,9 +1,9 @@
-import gameconf
+from apps.config.models import ConfigValue
 
 def general_context(request):
     """
     Returns common Evennia-related context stuff.
     """
     return {
-        'game_name': gameconf.get_configvalue('site_name'),
+        'game_name': ConfigValue.objects.get_configvalue('site_name'),
     }
diff --git a/webtemplates/prosimii/base.html b/webtemplates/prosimii/base.html
index d8498e5197..9e82631cf8 100644
--- a/webtemplates/prosimii/base.html
+++ b/webtemplates/prosimii/base.html
@@ -8,12 +8,12 @@
     <meta name="generator" content="haran" />
 
     {% if sidebar %}
-    <link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
+    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-screen-alt.css" media="screen" title="Prosimii (Sidebar)" />
     {% else %}
-    <link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-screen.css" media="screen" title="Prosimii" />
+    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-screen.css" media="screen" title="Prosimii" />
     {% endif %}
-    <link rel="stylesheet alternative" type="text/css" href="{{media_url}}css/prosimii-print.css" media="screen" title="Print Preview" />
-    <link rel="stylesheet" type="text/css" href="{{media_url}}css/prosimii-print.css" media="print" />
+    <link rel="stylesheet alternative" type="text/css" href="{{MEDIA_URL}}css/prosimii-print.css" media="screen" title="Print Preview" />
+    <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}css/prosimii-print.css" media="print" />
 
     {% block header_ext %}
     {% endblock %}