commit: 5c63f2a80a749897b66604e43cc483306d263aeb
parent af100afb98f56713deb94e19115883a2247e8a0b
Author: Cqoicebordel <Cqoicebordel@users.noreply.github.com>
Date: Tue, 17 Feb 2015 19:01:18 +0100
A bit of cleanup
Diffstat:
4 files changed, 5 insertions(+), 210 deletions(-)
diff --git a/searx/static/themes/pix-art/img/searx_logo.svg b/searx/static/themes/pix-art/img/searx_logo.svg
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="744.09448819"
- height="1052.3622047"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.4 r9939"
- sodipodi:docname="searx_logo.svg"
- inkscape:export-filename="/home/a/magnif.png"
- inkscape:export-xdpi="203.1774"
- inkscape:export-ydpi="203.1774">
- <defs
- id="defs4">
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3857">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop3859" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop3861" />
- </linearGradient>
- <linearGradient
- id="linearGradient3790">
- <stop
- style="stop-color:#a9a9a9;stop-opacity:1;"
- offset="0"
- id="stop3792" />
- <stop
- style="stop-color:#000000;stop-opacity:1;"
- offset="1"
- id="stop3794" />
- </linearGradient>
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3790"
- id="radialGradient3798"
- cx="294.45947"
- cy="208.37973"
- fx="294.45947"
- fy="208.37973"
- r="107.58125"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3857"
- id="linearGradient3865"
- x1="120.68947"
- y1="239.61774"
- x2="120.68947"
- y2="602.17517"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3790"
- id="linearGradient3912"
- x1="186.74416"
- y1="354.42426"
- x2="255.84358"
- y2="254.35953"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(1.2227304,0,0,0.89945099,-289.31433,113.40259)" />
- <filter
- inkscape:collect="always"
- id="filter4024"
- x="-0.12996517"
- width="1.2599303"
- y="-0.14709377"
- height="1.2941875">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="6.4759344"
- id="feGaussianBlur4026" />
- </filter>
- <filter
- inkscape:collect="always"
- id="filter3983"
- x="-1.0608404"
- width="3.1216809"
- y="-0.31017202"
- height="1.620344">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="9.392858"
- id="feGaussianBlur3985" />
- </filter>
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.979899"
- inkscape:cx="30.708726"
- inkscape:cy="948.08556"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1364"
- inkscape:window-height="663"
- inkscape:window-x="0"
- inkscape:window-y="30"
- inkscape:window-maximized="0"
- showguides="true"
- inkscape:guide-bbox="true" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1">
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- 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"
- id="path3814-0-7"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- 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"
- id="path3814-0"
- inkscape:connector-curvature="0" />
- <path
- transform="matrix(0.6556593,-0.75505688,0.75505688,0.6556593,0,0)"
- style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
- 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"
- id="rect3804" />
- <path
- sodipodi:type="arc"
- style="fill:url(#radialGradient3798);fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path2987"
- sodipodi:cx="294.45947"
- sodipodi:cy="208.37973"
- sodipodi:rx="107.58125"
- sodipodi:ry="107.58125"
- 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"
- transform="translate(-107.07617,-60.609153)" />
- <path
- sodipodi:type="arc"
- style="fill:url(#linearGradient3865);fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path3757"
- sodipodi:cx="131.82491"
- sodipodi:cy="299.29346"
- sodipodi:rx="101.52033"
- sodipodi:ry="101.52033"
- 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"
- transform="matrix(0.76865672,0,0,0.76865672,85.80266,-82.535889)" />
- <path
- sodipodi:type="arc"
- style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path3800"
- sodipodi:cx="183.34268"
- sodipodi:cy="156.35687"
- sodipodi:rx="27.274118"
- sodipodi:ry="27.274118"
- 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"
- transform="translate(5,-7.1428572)" />
- <path
- sodipodi:type="arc"
- style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
- id="path3802"
- sodipodi:cx="197.9899"
- sodipodi:cy="203.32896"
- sodipodi:rx="5.5558391"
- sodipodi:ry="5.5558391"
- 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"
- transform="translate(1.4847712,-63.564549)" />
- <rect
- style="fill:#ffffff;fill-opacity:0.82211531000000004;fill-rule:nonzero;stroke:none;filter:url(#filter4024)"
- id="rect3916"
- width="2.2392972"
- height="159.43797"
- x="19.525793"
- y="337.8396"
- rx="2.8666623"
- ry="9.0007057"
- transform="matrix(0.74466525,-0.84318084,0.84318084,0.74466525,-35.543204,-26.349917)" />
- </g>
-</svg>
diff --git a/searx/static/themes/pix-art/img/spinner.gif b/searx/static/themes/pix-art/img/spinner.gif
Binary files differ.
diff --git a/searx/static/themes/pix-art/js/searx.js b/searx/static/themes/pix-art/js/searx.js
@@ -71,7 +71,7 @@ function GetXmlHttpObject(){
var timer;
-// Calculate the rating
+// Load more results
function load_more(query,page){
xmlHttp = GetXmlHttpObject();
@@ -88,18 +88,16 @@ function load_more(query,page){
var loader = document.getElementById('load_more');
+ // If 4, response OK
if (xmlHttp.readyState == 4){
- //loader.style.display = 'none';
var res = xmlHttp.responseText;
- //loader.style.display = 'block';
- //loader.innerHTML = '<div class="voted">Vote pris en compte</div>';
clearTimeout(timer);
timer = setTimeout(function(){},6000);
var results = document.getElementById('results_list');
- //results_list.innerHTML += res;
+
var newNode = document.createElement('span');
newNode.innerHTML = res;
results_list.appendChild(newNode);
@@ -114,7 +112,6 @@ function load_more(query,page){
loader.removeAttribute("disabled");
} else {
- //loader.innerHTML = '<img src="images/rating_loading.gif" alt="loading" />';
loader.disabled = 'disabled';
}
}
@@ -127,6 +124,7 @@ function load_more(query,page){
xmlHttp.send(params);
}
+// Load the images on the canvas in the page
function load_images(page){
var arrayLength = favicons[page].length;
for (var i = 1; i < arrayLength+1; i++) {
diff --git a/searx/templates/pix-art/base.html b/searx/templates/pix-art/base.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"{% if rtl %} dir="rtl"{% endif %}>
<head>
<meta charset="UTF-8" />
<meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
