Commit graph

212 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
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
Thomas Pointhuber
0e1035eac1 Merge https://github.com/asciimoo/searx into template_oscar
Conflicts:
	searx/translations/de/LC_MESSAGES/messages.po
	searx/translations/en/LC_MESSAGES/messages.po
	searx/translations/es/LC_MESSAGES/messages.po
	searx/translations/fr/LC_MESSAGES/messages.po
	searx/translations/hu/LC_MESSAGES/messages.po
	searx/translations/it/LC_MESSAGES/messages.po
	searx/translations/nl/LC_MESSAGES/messages.po
	searx/webapp.py
2014-10-26 19:11:28 +01:00
dalf
a71b326d9e [mod] default template modifications
- more smartphone friendly
- more text browser friendly
- next button always on the right
- in case of small screen supporting touch event, categories are displayed on one line with a scroll
2014-10-26 11:14:05 +01:00
dalf
be4d219ae7 [mod] use pngcrush to reduce the size of png files 2014-10-25 17:07:39 +02:00
dalf
400279182e [fix] no horizontal scrolling on small screen
[fix] small images in the results aren't not "zoomed"
2014-10-25 17:05:37 +02:00
Thomas Pointhuber
c36c935b03 oscar template: add infobox 2014-10-05 15:46:43 +02:00
Thomas Pointhuber
517e57b996 oscar template: improve result icons 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
55b9b10d2e oscar template: include typeahead.css into bootstrap.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
f4457da0a1 oscar template: using less to generate oscar.min.css 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
841f1eedfc oscar template: generate bootstrap.min.css from source 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
14b0604bc0 oscar template: implement autocompleter 2014-10-05 14:40:47 +02:00
Thomas Pointhuber
4b7164f04a oscar template: remove unused css file 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
dc2c136220 oscar template: little style improvements 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
47d1caed61 oscar template: add forgoten github icon 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
b91b77e335 oscar template: improve result page
* add paging support
* add suggestion panel
* add links panel
2014-10-05 14:40:46 +02:00
Thomas Pointhuber
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
Thomas Pointhuber
a538bed745 oscar template: implement search input, index page,... 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
25919de608 oscar template: make the categories clickable 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
afcfa04e30 oscar template: improve style for check and uncheck of engines 2014-10-05 14:40:46 +02:00
Thomas Pointhuber
c21a907cac initial commit of the new template 'oscar'
* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js
2014-10-05 14:40:46 +02:00
Adam Tauber
c58e5a236a [fix] preferences button display 2014-10-05 13:37:26 +02:00
Adam Tauber
5d7b63223f [mod] sidebar positioning 2014-10-04 23:13:21 +02:00
Dalf
6bfd566353 [enh] add infoboxes and answers 2014-09-28 16:51:41 +02:00
Adam Tauber
00e5262834 [enh] archive.org link added to results 2014-09-08 00:52:15 +02:00
Thomas LEBEAU
75853bd0b5 [courgette_theme] add autocomplete theme 2014-08-19 15:06:20 +02:00
Thomas LEBEAU
195ff7522e optim img bg 2014-08-18 11:19:11 +02:00
Thomas LEBEAU
1188907c4f remove artichaut.css 2014-08-18 10:56:16 +02:00
Thomas LEBEAU
a28cfd4887 [new] theme courgette 2014-08-18 10:45:05 +02:00
Adam Tauber
6fb9eb8e47 [mod] select autocomplete results with mouse click 2014-07-15 17:02:58 +02:00
Adam Tauber
d290c1b9ac [enh] github ribbon to landingpage 2014-07-07 14:29:12 +02:00
Matej Cotman
08eaffe245 add multi theming support 2014-06-05 13:18:22 +02:00
Adam Tauber
66f87f8117 [mod] right sidebar 2014-05-10 06:42:33 +02:00
Adam Tauber
7c48b0f7da [fix] suggestions margin 2014-05-10 06:40:56 +02:00
Adam Tauber
ead8d30ea0 [mod] inline suggestions 2014-05-10 06:39:07 +02:00
Adam Tauber
c761d93dd6 [mod] search field width 2014-05-09 11:49:11 +02:00
Adam Tauber
5d9d04a16e [enh] better highlighting 2014-05-09 02:04:20 +02:00
Adam Tauber
58de2801ce [fix] padding 2014-05-09 01:32:21 +02:00
Adam Tauber
47d548d6a2 [enh][mod] results ui refactor 2014-05-09 01:27:55 +02:00
Adam Tauber
41dd4d9ba3 [enh] autocompleter server side part 2014-03-29 16:29:19 +01:00
Thomas Pointhuber
c8cf95aa56 deactivate autocompleter by default 2014-03-21 11:11:31 +01:00
Thomas Pointhuber
360543dec4 add forgotten search.less 2014-03-20 13:16:58 +01:00
Thomas Pointhuber
e181fd8f56 edit style of autcompleter 2014-03-20 11:08:55 +01:00
Thomas Pointhuber
8abf4ab993 adding initial code for backend-part of autocompleter
including test-code
2014-03-20 10:28:24 +01:00
Thomas Pointhuber
b5c695c6f5 edit style of autocompleter 2014-03-19 20:26:08 +01:00
Thomas Pointhuber
ecd293c8a9 add front-part of autocompleter function 2014-03-19 20:19:44 +01:00
Adam Tauber
c14e8fe0a5 [fix] #38 2014-03-18 09:38:23 +01:00
Adam Tauber
fa26da1187 Merge branch 'master' of github.com:asciimoo/searx 2014-03-17 18:30:53 +01:00
Adam Tauber
06b9238786 [fix] #38 2014-03-17 18:30:08 +01:00
Thomas Pointhuber
f159fc718f fix little style bug 2014-03-16 09:48:10 +01:00
Thomas Pointhuber
c54baf6301 Adding style for publish Date 2014-03-14 10:04:36 +01:00
Thomas Pointhuber
c8a1e0bda4 move *.less files into seperate directory 2014-03-13 16:51:15 +01:00
Thomas Pointhuber
3b31c60f07 fix little style errors 2014-03-06 16:25:15 +01:00
Thomas Pointhuber
a6c9a571ac rewrite wrong variable name 2014-03-05 16:03:13 +01:00
Thomas Pointhuber
425ec3b707 Using .less instead of .css
to generate the .css file from the .less file run: $make styles
2014-03-05 15:20:30 +01:00
Adam Tauber
6ff57dfbe1 [enh] linkable search url display 2014-03-04 18:53:56 +01:00
Adam Tauber
8c8d9d10cb [fix] visited link color change 2014-02-25 13:49:39 +01:00
asciimoo
239299d45e [enh] result css mods 2014-02-11 01:23:08 +01:00
asciimoo
c0013edcdd [enh] engine customisation init 2014-02-07 00:35:15 +01:00
asciimoo
2a788c8f29 [enh] search language support init 2014-01-31 04:35:23 +01:00
asciimoo
90a9342286 [mod] search input mods 2014-01-30 20:55:10 +01:00
asciimoo
3cc62341c5 [enh] ui mods 2014-01-30 14:26:54 +01:00