Browse Source

[enh] results favico handling

asciimoo 11 years ago
parent
commit
4f4cb1caca

+ 0
- 1
searx/engines/dailymotion.py View File

1
 from urllib import urlencode
1
 from urllib import urlencode
2
 from lxml import html
2
 from lxml import html
3
 from json import loads
3
 from json import loads
4
-from cgi import escape
5
 
4
 
6
 categories = ['videos']
5
 categories = ['videos']
7
 locale = 'en_US'
6
 locale = 'en_US'

+ 2
- 1
searx/static/css/style.css View File

79
 a:visited { color: #7b11be; }
79
 a:visited { color: #7b11be; }
80
 
80
 
81
 .result { margin: 19px 0 18px 0; padding: 0; max-width: 55em;  clear: both; }
81
 .result { margin: 19px 0 18px 0; padding: 0; max-width: 55em;  clear: both; }
82
-.result:hover { background: #e8e7e6; }
83
 .result_title { margin-bottom: 0; }
82
 .result_title { margin-bottom: 0; }
84
 .result h3 { font-size: 1em; word-wrap:break-word; margin: 5px 0 1px 0; padding: 0 }
83
 .result h3 { font-size: 1em; word-wrap:break-word; margin: 5px 0 1px 0; padding: 0 }
85
 .result .content { font-size: 0.8em; margin: 0; padding: 0; max-width: 54em; word-wrap:break-word; line-height: 1.24; }
84
 .result .content { font-size: 0.8em; margin: 0; padding: 0; max-width: 54em; word-wrap:break-word; line-height: 1.24; }
201
 
200
 
202
   .result img { max-width: 90%; width: auto; height: auto }
201
   .result img { max-width: 90%; width: auto; height: auto }
203
 }
202
 }
203
+
204
+.favicon { float: left; margin-right: 4px; }

+ 2
- 4
searx/templates/result_templates/default.html View File

1
 <div class="result {{ result.class }}">
1
 <div class="result {{ result.class }}">
2
 
2
 
3
   {% if result['favicon'] %}
3
   {% if result['favicon'] %}
4
-  <div style="float:left; margin:2px;">
5
-    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
6
-  </div>
4
+    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
7
   {% endif %}
5
   {% endif %}
8
 
6
 
9
   <div>
7
   <div>
10
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3></br>
8
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
11
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
9
     <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
12
     <p class="url">{{ result.pretty_url }}</p>
10
     <p class="url">{{ result.pretty_url }}</p>
13
   </div>
11
   </div>

+ 2
- 4
searx/templates/result_templates/videos.html View File

1
 <div class="result">
1
 <div class="result">
2
   {% if result['favicon'] %}
2
   {% if result['favicon'] %}
3
-  <div style="float:left; margin:2px;">
4
-    <img width="18" height="18" src="static/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}.ico" title="{{result['favicon']}}.ico" />
5
-  </div>
3
+    <img width="14" height="14" class="favicon" src="static/img/icon_{{result['favicon']}}.ico" />
6
   {% endif %}
4
   {% endif %}
7
 
5
 
8
     <p>
6
     <p>
9
       <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
7
       <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
10
-      <a href="{{ result.url }}"><img width="300" height="170"  src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
8
+      <a href="{{ result.url }}"><img width="400px" src="{{ result.thumbnail }}" title={{ result.title }} alt=" {{ result.title }}"/></a>
11
       <p class="url">{{ result.url }}</p>
9
       <p class="url">{{ result.url }}</p>
12
     </p>
10
     </p>
13
 </div>
11
 </div>

+ 1
- 1
searx/templates/results.html View File

9
     {% if suggestions %}
9
     {% if suggestions %}
10
     <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>
10
     <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>
11
     {% endif %}
11
     {% endif %}
12
-    
12
+
13
 
13
 
14
     <div id ="result_count">
14
     <div id ="result_count">
15
         Number of results: {{ number_of_results }}
15
         Number of results: {{ number_of_results }}