瀏覽代碼

[ehn] Add possibility to add icon in results (more ugly html / css, need fix)

pw3t 11 年之前
父節點
當前提交
fdb6fac214

二進制
searx/static/img/icon_wikipedia.png 查看文件


+ 10
- 1
searx/templates/result_templates/default.html 查看文件

@@ -1,5 +1,14 @@
1 1
 <div class="result {{ result.class }}">
2
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
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>
10
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
3 11
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
4 12
     <p class="url">{{ result.pretty_url }}</p>
13
+  </div>
5 14
 </div>

+ 10
- 0
searx/templates/result_templates/featured_results.html 查看文件

@@ -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>

+ 1
- 10
searx/templates/results.html 查看文件

@@ -15,16 +15,7 @@
15 15
         Number of results: {{ number_of_results }}
16 16
     </div>
17 17
     {% if featured_results  %}
18
-    <div id="fr">
19
-
20
-    {% for result in featured_results %}
21
-        {% if result['template'] %}
22
-            {% include 'result_templates/'+result['template'] %}
23
-        {% else %}
24
-            {% include 'result_templates/default.html' %}
25
-        {% endif %}
26
-    {% endfor %}
27
-    </div>
18
+	{% include 'result_templates/featured_results.html' %}
28 19
     {% endif %}
29 20
 
30 21
     {% for result in results %}

+ 8
- 3
searx/webapp.py 查看文件

@@ -140,9 +140,14 @@ def index():
140 140
         else:
141 141
             result['pretty_url'] = result['url']
142 142
 
143
-        if 'wikipedia' in result['engines'] or 'ddg definitions' in result['engines']:
144
-            featured_results.append(result)
145
-            results.remove(result)
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']:
149
+                featured_results.append(result)
150
+                results.remove(result)
146 151
 
147 152
     if request_data.get('format') == 'json':
148 153
         return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')