logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: 4f4cb1caca37c28cd8a8e58e259d41569d3290a7
parent: bfdd6ebb9292f544736ed264a8d8ab04ca8d0296
Author: asciimoo <asciimoo@gmail.com>
Date:   Sun, 19 Jan 2014 22:58:50 +0100

[enh] results favico handling

Diffstat:

searx/engines/dailymotion.py | 1-
searx/static/css/style.css | 3++-
searx/templates/result_templates/default.html | 6++----
searx/templates/result_templates/videos.html | 6++----
searx/templates/results.html | 2+-
5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/searx/engines/dailymotion.py b/searx/engines/dailymotion.py @@ -1,7 +1,6 @@ from urllib import urlencode from lxml import html from json import loads -from cgi import escape categories = ['videos'] locale = 'en_US' diff --git a/searx/static/css/style.css b/searx/static/css/style.css @@ -79,7 +79,6 @@ a { text-decoration: none; color: #1a11be; } a:visited { color: #7b11be; } .result { margin: 19px 0 18px 0; padding: 0; max-width: 55em; clear: both; } -.result:hover { background: #e8e7e6; } .result_title { margin-bottom: 0; } .result h3 { font-size: 1em; word-wrap:break-word; margin: 5px 0 1px 0; padding: 0 } .result .content { font-size: 0.8em; margin: 0; padding: 0; max-width: 54em; word-wrap:break-word; line-height: 1.24; } @@ -201,3 +200,5 @@ tr:hover td { background: #DDDDDD; } .result img { max-width: 90%; width: auto; height: auto } } + +.favicon { float: left; margin-right: 4px; } diff --git a/searx/templates/result_templates/default.html b/searx/templates/result_templates/default.html @@ -1,13 +1,11 @@ <div class="result {{ result.class }}"> {% if result['favicon'] %} - <div style="float:left; margin:2px;"> - <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" /> - </div> + <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" /> {% endif %} <div> - <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br> + <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p> <p class="url">{{ result.pretty_url }}</p> </div> diff --git a/searx/templates/result_templates/videos.html b/searx/templates/result_templates/videos.html @@ -1,13 +1,11 @@ <div class="result"> {% if result['favicon'] %} - <div style="float:left; margin:2px;"> - <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" /> - </div> + <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" /> {% endif %} <p> <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3> - <a href="{{ result.url }}"><img width="300" height="170" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a> + <a href="{{ result.url }}"><img width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a> <p class="url">{{ result.url }}</p> </p> </div> diff --git a/searx/templates/results.html b/searx/templates/results.html @@ -9,7 +9,7 @@ {% if suggestions %} <div id="suggestions"><span>Suggestions: </span>{% for suggestion in suggestions %}<form method="post" action="/"><input type="hidden" name="q" value="{{suggestion}}"><input type="submit" value="{{ suggestion }}" /></form>{% endfor %}</div> {% endif %} - + <div id ="result_count"> Number of results: {{ number_of_results }}