From 95d78225e58c59cff23e0701b3170a9fa974c787 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Wed, 11 Oct 2017 21:56:20 +0100 Subject: [PATCH 1/3] fix duplicate surname on membership card --- mhackspace/templates/users/user_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhackspace/templates/users/user_detail.html b/mhackspace/templates/users/user_detail.html index 6cd00ad..03eb10e 100644 --- a/mhackspace/templates/users/user_detail.html +++ b/mhackspace/templates/users/user_detail.html @@ -39,7 +39,7 @@
Joined {{membership.date}}
-

MHS{{ user.id|stringformat:"05d" }}

{{user.name}}{{user.last_name}}

+

MHS{{ user.id|stringformat:"05d" }}

{{user.name}}

Cancel Membership
From 1fe57ef0b476e367dc4ad3481deab1702527b798 Mon Sep 17 00:00:00 2001 From: Oliver Marks Date: Sat, 14 Oct 2017 09:00:30 +0100 Subject: [PATCH 2/3] Increase pagination size, and change class from sm-2 to sm-12 --- mhackspace/requests/views.py | 16 +--------------- mhackspace/templates/wiki/article.html | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/mhackspace/requests/views.py b/mhackspace/requests/views.py index 0864759..e313493 100644 --- a/mhackspace/requests/views.py +++ b/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 diff --git a/mhackspace/templates/wiki/article.html b/mhackspace/templates/wiki/article.html index bd0b89a..007c125 100644 --- a/mhackspace/templates/wiki/article.html +++ b/mhackspace/templates/wiki/article.html @@ -11,7 +11,7 @@ {% block wiki_contents %}
-
+

{{ article.current_revision.title }} @@ -29,7 +29,7 @@

-
+
{% block wiki_contents_tab %} {% endblock %}
From 0f4069a40a96d0703a982746dc21dadf7f733e1f Mon Sep 17 00:00:00 2001 From: Simon Ridley Date: Wed, 18 Oct 2017 20:18:29 +0100 Subject: [PATCH 3/3] Update home.html Alteration to sentence. --- mhackspace/templates/pages/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhackspace/templates/pages/home.html b/mhackspace/templates/pages/home.html index 23b8f15..e35ba55 100644 --- a/mhackspace/templates/pages/home.html +++ b/mhackspace/templates/pages/home.html @@ -19,7 +19,7 @@

Introduction

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.

-

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 mailing list, email, and Chat. If you're at all intrested please join our mailing list and say hi.

+

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 mailing list, email, and Chat. If you're at all intrested please join our mailing list and say hi.

If you would like to visit us click here for a map, and check the mailing list for when we are at the space, we recommend contacting us to avoid disapointment.