From 9b0fb4e781086b54d79a2eee851d6d8af49a1d9a Mon Sep 17 00:00:00 2001
From: Abdellah Chelli <abdellahchelli@gmail.com>
Date: Tue, 22 May 2018 01:27:39 +0100
Subject: [PATCH] Add pagination rel-links to all searches, #406

 Apply escape charaters filter on it
---
 src/alfanous-django/templates/aya_results.html            | 4 ----
 src/alfanous-django/templates/aya_search.html             | 6 ++++++
 src/alfanous-django/templates/translation_search.html     | 6 ++++++
 src/alfanous-django/templates/word_search.html            | 6 +++++-
 src/alfanous-django/wui/templates/wui/pagination_rel.html | 4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/alfanous-django/templates/aya_results.html b/src/alfanous-django/templates/aya_results.html
index 414fc6b00..66cd4af10 100644
--- a/src/alfanous-django/templates/aya_results.html
+++ b/src/alfanous-django/templates/aya_results.html
@@ -10,10 +10,6 @@
   {% block pagination_phone %} {% endblock %}
 {% endkwacro %}
 
-{% block pagination_rel_block %}
-  {% include 'wui/pagination_rel.html' with page=results.search.interval.page nb_pages=results.search.interval.nb_pages %}
-{% endblock %}
-
 {% block results %}
 	<div id="#search_result_static" class="row span9 offset2  text-center ">
 
diff --git a/src/alfanous-django/templates/aya_search.html b/src/alfanous-django/templates/aya_search.html
index ff2917555..2d894b5f1 100644
--- a/src/alfanous-django/templates/aya_search.html
+++ b/src/alfanous-django/templates/aya_search.html
@@ -3,6 +3,12 @@
 {% load custom_filters %}
 {% load query %}
 
+{% block pagination_rel_block %}
+  {% if results.search.interval.nb_pages > 1 %}
+    {% include 'wui/pagination_rel.html' with page=results.search.interval.page nb_pages=results.search.interval.nb_pages %}
+  {% endif %}
+{% endblock %}
+
 {% block options %}
 <!-- Multiple Checkboxes -->
 <div class="control-group">
diff --git a/src/alfanous-django/templates/translation_search.html b/src/alfanous-django/templates/translation_search.html
index d2389ec54..463ccec80 100644
--- a/src/alfanous-django/templates/translation_search.html
+++ b/src/alfanous-django/templates/translation_search.html
@@ -3,6 +3,12 @@
 {% load custom_filters %}
 {% load query %}
 
+{% block pagination_rel_block %}
+  {% if results.search.interval.nb_pages > 1 %}
+    {% include 'wui/pagination_rel.html' with page=results.search.interval.page nb_pages=results.search.interval.nb_pages %}
+  {% endif %}
+{% endblock %}
+
 {% block no_request %} 
 	<div style="direction: {{ bidi.direction }};">
 	{{ _("List of indexed Quran translations") }} ({{ _("Translation source:") }} <a  href='http://tanzil.net/trans/' target='_blank' >{{ _("Tanzil") }}</a>):<button id="showlog" type="button">{{ _("Show/Hide!") }}</button><br> 
diff --git a/src/alfanous-django/templates/word_search.html b/src/alfanous-django/templates/word_search.html
index 73db2c54c..0f051068e 100644
--- a/src/alfanous-django/templates/word_search.html
+++ b/src/alfanous-django/templates/word_search.html
@@ -3,7 +3,11 @@
 {% load custom_filters %}
 {% load query %}
 
-
+{% block pagination_rel_block %}
+  {% if results.search.interval.nb_pages > 1 %}
+    {% include 'wui/pagination_rel.html' with page=results.search.interval.page nb_pages=results.search.interval.nb_pages %}
+  {% endif %}
+{% endblock %}
 
 {% block options %}
 {% endblock %}
diff --git a/src/alfanous-django/wui/templates/wui/pagination_rel.html b/src/alfanous-django/wui/templates/wui/pagination_rel.html
index 5fcec111c..4b0ac69bc 100644
--- a/src/alfanous-django/wui/templates/wui/pagination_rel.html
+++ b/src/alfanous-django/wui/templates/wui/pagination_rel.html
@@ -6,12 +6,12 @@
 
 {% if page != 1 %}
   {% with page|add:"-1" as prev_page %}
-	<link rel="prev" href="?{% custom_query params.query prev_page False %}" />
+	<link rel="prev" href="{% filter force_escape %}?{% custom_query params.query prev_page False %}{% endfilter %}" />
   {% endwith %}
 {% endif %}
 
 {% if page != nb_pages %}
   {% with page|add:"+1" as next_page %}
-	<link rel="next" href="?{% custom_query params.query next_page False %}" />
+	<link rel="next" href="{% filter force_escape %}?{% custom_query params.query next_page False %}{% endfilter %}" />
   {% endwith %}
 {% endif %}