From bbb5e23551fd62d2372f96a9d4187cac276eb059 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Sat, 14 Feb 2015 01:42:06 +0100 Subject: [PATCH 1/2] Remove whitespace caused by Jinja commands Adding this conf change will remove every newline created by a Jinja command (`{% %}`). It can save a bit of bandwidth. --- searx/templates/oscar/base.html | 4 ++-- searx/webapp.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index df5c53965..c185f8774 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -46,7 +46,7 @@
{% include 'oscar/navbar.html' %} - + {% block site_alert_error %} {% endblock %} {% block site_alert_warning %} @@ -62,7 +62,7 @@ {% endblock %} {% block site_alert_success %} {% endblock %} - + {% block content %} {% endblock %} diff --git a/searx/webapp.py b/searx/webapp.py index b12a08db5..13c965e0d 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -81,6 +81,8 @@ app = Flask( template_folder=templates_path ) +app.jinja_env.trim_blocks = True +app.jinja_env.lstrip_blocks = True app.secret_key = settings['server']['secret_key'] babel = Babel(app) From f7b052c3542e7887aa23c48f3aa486b842e87292 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Mon, 16 Feb 2015 14:45:42 +0100 Subject: [PATCH 2/2] Allow autocompleter to work in a sub folder of the domain name. --- searx/static/themes/courgette/js/searx.js | 2 +- searx/static/themes/default/js/searx.js | 2 +- searx/static/themes/oscar/js/searx.min.js | Bin 5192 -> 5193 bytes .../oscar/js/searx_src/autocompleter.js | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/searx/static/themes/courgette/js/searx.js b/searx/static/themes/courgette/js/searx.js index 47dc722da..92a25e349 100644 --- a/searx/static/themes/courgette/js/searx.js +++ b/searx/static/themes/courgette/js/searx.js @@ -1,6 +1,6 @@ if(searx.autocompleter) { window.addEvent('domready', function() { - new Autocompleter.Request.JSON('q', '/autocompleter', { + new Autocompleter.Request.JSON('q', './autocompleter', { postVar:'q', postData:{ 'format': 'json' diff --git a/searx/static/themes/default/js/searx.js b/searx/static/themes/default/js/searx.js index 9be969bb3..d6d5b74bb 100644 --- a/searx/static/themes/default/js/searx.js +++ b/searx/static/themes/default/js/searx.js @@ -1,6 +1,6 @@ if(searx.autocompleter) { window.addEvent('domready', function() { - new Autocompleter.Request.JSON('q', '/autocompleter', { + new Autocompleter.Request.JSON('q', './autocompleter', { postVar:'q', postData:{ 'format': 'json' diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js index 2015c4d6a6aedd5b54d5a2f62d08425f6927939b..8a1055da35f92db88fcf8bd7a67d67d91e10ec73 100644 GIT binary patch delta 14 VcmX@1aZ+Q08zZCMW;aGAVE`vo1Q!4R delta 12 TcmX@9aYAE*8{=koMkZkZAdLg* diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js index 561bff35a..70c66d2fc 100644 --- a/searx/static/themes/oscar/js/searx_src/autocompleter.js +++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js @@ -19,7 +19,7 @@ if(searx.autocompleter) { searx.searchResults = new Bloodhound({ datumTokenizer: Bloodhound.tokenizers.obj.whitespace('value'), queryTokenizer: Bloodhound.tokenizers.whitespace, - remote: '/autocompleter?q=%QUERY' + remote: './autocompleter?q=%QUERY' }); searx.searchResults.initialize(); }