diff options
| author | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
|---|---|---|
| committer | Pydo <pydo@tutanota.com> | 2016-10-01 10:46:18 -0400 |
| commit | 55a5b686ed6dc0b9a6bfc45e0eaf1f70e24f2aea (patch) | |
| tree | 96e953057dd3fc29681039f7ac5b282dac189ee8 /searx/templates/default/base.html | |
| parent | 6f87bf2a1c76f1b94ad2119df7fb938c2307e370 (diff) | |
| parent | 295fc9ce96d8cca9c6c4776a00e5fb0942eb6f4d (diff) | |
Merge branch 'master' of https://github.com/asciimoo/searx into feature/seedpeer-engine-integration
Resolved conflict searx/settings.yml
Diffstat (limited to 'searx/templates/default/base.html')
| -rw-r--r-- | searx/templates/default/base.html | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html deleted file mode 100644 index a2c38fef7..000000000 --- a/searx/templates/default/base.html +++ /dev/null @@ -1,38 +0,0 @@ -<!DOCTYPE html> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}> - <head> - <meta charset="UTF-8" /> - <meta name="description" content="searx - a privacy-respecting, hackable metasearch engine" /> - <meta name="keywords" content="searx, search, search engine, metasearch, meta search" /> - <meta name="generator" content="searx/{{ searx_version }}"> - <meta name="referrer" content="no-referrer"> - <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" /> - <title>{% block title %}{% endblock %}searx</title> - <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" /> - {% if rtl %} - <link rel="stylesheet" href="{{ url_for('static', filename='css/style-rtl.css') }}" type="text/css" media="screen" /> - {% endif %} - <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}?v=2" /> - {% block styles %} - {% endblock %} - {% block meta %}{% endblock %} - {% block head %} - <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> - {% endblock %} - </head> - <body> - <div id="container"> - {% block content %} - {% endblock %} - {% if autocomplete %} - <script src="{{ url_for('static', filename='js/mootools-core-1.4.5-min.js') }}" ></script> - <script src="{{ url_for('static', filename='js/mootools-autocompleter-1.1.2-min.js') }}" ></script> - {% endif %} - <script type="text/javascript"> - searx = {}; - searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %}; - </script> - <script src="{{ url_for('static', filename='js/searx.js') }}" ></script> - </div> - </body> -</html> |