git.iko.soy/searx
on master help sign in
[enh] settings option to change instance name - closes #450
commit0fbd705259c500bb01ec2d649670de2f0a91830a authorAdam Tauber <asciimoo@gmail.com> dateSat 27 Feb 2016, 18:16 (11 years ago) parentead8456
7 files changed+10−7
compare with master
unifiedsplit
searx/settings.yml+1 searx/templates/courgette/opensearch.xml+1−1 searx/templates/default/opensearch.xml+1−1 searx/templates/oscar/base.html+2−2 searx/templates/oscar/navbar.html+2−2 searx/templates/oscar/opensearch.xml+1−1 searx/webapp.py+2
searx/settings.yml+1
@@ -1,5 +1,6 @@
11general:
22 debug : False # Debug mode, only for development
3+ instance_name : "searx" # displayed name
34
45search:
56 safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
searx/templates/courgette/opensearch.xml+1−1
@@ -1,6 +1,6 @@
11<?xml version="1.0" encoding="utf-8"?>
22<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3− <ShortName>searx</ShortName>
3+ <ShortName>{{ instance_name }}</ShortName>
44 <Description>a privacy-respecting, hackable metasearch engine</Description>
55 <InputEncoding>UTF-8</InputEncoding>
66 <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
searx/templates/default/opensearch.xml+1−1
@@ -1,6 +1,6 @@
11<?xml version="1.0" encoding="utf-8"?>
22<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3− <ShortName>searx</ShortName>
3+ <ShortName>{{ instance_name }}</ShortName>
44 <Description>a privacy-respecting, hackable metasearch engine</Description>
55 <InputEncoding>UTF-8</InputEncoding>
66 <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
searx/templates/oscar/base.html+2−2
@@ -9,7 +9,7 @@
99 <meta name="referrer" content="no-referrer">
1010 <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
1111 {% block meta %}{% endblock %}
12− <title>{% block title %}{% endblock %}searx</title>
12+ <title>{% block title %}{% endblock %}{{ instance_name }}</title>
1313
1414 <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
1515 <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />
@@ -31,7 +31,7 @@
3131 {% block head %}
3232 {% endblock %}
3333
34− <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
34+ <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
3535
3636 <script type="text/javascript">
3737 searx = {};
searx/templates/oscar/navbar.html+2−2
@@ -16,7 +16,7 @@
1616 <span class="icon-bar"></span>
1717 <span class="icon-bar"></span>
1818 </button>
19− <a class="navbar-brand" href="{{ url_for('index') }}">searx</a>
19+ <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
2020 </div>
2121 {% else %}
2222 <div class="navbar-header">
@@ -26,7 +26,7 @@
2626 <span class="icon-bar"></span>
2727 <span class="icon-bar"></span>
2828 </button>
29− <a class="navbar-brand" href="{{ url_for('index') }}">searx</a>
29+ <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
3030 </div>
3131 <div class="navbar-collapse collapse">
3232 <ul class="nav navbar-nav navbar-right"> <!-- results.html -->
searx/templates/oscar/opensearch.xml+1−1
@@ -1,6 +1,6 @@
11<?xml version="1.0" encoding="utf-8"?>
22<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3− <ShortName>searx</ShortName>
3+ <ShortName>{{ instance_name }}</ShortName>
44 <Description>a privacy-respecting, hackable metasearch engine</Description>
55 <InputEncoding>UTF-8</InputEncoding>
66 <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
searx/webapp.py+2
@@ -328,6 +328,8 @@ def render(template_name, override_theme=None, **kwargs):
328328
329329 kwargs['cookies'] = request.cookies
330330
331+ kwargs['instance_name'] = settings['general']['instance_name']
332+
331333 kwargs['scripts'] = set()
332334 for plugin in request.user_plugins:
333335 for script in plugin.js_dependencies: