Merge pull request #161 from olymk2/master

Increase pagination size, and change class from sm-2 to sm-12
This commit is contained in:
Oliver Marks 2017-10-14 09:07:35 +01:00 committed by GitHub
commit b7127fbef2
2 changed files with 3 additions and 17 deletions

View File

@ -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

View File

@ -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>