浏览代码

A bit of cleanup

Cqoicebordel 10 年前
父节点
当前提交
5c63f2a80a

+ 0
- 203
searx/static/themes/pix-art/img/searx_logo.svg 查看文件

@@ -1,203 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
3
-
4
-<svg
5
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
6
-   xmlns:cc="http://creativecommons.org/ns#"
7
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
8
-   xmlns:svg="http://www.w3.org/2000/svg"
9
-   xmlns="http://www.w3.org/2000/svg"
10
-   xmlns:xlink="http://www.w3.org/1999/xlink"
11
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
12
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
13
-   width="744.09448819"
14
-   height="1052.3622047"
15
-   id="svg2"
16
-   version="1.1"
17
-   inkscape:version="0.48.4 r9939"
18
-   sodipodi:docname="searx_logo.svg"
19
-   inkscape:export-filename="/home/a/magnif.png"
20
-   inkscape:export-xdpi="203.1774"
21
-   inkscape:export-ydpi="203.1774">
22
-  <defs
23
-     id="defs4">
24
-    <linearGradient
25
-       inkscape:collect="always"
26
-       id="linearGradient3857">
27
-      <stop
28
-         style="stop-color:#ffffff;stop-opacity:1;"
29
-         offset="0"
30
-         id="stop3859" />
31
-      <stop
32
-         style="stop-color:#ffffff;stop-opacity:0;"
33
-         offset="1"
34
-         id="stop3861" />
35
-    </linearGradient>
36
-    <linearGradient
37
-       id="linearGradient3790">
38
-      <stop
39
-         style="stop-color:#a9a9a9;stop-opacity:1;"
40
-         offset="0"
41
-         id="stop3792" />
42
-      <stop
43
-         style="stop-color:#000000;stop-opacity:1;"
44
-         offset="1"
45
-         id="stop3794" />
46
-    </linearGradient>
47
-    <radialGradient
48
-       inkscape:collect="always"
49
-       xlink:href="#linearGradient3790"
50
-       id="radialGradient3798"
51
-       cx="294.45947"
52
-       cy="208.37973"
53
-       fx="294.45947"
54
-       fy="208.37973"
55
-       r="107.58125"
56
-       gradientUnits="userSpaceOnUse" />
57
-    <linearGradient
58
-       inkscape:collect="always"
59
-       xlink:href="#linearGradient3857"
60
-       id="linearGradient3865"
61
-       x1="120.68947"
62
-       y1="239.61774"
63
-       x2="120.68947"
64
-       y2="602.17517"
65
-       gradientUnits="userSpaceOnUse" />
66
-    <linearGradient
67
-       inkscape:collect="always"
68
-       xlink:href="#linearGradient3790"
69
-       id="linearGradient3912"
70
-       x1="186.74416"
71
-       y1="354.42426"
72
-       x2="255.84358"
73
-       y2="254.35953"
74
-       gradientUnits="userSpaceOnUse"
75
-       gradientTransform="matrix(1.2227304,0,0,0.89945099,-289.31433,113.40259)" />
76
-    <filter
77
-       inkscape:collect="always"
78
-       id="filter4024"
79
-       x="-0.12996517"
80
-       width="1.2599303"
81
-       y="-0.14709377"
82
-       height="1.2941875">
83
-      <feGaussianBlur
84
-         inkscape:collect="always"
85
-         stdDeviation="6.4759344"
86
-         id="feGaussianBlur4026" />
87
-    </filter>
88
-    <filter
89
-       inkscape:collect="always"
90
-       id="filter3983"
91
-       x="-1.0608404"
92
-       width="3.1216809"
93
-       y="-0.31017202"
94
-       height="1.620344">
95
-      <feGaussianBlur
96
-         inkscape:collect="always"
97
-         stdDeviation="9.392858"
98
-         id="feGaussianBlur3985" />
99
-    </filter>
100
-  </defs>
101
-  <sodipodi:namedview
102
-     id="base"
103
-     pagecolor="#ffffff"
104
-     bordercolor="#666666"
105
-     borderopacity="1.0"
106
-     inkscape:pageopacity="0.0"
107
-     inkscape:pageshadow="2"
108
-     inkscape:zoom="1.979899"
109
-     inkscape:cx="30.708726"
110
-     inkscape:cy="948.08556"
111
-     inkscape:document-units="px"
112
-     inkscape:current-layer="layer1"
113
-     showgrid="false"
114
-     inkscape:window-width="1364"
115
-     inkscape:window-height="663"
116
-     inkscape:window-x="0"
117
-     inkscape:window-y="30"
118
-     inkscape:window-maximized="0"
119
-     showguides="true"
120
-     inkscape:guide-bbox="true" />
121
-  <metadata
122
-     id="metadata7">
123
-    <rdf:RDF>
124
-      <cc:Work
125
-         rdf:about="">
126
-        <dc:format>image/svg+xml</dc:format>
127
-        <dc:type
128
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
129
-        <dc:title />
130
-      </cc:Work>
131
-    </rdf:RDF>
132
-  </metadata>
133
-  <g
134
-     inkscape:label="Layer 1"
135
-     inkscape:groupmode="layer"
136
-     id="layer1">
137
-    <path
138
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
139
-       d="m 70.523181,34.870671 c -7.11959,15.242893 -10.17798,31.779192 -8.22563,48.814566 5.01677,43.774133 41.675309,79.324503 91.536109,95.162893 -6.62576,-22.40752 -5.34093,-44.9362 2.6395,-65.84431 C 108.73618,98.821131 74.828141,70.195435 70.523181,34.870671 z"
140
-       id="path3814-0-7"
141
-       inkscape:connector-curvature="0" />
142
-    <path
143
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
144
-       d="m 303.77876,36.21406 c 7.11959,15.242893 10.17798,31.779192 8.22563,48.814566 -5.01677,43.774134 -41.67531,79.324504 -91.53611,95.162894 6.62576,-22.40752 5.34093,-44.9362 -2.6395,-65.84431 47.73698,-14.18269 81.64502,-42.808386 85.94998,-78.13315 z"
145
-       id="path3814-0"
146
-       inkscape:connector-curvature="0" />
147
-    <path
148
-       transform="matrix(0.6556593,-0.75505688,0.75505688,0.6556593,0,0)"
149
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
150
-       d="m -5.0905523,259.06055 18.4167573,0 c 6.220455,0 11.228257,16.68196 11.228257,37.40349 l 0,172.83701 c 0,20.72153 -5.007802,37.40349 -11.228257,37.40349 l -18.4167573,0 c -6.2204547,0 -11.2282577,-16.68196 -11.2282577,-37.40349 l 0,-172.83701 c 0,-20.72153 5.007803,-37.40349 11.2282577,-37.40349 z"
151
-       id="rect3804" />
152
-    <path
153
-       sodipodi:type="arc"
154
-       style="fill:url(#radialGradient3798);fill-opacity:1;fill-rule:nonzero;stroke:none"
155
-       id="path2987"
156
-       sodipodi:cx="294.45947"
157
-       sodipodi:cy="208.37973"
158
-       sodipodi:rx="107.58125"
159
-       sodipodi:ry="107.58125"
160
-       d="m 402.04073,208.37973 a 107.58125,107.58125 0 1 1 -215.16251,0 107.58125,107.58125 0 1 1 215.16251,0 z"
161
-       transform="translate(-107.07617,-60.609153)" />
162
-    <path
163
-       sodipodi:type="arc"
164
-       style="fill:url(#linearGradient3865);fill-opacity:1;fill-rule:nonzero;stroke:none"
165
-       id="path3757"
166
-       sodipodi:cx="131.82491"
167
-       sodipodi:cy="299.29346"
168
-       sodipodi:rx="101.52033"
169
-       sodipodi:ry="101.52033"
170
-       d="m 233.34524,299.29346 a 101.52033,101.52033 0 1 1 -203.040667,0 101.52033,101.52033 0 1 1 203.040667,0 z"
171
-       transform="matrix(0.76865672,0,0,0.76865672,85.80266,-82.535889)" />
172
-    <path
173
-       sodipodi:type="arc"
174
-       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
175
-       id="path3800"
176
-       sodipodi:cx="183.34268"
177
-       sodipodi:cy="156.35687"
178
-       sodipodi:rx="27.274118"
179
-       sodipodi:ry="27.274118"
180
-       d="m 210.6168,156.35687 a 27.274118,27.274118 0 1 1 -54.54824,0 27.274118,27.274118 0 1 1 54.54824,0 z"
181
-       transform="translate(5,-7.1428572)" />
182
-    <path
183
-       sodipodi:type="arc"
184
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
185
-       id="path3802"
186
-       sodipodi:cx="197.9899"
187
-       sodipodi:cy="203.32896"
188
-       sodipodi:rx="5.5558391"
189
-       sodipodi:ry="5.5558391"
190
-       d="m 203.54574,203.32896 a 5.5558391,5.5558391 0 1 1 -11.11168,0 5.5558391,5.5558391 0 1 1 11.11168,0 z"
191
-       transform="translate(1.4847712,-63.564549)" />
192
-    <rect
193
-       style="fill:#ffffff;fill-opacity:0.82211531000000004;fill-rule:nonzero;stroke:none;filter:url(#filter4024)"
194
-       id="rect3916"
195
-       width="2.2392972"
196
-       height="159.43797"
197
-       x="19.525793"
198
-       y="337.8396"
199
-       rx="2.8666623"
200
-       ry="9.0007057"
201
-       transform="matrix(0.74466525,-0.84318084,0.84318084,0.74466525,-35.543204,-26.349917)" />
202
-  </g>
203
-</svg>

二进制
searx/static/themes/pix-art/img/spinner.gif 查看文件


+ 4
- 6
searx/static/themes/pix-art/js/searx.js 查看文件

@@ -71,7 +71,7 @@ function GetXmlHttpObject(){
71 71
 
72 72
 var timer;
73 73
 
74
-// Calculate the rating
74
+// Load more results
75 75
 function load_more(query,page){
76 76
 
77 77
     xmlHttp = GetXmlHttpObject();
@@ -88,18 +88,16 @@ function load_more(query,page){
88 88
         
89 89
         var loader = document.getElementById('load_more');
90 90
 
91
+        // If 4, response OK
91 92
         if (xmlHttp.readyState == 4){
92 93
             
93
-            //loader.style.display = 'none';
94 94
             var res = xmlHttp.responseText;
95 95
 
96
-            //loader.style.display = 'block';
97
-            //loader.innerHTML = '<div class="voted">Vote pris en compte</div>';
98 96
             clearTimeout(timer);
99 97
             timer = setTimeout(function(){},6000);
100 98
 
101 99
             var results = document.getElementById('results_list');
102
-            //results_list.innerHTML += res;
100
+
103 101
             var newNode = document.createElement('span');      
104 102
             newNode.innerHTML = res;
105 103
             results_list.appendChild(newNode);
@@ -114,7 +112,6 @@ function load_more(query,page){
114 112
             loader.removeAttribute("disabled");
115 113
             
116 114
         } else {
117
-            //loader.innerHTML = '<img src="images/rating_loading.gif" alt="loading" />'; 
118 115
             loader.disabled = 'disabled';
119 116
         }
120 117
     }
@@ -127,6 +124,7 @@ function load_more(query,page){
127 124
     xmlHttp.send(params);
128 125
 }
129 126
 
127
+// Load the images on the canvas in the page
130 128
 function load_images(page){
131 129
     var arrayLength = favicons[page].length;
132 130
     for (var i = 1; i < arrayLength+1; i++) {

+ 1
- 1
searx/templates/pix-art/base.html 查看文件

@@ -1,5 +1,5 @@
1 1
 <!DOCTYPE html>
2
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
2
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
3 3
     <head>
4 4
         <meta charset="UTF-8" />
5 5
         <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />