diff options
Diffstat (limited to 'postgresqleu')
| -rw-r--r-- | postgresqleu/newsevents/feeds.py | 8 | ||||
| -rw-r--r-- | postgresqleu/urls.py | 1 | ||||
| -rw-r--r-- | postgresqleu/views.py | 9 |
3 files changed, 13 insertions, 5 deletions
diff --git a/postgresqleu/newsevents/feeds.py b/postgresqleu/newsevents/feeds.py index cb72526a..00e24a77 100644 --- a/postgresqleu/newsevents/feeds.py +++ b/postgresqleu/newsevents/feeds.py @@ -6,9 +6,9 @@ from models import News, Event import datetime class LatestNews(Feed): - title = "News - PostgreSQL Europe" + title = "News - %s" % settings.ORG_NAME link = "/" - description = "The latest news from PostgreSQL Europe" + description = "The latest news from %s" % settings.ORG_NAME description_template = "pieces/news_description.html" def items(self): @@ -18,9 +18,9 @@ class LatestNews(Feed): return "%s/news/%s" % (settings.SITEBASE, news.id) class LatestEvents(Feed): - title = "Events - PostgreSQL Europe" + title = "Events - %s" % settings.ORG_NAME link = "%s/events/" % settings.SITEBASE - description = "The latest events from PostgreSQL Europe" + description = "The latest events from %s" % settings.ORG_NAME description_template = "pieces/event_description.html" def items(self): diff --git a/postgresqleu/urls.py b/postgresqleu/urls.py index 830d9ce2..1ed6bc1d 100644 --- a/postgresqleu/urls.py +++ b/postgresqleu/urls.py @@ -43,6 +43,7 @@ urlpatterns = patterns('', (r'^events$', postgresqleu.newsevents.views.eventlist), (r'^events/(\d+)$', postgresqleu.newsevents.views.event), (r'^events/archive$', postgresqleu.newsevents.views.eventarchive), + (r'^news$', postgresqleu.views.news), # Feeds (r'^feeds/news/$', LatestNews()), diff --git a/postgresqleu/views.py b/postgresqleu/views.py index 41ba3eb0..00a562a1 100644 --- a/postgresqleu/views.py +++ b/postgresqleu/views.py @@ -7,13 +7,20 @@ import datetime # Handle the frontpage def index(request): - events = Event.objects.filter(startdate__gte=datetime.datetime.today())[:3] + events = Event.objects.filter(startdate__gte=datetime.datetime.today())[:5] news = News.objects.filter()[:5] return render_to_response('index.html', { 'events': events, 'news': news, }) +# Handle the news page +def news(request): + news = News.objects.filter()[:5] + return render_to_response('news.html', { + 'news': news, + }) + # Handle CSRF failures def csrf_failure(request, reason=''): resp = render_to_response('csrf_failure.html', { |