Commit Graph

172 Commits

Author SHA1 Message Date
Cqoicebordel
d4ba97d00d Engine table in preference page in Courgette text-aligned to the right in RTL 2015-02-11 22:00:13 +01:00
Adam Tauber
df9cf9d09b Merge branch 'rtl' of github.com:Cqoicebordel/searx 2015-02-10 15:23:56 +01:00
Cqoicebordel
71ae75d73e Extract color 2015-01-19 22:04:53 +01:00
Cqoicebordel
9b2187b261 Change theme to allow the logo to be text instead of image 2015-01-19 21:24:46 +01:00
Thomas Pointhuber
9c94b1a00a [update] bootstrap.min.css 2015-01-18 13:55:45 +01:00
Thomas Pointhuber
1f00ce8527 Revert: [enh] add new bootstrap-themes to oscar-template 2015-01-18 13:54:24 +01:00
Thomas Pointhuber
7366a0e141 [fix] add wordwrap to fix style issues 2015-01-18 13:42:31 +01:00
Thomas Pointhuber
096ffd0659 [enh] add new bootstrap-themes to oscar-template 2015-01-18 12:00:38 +01:00
Cqoicebordel
14447a0761 Modify courgette theme and less it. 2015-01-16 00:55:28 +01:00
Cqoicebordel
4f14f6cd26 New icons for Courgette 2015-01-16 00:29:11 +01:00
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
5bfaabeb6b [enh] add nojs support into oscar-template 2015-01-15 15:48:50 +01:00
Cqoicebordel
08df681b48 Tweaks of color and theme 2015-01-15 01:46:01 +01:00
Cqoicebordel
ceb650a01f Add lots of icons 2015-01-15 01:00:48 +01:00
Adam Tauber
410dbc573b [enh] static content generalization 2015-01-12 14:54:16 +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
b918cd2b8e Whitespace correction 2015-01-05 02:09:11 +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
20c4de8f06 [fix] filename strip 2015-01-01 18:06:51 +01:00
Adam Tauber
8151585918 [fix] static file paths 2015-01-01 17:54:33 +01:00
Adam Tauber
9f12605f7e [enh] themes static content refactor 2015-01-01 17:48:12 +01:00
Thomas Pointhuber
67698ad29a [enh] add new favicons to oscar template 2014-12-28 15:46:03 +01:00
Thomas Pointhuber
a7adcacd04 [enh] add new marker-icons for map
fetched from https://github.com/pointhi/leaflet-color-markers
2014-12-28 15:10:42 +01:00
Thomas Pointhuber
a0293d6196 [enh] move favicons into own directory 2014-12-28 15:07:11 +01:00
Thomas Pointhuber
d810763107 [enh] remove repeating codeparts inside the oscar template 2014-12-22 16:07:02 +01:00
Thomas Pointhuber
7b44fd47a7 [enh] improve grunt-file for oscar_template 2014-12-22 15:28:23 +01:00
Thomas Pointhuber
7adb17452d [enh] add result_templates/code.html 2014-12-20 23:33:03 +01:00
Cqoicebordel
2fe3323449 Add double clic on categories
Allow to double clic on any category to activate or deactivate all categories.
2014-12-19 06:11:46 +01:00
Cqoicebordel
2ab621c0e3 Some more path issues 2014-12-19 05:05:12 +01:00
Cqoicebordel
06b59c7210 [fix] Show map on result in Oscar
Allow to find the leafleet js when searx is not installed at the root of the web server.
2014-12-18 15:51:09 +01:00
Thomas Pointhuber
7895e4f7a7 [enh][oscar_template] replace kickass icon 2014-12-15 10:49:35 +01:00
Cqoicebordel
e623ee593a Add icons and badge for the themes
Add kickass in engine list
Add content for the result from kickass
2014-12-14 23:27:27 +01:00
Adam Tauber
45734ee5f4 Merge pull request #136 from pointhi/template_oscar_fix
[oscar_template] split up js-files, FIX #132
2014-12-01 21:02:14 +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
91384c1f31 Merge pull request #130 from pointhi/template_oscar_fix
[fix][template_oscar] make overpass-api call over https and add better error-message
2014-11-20 15:49:31 +01:00
Thomas Pointhuber
08f4b7f506 [fix][template_oscar] make overpass-api call over https
and add better error message if ajax-call fail
2014-11-20 15:31:00 +01:00
Thomas LEBEAU
3ed43cf31a responsive theme courgette 2014-11-20 15:14:03 +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
1a81c20d73 [fix] sidebar overflow 2014-11-18 20:30:06 +01:00
Adam Tauber
6b31f55c90 [fix] suggestions display 2014-11-18 19:53:38 +01:00
Adam Tauber
b8efd1214f [enh] category select warning message 2014-11-18 19:44:33 +01:00
Adam Tauber
cb15a21681 [fix] syggestions max width 2014-11-18 19:03:52 +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
3b7b106684 [enh] template_oscar: add layer to leaflet map 2014-11-03 18:47:18 +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
b2c976a5a3 [enh] template_oscar: maxZoom if fitting bounds 2014-11-02 22:35:06 +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