Commit Graph

243 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
Adam Tauber c5599e3c7c Merge pull request #174 from pointhi/nojs_fix
add no javascript support to oscar-template
2015-01-15 17:05:44 +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 389fc3b8b2 Few fixes
- Whitespaces
- Change a few <p> in <span>
- Add RSS to allow browser detection
- A few UIUX changes
- Add a few more allowed translations
2015-01-15 01:48:46 +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
Adam Tauber d6b1ff08ad Merge branch 'master' of github.com:asciimoo/searx 2015-01-09 04:15:57 +01:00
Adam Tauber 425a576f28 [fix] template syntax 2015-01-09 04:05:39 +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 a0293d6196 [enh] move favicons into own directory 2014-12-28 15:07:11 +01:00
Adam Tauber ada01cb367 Merge branch 'Detect-favicons' of https://github.com/Cqoicebordel/searx into Cqoicebordel-Detect-favicons
Conflicts:
	searx/templates/courgette/result_templates/default.html
	searx/templates/courgette/result_templates/map.html
	searx/templates/courgette/result_templates/videos.html
	searx/templates/default/result_templates/default.html
	searx/templates/default/result_templates/map.html
	searx/templates/default/result_templates/videos.html
	searx/webapp.py
2014-12-24 20:34:08 +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
Adam Tauber ba51d784d1 [fix] mysterious string remove 2014-12-14 02:27:58 +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 8fb6ea1bf1 Add title and alt on image in infobox 2014-12-10 18:27:08 +01:00
Cqoicebordel 5104552937 Multiple HTML corrections
Alt on favicon
No <p> in <p>
Correct alt and title on img
2014-12-10 18:21:41 +01:00
Cqoicebordel 94ea67547a HTML and usability corrections
Put the result URL at the top, like in other results template
Put the magnet link on the same line as the stats (peer/seed).
2014-12-10 18:20:20 +01:00
Cqoicebordel 3e05570b32 Alt on favicon 2014-12-10 18:17:47 +01:00
Cqoicebordel 2bb820c281 Correct alt and title 2014-12-10 18:17:10 +01:00
Cqoicebordel 8708e5fc56 Alt on favicons 2014-12-10 18:16:32 +01:00
Cqoicebordel 149e19c68a Correct HTML entities and link 2014-12-10 18:15:39 +01:00
Cqoicebordel a809fd1bbb Multiple HTML corrections
Alt on favicon
Width of image should be 400 and not 400px
Correct alt+title on image
No <p> contains <p>
2014-12-10 18:14:29 +01:00
Cqoicebordel eef05c3ddc Alt on favicon 2014-12-10 18:11:59 +01:00
Cqoicebordel b043237c61 Correct alt and title 2014-12-10 18:11:20 +01:00
Cqoicebordel 74000c739d Alt on favicon 2014-12-10 18:10:19 +01:00
Cqoicebordel 18f772615b HTML Entities + Use the right template
Courgette was using the wrong template. I assume it was a mistake.
2014-12-10 18:09:21 +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