on master help sign in
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 <markus.heiser@darmarit.de>

commit3486613a1960f472b9cf8c85ade72c5aec9473eb authorMarkus Heiser <markus.heiser@darmarit.de> dateThu 26 Mar 2020, 10:58 (7 years ago) parent3381471
4 files changed+8−10
Makefile+1−2 searx/templates/__common__/about.html+5−6 searx/templates/courgette/github_ribbon.html+1−1 searx/templates/legacy/github_ribbon.html+1−1
Makefile+1−2
@@ -1,7 +1,6 @@
11# -*- coding: utf-8; mode: makefile-gmake -*-
22
33export GIT_URL=https://github.com/asciimoo/searx
4−export ISSUE_URL=$(GIT_URL)/issues
54export SEARX_URL=https://searx.me
65export DOCS_URL=https://asciimoo.github.io/searx
76
@@ -87,7 +86,7 @@ engines-languages: pyenvinstall
8786searx.brand:
8887 $(Q)echo "build searx/brand.py"
8988 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py
90− $(Q)echo "ISSUE_URL = '$(ISSUE_URL)'" >> searx/brand.py
89+ $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py
9190 $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
9291 $(Q)echo "DOCS_URL = '$(DOCS_URL)'" >> searx/brand.py
9392 $(Q)echo "PUBLIC_INSTANCES = 'https://searx.space'" >> searx/brand.py
searx/templates/__common__/about.html+5−6
@@ -7,7 +7,7 @@
77 <ul>
88 <li>searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
99 <li>searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you</li>
10− <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="{{ brand.GIT_URL }}">github</a></li>
10+ <li>searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
1111 </ul>
1212 <p>If you do care about privacy, want to be a conscious user, or otherwise believe
1313 in digital freedom, make searx your default search engine or run it on your own server</p>
@@ -22,15 +22,14 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
2222
2323<h2>How can I make it my own?</h2>
2424
25−<p>Searx appreciates your concern regarding logs, so take the <a href="{{ brand.GIT_URL }}">code</a> and run it yourself! <br />Add your Searx to this <a href="{{ brand.SEARX_URL }}">list</a> to help other people reclaim their privacy and make the Internet freer!
25+<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="{{ brand.PUBLIC_INSTANCES }}">list</a> to help other people reclaim their privacy and make the Internet freer!
2626<br />The more decentralized the Internet is, the more freedom we have!</p>
2727
2828
2929<h2>More about searx</h2>
3030
3131<ul>
32− <li><a href="{{ brand.GIT_URL }}">github</a></li>
33− <li><a href="https://www.ohloh.net/p/searx/">ohloh</a></li>
32+ <li><a href="https://github.com/asciimoo/searx">github</a></li>
3433 <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
3534 <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
3635 <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
@@ -48,8 +47,8 @@ Searx can be added to your browser's search bar; moreover, it can be set as the
4847
4948<h3>New engines?</h3>
5049<ul>
51− <li>Edit your <a href="{{ brand.GIT_URL }}/blob/master/searx/settings.yml">settings.yml</a></li>
52− <li>Create your custom engine module, check the <a href="{{ brand.GIT_URL }}/blob/master/examples/basic_engine.py">example engine</a></li>
50+ <li>Edit your <a href="https://github.com/asciimoo/searx/blob/master/searx/settings.yml">settings.yml</a></li>
51+ <li>Create your custom engine module, check the <a href="https://github.com/asciimoo/searx/blob/master/examples/basic_engine.py">example engine</a></li>
5352</ul>
5453<p>Don't forget to restart searx after config edit!</p>
5554
searx/templates/courgette/github_ribbon.html+1−1
@@ -1,3 +1,3 @@
1−<a href="{{ brand.GIT_URL }}" class="github">
1+<a href="https://github.com/asciimoo/searx" class="github">
22 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>
33</a>
searx/templates/legacy/github_ribbon.html+1−1
@@ -1,3 +1,3 @@
1−<a href="{{ brand.GIT_URL }}" class="github">
1+<a href="https://github.com/asciimoo/searx" class="github">
22 <img style="position: absolute; top: 0; right: 0; border: 0;" src="{{ url_for('static', filename='img/github_ribbon.png') }}" alt="Fork me on GitHub" class="github"/>
33</a>