Commit Graph

70 Commits

Author SHA1 Message Date
Adam Tauber 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
Thomas Pointhuber de6064994e [enh] show text "Start search" instead of icon, if javascript is disabled 2015-01-15 16:03:30 +01:00
Thomas Pointhuber 525833bea7 [enh] disable js-based links if no js is available 2015-01-15 15:55:39 +01:00
Thomas Pointhuber 5bfaabeb6b [enh] add nojs support into oscar-template 2015-01-15 15:48:50 +01:00
Cqoicebordel 824208491a Scientific accuracy 2015-01-12 13:08:32 +01:00
Cqoicebordel 3002725e2d Few more translations 2015-01-12 11:04:54 +01:00
Cqoicebordel e32cb59ad6 W3C fix 2015-01-11 19:45:17 +01:00
Cqoicebordel 6ca81f649d Fix RSS link
Fix page number, urlencoded request and encoded &
2015-01-11 19:34:50 +01:00
Cqoicebordel c59d0c200e Fix torrent W3C+UX
Puts links to torrents and magnets in tool bar
Fixes a lot of W3C errors
2015-01-11 19:34:11 +01:00
Thomas Pointhuber 9109686c4e [enh] using less html code to disable autoescaping for embeded results 2015-01-10 20:26:17 +01:00
Thomas Pointhuber eb6f3348c4 [enh] display filesize greater 1TB 2015-01-10 19:44:08 +01:00
Thomas Pointhuber 08f820d74c [enh] make some torrent strings translatable 2015-01-10 19:42:41 +01:00
Thomas Pointhuber 830f70a6bc [enh] improve torrent results 2015-01-10 19:40:27 +01:00
Thomas Pointhuber 29a526ff0e [enh] add rss-link which can be detected by browsers 2015-01-10 15:24:21 +01:00
Thomas Pointhuber 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
Cqoicebordel 67bd68b5e5 Put media above result content
Mimick more closely usual video viewer (video above, details below)
2015-01-05 20:25:47 +01:00
Cqoicebordel 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
Adam Tauber e5a323b288 [fix] favicon paths 2015-01-01 19:52:05 +01:00
Adam Tauber 798bef77f9 [fix] static content paths 2015-01-01 19:24:47 +01:00
Adam Tauber 2f9a386c0d [enh] better result template handling 2015-01-01 18:59:53 +01:00
Thomas Pointhuber d810763107 [enh] remove repeating codeparts inside the oscar template 2014-12-22 16:07:02 +01:00
Thomas Pointhuber 7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Cqoicebordel 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
Cqoicebordel 53a9af39ef Use the new way of finding the favicon 2014-12-12 19:16:29 +01:00
Cqoicebordel f3f544d5b5 Use the new way of finding the favicon 2014-12-12 19:15:30 +01:00
Cqoicebordel 002b812cc6 Use the new way of finding the favicon 2014-12-12 19:14:30 +01:00
Cqoicebordel 3ffe6014ed Use the new way of finding the favicon 2014-12-12 19:13:40 +01:00
Cqoicebordel 3b88adf8b6 Use the new way of finding an icon 2014-12-12 19:12:37 +01:00
Cqoicebordel 25c743f2af Striptag on alt and title
Strip HTML tags on alt and title of the images
2014-12-08 12:54:12 +01:00
Cqoicebordel 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
Cqoicebordel 9ea2d8c131 Bug + HTML corrections
Add alt on favicons
Use correct datetime format
Remove pubdate tag
Use url instead of pretty_url for web.archive.org
2014-12-08 01:22:54 +01:00
Cqoicebordel 0b98f71ff0 HTML corrections
Add alt on favicons
Use right format for datetime
Remove pubdate tag
2014-12-08 01:19:05 +01:00
Cqoicebordel 977972a8ec UX + HTML corrections
Add title on image for hover
Add alt on favicon
2014-12-08 01:11:45 +01:00
Cqoicebordel 0a2051ef3c Bug + HTML corrections
Add alt for favicon
Correct datetime format
Remove pubdate (not in html5 spec)
Don't use pretty_url for web.archive.org.
2014-12-08 01:09:16 +01:00
Cqoicebordel 42692aa2c5 Add alt for img
Add alt in infobox image.
2014-12-08 01:03:28 +01:00
Cqoicebordel 34b5d95669 UX and HTML corrections
Put the infobox first. Result first is more useful for the user.
Add id in form for "for".
htmlentities in the URL.
Take care of spaces in categories.
2014-12-08 01:01:33 +01:00
Thomas Pointhuber e687f5c290 [enh][oscar_template] split js-files and compile them together 2014-11-30 13:21:58 +01:00
Adam Tauber 075a5fe898 Merge pull request #127 from pointhi/template_oscar_map
Template oscar, add map support
2014-11-19 16:19:03 +01:00
Thomas Pointhuber 4b75d41f86 [enh][oscar_template] loading map informations from overpass-api 2014-11-19 15:49:55 +01:00
Thomas Pointhuber aba65369d2 [enh] make version of searx readable 2014-11-18 11:37:42 +01:00
Thomas Pointhuber a9b4f458e9 Merge pull request #6 from pointhi/template_oscar
[enh] add no-js support
2014-11-04 14:32:53 +01:00
Thomas Pointhuber 46dd502592 [fix][template][oscar] print ',' only if postcode is found 2014-11-04 12:58:12 +01:00
Thomas Pointhuber 25312c53e1 [enh] add no-js support
* image results have url, which can be clicked
* preferences full functionable without js
2014-11-03 22:18:40 +01:00
Thomas Pointhuber c0fc248213 [enh] template_oscar: improve visualisation of torrent results 2014-11-03 19:00:56 +01:00
Thomas Pointhuber 9274a59045 [fix] template_oscar: improve visualisation of video-results 2014-11-03 18:57:48 +01:00
Thomas Pointhuber c38917bb2a [enh] template_oscar: show addressdata if possible 2014-11-03 18:46:58 +01:00
Thomas Pointhuber 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
Thomas Pointhuber 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
Thomas Pointhuber a697a1eaa5 oscar template: display answers 2014-10-26 19:20:20 +01:00
Thomas Pointhuber c36c935b03 oscar template: add infobox 2014-10-05 15:46:43 +02:00