瀏覽代碼

[enh] settings option to change instance name - closes #450

Adam Tauber 9 年之前
父節點
當前提交
0fbd705259

+ 1
- 0
searx/settings.yml 查看文件

1
 general:
1
 general:
2
     debug : False # Debug mode, only for development
2
     debug : False # Debug mode, only for development
3
+    instance_name : "searx" # displayed name
3
 
4
 
4
 search:
5
 search:
5
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict
6
     safe_search : 0 # Filter results. 0: None, 1: Moderate, 2: Strict

+ 1
- 1
searx/templates/courgette/opensearch.xml 查看文件

1
 <?xml version="1.0" encoding="utf-8"?>
1
 <?xml version="1.0" encoding="utf-8"?>
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3
-  <ShortName>searx</ShortName>
3
+  <ShortName>{{ instance_name }}</ShortName>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
5
   <InputEncoding>UTF-8</InputEncoding>
5
   <InputEncoding>UTF-8</InputEncoding>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>

+ 1
- 1
searx/templates/default/opensearch.xml 查看文件

1
 <?xml version="1.0" encoding="utf-8"?>
1
 <?xml version="1.0" encoding="utf-8"?>
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3
-  <ShortName>searx</ShortName>
3
+  <ShortName>{{ instance_name }}</ShortName>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
5
   <InputEncoding>UTF-8</InputEncoding>
5
   <InputEncoding>UTF-8</InputEncoding>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>

+ 2
- 2
searx/templates/oscar/base.html 查看文件

9
     <meta name="referrer" content="no-referrer">
9
     <meta name="referrer" content="no-referrer">
10
     <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
10
     <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
11
     {% block meta %}{% endblock %}
11
     {% block meta %}{% endblock %}
12
-    <title>{% block title %}{% endblock %}searx</title>
12
+    <title>{% block title %}{% endblock %}{{ instance_name }}</title>
13
 
13
 
14
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
14
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
15
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />
15
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />
31
     {% block head %}
31
     {% block head %}
32
     {% endblock %}
32
     {% endblock %}
33
 
33
 
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') }}"/>
35
 
35
 
36
     <script type="text/javascript">
36
     <script type="text/javascript">
37
         searx = {};
37
         searx = {};

+ 2
- 2
searx/templates/oscar/navbar.html 查看文件

16
                 <span class="icon-bar"></span>
16
                 <span class="icon-bar"></span>
17
                 <span class="icon-bar"></span>
17
                 <span class="icon-bar"></span>
18
             </button>
18
             </button>
19
-            <a class="navbar-brand" href="{{ url_for('index') }}">searx</a>
19
+            <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
20
         </div>
20
         </div>
21
         {% else %}
21
         {% else %}
22
         <div class="navbar-header">
22
         <div class="navbar-header">
26
                 <span class="icon-bar"></span>
26
                 <span class="icon-bar"></span>
27
                 <span class="icon-bar"></span>
27
                 <span class="icon-bar"></span>
28
             </button>
28
             </button>
29
-            <a class="navbar-brand" href="{{ url_for('index') }}">searx</a>
29
+            <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a>
30
         </div>
30
         </div>
31
         <div class="navbar-collapse collapse">
31
         <div class="navbar-collapse collapse">
32
             <ul class="nav navbar-nav navbar-right"> <!-- results.html -->
32
             <ul class="nav navbar-nav navbar-right"> <!-- results.html -->

+ 1
- 1
searx/templates/oscar/opensearch.xml 查看文件

1
 <?xml version="1.0" encoding="utf-8"?>
1
 <?xml version="1.0" encoding="utf-8"?>
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
2
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
3
-  <ShortName>searx</ShortName>
3
+  <ShortName>{{ instance_name }}</ShortName>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
4
   <Description>a privacy-respecting, hackable metasearch engine</Description>
5
   <InputEncoding>UTF-8</InputEncoding>
5
   <InputEncoding>UTF-8</InputEncoding>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>
6
   <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image>

+ 2
- 0
searx/webapp.py 查看文件

328
 
328
 
329
     kwargs['cookies'] = request.cookies
329
     kwargs['cookies'] = request.cookies
330
 
330
 
331
+    kwargs['instance_name'] = settings['general']['instance_name']
332
+
331
     kwargs['scripts'] = set()
333
     kwargs['scripts'] = set()
332
     for plugin in request.user_plugins:
334
     for plugin in request.user_plugins:
333
         for script in plugin.js_dependencies:
335
         for script in plugin.js_dependencies: