From 56b7e05721394c0490ff43960cb7fa5626e83e3d Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 8 Dec 2019 14:14:18 +0100 Subject: themes: remove CR from newlines Adding a CR in some files and in others not, is a good starting point for a DOS+Unix mess we all have already seen in many projects. Patch fixes all files matching (even those comming from grunt's build):: find ./searx -exec file {} \; | grep CR BTW: Same with mixing TAB and SPACE indent styles in one and the same file. So if sources are tuched here in this patch, its also fixed. Signed-off-by: Markus Heiser --- searx/templates/oscar/results.html | 312 ++++++++++++++++++------------------- 1 file changed, 156 insertions(+), 156 deletions(-) (limited to 'searx/templates/oscar/results.html') diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index fce7f97d6..b6bcdd949 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -1,156 +1,156 @@ -{% extends "oscar/base.html" %} -{% macro search_form_attrs(pageno) -%} - {% for category in selected_categories %}{% endfor %} - - - - - {% if timeout_limit %}{% endif %} -{%- 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 content %} - {% include 'oscar/search.html' %} -
-
-

{{ _('Search results') }}

- - {% if corrections %} -
- {{ _('Try searching for:') }} - {% for correction in corrections %} - - {% endfor %} -
- {% endif %} - - {% if answers %} - {% for answer in answers %} -
- {{ answer }} -
- {% endfor %} - {% endif %} - - {% for result in results %} -
- {% set index = loop.index %} - {% if result.template %} - {% include get_result_template('oscar', result['template']) %} - {% else %} - {% include 'oscar/result_templates/default.html' %} - {% endif %} -
- {% endfor %} - - {% if not results and not answers %} - {% include 'oscar/messages/no_results.html' %} - {% endif %} - -
- - {% if paging %} - {% if rtl %} - -
- {% else %} - -
- {% endif %} - {% endif %} -
- - -
-{% endblock %} +{% extends "oscar/base.html" %} +{% macro search_form_attrs(pageno) -%} + {% for category in selected_categories %}{% endfor %} + + + + + {% if timeout_limit %}{% endif %} +{%- 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 content %} + {% include 'oscar/search.html' %} +
+
+

{{ _('Search results') }}

+ + {% if corrections %} +
+ {{ _('Try searching for:') }} + {% for correction in corrections %} + + {% endfor %} +
+ {% endif %} + + {% if answers %} + {% for answer in answers %} +
+ {{ answer }} +
+ {% endfor %} + {% endif %} + + {% for result in results %} +
+ {% set index = loop.index %} + {% if result.template %} + {% include get_result_template('oscar', result['template']) %} + {% else %} + {% include 'oscar/result_templates/default.html' %} + {% endif %} +
+ {% endfor %} + + {% if not results and not answers %} + {% include 'oscar/messages/no_results.html' %} + {% endif %} + +
+ + {% if paging %} + {% if rtl %} + +
+ {% else %} + +
+ {% endif %} + {% endif %} +
+ + +
+{% endblock %} -- cgit v1.2.3 From a3b5f3230c4c7a0305cc3d603550cee57205c1e0 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 10 Dec 2019 18:33:36 +0100 Subject: theme: oscar - remove dust (comes from PR #1671 implementation) was inadvertently included in the commit [1] [1] https://github.com/asciimoo/searx/commit/f34ac58752b3857468d01c79d7bc3409e8b03fe3#diff-0243d1c24e9981002156cc87cc10bd53R103 Signed-off-by: Markus Heiser --- searx/templates/oscar/results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/oscar/results.html') diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index a33d5b895..9cf942695 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -100,7 +100,7 @@ {% if unresponsive_engines and results|length >= 1 -%} -- cgit v1.2.3 From 36ca2dcc56651688cd7ca8b8d925a9370bdc1dec Mon Sep 17 00:00:00 2001 From: Vipul Date: Fri, 20 Dec 2019 23:34:22 +0000 Subject: [Fix] oscar: move info box at top of the page In low width devices like mobile, tablet etc, info box is present at bottom of the page. This change addresses the issue by rearranging column grids for low width devices and move side bar at top of the page. See - https://getbootstrap.com/docs/3.3/css/#grid-column-ordering. - and Searx issue tracker (issue#1777), for more information. Effect: Along with Info, Suggestion and Link boxes also move to top of the page. Resolves: #1777 --- searx/templates/oscar/results.html | 124 ++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'searx/templates/oscar/results.html') diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 9cf942695..43e3e26d9 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -15,7 +15,68 @@ {% include 'oscar/search.html' %}
-
+ + +

{{ _('Search results') }}

{% if corrections -%} @@ -91,66 +152,5 @@ {% endif %} {% endif %}
- -
{% endblock %} -- cgit v1.2.3