From 14b96b8824445765e8574b2da6fedc785e5eb660 Mon Sep 17 00:00:00 2001 From: Adam Tauber Date: Wed, 4 Jan 2017 00:49:52 +0100 Subject: [PATCH 01/17] [enh] propagate all search properties to the results page's components --- searx/templates/oscar/results.html | 40 +++++++++++++----------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 0ae83e74b..f5e95438d 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -1,6 +1,15 @@ {% extends "oscar/base.html" %} +{% macro search_form_attrs() -%} + {% for category in selected_categories %}{% endfor %} + + + + +{%- endmacro %} +{%- macro search_url() %}{{ base_url }}?q={{ q|urlencode }}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if time_range %}&time_range={{ time_range }}{% endif %}{% if current_language != 'all' %}&language={{ current_language }}{% endif %}{% endmacro -%} + {% block title %}{{ q|e }} - {% endblock %} -{% block meta %}{% endblock %} +{% block meta %}{% endblock %} {% block content %}
@@ -36,20 +45,14 @@ {% if rtl %}