Browse Source

[enh] stat bar graphs

asciimoo 11 years ago
parent
commit
afe767d8e9
3 changed files with 12 additions and 5 deletions
  1. 1
    1
      searx/engines/__init__.py
  2. 8
    1
      searx/static/css/style.css
  3. 3
    3
      searx/templates/stats.html

+ 1
- 1
searx/engines/__init__.py View File

180
         engine['percentage'] = int(engine['avg']/max_results*100)
180
         engine['percentage'] = int(engine['avg']/max_results*100)
181
 
181
 
182
 
182
 
183
-    return [('Page loads', sorted(pageloads, key=itemgetter('avg'), reverse=True))
183
+    return [('Page loads (sec)', sorted(pageloads, key=itemgetter('avg'), reverse=True))
184
            ,('Number of results', sorted(results, key=itemgetter('avg'), reverse=True))
184
            ,('Number of results', sorted(results, key=itemgetter('avg'), reverse=True))
185
            ]
185
            ]

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

84
 
84
 
85
 .invisible { display: none; }
85
 .invisible { display: none; }
86
 
86
 
87
+.left { float: left; }
88
+
87
 .image_result { float: left; margin: 10px 10px; position: relative;  height: 160px;}
89
 .image_result { float: left; margin: 10px 10px; position: relative;  height: 160px;}
88
 .image_result img { border: 0;  height: 160px;}
90
 .image_result img { border: 0;  height: 160px;}
89
 .image_result p { margin: 0; padding: 0; }
91
 .image_result p { margin: 0; padding: 0; }
90
 .image_result p span a { display: none; }
92
 .image_result p span a { display: none; }
91
 .image_result p span a { color: #FFFFFF; }
93
 .image_result p span a { color: #FFFFFF; }
92
-.image_result p:hover span a { display: block; position: absolute; bottom: 0; right: 0; padding: 4px; background-color: rgba(0, 0, 0, 0.6); font-size: 0.7em; }
94
+image_result p:hover span a { display: block; position: absolute; bottom: 0; right: 0; padding: 4px; background-color: rgba(0, 0, 0, 0.6); font-size: 0.7em; }
95
+
96
+.percentage { position: relative; width: 300px; }
97
+.percentage div { background: #444444; }
98
+td { padding: 0 4px; }
99
+tr:hover td { background: #DDDDDD; }

+ 3
- 3
searx/templates/stats.html View File

4
 <h2>Engine stats</h2>
4
 <h2>Engine stats</h2>
5
 
5
 
6
 {% for stat_name,stat_category in stats %}
6
 {% for stat_name,stat_category in stats %}
7
-<div>
7
+<div class="left">
8
     <table>
8
     <table>
9
         <tr colspan="3">
9
         <tr colspan="3">
10
             <th>{{ stat_name }}</th>
10
             <th>{{ stat_name }}</th>
12
         {% for engine in stat_category %}
12
         {% for engine in stat_category %}
13
         <tr>
13
         <tr>
14
             <td>{{ engine.name }}</td>
14
             <td>{{ engine.name }}</td>
15
-            <td>{{ engine.percentage }}</td>
16
-            <td>{{ engine.avg }}</td>
15
+            <td>{{ '%.02f'|format(engine.avg) }}</td>
16
+            <td class="percentage"><div style="width: {{ engine.percentage }}%">&nbsp;</div></td>
17
         </tr>
17
         </tr>
18
         {% endfor %}
18
         {% endfor %}
19
     </table>
19
     </table>