a04fafd419
Merge branch 'code_results' of https://github.com/pointhi/searx into pointhi-code_results
...
Conflicts:
searx/static/themes/default/css/style.css
searx/static/themes/oscar/css/oscar.min.css
searx/templates/oscar/result_templates/torrent.html
2015-01-15 18:26:00 +01:00
525833bea7
[enh] disable js-based links if no js is available
2015-01-15 15:55:39 +01:00
9109686c4e
[enh] using less html code to disable autoescaping for embeded results
2015-01-10 20:26:17 +01:00
400b54191c
Merge branch 'master' of https://github.com/asciimoo/searx into code_results
...
Conflicts:
searx/engines/searchcode_code.py
searx/engines/searchcode_doc.py
searx/static/oscar/js/searx.min.js
searx/templates/oscar/result_templates/default.html
searx/templates/oscar/result_templates/images.html
searx/templates/oscar/result_templates/map.html
searx/templates/oscar/result_templates/torrent.html
searx/templates/oscar/result_templates/videos.html
2015-01-09 21:30:09 +01:00
67bd68b5e5
Put media above result content
...
Mimick more closely usual video viewer (video above, details below)
2015-01-05 20:25:47 +01:00
4a195e0b28
Integrated media in results + Deezer Engine
...
New "embedded" item for the results, allow to give an iframe to display the media directly in the results.
Note that the attributes src of the iframes are not set, but instead data-src is set, allowing to only load the iframe when clicked.
Deezer engine based on public API (no key).
2015-01-05 02:04:23 +01:00
e5a323b288
[fix] favicon paths
2015-01-01 19:52:05 +01:00
d810763107
[enh] remove repeating codeparts inside the oscar template
2014-12-22 16:07:02 +01:00
83d6f36659
Final commit on favicons
...
Definitely remove engine array
Change every themes to accomodate that change
Tweak of video template of oscar to add link on video thumbnail
2014-12-18 16:26:32 +01:00
53a9af39ef
Use the new way of finding the favicon
2014-12-12 19:16:29 +01:00
79b936963f
Bug + HTML corrections
...
Add alt on favicon.
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
Add alt on video image
2014-12-08 01:26:28 +01:00
9274a59045
[fix] template_oscar: improve visualisation of video-results
2014-11-03 18:57:48 +01:00
2e7723a6c1
[enh] oscar_template: improve result visualisation
...
* highlight parts of result
* add link to archiv.to
* fix little bugs
* add little icons
* change style of "show map" button
2014-11-03 10:39:47 +01:00
740594a4b7
[enh] oscar_template: initial osm-map support for map results
...
* TODO: remove leaflet.min.css if not required
2014-11-02 13:00:28 +01:00
517e57b996
oscar template: improve result icons
2014-10-05 14:40:47 +02:00
f3b565e17e
oscar template: implement first version of results page
...
* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
2014-10-05 14:40:46 +02:00
Adam Tauber