diff --git a/pgweb/events/views.py b/pgweb/events/views.py index 5c76c896..8668b1de 100644 --- a/pgweb/events/views.py +++ b/pgweb/events/views.py @@ -15,7 +15,7 @@ def main(request): other_events = Event.objects.select_related('country').filter(approved=True, badged=False).filter(training=False, enddate__gt=date.today()).order_by('enddate', 'startdate',) training = Event.objects.select_related('country').filter(approved=True).filter(training=True, enddate__gt=date.today()).order_by('enddate', 'startdate',) return render_pgweb(request, 'about', 'events/archive.html', { - 'title': 'Upcoming events', + 'title': 'Upcoming Events', 'eventblocks': ( { 'name': 'Community Events', 'events': community_events, 'link': '',}, { 'name': 'Other Events', 'events': other_events, 'link': '',}, diff --git a/pgweb/util/contexts.py b/pgweb/util/contexts.py index c47a8d03..5f80c5e3 100644 --- a/pgweb/util/contexts.py +++ b/pgweb/util/contexts.py @@ -15,8 +15,8 @@ sitenav = { {'title': 'Sponsors', 'link':'/about/sponsors/', 'submenu': [ {'title': 'Servers', 'link': '/about/servers/'}, ]}, - {'title': 'Latest news', 'link':'/about/newsarchive/'}, - {'title': 'Upcoming events', 'link':'/about/events/'}, + {'title': 'Latest News', 'link':'/about/newsarchive/'}, + {'title': 'Upcoming Events', 'link':'/about/events/'}, {'title': 'Press', 'link':'/about/press/'}, {'title': 'Licence', 'link':'/about/licence/'}, ], diff --git a/templates/news/newsarchive.html b/templates/news/newsarchive.html index e5dd3b3e..484ff6b2 100644 --- a/templates/news/newsarchive.html +++ b/templates/news/newsarchive.html @@ -1,8 +1,8 @@ {%extends "base/page.html"%} {%load markup%} -{%block title%}News archive{%if tag%} - {{tag.name}}{%endif%}{%endblock%} +{%block title%}News Archive{%if tag%} - {{tag.name}}{%endif%}{%endblock%} {%block contents%} -

News archive{%if tag%} - {{tag.name}}{%endif%}

+

News Archive{%if tag%} - {{tag.name}}{%endif%}

{%for t in newstags%}{{t.name}} {%endfor%}