From a6f20caf32af463b57a026ee7cb7ed6317db6b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Mon, 23 Sep 2019 17:14:32 +0200 Subject: add initial support for offline engines && command engine --- searx/templates/oscar/result_templates/key-value.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 searx/templates/oscar/result_templates/key-value.html (limited to 'searx/templates/oscar/result_templates') diff --git a/searx/templates/oscar/result_templates/key-value.html b/searx/templates/oscar/result_templates/key-value.html new file mode 100644 index 000000000..67c748e7f --- /dev/null +++ b/searx/templates/oscar/result_templates/key-value.html @@ -0,0 +1,19 @@ +{% from 'oscar/macros.html' import result_footer, result_footer_rtl with context %} +
+ + {% for key, value in result.items() %} + {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %} + {% continue %} + {% endif %} + + + + {% endfor %} +
{{ key|upper }}: {{ value }}
+ +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} +{{ result_footer(result) }} +{% endif %} +
-- cgit v1.2.3 From 9299355570e32c4d24d7274d716eca1a93119d13 Mon Sep 17 00:00:00 2001 From: Marc Abonce Seguin Date: Sun, 24 Nov 2019 20:21:37 -0700 Subject: add seedpeer again --- searx/templates/oscar/result_templates/torrent.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/oscar/result_templates') diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html index f5ea415e2..089367e36 100644 --- a/searx/templates/oscar/result_templates/torrent.html +++ b/searx/templates/oscar/result_templates/torrent.html @@ -3,7 +3,7 @@ {{ result_header(result, favicons) }} {{ result_sub_header(result) }} -{% if result.seed %}

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }} • {{ _('Leecher') }} {{ result.leech }}{% endif %} +{% if result.seed is defined %}

{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }} • {{ _('Leecher') }} {{ result.leech }}{% endif %} {% if result.filesize %}
{{ icon('floppy-disk') }} {{ _('Filesize') }} {% if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }} -- cgit v1.2.3 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/result_templates/code.html | 36 +++--- .../templates/oscar/result_templates/default.html | 62 ++++----- searx/templates/oscar/result_templates/images.html | 98 +++++++------- searx/templates/oscar/result_templates/map.html | 144 ++++++++++----------- searx/templates/oscar/result_templates/videos.html | 54 ++++---- 5 files changed, 197 insertions(+), 197 deletions(-) (limited to 'searx/templates/oscar/result_templates') diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html index ba74d0333..a1c18a6b7 100644 --- a/searx/templates/oscar/result_templates/code.html +++ b/searx/templates/oscar/result_templates/code.html @@ -1,18 +1,18 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if result.content %}

{{ result.content|safe }}

{% endif %} - -{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %} - -
-{{ result.codelines|code_highlighter(result.code_language)|safe }} -
- -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} + +{{ result_header(result, favicons) }} +{{ result_sub_header(result) }} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} + +{% if result.repository %}

{{ icon('file') }} {{ result.repository }}

{% endif %} + +
+{{ result.codelines|code_highlighter(result.code_language)|safe }} +
+ +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} +{{ result_footer(result) }} +{% endif %} diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 3ed0f3122..62b4d572d 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,31 +1,31 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if result.embedded %} - • -{% endif %} - -{% if result.embedded %} -
- {{ result.embedded|safe }} -
-{% endif %} - -{% if result.img_src %} -
-
-{{ result.title|striptags }} -{% if result.content %}

{{ result.content|safe }}

{% endif %} -
-
-{% else %} -{% if result.content %}

{{ result.content|safe }}

{% endif %} -{% endif %} - -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} + +{{ result_header(result, favicons) }} +{{ result_sub_header(result) }} + +{% if result.embedded %} + • +{% endif %} + +{% if result.embedded %} +
+ {{ result.embedded|safe }} +
+{% endif %} + +{% if result.img_src %} +
+
+{{ result.title|striptags }} +{% if result.content %}

{{ result.content|safe }}

{% endif %} +
+
+{% else %} +{% if result.content %}

{{ result.content|safe }}

{% endif %} +{% endif %} + +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} +{{ result_footer(result) }} +{% endif %} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index b3292f448..55da5485f 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -1,49 +1,49 @@ -{% from 'oscar/macros.html' import draw_favicon %} - - - {{ result.title|striptags }} - - - +{% from 'oscar/macros.html' import draw_favicon %} + + + {{ result.title|striptags }} + + + diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html index 822c7cdea..712375d7f 100644 --- a/searx/templates/oscar/result_templates/map.html +++ b/searx/templates/oscar/result_templates/map.html @@ -1,72 +1,72 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if (result.latitude and result.longitude) or result.boundingbox %} - • -{% endif %} - -{% if result.osm and (result.osm.type and result.osm.id) %} - • -{% endif %} - -{# {% if (result.latitude and result.longitude) %} - • -{% endif %} #} - -
- -{% if result.address %} -

- {% if result.address.name %} - {{ result.address.name }}
- {% endif %} - {% if result.address.road %} - - {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %} - {{ result.address.road }} -
- {% endif %} - {% if result.address.locality %} - {{ result.address.locality }} - {% if result.address.postcode %}, {{ result.address.postcode }}{% endif %} -
- {% endif %} - {% if result.address.country %} - {{ result.address.country }} - {% endif %} -

-{% endif %} - -{% if result.osm and (result.osm.type and result.osm.id) %} -
-
Loading ...
- - - -
-{% endif %} - -{# {% if (result.latitude and result.longitude) %} -
- Longitude: {{ result.longitude }}
- Latitude: {{ result.latitude }} -
-{% endif %} #} - -{% if result.content %}

{{ result.content|safe }}

{% endif %} - -
- -{% if (result.latitude and result.longitude) or result.boundingbox %} -
-
-
-{% endif %} - -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} + +{{ result_header(result, favicons) }} +{{ result_sub_header(result) }} + +{% if (result.latitude and result.longitude) or result.boundingbox %} + • +{% endif %} + +{% if result.osm and (result.osm.type and result.osm.id) %} + • +{% endif %} + +{# {% if (result.latitude and result.longitude) %} + • +{% endif %} #} + +
+ +{% if result.address %} +

+ {% if result.address.name %} + {{ result.address.name }}
+ {% endif %} + {% if result.address.road %} + + {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %} + {{ result.address.road }} +
+ {% endif %} + {% if result.address.locality %} + {{ result.address.locality }} + {% if result.address.postcode %}, {{ result.address.postcode }}{% endif %} +
+ {% endif %} + {% if result.address.country %} + {{ result.address.country }} + {% endif %} +

+{% endif %} + +{% if result.osm and (result.osm.type and result.osm.id) %} +
+
Loading ...
+ + + +
+{% endif %} + +{# {% if (result.latitude and result.longitude) %} +
+ Longitude: {{ result.longitude }}
+ Latitude: {{ result.latitude }} +
+{% endif %} #} + +{% if result.content %}

{{ result.content|safe }}

{% endif %} + +
+ +{% if (result.latitude and result.longitude) or result.boundingbox %} +
+
+
+{% endif %} + +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} +{{ result_footer(result) }} +{% endif %} diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html index 36fb26240..3c1913d9d 100644 --- a/searx/templates/oscar/result_templates/videos.html +++ b/searx/templates/oscar/result_templates/videos.html @@ -1,27 +1,27 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if result.embedded %} - • -{% endif %} - -{% if result.embedded %} -
- {{ result.embedded|safe }} -
-{% endif %} - -
-
- {{ result.title|striptags }} {{ result.engine }} - {% if result.content %}

{{ result.content|safe }}

{% endif %} -
-
- -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %} + +{{ result_header(result, favicons) }} +{{ result_sub_header(result) }} + +{% if result.embedded %} + • +{% endif %} + +{% if result.embedded %} +
+ {{ result.embedded|safe }} +
+{% endif %} + +
+
+ {{ result.title|striptags }} {{ result.engine }} + {% if result.content %}

{{ result.content|safe }}

{% endif %} +
+
+ +{% if rtl %} +{{ result_footer_rtl(result) }} +{% else %} +{{ result_footer(result) }} +{% endif %} -- cgit v1.2.3 From f34ac58752b3857468d01c79d7bc3409e8b03fe3 Mon Sep 17 00:00:00 2001 From: Dalf Date: Tue, 6 Aug 2019 11:41:16 +0200 Subject: [mod] tidy oscar HTML output --- .../templates/oscar/result_templates/default.html | 62 ++++++++-------- searx/templates/oscar/result_templates/images.html | 85 +++++++++------------- 2 files changed, 67 insertions(+), 80 deletions(-) (limited to 'searx/templates/oscar/result_templates') diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html index 3ed0f3122..885cbbfa8 100644 --- a/searx/templates/oscar/result_templates/default.html +++ b/searx/templates/oscar/result_templates/default.html @@ -1,31 +1,31 @@ -{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} - -{{ result_header(result, favicons) }} -{{ result_sub_header(result) }} - -{% if result.embedded %} - • -{% endif %} - -{% if result.embedded %} -
- {{ result.embedded|safe }} -
-{% endif %} - -{% if result.img_src %} -
-
-{{ result.title|striptags }} -{% if result.content %}

{{ result.content|safe }}

{% endif %} -
-
-{% else %} -{% if result.content %}

{{ result.content|safe }}

{% endif %} -{% endif %} - -{% if rtl %} -{{ result_footer_rtl(result) }} -{% else %} -{{ result_footer(result) }} -{% endif %} +{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon with context %} + +{{- result_header(result, favicons) -}} +{{- result_sub_header(result) -}} + +{%- if result.embedded -%} + • +{%- endif -%} + +{%- if result.embedded -%} +
+ {{ result.embedded|safe }} +
+{%- endif -%} + +{%- if result.img_src -%} +
+
+{{ result.title|striptags }} +{% if result.content %}

{{ result.content|safe }}

{% endif -%} +
+
+{%- else -%} +{%- if result.content %}

{{ result.content|safe }}

{% endif -%} +{%- endif -%} + +{%- if rtl -%} +{{ result_footer_rtl(result) }} +{%- else -%} +{{ result_footer(result) }} +{%- endif -%} diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index b3292f448..8985a9f4e 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -1,49 +1,36 @@ -{% from 'oscar/macros.html' import draw_favicon %} - - - {{ result.title|striptags }} - - - +{%- from 'oscar/macros.html' import draw_favicon -%} + +{{- "" -}} + {{ result.title|striptags }}{{- "" -}} + +{{- "" -}} -- cgit v1.2.3 From 2a5c39e33c3306ca17e09211fbf5a0f785cb10c8 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 10 Dec 2019 18:10:33 +0100 Subject: theme: oscar - tidy up trailing whitespaces and tab usage Signed-off-by: Markus Heiser --- searx/templates/oscar/result_templates/images.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/oscar/result_templates') diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html index 8985a9f4e..d0a3b7b83 100644 --- a/searx/templates/oscar/result_templates/images.html +++ b/searx/templates/oscar/result_templates/images.html @@ -22,7 +22,7 @@ {{ result.engine }}{{- "" -}}

{{ result.pretty_url }}

{{- "" -}}
{{- "" -}} -
{{- "" -}} +
{{- "" -}}
{{- "" -}} {{ _('Get image') }}{{- "" -}}
{{- "" -}} -- cgit v1.2.3