From 7526774a620d248bd2b02d4d6c87c1e8ac3176e9 Mon Sep 17 00:00:00 2001 From: vaishk Date: Tue, 19 Dec 2017 15:10:14 +0530 Subject: [PATCH] Search Page --- camp/static/css/main.css | 21 +++++++++++++-- content/templates/preview.html | 38 ++++++++++++++------------- content/templates/results.html | 48 ++++++++++++++++++++++++++++------ content/views.py | 10 +++++++ 4 files changed, 89 insertions(+), 28 deletions(-) diff --git a/camp/static/css/main.css b/camp/static/css/main.css index 5d45c7a..2400ab5 100644 --- a/camp/static/css/main.css +++ b/camp/static/css/main.css @@ -121,7 +121,24 @@ ul.clearing-thumbs li { border: none; } -.related-row { - padding: 5px 0px; +.results { + padding: 20px; } +.results-title { + padding-top: 20px; + padding-left: 20px; +} + +.pagination { + padding-bottom: 20px; +} + +.pagination a, .pagination button { + color: #ffffff !important; +} + +.pagination a:hover, + .pagination button:hover { + background: #1779ba !important; } + diff --git a/content/templates/preview.html b/content/templates/preview.html index 6e95736..7ab050d 100644 --- a/content/templates/preview.html +++ b/content/templates/preview.html @@ -1,19 +1,21 @@ -
-
- {% if content.image_url %} - - {% endif %} -
-
- {{content.title}} - {% if content.type.name == 'events' %} -
- - {{ content.datestart }} {% if content.dateend %} - {{content.dateend}} {% endif %} - - {% if content.place %}
{{content.place}}{% endif%} -
- {% endif %} -

{{ content.formatted_teaser }}

+
+
+
+ {% if content.image_url %} + + {% endif %}
-
+
+ {{content.title}} + {% if content.type.name == 'events' %} +
+ + {{ content.datestart }} {% if content.dateend %} - {{content.dateend}} {% endif %} + + {% if content.place %}
{{content.place}}{% endif%} +
+ {% endif %} +

{{ content.formatted_teaser }}

+
+
+
\ No newline at end of file diff --git a/content/templates/results.html b/content/templates/results.html index a26b3df..4796be3 100644 --- a/content/templates/results.html +++ b/content/templates/results.html @@ -3,10 +3,15 @@ {% block content %}
+
+
+

Search results

+
+
{% for content in results %} {% if content.type.name == 'news' %}
-
+
{{content.datestart}} {{ content.title }}
{{ content.formatted_header|striptags|safe }} @@ -14,26 +19,53 @@
{% elif content.type.name == 'events' %} -
-
+
+
-
+
{{ content.title }} -
{{ content.datestart }} {% if content.dateend %} - {{content.dateend}} {% endif %}
- {{content.place}}
-

{{content.header|striptags|truncatechars:100|safe}}

+
{{ content.datestart }} {% if content.dateend %} - {{content.dateend}} {% endif %} + {% if content.place %}
{{content.place}} {% endif%}
+

{{content.header|striptags|safe}}

read more

{% else %} -
+
+
Add view for content type: {{content.type}} +
{% endif %} {% endfor %}

+ {% if results.has_other_pages %} +
+
+
    + {% if results.has_previous %} +
  • «
    • + {% else %} +
  • «
    • + {% endif %} + {% for i in results.paginator.page_range %} + {% if results.number == i %} +
  • {{ i }} (current)
    • + {% else %} +
  • {{ i }}
    • + {% endif %} + {% endfor %} + {% if results.has_next %} +
  • »
    • + {% else %} +
  • »
    • + {% endif %} +
+
+
+{% endif %}
{% endblock %} diff --git a/content/views.py b/content/views.py index 5931475..936120d 100644 --- a/content/views.py +++ b/content/views.py @@ -8,6 +8,7 @@ from django.http import HttpResponse, Http404 from django.shortcuts import get_object_or_404, render, redirect from django.urls import reverse from django.views.generic.list import ListView +from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from photologue.views import GalleryListView from photologue.models import Photo, Gallery @@ -121,6 +122,15 @@ def page(request, shortname): def search(request): q = request.GET.get('q') results = Content.objects.filter(body__contains=q).order_by('-datestart') + page = request.GET.get('page', 1) + paginator = Paginator(results, 5) + try: + results = paginator.page(page) + except PageNotAnInteger: + results = paginator.page(1) + except EmptyPage: + results = paginator.page(paginator.num_pages) + return render(request, 'results.html', {'results': results})