From 61ca8968ae9d916a0f2239bc88b81aad1c8b6082 Mon Sep 17 00:00:00 2001
From: Oliver Marks <oly@digitaloctave.com>
Date: Thu, 18 Jan 2018 21:44:49 +0000
Subject: [PATCH] Requests form updated

---
 mhackspace/blog/feeds.py                      |  2 +-
 mhackspace/requests/views.py                  |  2 +-
 mhackspace/templates/base.html                |  5 ++-
 .../templates/pages/requests-detail.html      | 13 ++------
 mhackspace/templates/pages/requests.html      | 13 ++------
 mhackspace/templates/partials/form.html       | 31 +++++++++++++++++++
 6 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 mhackspace/templates/partials/form.html

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 @@
 
   <link href="{% sass_src 'sass/project.scss' %}" rel="stylesheet">
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
-
+  {% render_block "css" %}
+  {% block css %}{% endblock %}
 
   {% block head-open-graph %}
   <meta property="og:title" content="Maidstone Hackspace" />
@@ -39,8 +40,6 @@
   <meta property="og:image" content="https://maidstone-hackspace.org.uk/static/images/android-chrome-192x192.png" />
   {% 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 @@
   <p>{{ comment.comment }}</p>
   {% endfor %}
 
-  {% if requests_form %}
+  {% if form %}
     <form method="POST" action="{% url 'requests_detail_form' request_detail.id %}" class="requests_detail_form">
       {% csrf_token %}
-      {{ requests_form|crispy }}
-      {{ google_capture }}
-      <button class="btn btn-primary " type="submit" name="action">
-        <span class="fa fa-submit" ></span>
-        {% trans "Add Comment" %}</button>
+      {% include "partials/form.html" %}
     </form>
   {% endif %}
 
 {% endblock content %}
 
-{% block javascript %}
-  {{ block.super }}
-  <script src='https://www.google.com/recaptcha/api.js'></script>
-{% 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 %}
-    <form method="POST" action="{% url 'requests_form' %}" class="requests_form">
+    <form method="POST" action="{% url 'requests_form' %}" class="ui form">
       {% csrf_token %}
-      {{ form|crispy }}
-      {{ google_capture }}
-      <button class="btn btn-primary " type="submit" name="action">
-        <span class="fa fa-submit" ></span>
-        {% trans "Send" %}</button>
+      {% include "partials/form.html" %}
     </form>
   {% else %}
   <div class="row">
@@ -111,7 +108,3 @@
   {% endif %}
 {% endblock content %}
 
-{% block javascript %}
-  {{ block.super }}
-  <script src='https://www.google.com/recaptcha/api.js'></script>
-{% endblock %}
diff --git a/mhackspace/templates/partials/form.html b/mhackspace/templates/partials/form.html
new file mode 100644
index 0000000..2e0eab2
--- /dev/null
+++ b/mhackspace/templates/partials/form.html
@@ -0,0 +1,31 @@
+{% load crispy_forms_tags %}
+{% load recapture %}
+{% load sekizai_tags i18n wiki_tags static %}
+
+<form method="POST" action="{% url 'requests_form' %}" class="ui form">
+  {% csrf_token %}
+  {{ form|crispy }}
+  {{ google_capture }}
+  <button class="btn btn-primary " type="submit" name="action">
+    <span class="fa fa-submit" ></span>
+    {% trans "Send" %}</button>
+</form>
+
+{% addtoblock "css" %}
+  <link href="{% static 'plugins/css/ace.min.css' %}" type="text/css" media="all" rel="stylesheet" />
+  <link href="{% static 'plugins/css/semantic.min.css' %}" type="text/css" media="all" rel="stylesheet" />
+  <link href="{% static 'martor/css/martor.css' %}" type="text/css" media="all" rel="stylesheet" />
+{% endaddtoblock css %}
+
+{% addtoblock "js" %}
+  <script src='https://www.google.com/recaptcha/api.js'></script>
+  <script type="text/javascript" src="{% static 'plugins/js/ace.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/semantic.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/mode-markdown.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/ext-language_tools.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/theme-github.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/highlight.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/resizable.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'plugins/js/emojis.min.js' %}"></script>
+  <script type="text/javascript" src="{% static 'martor/js/martor.min.js' %}"></script>
+{% endaddtoblock %}