diff options
| author | Markus Heiser <markus.heiser@darmarIT.de> | 2019-12-29 09:47:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-29 09:47:06 +0100 |
| commit | 36e72a46192235615f63a02984ab88c70145b0ec (patch) | |
| tree | 0c2e238ed8fd03a95a090692d0d761fe2ea13d79 /searx/templates/oscar/base.html | |
| parent | b2e1ee8d35050033b41765a2de49c0eea5f8b4b4 (diff) | |
| parent | f6d66c0f6f1d8f1f583d9000ee0123450cce8130 (diff) | |
Merge branch 'master' into fix-engine-spotify
Diffstat (limited to 'searx/templates/oscar/base.html')
| -rw-r--r-- | searx/templates/oscar/base.html | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 243e8b3d7..66a9e6029 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -10,16 +10,17 @@ <meta name="referrer" content="no-referrer"> <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" /> {% block meta %}{% endblock %} - <title>{% block title %}{% endblock %}{{ instance_name }}</title> + <title>{% block title %}{% endblock %}{{ instance_name }}</title> <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" /> - {% if preferences.get_value('oscar-style') %} - <link rel="stylesheet" href="{{ url_for('static', filename='css/'+preferences.get_value('oscar-style')+'.min.css') }}" type="text/css" /> - {% else %} - <link rel="stylesheet" href="{{ url_for('static', filename='css/logicodev.min.css') }}" type="text/css" /> - {% endif %} + {% if preferences.get_value('oscar-style') -%} + {{' '}}<link rel="stylesheet" href="{{ url_for('static', filename='css/'+preferences.get_value('oscar-style')+'.min.css') }}" type="text/css" /> + {%- else -%} + {{' '}}<link rel="stylesheet" href="{{ url_for('static', filename='css/logicodev.min.css') }}" type="text/css" /> + {%- endif %} + <link rel="stylesheet" href="{{ url_for('static', filename='css/leaflet.min.css') }}" type="text/css" /> - {% for css in styles %} + {%- for css in styles %} <link rel="stylesheet" href="{{ url_for('static', filename=css) }}" type="text/css" /> {% endfor %} @@ -37,12 +38,6 @@ {% endblock %} <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> - - <script type="text/javascript"> - searx = {}; - searx.method = "{{ method or 'POST' }}"; - searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; - </script> <noscript> <style type="text/css"> .tab-content > .active_if_nojs, .active_if_nojs {display: block !important; visibility: visible !important;} @@ -54,6 +49,7 @@ </head> <body> {% include 'oscar/navbar.html' %} + <div class="container"> {% if errors %} <div class="alert alert-danger fade in" role="alert"> @@ -99,11 +95,14 @@ </div> <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script> <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script> - {% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %} + {% if autocomplete %} <script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %} + <script src="{{ url_for('static', filename='js/require-2.1.15.min.js') }}"></script> - <script src="{{ url_for('static', filename='js/searx.min.js') }}"></script> + <script src="{{ url_for('static', filename='js/searx.min.js') }}" + data-method="{{ method or 'POST' }}" + data-autocompleter="{% if autocomplete %}true{% else %}false{% endif %}"></script> {% for script in scripts %} - <script src="{{ url_for('static', filename=script) }}"></script> + {{""}}<script src="{{ url_for('static', filename=script) }}"></script> {% endfor %} <noscript> <style> |