fdb6fac · searx · git.iko.soy

searx/static/img/icon_wikipedia.pngnew file

compare with master

unifiedsplit

Binary file not shown.

searx/templates/result_templates/default.html+10−1

@@ -1,5 +1,14 @@

1<div class="result {{ result.class }}">

2+

3+ {% if result['favicon'] %}

4+ <div style="float:left; margin:2px;">

5+ <img width="24" height="24" src="static/img/icon_{{result['favicon']}}.png" alt="{{result['favicon']}}.png" title="{{result['favicon']}}.png" />

6+ </div>

7+ {% endif %}

8+

9+ <div>

2− <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

10+ <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>

3 <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>

11 <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>

4 <p class="url">{{ result.pretty_url }}</p>

12 <p class="url">{{ result.pretty_url }}</p>

13+ </div>

5</div>

14</div>

searx/templates/result_templates/featured_results.htmlnew file+10

@@ -0,0 +1,10 @@

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+1−10

@@ -15,16 +15,7 @@

15 Number of results: {{ number_of_results }}

16 </div>

17 {% if featured_results %}

18− <div id="fr">

19−

20− {% for result in featured_results %}

18+ {% include 'result_templates/featured_results.html' %}

21− {% if result['template'] %}

22− {% include 'result_templates/'+result['template'] %}

23− {% else %}

24− {% include 'result_templates/default.html' %}

25− {% endif %}

26− {% endfor %}

27− </div>

28 {% endif %}

19 {% endif %}

29

20

30 {% for result in results %}

21 {% for result in results %}

searx/webapp.py+8−3

@@ -140,9 +140,14 @@ def index():

140 else:

141 result['pretty_url'] = result['url']

142

143− if 'wikipedia' in result['engines'] or 'ddg definitions' in result['engines']:

143+ for engine in result['engines']:

144+ if engine in ['wikipedia']:

145+ result['favicon'] = engine

146+ featured_results.append(result)

147+ results.remove(result)

148+ elif engine in ['ddg definitions']:

144− featured_results.append(result)

149+ featured_results.append(result)

145− results.remove(result)

150+ results.remove(result)

146

151

147 if request_data.get('format') == 'json':

152 if request_data.get('format') == 'json':

148 return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')

153 return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')