1
0
mirror of https://github.com/searxng/searxng.git synced 2024-09-13 00:36:39 +02:00
Commit Graph

227 Commits

Author SHA1 Message Date
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
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
Adam Tauber
524e30e001 [doc] description fixes 2014-12-01 21:33:35 +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
Adam Tauber
b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Thomas Pointhuber
aba65369d2 [enh] make version of searx readable 2014-11-18 11:37:42 +01:00
Adam Tauber
b6da893c78 [fix] html attribute quote 2014-11-11 18:59:26 +01:00
Adam Tauber
0d80d5d3b4 Merge pull request #105 from pointhi/template_oscar
new template: oscar
2014-11-11 09:36:39 +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