Browse Source

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

pw3t 11 years ago
parent
commit
fdb6fac214

BIN
searx/static/img/icon_wikipedia.png


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

@@ -1,5 +1,14 @@
 <div class="result {{ result.class }}">
 <div class="result {{ result.class }}">
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+
+  {% if result['favicon'] %}
+  <div style="float:left; margin:2px;">
+    <img width="24" height="24" src="static/img/icon_{{result['favicon']}}.png" alt="{{result['favicon']}}.png" title="{{result['favicon']}}.png" />
+  </div>
+  {% endif %}
+
+  <div>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
     <p class="url">{{ result.pretty_url }}</p>
     <p class="url">{{ result.pretty_url }}</p>
+  </div>
 </div>
 </div>

+ 10 - 0
searx/templates/result_templates/featured_results.html

@@ -0,0 +1,10 @@
+<div id="fr"> 
+    {% for result in featured_results %}
+
+        {% if result['template'] %}
+            {% include 'result_templates/'+result['template'] %}
+        {% else %}
+            {% include 'result_templates/default.html' %}
+        {% endif %}
+    {% endfor %}
+</div>

+ 1 - 10
searx/templates/results.html

@@ -15,16 +15,7 @@
         Number of results: {{ number_of_results }}
         Number of results: {{ number_of_results }}
     </div>
     </div>
     {% if featured_results  %}
     {% if featured_results  %}
-    <div id="fr">
-
-    {% for result in featured_results %}
-        {% if result['template'] %}
-            {% include 'result_templates/'+result['template'] %}
-        {% else %}
-            {% include 'result_templates/default.html' %}
-        {% endif %}
-    {% endfor %}
-    </div>
+	{% include 'result_templates/featured_results.html' %}
     {% endif %}
     {% endif %}
 
 
     {% for result in results %}
     {% for result in results %}

+ 8 - 3
searx/webapp.py

@@ -140,9 +140,14 @@ def index():
         else:
         else:
             result['pretty_url'] = result['url']
             result['pretty_url'] = result['url']
 
 
-        if 'wikipedia' in result['engines'] or 'ddg definitions' in result['engines']:
-            featured_results.append(result)
-            results.remove(result)
+        for engine in result['engines']:
+            if engine in ['wikipedia']:
+                result['favicon'] = engine 
+                featured_results.append(result)
+                results.remove(result)
+            elif engine in ['ddg definitions']:
+                featured_results.append(result)
+                results.remove(result)
 
 
     if request_data.get('format') == 'json':
     if request_data.get('format') == 'json':
         return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')
         return Response(json.dumps({'query': query, 'results': results}), mimetype='application/json')