Merge pull request #1369 from dalf/links-help-donate

Theme : add links to a donation page and the about page.

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"""
 

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

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',
       },

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;
+  display: flex;
-  font-size: 1.2em;
+  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);
   }

searx/templates/simple/base.html

@@ -40,10 +40,18 @@
         </div>
     {% endif %}
 
-    {% block linkto_preferences %}
+    <nav id="links_on_top">
-    {% from 'simple/icons.html' import icon_big %}
+      {%- from 'simple/icons.html' import icon_big -%}
-      <nav id="linkto_preferences"><a href="{{ url_for('preferences') }}" aria-label="{{ _('preferences') }}">{{ icon_big('menu-outline') }}</a></nav>
+      {%- block linkto_about -%}
-    {% endblock %}
+        <a href="{{ url_for('info', pagename='about') }}" class="link_on_top_about">{{ icon_big('help-circle-outline') }}<span>{{ _('About') }}</span></a>
+      {%- endblock -%}
+      {%- block linkto_donate -%}
+        <a href="{{ url_for('info', pagename='donate') }}" class="link_on_top_donate">{{ icon_big('heart-outline') }}<span>{{ _('Donate') }}</span></a>
+      {%- endblock -%}
+      {%- block linkto_preferences -%}
+        <a href="{{ url_for('preferences') }}" aria-label="{{ _('preferences') }}" class="link_on_top_preferences">{{ icon_big('menu-outline') }}</a>
+      {%- endblock -%}
+    </nav>
     {% block header %}
     {% endblock %}
     {% block content %}

searx/templates/simple/icons.html

@@ -19,6 +19,8 @@
   'school-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M32 192L256 64l224 128-224 128L32 192z"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M112 240v128l144 80 144-80V240M480 368V192M256 320v128"/></svg>',
   'file-tray-full-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M384 80H128c-26 0-43 14-48 40L48 272v112a48.14 48.14 0 0048 48h320a48.14 48.14 0 0048-48V272l-32-152c-5-27-23-40-48-40z" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M48 272h144M320 272h144M192 272a64 64 0 00128 0M144 144h224M128 208h256"/></svg>',
   'people-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M402 168c-2.93 40.67-33.1 72-66 72s-63.12-31.32-66-72c-3-42.31 26.37-72 66-72s69 30.46 66 72z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M336 304c-65.17 0-127.84 32.37-143.54 95.41-2.08 8.34 3.15 16.59 11.72 16.59h263.65c8.57 0 13.77-8.25 11.72-16.59C463.85 335.36 401.18 304 336 304z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M200 185.94c-2.34 32.48-26.72 58.06-53 58.06s-50.7-25.57-53-58.06C91.61 152.15 115.34 128 147 128s55.39 24.77 53 57.94z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/><path d="M206 306c-18.05-8.27-37.93-11.45-59-11.45-52 0-102.1 25.85-114.65 76.2-1.65 6.66 2.53 13.25 9.37 13.25H154" fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="32"/></svg>',
+  'heart-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M352.92 80C288 80 256 144 256 144s-32-64-96.92-64c-52.76 0-94.54 44.14-95.08 96.81-1.1 109.33 86.73 187.08 183 252.42a16 16 0 0018 0c96.26-65.34 184.09-143.09 183-252.42-.54-52.67-42.32-96.81-95.08-96.81z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32"/></svg>',
+  'help-circle-outline':'<svg class="ionicon" viewBox="0 0 512 512" aria-hidden="true"><path d="M256 80a176 176 0 10176 176A176 176 0 00256 80z" fill="none" stroke="currentColor" stroke-miterlimit="10" stroke-width="32"/><path d="M200 202.29s.84-17.5 19.57-32.57C230.68 160.77 244 158.18 256 158c10.93-.14 20.69 1.67 26.53 4.45 10 4.76 29.47 16.38 29.47 41.09 0 26-17 37.81-36.37 50.8S251 281.43 251 296" fill="none" stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="28"/><circle cx="250" cy="348" r="20" stroke="currentColor" stroke-width="16" fill="currentColor"/></svg>',
 
 }
 -%}

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 %}
 <ul class="tabs">
 {% for pagename, locale, page in all_pages %}