diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2019-12-10 17:35:23 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2019-12-10 17:35:23 +0100 |
| commit | 9988cdcbc514f799c5a2d2a111c82b8a123bbae3 (patch) | |
| tree | 4f6701f3b443c617e5646b2a9dff3ab55c3084bc /searx/templates/oscar/base.html | |
| parent | 56b7e05721394c0490ff43960cb7fa5626e83e3d (diff) | |
| parent | 50e1fcaa5e7369a64829552fc96cd24c787706c9 (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into dos2unix
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/templates/oscar/base.html')
| -rw-r--r-- | searx/templates/oscar/base.html | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 321784ebb..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 %} @@ -48,6 +49,7 @@ </head> <body> {% include 'oscar/navbar.html' %} + <div class="container"> {% if errors %} <div class="alert alert-danger fade in" role="alert"> @@ -93,13 +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') }}" 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> |