5c8382c · searx · git.iko.soy

git.iko.soy/searx

on master help sign in

[enh] favicon added

5c8382casciimoo13 years ago

searx/static/img/favicon.pngnew file

compare with master

unifiedsplit

Binary file not shown.

searx/templates/base.html+1

@@ -7,6 +7,7 @@

7 <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />

8 <title>{% block title %}{% endblock %}searx</title>

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 {% block styles %}

11 {% block styles %}

11 {% endblock %}

12 {% endblock %}

12 {% block head %}

13 {% block head %}

searx/webapp.py+11−6

@@ -17,10 +17,10 @@ along with searx. If not, see < http://www.gnu.org/licenses/ >.

18'''

20+import os

20if __name__ == "__main__":

21if __name__ == "__main__":

21 from sys import path

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__))+'/../'))

25from flask import Flask, request, render_template, url_for, Response, make_response

26from searx.engines import search, categories, engines, get_engines_stats

@@ -28,6 +28,8 @@ from searx import settings

28import json

29import cStringIO

30from searx.utils import UnicodeWriter

31+from flask import send_from_directory

32+

33app = Flask(__name__)

35app = Flask(__name__)

@@ -133,10 +135,6 @@ def index():

133

135

134 return resp

136 return resp

135

137

136−@app.route('/favicon.ico', methods=['GET'])

137−def fav():

138− return ''

139−

140@app.route('/about', methods=['GET'])

138@app.route('/about', methods=['GET'])

141def about():

139def about():

142 global categories

140 global categories

@@ -172,6 +170,13 @@ def opensearch():

172 mimetype="application/xml")

170 mimetype="application/xml")

173 return resp

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+

175if __name__ == "__main__":

180if __name__ == "__main__":

176 from gevent import monkey

181 from gevent import monkey

177 monkey.patch_all()

182 monkey.patch_all()