git.iko.soy/searx
on master help sign in
Merge pull request #2662 from dalf/oscar-trim-space
7e5553dAlexandre Flament
searx/templates/oscar/macros.html+51−51
compare with master
unifiedsplit
@@ -19,9 +19,9 @@
19
19
20<!-- Draw result sub header -->
20<!-- Draw result sub header -->
21{% macro result_sub_header(result, id) -%}
21{% macro result_sub_header(result, id) -%}
22− {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}
22+ {%- if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif -%}
23− {% if result.magnetlink %}<small> &bull; {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink", id) }}</small>{% endif %}
23+ {%- if result.magnetlink %}<small> &bull; {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink", id) }}</small>{% endif -%}
24− {% if result.torrentfile %}<small> &bull; {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile", id) }}</small>{% endif %}
24+ {%- if result.torrentfile %}<small> &bull; {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile", id) }}</small>{% endif -%}
25{%- endmacro %}
25{%- endmacro %}
26
26
27<!-- Draw result footer -->
27<!-- Draw result footer -->
@@ -32,11 +32,11 @@
32 <span class="label label-default">{{ engine }}</span>
32 <span class="label label-default">{{ engine }}</span>
33 {%- endfor -%}
33 {%- endfor -%}
34 {%- if result.url -%}
34 {%- if result.url -%}
35− {% if result.cached_url %}
35+ {%- if result.cached_url -%}
36 <small>{{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }}</small>
36 <small>{{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }}</small>
37− {% elif not result.is_onion %}
37+ {%- elif not result.is_onion -%}
38 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
38 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
39− {% endif %}
39+ {%- endif -%}
40 {%- endif -%}
40 {%- endif -%}
41 {%- if proxify -%}
41 {%- if proxify -%}
42 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
42 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
@@ -49,73 +49,73 @@
49
49
50<!-- Draw result footer without cache link -->
50<!-- Draw result footer without cache link -->
51{% macro result_footer_nocache(result) -%}
51{% macro result_footer_nocache(result) -%}
52− <div class="clearfix"></div>
52+ <div class="clearfix"></div>{{- "" -}}
53 <div class="pull-right">
53 <div class="pull-right">
54− {% for engine in result.engines %}
54+ {%- for engine in result.engines -%}
55 <span class="label label-default">{{ engine }}</span>
55 <span class="label label-default">{{ engine }}</span>
56− {% endfor %}
56+ {%- endfor -%}
57− {% if proxify %}
57+ {%- if proxify -%}
58 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
58 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
59− {% endif %}
59+ {%- endif -%}
60−</div>
60+</div>{{- "" -}}
61<div class="external-link">{{ result.pretty_url }}</div>
61<div class="external-link">{{ result.pretty_url }}</div>
62{%- endmacro %}
62{%- endmacro %}
63
63
64<!-- Draw result footer -->
64<!-- Draw result footer -->
65{% macro result_footer_rtl(result, id) -%}
65{% macro result_footer_rtl(result, id) -%}
66− <div class="clearfix"></div>{{- "" -}}
66+ <div class="clearfix"></div>
67− {% for engine in result.engines -%}
67+ {%- for engine in result.engines -%}
68 <span class="label label-default">{{ engine }}</span>
68 <span class="label label-default">{{ engine }}</span>
69− {%- endfor %}
69+ {%- endfor -%}
70 {%- if result.url -%}
70 {%- if result.url -%}
71− {% if result.cached_url %}
71+ {%- if result.cached_url -%}
72 <small>{{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }}</small>
72 <small>{{ result_link(result.cached_url, icon('link') + _('cached'), "text-info", id) }}</small>
73− {% elif not result.is_onion %}
73+ {%- elif not result.is_onion -%}
74 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
74 <small>{{ result_link("https://web.archive.org/web/" + result.url, icon('link') + _('cached'), "text-info", id) }}</small>
75− {% endif %}
75+ {%- endif -%}
76 {%- endif -%}
76 {%- endif -%}
77− {% if proxify -%}
77+ {%- if proxify -%}
78 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
78 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info", id) }}</small>
79− {%- endif %}
79+ {%- endif -%}
80 {%- if result.pretty_url -%}
80 {%- if result.pretty_url -%}
81 <div class="external-link">{{ result.pretty_url }}</div>
81 <div class="external-link">{{ result.pretty_url }}</div>
82− {%- endif %}
82+ {%- endif -%}
83{%- endmacro %}
83{%- endmacro %}
84
84
85<!-- Draw result footer without cache link -->
85<!-- Draw result footer without cache link -->
86{% macro result_footer_nocache_rtl(result) -%}
86{% macro result_footer_nocache_rtl(result) -%}
87 <div class="clearfix"></div>
87 <div class="clearfix"></div>
88− {% for engine in result.engines %}
88+ {%- for engine in result.engines -%}
89 <span class="label label-default">{{ engine }}</span>
89 <span class="label label-default">{{ engine }}</span>
90− {% endfor %}
90+ {%- endfor -%}
91− {% if proxify %}
91+ {%- if proxify -%}
92 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
92 <small>{{ result_link(proxify(result.url), icon('sort') + _('proxied'), "text-info") }}</small>
93− {% endif %}
93+ {%- endif -%}
94 <div class="external-link">{{ result.pretty_url }}</div>
94 <div class="external-link">{{ result.pretty_url }}</div>
95{%- endmacro %}
95{%- endmacro %}
96
96
97{% macro preferences_item_header(info, label, rtl, id) -%}
97{% macro preferences_item_header(info, label, rtl, id) -%}
98− {% if rtl %}
98+ {%- if rtl -%}
99− <div class="row form-group">
99+ <div class="row form-group">{{- "" -}}
100− <label class="col-sm-3 col-md-2 pull-right"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>
100+ <label class="col-sm-3 col-md-2 pull-right"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>{{- "" -}}
101− <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>
101+ <span class="col-sm-5 col-md-6 help-block pull-left">{{ info }}</span>{{- "" -}}
102 <div class="col-sm-4 col-md-4">
102 <div class="col-sm-4 col-md-4">
103− {% else %}
103+ {%- else -%}
104− <div class="row form-group">
104+ <div class="row form-group">{{- "" -}}
105− <label class="col-sm-3 col-md-2"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>
105+ <label class="col-sm-3 col-md-2"{% if id %} for="{{id}}"{% endif %}>{{ label }}</label>{{- "" -}}
106 <div class="col-sm-4 col-md-4">
106 <div class="col-sm-4 col-md-4">
107− {% endif %}
107+ {%- endif -%}
108{%- endmacro %}
108{%- endmacro %}
109
109
110{% macro preferences_item_footer(info, label, rtl) -%}
110{% macro preferences_item_footer(info, label, rtl) -%}
111− {% if rtl %}
111+ {%- if rtl -%}
112− </div>
112+ </div>{{- "" -}}
113 </div>
113 </div>
114− {% else %}
114+ {%- else -%}
115 </div>
115 </div>
116− <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>
116+ <span class="col-sm-5 col-md-6 help-block">{{ info }}</span>{{- "" -}}
117 </div>
117 </div>
118− {% endif %}
118+ {%- endif -%}
119{%- endmacro %}
119{%- endmacro %}
120
120
121{% macro custom_select_class(rtl) -%}
121{% macro custom_select_class(rtl) -%}
@@ -123,24 +123,24 @@ custom-select{% if rtl %}-rtl{% endif %}
123{%- endmacro %}
123{%- endmacro %}
124
124
125{% macro checkbox_toggle(id, blocked) -%}
125{% macro checkbox_toggle(id, blocked) -%}
126− <div class="onoffswitch">
126+ <div class="onoffswitch">{{- "" -}}
127− <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">
127+ <input type="checkbox" id="{{ id }}" name="{{ id }}"{% if blocked %} checked="checked"{% endif %} class="onoffswitch-checkbox">{{- "" -}}
128− <label class="onoffswitch-label" for="{{ id }}">
128+ <label class="onoffswitch-label" for="{{ id }}">{{- "" -}}
129− <span class="onoffswitch-inner"></span>
129+ <span class="onoffswitch-inner"></span>{{- "" -}}
130− <span class="onoffswitch-switch"></span>
130+ <span class="onoffswitch-switch"></span>{{- "" -}}
131− </label>
131+ </label>{{- "" -}}
132− <label class="visually-hidden" for="{{ id }}">{{ _('Allow') }}</label>
132+ <label class="visually-hidden" for="{{ id }}">{{ _('Allow') }}</label>{{- "" -}}
133− </div>
133+ </div>{{- "" -}}
134{%- endmacro %}
134{%- endmacro %}
135
135
136{% macro support_toggle(supports) -%}
136{% macro support_toggle(supports) -%}
137− {% if supports %}
137+ {%- if supports -%}
138 <span class="label label-success">
138 <span class="label label-success">
139− {{ _("supported") }}
139+ {{- _("supported") -}}
140 </span>
140 </span>
141− {% else %}
141+ {%- else -%}
142 <span class="label label-danger">
142 <span class="label label-danger">
143− {{ _("not supported") }}
143+ {{- _("not supported") -}}
144 </span>
144 </span>
145− {% endif %}
145+ {%- endif -%}
146{%- endmacro %}
146{%- endmacro %}
searx/templates/oscar/result_templates/default.html+6−6
@@ -9,16 +9,16 @@
9
9
10{%- if result.embedded -%}
10{%- if result.embedded -%}
11<div id="result-media-{{ index }}" class="collapse">
11<div id="result-media-{{ index }}" class="collapse">
12− {{ result.embedded|safe }}
12+ {{- result.embedded|safe -}}
13</div>
13</div>
14{%- endif -%}
14{%- endif -%}
15
15
16{%- if result.img_src -%}
16{%- if result.img_src -%}
17−<div class="container-fluid">
17+<div class="container-fluid">{{- "" -}}
18− <div class="row">
18+ <div class="row">{{- "" -}}
19−<img src="{{ image_proxify(result.img_src) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
19+ <img src="{{ image_proxify(result.img_src) }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
20−{% if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif -%}
20+ {%- if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif -%}
21− </div>
21+ </div>{{- "" -}}
22</div>
22</div>
23{%- else -%}
23{%- else -%}
24{%- if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif -%}
24{%- if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif -%}
searx/templates/oscar/result_templates/files.html+55−55
@@ -1,55 +1,55 @@
1−{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer_nocache, result_footer_nocache_rtl, icon with context %}
1+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer_nocache, result_footer_nocache_rtl, icon with context %}
2−
2+
3−{{ result_header(result, favicons) }}
3+{{- result_header(result, favicons) -}}
4−{{ result_sub_header(result) }}
4+{{- result_sub_header(result) -}}
5−
5+
6−{% if result.embedded %}
6+{%- if result.embedded -%}
7− <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">
7+ <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-media-{{ index }}" data-btn-text-collapsed="{{ _('show media') }}" data-btn-text-not-collapsed="{{ _('hide media') }}">
8− {% if result.mtype == 'audio' %}{{ icon('music') }}
8+ {%- if result.mtype == 'audio' %}{{ icon('music') -}}
9− {% elif result.mtype == 'video' %} {{ icon('film') }}
9+ {%- elif result.mtype == 'video' %} {{ icon('film') -}}
10− {% endif %} {{ _('show media') }}</a></small>
10+ {%- endif %} {{ _('show media') }}</a></small>
11−{% endif %}
11+{%- endif -%}
12−
12+
13−{% if result.embedded %}
13+{%- if result.embedded -%}
14−<div id="result-media-{{ index }}" class="collapse">
14+<div id="result-media-{{ index }}" class="collapse">
15− {{ result.embedded|safe }}
15+ {{- result.embedded|safe -}}
16−</div>
16+</div>
17−{% endif %}
17+{%- endif -%}
18−
18+
19−{% if result.abstract %}<p class="result-content result-abstract">{{ result.abstract|safe }}</p>{% endif %}
19+{%- if result.abstract %}<p class="result-content result-abstract">{{ result.abstract|safe }}</p>{% endif -%}
20−
20+
21−{% if result.img_src %}
21+{%- if result.img_src -%}
22−<div class="container-fluid">
22+<div class="container-fluid">
23− <div class="row">
23+ <div class="row">
24−<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
24+<img src="{{ image_proxify(result.img_src) }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" style="width: auto; max-height: 60px; min-height: 60px;" class="col-xs-2 col-sm-4 col-md-4 result-content">
25−{% if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
25+{%- if result.content %}<p class="result-content col-xs-8 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif -%}
26− </div>
26+ </div>
27−</div>
27+</div>
28−{% else %}
28+{%- else -%}
29−{% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}
29+{%- if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif -%}
30−{% endif %}
30+{%- endif -%}
31−
31+
32−<table class="result-metadata result-content">
32+<table class="result-metadata result-content">
33−{% if result.author %}<tr><td>{{ _('Author') }}</td><td>{{ result.author|safe }}</td></tr>{% endif %}
33+{%- if result.author %}<tr><td>{{ _('Author') }}</td><td>{{ result.author|safe }}</td></tr>{% endif -%}
34−
34+
35−{% if result.filename %}<tr><td>{{ _('Filename') }}</td><td>{{ result.filename|safe }}</td></tr>{% endif %}
35+{%- if result.filename %}<tr><td>{{ _('Filename') }}</td><td>{{ result.filename|safe }}</td></tr>{% endif -%}
36−
36+
37−{% if result.size %}<tr><td>{{ _('Filesize') }}</td><td>
37+{%- if result.size %}<tr><td>{{ _('Filesize') }}</td><td>
38− {% if result.size < 1024 %}{{ result.size }} {{ _('Bytes') }}
38+ {%- if result.size < 1024 %}{{ result.size }} {{ _('Bytes') -}}
39− {% elif result.size < 1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024) }} {{ _('kiB') }}
39+ {%- elif result.size < 1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024) }} {{ _('kiB') -}}
40− {% elif result.size < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024/1024) }} {{ _('MiB') }}
40+ {%- elif result.size < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024/1024) }} {{ _('MiB') -}}
41− {% elif result.size < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024/1024/1024) }} {{ _('GiB') }}
41+ {%- elif result.size < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.size/1024/1024/1024) }} {{ _('GiB') -}}
42− {% else %}{{ '{0:0.2f}'.format(result.size/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif %}
42+ {%- else %}{{ '{0:0.2f}'.format(result.size/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif -%}
43− </td></tr>
43+ </td></tr>
44−{% endif %}
44+{%- endif -%}
45−
45+
46−{% if result.time %}<tr><td>{{ _('Date') }}</td><td>{{ result.time|safe }}</td></tr>{% endif %}
46+{%- if result.time %}<tr><td>{{ _('Date') }}</td><td>{{ result.time|safe }}</td></tr>{% endif -%}
47−
47+
48−{% if result.mtype %}<tr><td>{{ _('Type') }}</td><td>{{ result.mtype|safe }}/{{ result.subtype|safe }}</td></tr>{% endif %}
48+{%- if result.mtype %}<tr><td>{{ _('Type') }}</td><td>{{ result.mtype|safe }}/{{ result.subtype|safe }}</td></tr>{% endif -%}
49−</table>
49+</table>
50−
50+
51−{% if rtl %}
51+{%- if rtl -%}
52−{{ result_footer_nocache_rtl(result) }}
52+{{ result_footer_nocache_rtl(result) }}
53−{% else %}
53+{%- else -%}
54−{{ result_footer_nocache(result) }}
54+{{ result_footer_nocache(result) }}
55−{% endif %}
55+{%- endif -%}
searx/templates/oscar/result_templates/map.html+28−28
@@ -1,15 +1,15 @@
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
2
2
3−{{ result_header(result, favicons, loop.index) }}
3+{{- result_header(result, favicons, loop.index) -}}
4−{{ result_sub_header(result, loop.index) }}
4+{{- result_sub_header(result, loop.index) -}}
5
5
6−{% if (result.latitude and result.longitude) or result.boundingbox %}
6+{%- if (result.latitude and result.longitude) or result.boundingbox -%}
7 <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>
7 <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>
8−{% endif %}
8+{%- endif -%}
9
9
10−{% if result.osm and (result.osm.type and result.osm.id) %}
10+{%- if result.osm and (result.osm.type and result.osm.id) -%}
11 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer searx_overpass_request disabled_if_nojs" data-toggle="collapse" data-target="#result-overpass-{{ index }}" data-osm-type="{{ result.osm.type }}" data-osm-id="{{ result.osm.id }}" data-result-table="result-overpass-table-{{ index }}" data-result-table-loadicon="result-overpass-table-loading-{{ index }}" data-btn-text-collapsed="{{ _('show details') }}" data-btn-text-not-collapsed="{{ _('hide details') }}">{{ icon('map-marker') }} {{ _('show details') }}</a></small>
11 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer searx_overpass_request disabled_if_nojs" data-toggle="collapse" data-target="#result-overpass-{{ index }}" data-osm-type="{{ result.osm.type }}" data-osm-id="{{ result.osm.id }}" data-result-table="result-overpass-table-{{ index }}" data-result-table-loadicon="result-overpass-table-loading-{{ index }}" data-btn-text-collapsed="{{ _('show details') }}" data-btn-text-not-collapsed="{{ _('hide details') }}">{{ icon('map-marker') }} {{ _('show details') }}</a></small>
12−{% endif %}
12+{%- endif -%}
13
13
14{# {% if (result.latitude and result.longitude) %}
14{# {% if (result.latitude and result.longitude) %}
15 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-geodata-{{ index }}" data-btn-text-collapsed="{{ _('show geodata') }}" data-btn-text-not-collapsed="{{ _('hide geodata') }}">{{ icon('map-marker') }} {{ _('show geodata') }}</a></small>
15 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer disabled_if_nojs" data-toggle="collapse" data-target="#result-geodata-{{ index }}" data-btn-text-collapsed="{{ _('show geodata') }}" data-btn-text-not-collapsed="{{ _('hide geodata') }}">{{ icon('map-marker') }} {{ _('show geodata') }}</a></small>
@@ -17,36 +17,36 @@
17
17
18<div class="container-fluid">
18<div class="container-fluid">
19
19
20−{% if result.address %}
20+{%- if result.address -%}
21<p class="row result-content result-adress col-xs-12 col-sm-5 col-md-4" itemscope itemtype="http://schema.org/PostalAddress">
21<p class="row result-content result-adress col-xs-12 col-sm-5 col-md-4" itemscope itemtype="http://schema.org/PostalAddress">
22− {% if result.address.name %}
22+ {%- if result.address.name -%}
23 <strong itemprop="name">{{ result.address.name }}</strong><br/>
23 <strong itemprop="name">{{ result.address.name }}</strong><br/>
24− {% endif %}
24+ {%- endif -%}
25− {% if result.address.road %}
25+ {%- if result.address.road -%}
26 <span itemprop="streetAddress">
26 <span itemprop="streetAddress">
27− {% if result.address.house_number %}{{ result.address.house_number }}, {% endif %}
27+ {%- if result.address.house_number %}{{ result.address.house_number }}, {% endif -%}
28− {{ result.address.road }}
28+ {{- result.address.road -}}
29 </span><br/>
29 </span><br/>
30− {% endif %}
30+ {%- endif -%}
31− {% if result.address.locality %}
31+ {%- if result.address.locality -%}
32 <span itemprop="addressLocality">{{ result.address.locality }}</span>
32 <span itemprop="addressLocality">{{ result.address.locality }}</span>
33− {% if result.address.postcode %}, <span itemprop="postalCode">{{ result.address.postcode }}</span>{% endif %}
33+ {%- if result.address.postcode %}, <span itemprop="postalCode">{{ result.address.postcode }}</span>{% endif -%}
34 <br/>
34 <br/>
35− {% endif %}
35+ {%- endif -%}
36− {% if result.address.country %}
36+ {%- if result.address.country -%}
37 <span itemprop="addressCountry">{{ result.address.country }}</span>
37 <span itemprop="addressCountry">{{ result.address.country }}</span>
38− {% endif %}
38+ {%- endif -%}
39</p>
39</p>
40−{% endif %}
40+{%- endif %}
41
41
42−{% if result.osm and (result.osm.type and result.osm.id) %}
42+{%- if result.osm and (result.osm.type and result.osm.id) -%}
43 <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}"{% if rtl %} dir="ltr"{% endif %}>
43 <div class="row result-content collapse col-xs-12 col-sm-7 col-md-8" id="result-overpass-{{ index }}"{% if rtl %} dir="ltr"{% endif %}>
44 <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
44 <div class="text-center" id="result-overpass-table-loading-{{ index }}"><img src="{{ url_for('static', filename='img/loader.gif') }}" alt="Loading ..."/></div>
45 <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
45 <table class="table table-striped table-condensed hidden" id="result-overpass-table-{{ index }}">
46 <tr><th>key</th><th>value</th></tr>
46 <tr><th>key</th><th>value</th></tr>
47 </table>
47 </table>
48 </div>
48 </div>
49−{% endif %}
49+{%- endif -%}
50
50
51{# {% if (result.latitude and result.longitude) %}
51{# {% if (result.latitude and result.longitude) %}
52 <div class="row collapse col-xs-12 col-sm-5 col-md-4" id="result-geodata-{{ index }}">
52 <div class="row collapse col-xs-12 col-sm-5 col-md-4" id="result-geodata-{{ index }}">
@@ -55,18 +55,18 @@
55 </div>
55 </div>
56{% endif %} #}
56{% endif %} #}
57
57
58−{% if result.content %}<p class="row result-content col-xs-12 col-sm-12 col-md-12">{{ result.content|safe }}</p>{% endif %}
58+{%- if result.content %}<p class="row result-content col-xs-12 col-sm-12 col-md-12">{{ result.content|safe }}</p>{% endif -%}
59
59
60</div>
60</div>
61
61
62−{% if (result.latitude and result.longitude) or result.boundingbox %}
62+{%- if (result.latitude and result.longitude) or result.boundingbox -%}
63 <div class="collapse" id="result-map-{{ index }}">
63 <div class="collapse" id="result-map-{{ index }}">
64 <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
64 <div style="height:300px; width:100%; margin: 10px 0;" id="osm-map-{{ index }}"></div>
65 </div>
65 </div>
66−{% endif %}
66+{%- endif -%}
67
67
68−{% if rtl %}
68+{%- if rtl -%}
69−{{ result_footer_rtl(result, loop.index) }}
69+{{- result_footer_rtl(result, loop.index) -}}
70{% else %}
70{% else %}
71−{{ result_footer(result, loop.index) }}
71+{{- result_footer(result, loop.index) -}}
72−{% endif %}
72+{%- endif -%}
searx/templates/oscar/result_templates/torrent.html+15−15
@@ -1,25 +1,25 @@
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
2
2
3−{{ result_header(result, favicons, loop.index) }}
3+{{- result_header(result, favicons, loop.index) -}}
4−{{ result_sub_header(result, loop.index) }}
4+{{- result_sub_header(result, loop.index) -}}
5
5
6−{% if result.seed is defined %}<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>{% endif %}
6+{%- if result.seed is defined %}<p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> &bull; {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>{% endif -%}
7−{% if result.filesize %}<br />{{ icon('floppy-disk') }} {{ _('Filesize') }}
7+{%- if result.filesize %}<br />{{ icon('floppy-disk') }} {{ _('Filesize') -}}
8 <span class="badge">
8 <span class="badge">
9− {% if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }}
9+ {%- if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') -}}
10− {% elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} {{ _('kiB') }}
10+ {%- elif result.filesize < 1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024) }} {{ _('kiB') -}}
11− {% elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} {{ _('MiB') }}
11+ {%- elif result.filesize < 1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024) }} {{ _('MiB') -}}
12− {% elif result.filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024) }} {{ _('GiB') }}
12+ {%- elif result.filesize < 1024*1024*1024*1024 %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024) }} {{ _('GiB') -}}
13− {% else %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif %}
13+ {%- else %}{{ '{0:0.2f}'.format(result.filesize/1024/1024/1024/1024) }} {{ _('TiB') }}{% endif -%}
14− </span>{% endif %}
14+ </span>{% endif -%}
15−{% if result.files %}<br />{{ icon('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span>{% endif %}
15+{%- if result.files %}<br />{{ icon('file') }} {{ _('Number of Files') }} <span class="badge">{{ result.files }}</span>{% endif -%}
16
16
17−{% if result.content %}<br />{{ result.content|safe }}{% endif %}
17+{%- if result.content %}<br />{{ result.content|safe }}{% endif -%}
18
18
19</p>
19</p>
20
20
21−{% if rtl %}
21+{%- if rtl -%}
22{{ result_footer_rtl(result, loop.index) }}
22{{ result_footer_rtl(result, loop.index) }}
23−{% else %}
23+{%- else -%}
24{{ result_footer(result, loop.index) }}
24{{ result_footer(result, loop.index) }}
25−{% endif %}
25+{%- endif -%}
searx/templates/oscar/result_templates/videos.html+16−16
@@ -1,29 +1,29 @@
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
1{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, result_footer_rtl, icon %}
2
2
3−{{ result_header(result, favicons, loop.index) }}
3+{{- result_header(result, favicons, loop.index) -}}
4−{{ result_sub_header(result, loop.index) }}
4+{{- result_sub_header(result, loop.index) -}}
5
5
6−{% if result.embedded %}
6+{%- if result.embedded -%}
7 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}" aria-labelledby="result-{{loop.index}}">{{ icon('film') }} {{ _('show video') }}</a></small>
7 <small> &bull; <a class="text-info btn-collapse collapsed cursor-pointer media-loader disabled_if_nojs" data-toggle="collapse" data-target="#result-video-{{ index }}" data-btn-text-collapsed="{{ _('show video') }}" data-btn-text-not-collapsed="{{ _('hide video') }}" aria-labelledby="result-{{loop.index}}">{{ icon('film') }} {{ _('show video') }}</a></small>
8−{% endif %}
8+{%- endif -%}
9
9
10−{% if result.embedded %}
10+{%- if result.embedded -%}
11<div id="result-video-{{ index }}" class="collapse">
11<div id="result-video-{{ index }}" class="collapse">
12− {{ result.embedded|safe }}
12+ {{- result.embedded|safe -}}
13</div>
13</div>
14−{% endif %}
14+{%- endif -%}
15
15
16−<div class="container-fluid">
16+<div class="container-fluid">{{- "" -}}
17− <div class="row">
17+ <div class="row">{{- "" -}}
18 <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" aria-labelledby="result-{{loop.index}}" /></a>
18 <a href="{{ result.url }}" {% if results_on_new_tab %}target="_blank" rel="noopener noreferrer"{% else %}rel="noreferrer"{% endif %}><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" aria-labelledby="result-{{loop.index}}" /></a>
19− {% if result.author %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Author') }}</b>: {{ result.author }}</p>{% endif %}
19+ {%- if result.author %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Author') }}</b>: {{ result.author }}</p>{% endif -%}
20− {% if result.length %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Length') }}</b>: {{ result.length }}</p>{% endif %}
20+ {%- if result.length %}<p class="col-xs-12 col-sm-8 col-md-8 result-content"><b>{{ _('Length') }}</b>: {{ result.length }}</p>{% endif -%}
21− {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
21+ {%- if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif -%}
22− </div>
22+ </div>{{- "" -}}
23</div>
23</div>
24
24
25−{% if rtl %}
25+{%- if rtl -%}
26{{ result_footer_rtl(result, loop.index) }}
26{{ result_footer_rtl(result, loop.index) }}
27−{% else %}
27+{%- else -%}
28{{ result_footer(result, loop.index) }}
28{{ result_footer(result, loop.index) }}
29−{% endif %}
29+{%- endif -%}