From 6e2b5f3d5ad95fe87fe58734a6730b9ed46ac6c0 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 13 Jun 2022 21:10:44 +0200 Subject: [PATCH 1/3] Theme: add Help and Donate links in all pages Close https://github.com/searxng/searxng/issues/931 --- searx/infopage/__init__.py | 1 + searx/static/themes/simple/gruntfile.js | 2 + .../static/themes/simple/src/less/style.less | 49 ++++++++++++++++-- .../simple/src/svg/help-circle-outline.svg | Bin 0 -> 596 bytes searx/templates/simple/base.html | 16 ++++-- searx/templates/simple/info.html | 2 + 6 files changed, 61 insertions(+), 9 deletions(-) create mode 100644 searx/static/themes/simple/src/svg/help-circle-outline.svg diff --git a/searx/infopage/__init__.py b/searx/infopage/__init__.py index 4aebfa5a7..730d50a74 100644 --- a/searx/infopage/__init__.py +++ b/searx/infopage/__init__.py @@ -134,6 +134,7 @@ class InfoPageSet: # pylint: disable=too-few-public-methods self.toc: typing.List[str] = [ 'search-syntax', 'about', + 'donate', ] """list of articles in the online documentation""" diff --git a/searx/static/themes/simple/gruntfile.js b/searx/static/themes/simple/gruntfile.js index 50ea3b1d4..e9aadee92 100644 --- a/searx/static/themes/simple/gruntfile.js +++ b/searx/static/themes/simple/gruntfile.js @@ -189,6 +189,8 @@ module.exports = function (grunt) { 'school-outline': 'node_modules/ionicons/dist/svg/school-outline.svg', 'file-tray-full-outline': 'node_modules/ionicons/dist/svg/file-tray-full-outline.svg', 'people-outline': 'node_modules/ionicons/dist/svg/people-outline.svg', + 'heart-outline': 'node_modules/ionicons/dist/svg/heart-outline.svg', + 'help-circle-outline': 'src/svg/help-circle-outline.svg', }, dest: '../../../templates/simple/icons.html', }, diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index c2efcdd50..b97e113fe 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -639,16 +639,30 @@ article[data-vim-selected].category-social { } } -#linkto_preferences { +#links_on_top { position: absolute; .ltr-right(1.8rem); + .ltr-text-align-right(); top: 2.2rem; padding: 0; border: 0; - display: block; - font-size: 1.2em; + display: flex; + align-items: center; + font-size: 1em; color: var(--color-search-font); + a { + display: flex; + align-items: center; + margin-left: 1em; + + svg { + font-size: 1.2em; + .ltr-margin-right(0.125em); + } + } + + a, a:link *, a:hover *, a:visited *, @@ -706,6 +720,12 @@ article[data-vim-selected].category-social { */ .results-tablet() { + #links_on_top { + span { + display: none; + } + } + .page_with_header { margin: 2rem 0.5rem; width: auto; @@ -806,6 +826,25 @@ article[data-vim-selected].category-social { } } +@media screen and (max-width: calc(@tablet - 0.5px)) { + #links_on_top { + span { + display: none; + } + } +} + +@media screen and (max-width: 52rem) { + body.results_endpoint { + #links_on_top { + .link_on_top_about, + .link_on_top_donate { + display: none; + } + } + } +} + @media screen and (min-width: @phone) and (max-width: @tablet) { // when .center-aligment-yes, see style-center.less // the media query includes "min-width: @phone" @@ -872,12 +911,12 @@ article[data-vim-selected].category-social { margin: 1rem 0 0 0; } - #linkto_preferences { + #links_on_top { top: 0.8rem; .ltr-right(0.7rem); } - #main_index #linkto_preferences { + #main_index #links_on_top { top: 0.5rem; .ltr-right(0.5rem); } diff --git a/searx/static/themes/simple/src/svg/help-circle-outline.svg b/searx/static/themes/simple/src/svg/help-circle-outline.svg new file mode 100644 index 0000000000000000000000000000000000000000..df36289d3993bc37fb79916c5bf4d1ba1849d446 GIT binary patch literal 596 zcmb7C$xiJs4Bhh;R`xY^rl!&j60l~)7gT8;H=?vC?PdCUd>M)mdPqcaY@H+?&dF|h zxPdhG%Mw+Yr;_GL!9&T97xPn81O$%t(G>Kx^v%8uL!P2q>mjSN6OgsL@7FyHQC(^0 zAyCh)hoccNeZ=Qq7}5K+7X|;yI7T(iQ&zC7b-v9}r9-WGS}*5uuAgXgSJqs|A}%VX z4Sp=cx{u0eb^4wv5!t@Y+jRFf9gdjGVXN2*b5@3_37c zBef*#{2z!I%al`pA61 {% endif %} - {% block linkto_preferences %} - {% from 'simple/icons.html' import icon_big %} - - {% endblock %} + {% block header %} {% endblock %} {% block content %} diff --git a/searx/templates/simple/info.html b/searx/templates/simple/info.html index b94ad0037..52b29b0ad 100644 --- a/searx/templates/simple/info.html +++ b/searx/templates/simple/info.html @@ -1,5 +1,7 @@ {% extends 'simple/page_with_header.html' %} {% block title %}{{ active_page.title }} - {% endblock %} +{% block linkto_about %}{% endblock %} +{% block linkto_donate %}{% endblock %} {% block content %}
    {% for pagename, locale, page in all_pages %} From 86f14fd066b4a440c460b758ab2fd78f54ab67a6 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sat, 25 Jun 2022 20:32:04 +0200 Subject: [PATCH 2/3] [build] /static --- .../themes/simple/css/searxng-rtl.min.css | Bin 66930 -> 67385 bytes .../themes/simple/css/searxng-rtl.min.css.map | Bin 108393 -> 109157 bytes .../static/themes/simple/css/searxng.min.css | Bin 65832 -> 66289 bytes .../themes/simple/css/searxng.min.css.map | Bin 106706 -> 107470 bytes searx/templates/simple/icons.html | 2 ++ 5 files changed, 2 insertions(+) diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css index 2c87867839702786946144e5b03446dcc757faf9..7b5b2231211ade5a877426c5cce44243ffea2399 100644 GIT binary patch delta 577 zcmey=#j>-HWy7?09L4eZdGRIr1(O5&g(q)+$IF*mQKFlelbN1pm6MuQGWpOu^~r0u zN^qy;=auLdXI7X`#ASI|{3&@(Nl(A2C(wYIn*F|Rr$v$!B9vC=9p zKQDFi!4!phqoUMY&FZB5luEs#)Z)^dlH&N(yp)3c%)Al>RQ-A&H$a0uJ~1i3v_yww zZ7KPAi6yB>u3!Q?Lu_)uQO?PGkLru&<)hgOa`j|^FUp&_KYe4zB8OyFUTW=T#$U}W Rh{Q4JpE{hg`S`!pYyf5o;=TX? delta 258 zcmdnl$MUI*Wy7?0d?oqu1x2Z8sYR)I$*IMY1N()!b5hevtPJ%mic)hYpLwS~d6|>I zWT86}li%-PuTRU*E77b~&dJQnM%Ag1XqA{;l3A9jprwOdIwQXgJ7E3cB!S?-O}9^kpm>2 zjUPiCPA0~?(Szy5NIYQFgN=!Qz=JWUSFh^KZm|bHPVQm$o%em_ndf=uU42{k@qOLn z7OgXlVhK2k5Q3vx)WirXB0htx7=jl?sE{6mr;}cqz8K#|S0)?h$9xnAoflCO@kmAJ z44lO%aTaE=pdInfi&72lMM;!E(DE?eaa9Xjc&LgZ?YtrwlB0rcAP#3RipQbLnNPtk zzMg~hrnV#(OB}~9MR0`JBKGupmwI}^bHtA1}3 z!Q;15JL=%mzDU5@Z|X|l)@p)o=7E*;6NY>m2jz$a5kyNi=>gogKTrzi9;0XIeu zPre%}b+7s73aSsM5L;v;am^5auiFZVbYm+93o$e`Z18{0v5*e)m@cRH(ux+O7qbWd zpNp5-7k_i{=*p+S^Z;eKlfB*mdefz9(H`#E8$gxhWIQHbJ9fdJJykR0TGf_m!_;VF zSjI)X_PD(=El%AFl)7((^5sw-RN6M#Da%YbR#BRxAHMBofkm*BIU&$Qn|^Fy&5NLq zJx_qvhDpnGI_%ta{g@Qi3-rOOU94XLjqLU!2(l+LU=LeNftGy*Qp)Dc4nv=GJYe61 zIblltv#(~QIriZ=Xl7rpgUxL94%iV4M`XRgic!!UAh67-#@00+Fmh(TCW?LE1@^Mx zTVNx*Tn{#}g(wJ?KQpjY#}@d$Jxz>sTfajzLwBSOsjE{iUORM1niIGFld5B0j+FF5 z6{=a8+0K$~yM|+@bTd=5a;D?6{Kn%OlB7quLu-9tcOQb}uU&cdAy`=V6GT&R00000 delta 655 zcmaEQh3(}zwhdBA()mt~&aOJaj*gBx!Aa(MPL4X>Ahv&^cHU(BBsD!>M`uT!P>>Lq z4%q(*9 zg;?zkazr>-dy-+Xlb=o`n4M@+3{(LzHmL$6o(K|mO|&QmT4&}oxhBJPvTbU$P*sVO z8^l!aM57WXPo2QYhDxH7@29?I%6FQ4Chek?r2)*%-j1HoFz`;)28kNEBpHKfsGa$S zPWjF{xz3JNUIorN*-n!aQ)DNzWaxNM%juIVG7jQ$aYE*Erfk>Ao>_L2{S?@YJwe{} zO)4=0dJi0JzKI4#PLaTfaC8pSfyx>q$!Z%--k%lBpJ(h;-~@}0Qsc>r+0&RT4Vrgm zZ{L~CcwU3ABtO2OC^ap$C^auRwRrl3DU2r5A5391n|?-;k!$+IYDUq?(@qIbkDbaW wvR!H#V+iy1jWZc%vQ00D0ZRXiX5`pDXCdPU7Ibr_EMxRU6WjiD8Dj%80EvpvjsO4v diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css index 444518ca865f09b046188e531e171ceb723812a5..8f1754a11335d92c940e351d831a102a87e45649 100644 GIT binary patch delta 590 zcmZ3{#PYF~WkdHnj^gsqxFnZb76YGuCUTGG&051r-NpWRbp~UW?8C&7OI54 zLZVehepzY}x&%-h&5iG!nI^B>&uNyNn3JqwZmDMuv|K?~!9dTnph8o#8r9n3 zg2X(ypY!tbQYRlwQK&a6O3l@*PRdWI)GJCYF3l+^j!(@?Dag;vD^WnzuLp7iGz#Jq zlk!VTbV$~glAo7Yl8WRCCa^QaCi@-boP749kr1ktASX{g`BiE2|BpY|(VTIwh= delta 215 zcmey^%Ce$~WkdHnzLNa-f}+&4)S}e9vVBno ziqk81okT_i!Mg|{C`uvC3Cow)l8C0}S!#ksGc1a;NJMA?u3#ig!YoD+0ZuXKk8-y$ zjsye^x5jN3Wxs(FP;yBn4@DS5JjK{Xqi`9cXcXF%c?|jhcAm?de5p)}lB{7$GFj}3 zbYFDExRH)w@?l&@KMyyh_}Wo=qf(zGvf_Nm?i}V|`~J74rBUZq z?&grfh8brXML8U5_|5Tn9{Q-v**dE64bOHyaGaG27+$#xB`aB>j&UC@r{7UGXfK39O32gMPvO66=$AJEiAiA{|SqI0e zzbYVgq~ns7(+hPm+$za-f*$g=nKJxn1I^XcOR&*G);*xjqez-^<(4JMnrd+aoX^Xb z9`^Ths|z~E9mX=a#s|vu*;_1t E0e<;d0{{R3 delta 609 zcmX?iobA#M`uT!P>>Lq z1(fvHsdRGmcGb~#a&&Xiv2b#9anUhza&&dqNq3(7JZTPJNg>b_Z;+P2#PY()6O$$R z^b3GO$si%`}bc|da3*60JCMTr$^63{kc|k1qPRuNt?2sX%ZCLE& zr;`ZQmS|G!WBrrT3ox^mXvc^cV z+D4NPW(D)-89Nm?!Gg8axLG-SyK*+;IVHZ5{P=>R)U?#1)V$=>;_3QKjIz_k`WVHh zd-gG!O+MGmA*7&?mY-LmTbx;yYNcSPXOx;d`Tl8%=>qPI?9{P-Yzwn haVFdJ*ic5H?X0sIKd_*i{C7U1Cz{xHzXgm9%mAmYz=Qw* diff --git a/searx/templates/simple/icons.html b/searx/templates/simple/icons.html index c23c32ee7..c01c70542 100644 --- a/searx/templates/simple/icons.html +++ b/searx/templates/simple/icons.html @@ -19,6 +19,8 @@ 'school-outline':'', 'file-tray-full-outline':'', 'people-outline':'', + 'heart-outline':'', + 'help-circle-outline':'', } -%} From 0801f9a24e0bcdab85c7ce8ae82de97dad5ecd50 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 27 Jun 2022 21:16:49 +0200 Subject: [PATCH 3/3] Add donate.md --- searx/infopage/en/donate.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 searx/infopage/en/donate.md diff --git a/searx/infopage/en/donate.md b/searx/infopage/en/donate.md new file mode 100644 index 000000000..97306a49a --- /dev/null +++ b/searx/infopage/en/donate.md @@ -0,0 +1,20 @@ +# Donate to SearXNG + +* Credit/debit card and bank transfer + * [Liberapay] (recurrent donation) + * [Buy Me a Coffee] (one time donation) + +* Cryptocurrency + * Bitcoin: [bc1qn3rw8t86h05cs3grx2kmwmptw9k4kt4hyzktqj] (Segwit compatible) + * Bitcoin cash: [qpead2yu482e3h9amy5zk45l8qrfhk59jcpw3cth9e] + * Ethereum: [0xCf82c7eb915Ee70b5B69C1bBB5525e157F35FA43] + * Dogecoin: [DBCYS9issTt84pddXSsTHpQxyQDTFp1TE4] + * Litecoin: [ltc1q5j6x6f4f2htldhq570e353clc8fmw44ra5er5q] + +[Liberapay]: https://liberapay.com/SearXNG/ +[Buy Me a Coffee]: https://buymeacoffee.com/searxng +[bc1qn3rw8t86h05cs3grx2kmwmptw9k4kt4hyzktqj]: bitcoin:bc1qn3rw8t86h05cs3grx2kmwmptw9k4kt4hyzktqj +[qpead2yu482e3h9amy5zk45l8qrfhk59jcpw3cth9e]: bitcoincash:qpead2yu482e3h9amy5zk45l8qrfhk59jcpw3cth9e +[0xCf82c7eb915Ee70b5B69C1bBB5525e157F35FA43]: ethereum:0xCf82c7eb915Ee70b5B69C1bBB5525e157F35FA43 +[DBCYS9issTt84pddXSsTHpQxyQDTFp1TE4]: dogecoin:DBCYS9issTt84pddXSsTHpQxyQDTFp1TE4 +[ltc1q5j6x6f4f2htldhq570e353clc8fmw44ra5er5q]: litecoin:ltc1q5j6x6f4f2htldhq570e353clc8fmw44ra5er5q