From 3486613a1960f472b9cf8c85ade72c5aec9473eb Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 26 Mar 2020 10:58:25 +0100 Subject: [PATCH] brands: hardcode ISSUE_URL and some links on the about-page A *brand* of searx is a fork which might have its own design and some special functions which might bee reasonable in a special context. In this sense, the fork might have its own documentation but not its own issue tracker. The *upstream* of a brand is always https://github.com/asciimoo from where the brand-fork pulls the master branch regularly. A fork which has its own issue tracker is a spin-off and out of the scope of the searx project itself. The conclusion is: - hard code ISSUE_URL (in the Makefile) - always refer to DOCS_URL - links in the about page refer to the *upstream* (searx project) except DOCS_URL - "fork me on github" ribbons refer to the *upstream* Signed-off-by: Markus Heiser --- Makefile | 3 +-- searx/templates/__common__/about.html | 11 +++++------ searx/templates/courgette/github_ribbon.html | 2 +- searx/templates/legacy/github_ribbon.html | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index bdaa6c77..2bea06c9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ # -*- coding: utf-8; mode: makefile-gmake -*- export GIT_URL=https://github.com/asciimoo/searx -export ISSUE_URL=$(GIT_URL)/issues export SEARX_URL=https://searx.me export DOCS_URL=https://asciimoo.github.io/searx @@ -87,7 +86,7 @@ engines-languages: pyenvinstall searx.brand: $(Q)echo "build searx/brand.py" $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py - $(Q)echo "ISSUE_URL = '$(ISSUE_URL)'" >> searx/brand.py + $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py $(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 diff --git a/searx/templates/__common__/about.html b/searx/templates/__common__/about.html index d8e1335d..3f702e63 100644 --- a/searx/templates/__common__/about.html +++ b/searx/templates/__common__/about.html @@ -7,7 +7,7 @@

If you do care about privacy, want to be a conscious user, or otherwise believe in digital freedom, make searx your default search engine or run it on your own server

@@ -22,15 +22,14 @@ Searx can be added to your browser's search bar; moreover, it can be set as the

How can I make it my own?

-

Searx appreciates your concern regarding logs, so take the code and run it yourself!
Add your Searx to this list to help other people reclaim their privacy and make the Internet freer! +

Searx appreciates your concern regarding logs, so take the code and run it yourself!
Add your Searx to this list to help other people reclaim their privacy and make the Internet freer!
The more decentralized the Internet is, the more freedom we have!

More about searx