Merge remote-tracking branch 'origin/master' into issue-153

mhackspace/requests/views.py

@@ -17,15 +17,7 @@ class RequestsForm(LoginRequiredMixin, FormView):
             obj = form.save(commit=False)
             obj.user = self.request.user
             obj.save()
-            # email = EmailMessage(
-            #     '[%s] - %s' % (data['enquiry_type'], data['subject']),
-            #     data['message'],
-            #     data['contact_email'],
-            #     to=['contact@maidstone-hackspace.org.uk'],
-            #     headers={'Reply-To': data['contact_email']})
-            # email.send()
             messages.add_message(self.request, messages.INFO, 'Request successfully made.')
-
         return super(FormView, self).form_valid(form)
 
 
@@ -33,10 +25,4 @@ class RequestsList(LoginRequiredMixin, ListView):
     template_name = 'pages/requests.html'
     model = UserRequests
     context_object_name = 'requests'
-    paginate_by = 5
-
-    # def get_queryset(self):
-    #     if 'category' in self.kwargs:
-    #         self.category = get_object_or_404(Category, slug=self.kwargs['category'])
-    #         return Post.objects.filter(active=True, categories=self.category, published_date__lte=timezone.now(), members_only=False)
-    #     return Post.objects.filter(active=True, published_date__lte=timezone.now(), members_only=False)
+    paginate_by = 50

mhackspace/templates/pages/home.html

@@ -19,7 +19,7 @@
   <h3>Introduction</h3>
   <p>Hackspaces (also known as makerspaces) are a shared space where artists, designers, makers, hackers, programmers, tinkerers, professionals and hobbyists can work on their projects, share knowledge and collaborate.</p>
 
-  <p>We now how a space as of March 2017, we are now in the process of kitting it out with tools to facilitate working on your projects, At the moment, communication is via a <a href="https://groups.google.com/forum/#!forum/maidstone-hackspace">mailing list</a>, email, and <a href="https://hangouts.google.com/group/oDcAL0nDfQYfO3qq1">Chat</a>. If you're at all intrested please join our mailing list and say hi.</p>
+  <p>We now how a space as of March 2017, we are now in the process of kitting it out with tools to facilitate working on your projects. At the moment, communication is via a <a href="https://groups.google.com/forum/#!forum/maidstone-hackspace">mailing list</a>, email, and <a href="https://hangouts.google.com/group/oDcAL0nDfQYfO3qq1">Chat</a>. If you're at all intrested please join our mailing list and say hi.</p>
 
   <p>If you would like to visit us <a href="https://www.google.co.uk/maps/place/Maidstone+Community+Support+Centre/@51.2743759,0.5252557,17z/data=!3m1!4b1!4m5!3m4!1s0x47df32307962b7b3:0x8478b1177ec21ef7!8m2!3d51.2743759!4d0.5274444">click here</a> for a map, and check the <a href="https://groups.google.com/forum/#!forum/maidstone-hackspace">mailing list</a> for when we are at the space, we recommend contacting us to avoid disapointment.</p>
 

mhackspace/templates/users/user_detail.html

@@ -39,7 +39,7 @@
         <div class="date">Joined {{membership.date}}</div>
         <div class="container">
           <div class="middle">
-            <p>MHS{{ user.id|stringformat:"05d" }}</p><p>{{user.name}}{{user.last_name}}</p>
+            <p>MHS{{ user.id|stringformat:"05d" }}</p><p>{{user.name}}</p>
           </div>
           <a href="{% url 'cancel_membership' %}">Cancel Membership</a>
         </div>

mhackspace/templates/wiki/article.html

@@ -11,7 +11,7 @@
 {% block wiki_contents %}
     <div id="article-container" class="container-fluid">
         <div class="row inline-group" id="article-title">
-            <div class="col-sm-2 float-left" id="article-title-li">
+            <div class="col-sm-12 float-left" id="article-title-li">
                 <h1 id="article-title">
                     {{ article.current_revision.title }}
                     <small style="font-size: 14px;">
@@ -29,7 +29,7 @@
         </div>
 
         <div class="row inline-group" id="article-contents">
-            <div class="col-sm-2 float-left" id="article-contents-li">
+            <div class="col-sm-12 float-left" id="article-contents-li">
                 {% block wiki_contents_tab %}
                 {% endblock %}
             </div>