diff --git a/apps/news/urls.py b/apps/news/urls.py index 3f0ed725d1..902f9cafdf 100755 --- a/apps/news/urls.py +++ b/apps/news/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.defaults import * urlpatterns = patterns('apps.news.views', -# (r'^news/show/(?P\d+)/$', 'show_news'), + (r'^show/(?P\d+)/$', 'show_news'), # (r'^news/categories/list/$', 'recent_kills'), ) diff --git a/apps/news/views.py b/apps/news/views.py index ce98b4600a..f4b221e148 100755 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -2,34 +2,21 @@ # News display. # from django.shortcuts import render_to_response, get_object_or_404 -from django.db import connection from django.template import RequestContext -from django import newforms as forms -from django.newforms.util import ValidationError import django.views.generic.list_detail as list_detail from django.contrib.auth.models import User -from django.utils import simplejson -import frontier.settings as settings -from frontier.apps.player.models import UserProfile -from frontier.apps.news.models import NewsTopic, NewsEntry +from apps.news.models import NewsTopic, NewsEntry -nav_block = """ -
-
-""" - -def index(request): +def show_news(request, entry_id): """ - News index. + Show an individual news entry. """ - news_entries = NewsEntry.objects.all().order_by('-date_posted')[:10] + #news_entries = NewsEntry.objects.all().order_by('-date_posted')[:10] pagevars = { "page_title": "Front Page", - "nav_block": nav_block, - "news_entries": news_entries, } context_instance = RequestContext(request) - return render_to_response('news/index.html', pagevars, context_instance) + return render_to_response('base.html', pagevars, context_instance) diff --git a/urls.py b/urls.py index 9ccea53526..fa5cd809ef 100755 --- a/urls.py +++ b/urls.py @@ -15,6 +15,9 @@ urlpatterns = patterns('', # Front page (r'^', include('apps.website.urls')), + + # News stuff + (r'^news/', include('apps.news.urls')), ) # If you'd like to serve media files via Django (strongly not recommended!), diff --git a/webtemplates/prosimii/base.html b/webtemplates/prosimii/base.html index e04502c1e3..1aada3d657 100644 --- a/webtemplates/prosimii/base.html +++ b/webtemplates/prosimii/base.html @@ -7,21 +7,11 @@ - - - - - - - - - + + + - - - - - Prosimii Page Two + {{game_name}} @@ -33,31 +23,34 @@ @@ -129,12 +122,9 @@