diff --git a/searx/static/courgette/img/icon_dailymotion.ico b/searx/static/courgette/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/courgette/img/icon_dailymotion.ico rename to searx/static/courgette/img/icons/icon_dailymotion.ico diff --git a/searx/static/courgette/img/icon_deviantart.ico b/searx/static/courgette/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/courgette/img/icon_deviantart.ico rename to searx/static/courgette/img/icons/icon_deviantart.ico diff --git a/searx/static/courgette/img/icon_github.ico b/searx/static/courgette/img/icons/icon_github.ico similarity index 100% rename from searx/static/courgette/img/icon_github.ico rename to searx/static/courgette/img/icons/icon_github.ico diff --git a/searx/static/courgette/img/icon_kickass.ico b/searx/static/courgette/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/courgette/img/icon_kickass.ico rename to searx/static/courgette/img/icons/icon_kickass.ico diff --git a/searx/static/courgette/img/icon_soundcloud.ico b/searx/static/courgette/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/courgette/img/icon_soundcloud.ico rename to searx/static/courgette/img/icons/icon_soundcloud.ico diff --git a/searx/static/courgette/img/icon_stackoverflow.ico b/searx/static/courgette/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/courgette/img/icon_stackoverflow.ico rename to searx/static/courgette/img/icons/icon_stackoverflow.ico diff --git a/searx/static/courgette/img/icon_twitter.ico b/searx/static/courgette/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/courgette/img/icon_twitter.ico rename to searx/static/courgette/img/icons/icon_twitter.ico diff --git a/searx/static/courgette/img/icon_vimeo.ico b/searx/static/courgette/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/courgette/img/icon_vimeo.ico rename to searx/static/courgette/img/icons/icon_vimeo.ico diff --git a/searx/static/courgette/img/icon_wikipedia.ico b/searx/static/courgette/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/courgette/img/icon_wikipedia.ico rename to searx/static/courgette/img/icons/icon_wikipedia.ico diff --git a/searx/static/courgette/img/icon_youtube.ico b/searx/static/courgette/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/courgette/img/icon_youtube.ico rename to searx/static/courgette/img/icons/icon_youtube.ico diff --git a/searx/static/default/img/icon_dailymotion.ico b/searx/static/default/img/icons/icon_dailymotion.ico similarity index 100% rename from searx/static/default/img/icon_dailymotion.ico rename to searx/static/default/img/icons/icon_dailymotion.ico diff --git a/searx/static/default/img/icon_deviantart.ico b/searx/static/default/img/icons/icon_deviantart.ico similarity index 100% rename from searx/static/default/img/icon_deviantart.ico rename to searx/static/default/img/icons/icon_deviantart.ico diff --git a/searx/static/default/img/icon_github.ico b/searx/static/default/img/icons/icon_github.ico similarity index 100% rename from searx/static/default/img/icon_github.ico rename to searx/static/default/img/icons/icon_github.ico diff --git a/searx/static/default/img/icon_kickass.ico b/searx/static/default/img/icons/icon_kickass.ico similarity index 100% rename from searx/static/default/img/icon_kickass.ico rename to searx/static/default/img/icons/icon_kickass.ico diff --git a/searx/static/default/img/icon_soundcloud.ico b/searx/static/default/img/icons/icon_soundcloud.ico similarity index 100% rename from searx/static/default/img/icon_soundcloud.ico rename to searx/static/default/img/icons/icon_soundcloud.ico diff --git a/searx/static/default/img/icon_stackoverflow.ico b/searx/static/default/img/icons/icon_stackoverflow.ico similarity index 100% rename from searx/static/default/img/icon_stackoverflow.ico rename to searx/static/default/img/icons/icon_stackoverflow.ico diff --git a/searx/static/default/img/icon_twitter.ico b/searx/static/default/img/icons/icon_twitter.ico similarity index 100% rename from searx/static/default/img/icon_twitter.ico rename to searx/static/default/img/icons/icon_twitter.ico diff --git a/searx/static/default/img/icon_vimeo.ico b/searx/static/default/img/icons/icon_vimeo.ico similarity index 100% rename from searx/static/default/img/icon_vimeo.ico rename to searx/static/default/img/icons/icon_vimeo.ico diff --git a/searx/static/default/img/icon_wikipedia.ico b/searx/static/default/img/icons/icon_wikipedia.ico similarity index 100% rename from searx/static/default/img/icon_wikipedia.ico rename to searx/static/default/img/icons/icon_wikipedia.ico diff --git a/searx/static/default/img/icon_youtube.ico b/searx/static/default/img/icons/icon_youtube.ico similarity index 100% rename from searx/static/default/img/icon_youtube.ico rename to searx/static/default/img/icons/icon_youtube.ico diff --git a/searx/static/oscar/img/icons/openstreetmap.png b/searx/static/oscar/img/icons/openstreetmap.png new file mode 100644 index 000000000..4f88c9643 Binary files /dev/null and b/searx/static/oscar/img/icons/openstreetmap.png differ diff --git a/searx/static/oscar/img/icons/photon.png b/searx/static/oscar/img/icons/photon.png new file mode 100644 index 000000000..0d0732027 Binary files /dev/null and b/searx/static/oscar/img/icons/photon.png differ diff --git a/searx/static/oscar/img/icons/searchcode code.png b/searx/static/oscar/img/icons/searchcode code.png new file mode 100644 index 000000000..884c2660d Binary files /dev/null and b/searx/static/oscar/img/icons/searchcode code.png differ diff --git a/searx/static/oscar/img/icons/searchcode doc.png b/searx/static/oscar/img/icons/searchcode doc.png new file mode 100644 index 000000000..884c2660d Binary files /dev/null and b/searx/static/oscar/img/icons/searchcode doc.png differ diff --git a/searx/static/oscar/img/map/marker-icon-2x-green.png b/searx/static/oscar/img/map/marker-icon-2x-green.png new file mode 100644 index 000000000..c359abb6c Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-2x-green.png differ diff --git a/searx/static/oscar/img/map/marker-icon-2x-orange.png b/searx/static/oscar/img/map/marker-icon-2x-orange.png new file mode 100644 index 000000000..c3c863211 Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-2x-orange.png differ diff --git a/searx/static/oscar/img/map/marker-icon-2x-red.png b/searx/static/oscar/img/map/marker-icon-2x-red.png new file mode 100644 index 000000000..1c26e9fc2 Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-2x-red.png differ diff --git a/searx/static/oscar/img/map/marker-icon-green.png b/searx/static/oscar/img/map/marker-icon-green.png new file mode 100644 index 000000000..56db5ea9f Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-green.png differ diff --git a/searx/static/oscar/img/map/marker-icon-orange.png b/searx/static/oscar/img/map/marker-icon-orange.png new file mode 100644 index 000000000..fbbce7b2a Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-orange.png differ diff --git a/searx/static/oscar/img/map/marker-icon-red.png b/searx/static/oscar/img/map/marker-icon-red.png new file mode 100644 index 000000000..3e64e06d1 Binary files /dev/null and b/searx/static/oscar/img/map/marker-icon-red.png differ diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html index 3e93eee73..b46f95e9f 100644 --- a/searx/templates/courgette/result_templates/default.html +++ b/searx/templates/courgette/result_templates/default.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html index 3e93eee73..b46f95e9f 100644 --- a/searx/templates/courgette/result_templates/map.html +++ b/searx/templates/courgette/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html index 2694a9101..7b8bf6653 100644 --- a/searx/templates/courgette/result_templates/videos.html +++ b/searx/templates/courgette/result_templates/videos.html @@ -1,6 +1,6 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}

{{ result.title|safe }}

diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 0f3e3e6d8..73e9af1a9 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,5 +1,5 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

diff --git a/searx/templates/default/result_templates/map.html b/searx/templates/default/result_templates/map.html index f9ba7dcf6..d361ddb01 100644 --- a/searx/templates/default/result_templates/map.html +++ b/searx/templates/default/result_templates/map.html @@ -1,7 +1,7 @@
{% if "icon_"~result.engine~".ico" in favicons %} - {{result.engine}} + {{result.engine}} {% endif %}
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 16b2d5f30..08575e847 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,5 +1,5 @@
-

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

+

{% if "icon_"~result.engine~".ico" in favicons %}{{result.engine}}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} {{ result.title|striptags }}

{{ result.url }}

diff --git a/searx/tests/test_webapp.py b/searx/tests/test_webapp.py index 35ae49343..75ff585cc 100644 --- a/searx/tests/test_webapp.py +++ b/searx/tests/test_webapp.py @@ -49,7 +49,7 @@ class ViewsTestCase(SearxTestCase): ) result = self.app.post('/', data={'q': 'test'}) self.assertIn( - '

youtubeSecond Test

', # noqa + '

youtubeSecond Test

', # noqa result.data ) self.assertIn( diff --git a/searx/webapp.py b/searx/webapp.py index 8d1676808..be7feee82 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -68,7 +68,7 @@ babel = Babel(app) global_favicons = [] for indice, theme in enumerate(themes): global_favicons.append([]) - theme_img_path = searx_dir+"/static/"+theme+"/img/" + theme_img_path = searx_dir+"/static/"+theme+"/img/icons/" for (dirpath, dirnames, filenames) in os.walk(theme_img_path): global_favicons[indice].extend(filenames)