git.iko.soy/searx
on master help sign in
Merge branch 'featured_result'
commitd6b017efb5b51623a02c85690c7335cfc6674092 authorpw3t <romain@berthor.fr> dateSun 19 Jan 2014, 19:54 (13 years ago) parent9e72ebe380b440
5 files changed−29
compare with master
unifiedsplit
searx/engines/mediawiki.py−6 searx/static/css/style.css−7 searx/templates/result_templates/featured_results.html−10 searx/templates/results.html−3 searx/webapp.py−3
searx/engines/mediawiki.py−6
@@ -18,9 +18,3 @@ def response(resp):
1818 return [{'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')),
1919 'title': result['title']} for result in res[:int(number_of_results)]]
2020
21− if not len(res):
22− return results
23− for result in res[:int(number_of_results)]:
24− results.append({'url': url + 'wiki/' + quote(result['title'].replace(' ', '_').encode('utf-8')), 'title': result['title'], 'favicon':'wikipedia'})
25− return results
26−
searx/static/css/style.css−7
@@ -151,13 +151,6 @@ tr:hover td { background: #DDDDDD; }
151151
152152#result_count { font-size: 0.8em; margin: 2px 0 2px 0; padding: 0 }
153153
154−#fr { padding: 2px 6px;
155−display: inline-block;
156−background: #ECF0F1;
157−border-radius: 4px;
158−border: 1px solid #3498DB;;
159−width:55em;}
160−
161154#suggestions { position: absolute; left: 54em; width: 12em; margin: 0 2px 5px 5px; padding: 0 2px 2px 2px; }
162155#suggestions span { display: block; font-size: 0.8em; margin: 0 2px 10px 2px; padding: 0; }
163156#suggestions form { display: block; }
searx/templates/result_templates/featured_results.htmldeleted−10
@@ -1,10 +0,0 @@
1−<div id="fr">
2− {% for result in featured_results %}
3−
4− {% if result['template'] %}
5− {% include 'result_templates/'+result['template'] %}
6− {% else %}
7− {% include 'result_templates/default.html' %}
8− {% endif %}
9− {% endfor %}
10−</div>
searx/templates/results.html−3
@@ -14,9 +14,6 @@
1414 <div id ="result_count">
1515 Number of results: {{ number_of_results }}
1616 </div>
17− {% if featured_results %}
18− {% include 'result_templates/featured_results.html' %}
19− {% endif %}
2017
2118 {% for result in results %}
2219 {% if result['template'] %}
searx/webapp.py−3
@@ -138,9 +138,6 @@ def index():
138138 for engine in result['engines']:
139139 if engine in ['wikipedia', 'youtube', 'vimeo', 'soundcloud', 'twitter', 'stackoverflow', 'github']:
140140 result['favicon'] = engine
141− if engine in ['wikipedia', 'ddg definitions']:
142− featured_results.append(result)
143− results.remove(result)
144141
145142 if request_data.get('format') == 'json':
146143 return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')