diff --git a/mhackspace/blog/feeds.py b/mhackspace/blog/feeds.py index ba6097f..c78b121 100644 --- a/mhackspace/blog/feeds.py +++ b/mhackspace/blog/feeds.py @@ -83,7 +83,7 @@ class RssFeed(Feed): class BlogFeed(Feed): - title = "Mss.xmlaidstone Hackspace Blog" + title = "Maidstone Hackspace Blog" link = "/blog/" feed_type = MediaRssFeed description = "The latest blog posts and news from the Maidstone Hackspace site" diff --git a/mhackspace/requests/views.py b/mhackspace/requests/views.py index a1e351f..bf8a414 100644 --- a/mhackspace/requests/views.py +++ b/mhackspace/requests/views.py @@ -47,7 +47,7 @@ class RequestsDetail(LoginRequiredMixin, DetailView): def get_context_data(self, *args, **kwargs): context = super(RequestsDetail, self).get_context_data(*args, **kwargs) context['requests_comments'] = UserRequestsComment.objects.all() - context['requests_form'] = UserRequestFormComment + context['form'] = UserRequestFormComment return context diff --git a/mhackspace/templates/base.html b/mhackspace/templates/base.html index 933030a..4fd3dcb 100644 --- a/mhackspace/templates/base.html +++ b/mhackspace/templates/base.html @@ -30,7 +30,8 @@ - + {% render_block "css" %} + {% block css %}{% endblock %} {% block head-open-graph %} @@ -39,8 +40,6 @@ {% endblock head-open-graph %} - {% render_block "css" %} - {% block css %}{% endblock %} {% block head-extra %} {% endblock head-extra %} diff --git a/mhackspace/templates/pages/requests-detail.html b/mhackspace/templates/pages/requests-detail.html index 538794a..a761ba1 100644 --- a/mhackspace/templates/pages/requests-detail.html +++ b/mhackspace/templates/pages/requests-detail.html @@ -1,7 +1,6 @@ {% extends "base.html" %} {% load i18n %} {% load crispy_forms_tags %} -{% load recapture %} {% block head-open-graph %} @@ -25,20 +24,12 @@
{{ comment.comment }}
{% endfor %} - {% if requests_form %} + {% if form %} {% endif %} {% endblock content %} -{% block javascript %} - {{ block.super }} - -{% endblock %} diff --git a/mhackspace/templates/pages/requests.html b/mhackspace/templates/pages/requests.html index ee40b06..8c03d01 100644 --- a/mhackspace/templates/pages/requests.html +++ b/mhackspace/templates/pages/requests.html @@ -2,6 +2,7 @@ {% load i18n %} {% load crispy_forms_tags %} {% load recapture %} +{% load sekizai_tags i18n wiki_tags static %} {% block head-open-graph %} @@ -22,13 +23,9 @@ {% if form %} - {% else %}