From 19fce74443b7183917ef67bfebf36432e0d1e1e8 Mon Sep 17 00:00:00 2001
From: BBaoVanC
Date: Fri, 18 Dec 2020 02:53:28 -0600
Subject: [PATCH] Add link to contact instance maintainer to footer of each
page (#2391)
---
Makefile | 4 ++++
searx/brand.py | 1 +
searx/templates/oscar/base.html | 3 ++-
searx/templates/simple/base.html | 3 ++-
utils/brand.env | 1 +
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7704b337f..8a4a38e1c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ export GIT_URL=https://github.com/searx/searx
export GIT_BRANCH=master
export SEARX_URL=https://searx.me
export DOCS_URL=https://searx.github.io/searx
+export CONTACT_URL=mailto:contact@example.com
# END Makefile setup
include utils/makefile.include
@@ -46,6 +47,7 @@ help-min:
@echo ' SEARX_URL = $(SEARX_URL)'
@echo ' GIT_URL = $(GIT_URL)'
@echo ' DOCS_URL = $(DOCS_URL)'
+ @echo ' CONTACT_URL = $(CONTACT_URL)'
@echo ''
@$(MAKE) -e -s make-help
@@ -124,6 +126,7 @@ buildenv:
$(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
$(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py
$(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py
+ $(Q)echo "CONTACT_URL = '$(CONTACT_URL)'" >> searx/brand.py
$(Q)echo "build utils/brand.env"
$(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env
$(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> utils/brand.env
@@ -131,6 +134,7 @@ buildenv:
$(Q)echo "export SEARX_URL='$(SEARX_URL)'" >> utils/brand.env
$(Q)echo "export DOCS_URL='$(DOCS_URL)'" >> utils/brand.env
$(Q)echo "export PUBLIC_INSTANCES='https://searx.space'" >> utils/brand.env
+ $(Q)echo "export CONTACT_URL='$(CONTACT_URL)'" >> utils/brand.env
# node / npm
diff --git a/searx/brand.py b/searx/brand.py
index d71c57db7..0eaaf0be3 100644
--- a/searx/brand.py
+++ b/searx/brand.py
@@ -4,3 +4,4 @@ ISSUE_URL = 'https://github.com/searx/searx/issues'
SEARX_URL = 'https://searx.me'
DOCS_URL = 'https://searx.github.io/searx'
PUBLIC_INSTANCES = 'https://searx.space'
+CONTACT_URL = 'mailto:contact@example.com'
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 7b3d33f7a..c8f390d3a 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -88,7 +88,8 @@
{{ _('Powered by') }} searx - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} |
{{ _('Issue tracker') }} |
- {{ _('Public instances') }}
+ {{ _('Public instances') }} |
+ {{ _('Contact instance maintainer') }}
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html
index 10fb424bf..2318f6bfc 100644
--- a/searx/templates/simple/base.html
+++ b/searx/templates/simple/base.html
@@ -54,7 +54,8 @@
{{ _('Powered by') }} searx - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}
{{ _('Source code') }} |
{{ _('Issue tracker') }} |
- {{ _('Public instances') }}
+ {{ _('Public instances') }} |
+ {{ _('Contact instance maintainer') }}
diff --git a/utils/brand.env b/utils/brand.env
index 55244bd72..660160e43 100644
--- a/utils/brand.env
+++ b/utils/brand.env
@@ -4,3 +4,4 @@ export ISSUE_URL='https://github.com/searx/searx/issues'
export SEARX_URL='https://searx.me'
export DOCS_URL='https://searx.github.io/searx'
export PUBLIC_INSTANCES='https://searx.space'
+export CONTACT_URL='mailto:contact@example.com'