diff options
| author | Kang-min Liu <gugod@gugod.org> | 2015-11-14 00:05:44 +0100 |
|---|---|---|
| committer | Kang-min Liu <gugod@gugod.org> | 2015-11-14 00:05:44 +0100 |
| commit | ac8759cd3ff99024864fd04d7c4bef5c3a00b971 (patch) | |
| tree | 30c3f8b61504532df926bbffedcc8df80a8e926e /searx/templates | |
| parent | c7c6c35ccd7373d2107b70b92badb9b70d31905f (diff) | |
| parent | e98aef6fc4954681e58d774203d522f0ae478004 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/courgette/opensearch.xml | 1 | ||||
| -rw-r--r-- | searx/templates/default/opensearch.xml | 1 | ||||
| -rw-r--r-- | searx/templates/oscar/macros.html | 6 | ||||
| -rw-r--r-- | searx/templates/oscar/opensearch.xml | 1 | ||||
| -rw-r--r-- | searx/templates/pix-art/preferences.html | 4 |
5 files changed, 10 insertions, 3 deletions
diff --git a/searx/templates/courgette/opensearch.xml b/searx/templates/courgette/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/courgette/opensearch.xml +++ b/searx/templates/courgette/opensearch.xml @@ -3,6 +3,7 @@ <ShortName>searx</ShortName> <Description>Search searx</Description> <InputEncoding>UTF-8</InputEncoding> + <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/default/opensearch.xml b/searx/templates/default/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/default/opensearch.xml +++ b/searx/templates/default/opensearch.xml @@ -3,6 +3,7 @@ <ShortName>searx</ShortName> <Description>Search searx</Description> <InputEncoding>UTF-8</InputEncoding> + <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html index 5866c132c..cf49ce81a 100644 --- a/searx/templates/oscar/macros.html +++ b/searx/templates/oscar/macros.html @@ -25,7 +25,11 @@ <!-- Draw result footer -->
{% macro result_footer(result) -%}
<div class="clearfix"></div>
- <span class="label label-default pull-right">{{ result.engine }}</span>
+ <div class="pull-right">
+ {% for engine in result.engines %}
+ <span class="label label-default">{{ engine }}</span>
+ {% endfor %}
+</div>
<p class="text-muted">{{ result.pretty_url }}</p>
{%- endmacro %}
diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml index f39283f99..ff9eac55b 100644 --- a/searx/templates/oscar/opensearch.xml +++ b/searx/templates/oscar/opensearch.xml @@ -3,6 +3,7 @@ <ShortName>searx</ShortName> <Description>Search searx</Description> <InputEncoding>UTF-8</InputEncoding> + <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/pix-art/preferences.html b/searx/templates/pix-art/preferences.html index 0caf31b46..f59497ec8 100644 --- a/searx/templates/pix-art/preferences.html +++ b/searx/templates/pix-art/preferences.html @@ -53,8 +53,8 @@ <th>{{ _('Engine name') }}</th> <th>{{ _('Allow') }} / {{ _('Block') }}</th> </tr> - {% for (categ,search_engines) in categs %} - {% for search_engine in search_engines %} + {% for categ in all_categories %} + {% for search_engine in engines_by_category[categ] %} {% if not search_engine.private %} <tr> |