Sfoglia il codice sorgente

[enh] favicon added

asciimoo 11 anni fa
parent
commit
5c8382c1ba
3 ha cambiato i file con 12 aggiunte e 6 eliminazioni
  1. BIN
      searx/static/img/favicon.png
  2. 1
    0
      searx/templates/base.html
  3. 11
    6
      searx/webapp.py

BIN
searx/static/img/favicon.png Vedi File


+ 1
- 0
searx/templates/base.html Vedi File

@@ -7,6 +7,7 @@
7 7
     <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
8 8
     <title>{% block title %}{% endblock %}searx</title>
9 9
     <link rel="stylesheet" href="/static/css/style.css" type="text/css" media="screen" charset="utf-8" />
10
+    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
10 11
     {% block styles %}
11 12
     {% endblock %}
12 13
     {% block head %}

+ 11
- 6
searx/webapp.py Vedi File

@@ -17,10 +17,10 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.
17 17
 (C) 2013- by Adam Tauber, <asciimoo@gmail.com>
18 18
 '''
19 19
 
20
+import os
20 21
 if __name__ == "__main__":
21 22
     from sys import path
22
-    from os.path import realpath, dirname
23
-    path.append(realpath(dirname(realpath(__file__))+'/../'))
23
+    path.append(os.path.realpath(os.path.dirname(os.path.realpath(__file__))+'/../'))
24 24
 
25 25
 from flask import Flask, request, render_template, url_for, Response, make_response
26 26
 from searx.engines import search, categories, engines, get_engines_stats
@@ -28,6 +28,8 @@ from searx import settings
28 28
 import json
29 29
 import cStringIO
30 30
 from searx.utils import UnicodeWriter
31
+from flask import send_from_directory
32
+
31 33
 
32 34
 
33 35
 app = Flask(__name__)
@@ -133,10 +135,6 @@ def index():
133 135
 
134 136
     return resp
135 137
 
136
-@app.route('/favicon.ico', methods=['GET'])
137
-def fav():
138
-    return ''
139
-
140 138
 @app.route('/about', methods=['GET'])
141 139
 def about():
142 140
     global categories
@@ -172,6 +170,13 @@ def opensearch():
172 170
                 mimetype="application/xml")
173 171
     return resp
174 172
 
173
+@app.route('/favicon.ico')
174
+def favicon():
175
+    print os.path.join(app.root_path, 'static/img'), 'asdf'
176
+    return send_from_directory(os.path.join(app.root_path, 'static/img'),
177
+                               'favicon.png', mimetype='image/vnd.microsoft.icon')
178
+
179
+
175 180
 if __name__ == "__main__":
176 181
     from gevent import monkey
177 182
     monkey.patch_all()