diff --git a/apps/website/views.py b/apps/website/views.py
index 5e21eb38c5..bc3cead1f0 100644
--- a/apps/website/views.py
+++ b/apps/website/views.py
@@ -28,7 +28,6 @@ def page_index(request):
pagevars = {
"page_title": "Front Page",
- "no_sidebar": True,
"news_entries": news_entries,
"players_connected_recent": recent_players,
"num_players_connected": functions_db.get_connected_players().count(),
@@ -55,4 +54,4 @@ def to_be_implemented(request):
}
context_instance = RequestContext(request)
- return render_to_response('tbi.html', pagevars, context_instance)
\ No newline at end of file
+ return render_to_response('tbi.html', pagevars, context_instance)
diff --git a/settings.py.dist b/settings.py.dist
index 938ba093dc..7e649f6e25 100755
--- a/settings.py.dist
+++ b/settings.py.dist
@@ -85,6 +85,10 @@ USE_I18N = False
# lighttpd).
SERVE_MEDIA = False
+# The master urlconf file that contains all of the sub-branches to the
+# applications.
+ROOT_URLCONF = 'urls'
+
# Where users are redirected after logging in via contribu.auth.login.
LOGIN_REDIRECT_URL = '/'
@@ -123,12 +127,9 @@ MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
+ 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
)
-# The master urlconf file that contains all of the sub-branches to the
-# applications.
-ROOT_URLCONF = 'urls'
-
# Context processors define context variables, generally for the template
# system to use.
TEMPLATE_CONTEXT_PROCESSORS = (
@@ -154,9 +155,11 @@ TEMPLATE_DIRS = (
# refer to app models and perform DB syncs.
INSTALLED_APPS = (
'django.contrib.auth',
+ 'django.contrib.sites,
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.admin',
+ 'django.contrib.flatpages',
'apps.config',
'apps.objects',
'apps.helpsys',
diff --git a/webtemplates/prosimii/base.html b/webtemplates/prosimii/base.html
index 7cafbab7d3..d47a83ff5f 100644
--- a/webtemplates/prosimii/base.html
+++ b/webtemplates/prosimii/base.html
@@ -7,10 +7,10 @@
- {% if no_sidebar %}
-
- {% else %}
+ {% if sidebar %}
+ {% else %}
+
{% endif %}
@@ -18,7 +18,7 @@
{% block header_ext %}
{% endblock %}
- {{game_name}} - {{page_title}}
+ {{game_name}} - {% if flatpage %}{{flatpage.title}}{% else %}{{page_title}}{% endif %}
@@ -54,7 +54,7 @@