From e181041f11f612937299d440ccb090d3a78cf740 Mon Sep 17 00:00:00 2001 From: Cqoicebordel Date: Tue, 17 Feb 2015 01:07:14 +0100 Subject: [PATCH] Ajax loading + Tweaks of CSS --- searx/static/themes/pix-art/css/style.css | 2 +- .../themes/pix-art/img/searx-pixel-small.png | Bin 0 -> 238 bytes searx/static/themes/pix-art/img/spinner.gif | Bin 0 -> 7293 bytes searx/static/themes/pix-art/js/searx.js | 94 ++++++++++++++++++ searx/static/themes/pix-art/less/search.less | 6 +- searx/static/themes/pix-art/less/style.less | 25 +++-- searx/templates/pix-art/base.html | 6 ++ .../pix-art/result_templates/default.html | 9 +- searx/templates/pix-art/results.html | 58 +++++------ searx/templates/pix-art/search.html | 2 +- 10 files changed, 147 insertions(+), 55 deletions(-) create mode 100644 searx/static/themes/pix-art/img/searx-pixel-small.png create mode 100644 searx/static/themes/pix-art/img/spinner.gif diff --git a/searx/static/themes/pix-art/css/style.css b/searx/static/themes/pix-art/css/style.css index a173f5428..22f30adcb 100644 --- a/searx/static/themes/pix-art/css/style.css +++ b/searx/static/themes/pix-art/css/style.css @@ -1 +1 @@ -html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}canvas{image-rendering:optimizeSpeed;image-rendering:-moz-crisp-edges;image-rendering:-webkit-optimize-contrast;image-rendering:optimize-contrast;image-rendering:pixelated;-ms-interpolation-mode:nearest-neighbor;width:32px;height:32px}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:13px;right:1px;padding:0;border:0;background:url('../img/search-icon-pixel2.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:30px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx-pixel.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}input[type="submit"]{padding:2px 6px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon-pixel.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both}#pagination br{clear:both}#apis{margin-top:8px;clear:both}#categories_container{position:relative}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#apis{display:none}#search_url{display:none}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:white;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8} \ No newline at end of file +html{font-family:sans-serif;font-size:.9em;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-moz-text-size-adjust:100%;text-size-adjust:100%;color:#444;padding:0;margin:0}body,#container{padding:0;margin:0}canvas{image-rendering:optimizeSpeed;image-rendering:-moz-crisp-edges;image-rendering:-webkit-optimize-contrast;image-rendering:optimize-contrast;image-rendering:pixelated;-ms-interpolation-mode:nearest-neighbor;width:32px;height:32px}#container{width:100%;position:absolute;top:0}.search{padding:0;margin:0}#search_wrapper{position:relative;width:50em;padding:10px}.center #search_wrapper{margin-left:auto;margin-right:auto}.q{background:none repeat scroll 0 0 #fff;border:1px solid #3498db;color:#222;font-size:16px;height:28px;margin:0;outline:medium none;padding:2px;padding-left:8px;padding-right:0 !important;width:100%;z-index:2}#search_submit{position:absolute;top:15px;right:5px;padding:0;border:0;background:url('../img/search-icon-pixel.png') no-repeat;background-size:24px 24px;opacity:.8;width:24px;height:24px;font-size:0}@media screen and (max-width:50em){#search_wrapper{width:90%;clear:both;overflow:hidden}}.row{max-width:800px;margin:20px auto;text-align:justify}.row h1{font-size:3em;margin-top:50px}.row p{padding:0 10px;max-width:700px}.row h3,.row ul{margin:4px 8px}.hmarg{margin:0 20px;border:1px solid #3498db;padding:4px 10px}a:link.hmarg{color:#3498db}a:visited.hmarg{color:#3498db}a:active.hmarg{color:#3498db}a:hover.hmarg{color:#3498db}.top_margin{margin-top:60px}.center{text-align:center}h1{font-size:5em}div.title{background:url('../img/searx-pixel.png') no-repeat;width:100%;min-height:80px;background-position:center}div.title h1{visibility:hidden}input[type="button"]{padding:4px 12px;margin:2px 4px;display:inline-block;background:#3498db;color:#fff;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;border:0;cursor:pointer}input[type="button"]:disabled{cursor:progress}input[type="checkbox"]{visibility:hidden}fieldset{margin:8px;border:1px solid #3498db}#logo{position:absolute;top:13px;left:10px}#categories{margin:0 10px;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container{display:inline-block;position:relative;margin:0 3px;padding:0}.checkbox_container input{display:none}.checkbox_container label,.engine_checkbox label{cursor:pointer;padding:4px 10px;margin:0;display:block;text-transform:capitalize;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.checkbox_container input[type="checkbox"]:checked+label{background:#3498db;color:#fff}.engine_checkbox{padding:4px}label.allow{background:#e74c3c;padding:4px 8px;color:#fff;display:none}label.deny{background:#2ecc71;padding:4px 8px;color:#444;display:inline}.engine_checkbox input[type="checkbox"]:checked+label:nth-child(2)+label{display:none}.engine_checkbox input[type="checkbox"]:checked+label.allow{display:inline}a{text-decoration:none;color:#1a11be}a:visited{color:#8e44ad}.engines{color:#888}.small_font{font-size:.8em}.small p{margin:2px 0}.right{float:right}.invisible{display:none}.left{float:left}.highlight{color:#094089}.content .highlight{color:#000}.percentage{position:relative;width:300px}.percentage div{background:#444}table{width:100%}td{padding:0 4px}tr:hover{background:#ddd}#results{margin:auto;padding:0;width:50em;margin-bottom:20px}#search_url{margin-top:8px}#search_url input{border:1px solid #888;padding:4px;color:#444;width:14em;display:block;margin:4px;font-size:.8em}#preferences{top:10px;padding:0;border:0;background:url('../img/preference-icon-pixel.png') no-repeat;background-size:28px 28px;opacity:.8;width:28px;height:30px;display:block}#preferences *{display:none}#pagination{clear:both;text-align:center}#pagination br{clear:both}#apis{margin-top:8px;clear:both}#categories_container{position:relative}@media screen and (max-width:50em){#results{margin:auto;padding:0;width:90%}.checkbox_container{display:block;width:90%}.checkbox_container label{border-bottom:0}.preferences_container{display:none;postion:fixed !important;top:100px;right:0}}@media screen and (max-width:75em){div.title h1{font-size:1em}html.touch #categories{width:95%;height:30px;text-align:left;overflow-x:scroll;overflow-y:hidden;-webkit-overflow-scrolling:touch}html.touch #categories #categories_container{width:1000px;width:-moz-max-content;width:-webkit-max-content;width:max-content}html.touch #categories #categories_container .checkbox_container{display:inline-block;width:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#categories{font-size:90%;clear:both}#categories .checkbox_container{margin-top:2px;margin:auto}#apis{display:none}#search_url{display:none}#logo{display:none}}.favicon{float:left;margin-right:4px;margin-top:2px}.preferences_back{background:none repeat scroll 0 0 #3498db;border:0 none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;cursor:pointer;display:inline-block;margin:2px 4px;padding:4px 6px}.preferences_back a{color:#fff}.hidden{opacity:0;overflow:hidden;font-size:.8em;position:absolute;bottom:-20px;width:100%;text-position:center;background:white;transition:opacity 1s ease}#categories_container:hover .hidden{transition:opacity 1s ease;opacity:.8} \ No newline at end of file diff --git a/searx/static/themes/pix-art/img/searx-pixel-small.png b/searx/static/themes/pix-art/img/searx-pixel-small.png new file mode 100644 index 0000000000000000000000000000000000000000..76f381c5c5bb137ec7dc0d129fff0d89552d9f89 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^^MP1~kr_z3e*AwGNU;U@gt(edyQ@6ouJ6R`H$V}_ zk|4ie28U-i(m_}nhf7NqLLsC)I^~iBPR%Qm#XS1%~4k**$ zl!zBOro#DqqWFWWQlB(=zg5J#-77GvOHopK&ylwHM03Fs`NManeDAD3>w3n`O8TV5 c@wz_@;vC{(GM5}T0xe_kboFyt=akR{0ALeKivR!s literal 0 HcmV?d00001 diff --git a/searx/static/themes/pix-art/img/spinner.gif b/searx/static/themes/pix-art/img/spinner.gif new file mode 100644 index 0000000000000000000000000000000000000000..d70e679c47adee493a2077547ac8114fb4ef582b GIT binary patch literal 7293 zcmd6sX;4%5{)Ynzgf*;LfDn=pLN-F!LAHb}BqWfKl05rv2EM7 z?c2BS+_`htu3bYzLr*>R)bQ}|?%lih?Ai15(@*c)x9{0!pWVNI|A7Mso_p@O=bwN6 zg%@6U>7|zr9Xj;#%P+t3$}6wE_S);OzdkxTIyN@;=9_Q6_10TQj~*Q#A3t{N*u=!d z+i$=9?z`{4_uhLaPMkP-^5oRi)alcwKltE-4?q0yqmMrN_~Vbyojdo*C!c)!>8D?O z@x_;4e);v+UthX(>DzC={qDQ(zW@IFAAb1Z#~*+E>8GDAU%q_h%9X2Eum1e=&%gZg z%RBG9L%SY-M87e@VrVE$^zYavquZs|IgEvB4LuD0Evo5%&-8y2jXB=o#k>e6i*yHY z%oJ1UWz*bFS#8i;&xrOWhj~jm^|;aOmC{wL@G@?(*J<`3aZF`nR8obMFKRSNGVESm zd_-)M16yCn%`xD`X{+%$)d4w=$Jd8!1?s$_^n}C|ZOAGUiabX^)8s*t5{vDu)UrH&c)cMz&F(dD;*;%8%w>~uvg`0Uxt?HoRiH$cBQb^= zHA-cnB1?EK^o~d<514DF@LC<-T*?EqWE{24>yav^e(l~lkt~!AULM&dI=)e0*q6F{ zWWmv15xc$BHxo7$E0Z+(4z zk38}SFt%>pI>K;N%)oGj-U!V8(r|nC?gi3j7;ZLcufF;!;W?`0jvqfh!*Higo%)}o zk(hn+%{PSYfHd&j^_3i;<;VOeCQJmh{FYR+KOqWjX66O`_IRE@DcYYLUV>X4{>s=Y zc1#VO@H4v`ryicU6vi~QMnAi9@?-P7xI-mki&nX<)NUJlarI1 zn+sf3R8;76I#5<)W23|20CC-N%PpWOfU2XTgMbRM3BKB}VFMK;qLx&a2xU=I`41qG zz5SZa}%}&f| ziwTdCug0{+lYykPK%qjRHidNY35l6lb3-VSlL0PvI*qElnzw8VrW|`g*h3471Gbb`$mjbpc|q%pi|< z+;Iow5hfbsan-6-q`d&QO`A47`skx%9>H5g8wq30ZX>}Okw-#ZFv|#O5n&`in{6!E zWPeE+46-w4&OjTfpndk)XVfr~y1LQE87wXz=0mY^6{yQ+mNxj*e6*QU5%k&lN?(44 zPmxfA*EjmKX}SWgK2hd#=umGCzuK)VwbYcP*vez096oCvFZY_d*b%IfKA*m95)IaXJV1dL)gHgePu@6iCACMx){@+Cq20lzIsqHZl1`!_67*SvMjUE>`d z%!6Pha$w72%&zw+Gmz%o@}S3-F7xCGJVjg`u5a*EajWyQOuPb*y#{fMGb);8MW)(0 zSqZ)faC2$l%k)$qE7atRy7%){%VbXlu zQIsZd;z$%dwmRzZL&62oaT(TCOEg*uy)%5Qy*Ii2yeTd^m)5_3K+o8ybJX~%QxrlLxtYzlJ0T)b8}-O=;)3Yd*vdQm9omIQIvGuS&L!sT z8taK*w$e5`hQ@>Pz}A(tf{3tAMSS>~L&XdAS~`6=Drw$@WcGZ7uc4ilJi1N$7f}=l z1TvWn78kq|YinyEiU60(<$^Q_$;~v(KvFt>KFGcwJdv zprSHRqEh8sLQR@HRgp3)OR^(q#vE)nJBtc771kwa+V z#*G_cYLQeCvz}xNUWtGAM1-kD?5r7V5zC&swr1SHfGrsJ)FT*GXk;eIJJ^iP_0?Bj zQ8RgisEm2MqXld6W98FqwOAz9mb^^AM^+PTaq?v?`GS^Gwh1>oTIx9Z0$~HEsKsOU z`*JdBHqknjJZn^*Txj;I%$8X>;EWt!DA7?s;jFb zqKF^}d1i$@59)$0!k#DYTjawL(g@yyF%OVY-;UHXD@hnJ>B%$ej7%Opc#u4{&d?aq zOX|go=;iqMIDs1VAVHu8cP~O_U^0?3>JWp&>kQ5anO(1^By_P2YnzKzsR6Gxo3yD- zBbe(`=!0!YrlPG-*jCAHz^$$}BhOSUYUGu-`K)tWbNKoVl{T|M?6F8PylwV;Zmz!t zYxR|IrDnW{-5RXc1>)(9sEUxgxFElb6&b-S4moAn;=F)P`aW(v5ok^h3m?T*yh3MN zYbvdGTh|yf*VeIrIN6|Qs@iTJ{8=Yl-5ae}{eC&zXs*h4b2Q(Kg<&Cf+Sb-N1KJ*L ze8S7--)I+|TqWj4H+M(;*+m}(uB4@IjO!Z8Ah2nT%PrAUxPoVv)x1ydfZ z^*@=Sb`gMr(M4WPXYVeeh*XZq(e)1;5d&=YvY$Z{Raw^;C344;e*w5q4E16qxd0bh zFSekH46jR46-1lTB&aeIElM@w`88+>Tbm~^vo)y8a05Kwoe`l+|{5k}lBJT4uPF^RjeIO!* z1)$BQ40acB^&)IV{Zd4z>bid;f=d^`g8G^fEM$?{(*BgJ@$|1gaJQRrPq4 z0oBmNqAUm_>b7`2k&Mh{W_*oNCv? + var favicons = [[]]; +
@@ -23,6 +26,9 @@ searx = {}; +
diff --git a/searx/templates/pix-art/result_templates/default.html b/searx/templates/pix-art/result_templates/default.html index b9cbca342..60ff502c8 100644 --- a/searx/templates/pix-art/result_templates/default.html +++ b/searx/templates/pix-art/result_templates/default.html @@ -2,12 +2,5 @@ \ No newline at end of file diff --git a/searx/templates/pix-art/results.html b/searx/templates/pix-art/results.html index b01b7cb09..9385b608a 100644 --- a/searx/templates/pix-art/results.html +++ b/searx/templates/pix-art/results.html @@ -1,44 +1,32 @@ -{% extends "pix-art/base.html" %} -{% block title %}{{ q }} - {% endblock %} -{% block meta %}{% endblock %} -{% block content %} -
preferences
-
- {% include 'pix-art/search.html' %} -
-
+{% if pageno > 1 %} {% for result in results %} {% set index = loop.index %} {% include 'pix-art/result_templates/default.html' %} {% endfor %} - - {% if paging %} +{% else %} +{% extends "pix-art/base.html" %} +{% block title %}{{ q }} - {% endblock %} +{% block meta %}{% endblock %} +{% block content %} + +
preferences
+
+ {% include 'pix-art/search.html' %} +
+ +
+ + {% for result in results %} + {% set index = loop.index %} + {% include 'pix-art/result_templates/default.html' %} + {% endfor %} + - {% endif %}
{% endblock %} +{% endif %} \ No newline at end of file diff --git a/searx/templates/pix-art/search.html b/searx/templates/pix-art/search.html index 678ab11ed..4d129ec68 100644 --- a/searx/templates/pix-art/search.html +++ b/searx/templates/pix-art/search.html @@ -1,7 +1,7 @@
- + {% for category in categories %} {% endfor %}