Add link to contact instance maintainer to footer of each page (#2391)

Browse Source
This commit is contained in:
BBaoVanC 2020-12-18 02:53:28 -06:00 committed by GitHub
parent 5c6a5407a0
commit 19fce74443
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,6 +6,7 @@ export GIT_URL=https://github.com/searx/searx
export GIT_BRANCH=master export GIT_BRANCH=master
export SEARX_URL=https://searx.me export SEARX_URL=https://searx.me
export DOCS_URL=https://searx.github.io/searx export DOCS_URL=https://searx.github.io/searx
export CONTACT_URL=mailto:contact@example.com
# END Makefile setup # END Makefile setup
include utils/makefile.include include utils/makefile.include
@ -46,6 +47,7 @@ help-min:
@echo ' SEARX_URL = $(SEARX_URL)' @echo ' SEARX_URL = $(SEARX_URL)'
@echo ' GIT_URL = $(GIT_URL)' @echo ' GIT_URL = $(GIT_URL)'
@echo ' DOCS_URL = $(DOCS_URL)' @echo ' DOCS_URL = $(DOCS_URL)'
@echo ' CONTACT_URL = $(CONTACT_URL)'
@echo '' @echo ''
@$(MAKE) -e -s make-help @$(MAKE) -e -s make-help
@ -124,6 +126,7 @@ buildenv:
$(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py $(Q)echo "SEARX_URL = '$(SEARX_URL)'" >> searx/brand.py
$(Q)echo "DOCS_URL = '$(DOCS_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 "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 "build utils/brand.env"
$(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env $(Q)echo "export GIT_URL='$(GIT_URL)'" > utils/brand.env
$(Q)echo "export GIT_BRANCH='$(GIT_BRANCH)'" >> 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 SEARX_URL='$(SEARX_URL)'" >> utils/brand.env
$(Q)echo "export DOCS_URL='$(DOCS_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 PUBLIC_INSTANCES='https://searx.space'" >> utils/brand.env
$(Q)echo "export CONTACT_URL='$(CONTACT_URL)'" >> utils/brand.env
# node / npm # node / npm

1
searx/brand.py
View File

@ -4,3 +4,4 @@ ISSUE_URL = 'https://github.com/searx/searx/issues'
SEARX_URL = 'https://searx.me' SEARX_URL = 'https://searx.me'
DOCS_URL = 'https://searx.github.io/searx' DOCS_URL = 'https://searx.github.io/searx'
PUBLIC_INSTANCES = 'https://searx.space' PUBLIC_INSTANCES = 'https://searx.space'
CONTACT_URL = 'mailto:contact@example.com'

3
searx/templates/oscar/base.html
View File

@ -88,7 +88,8 @@
{{ _('Powered by') }} <a href="{{ brand.DOCS_URL }}">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}<br/> {{ _('Powered by') }} <a href="{{ brand.DOCS_URL }}">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
<a href="{{ brand.GIT_URL }}">{{ _('Source code') }}</a> | <a href="{{ brand.GIT_URL }}">{{ _('Source code') }}</a> |
<a href="{{ brand.ISSUE_URL }}">{{ _('Issue tracker') }}</a> | <a href="{{ brand.ISSUE_URL }}">{{ _('Issue tracker') }}</a> |
<a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a> <a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a> |
<a href="{{ brand.CONTACT_URL }}">{{ _('Contact instance maintainer') }}</a>
</small> </small>
</p> </p>
</div> </div>

3
searx/templates/simple/base.html
View File

@ -54,7 +54,8 @@
{{ _('Powered by') }} <a href="{{ url_for('about') }}">searx</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/> {{ _('Powered by') }} <a href="{{ url_for('about') }}">searx</a> - {{ searx_version }} — {{ _('a privacy-respecting, hackable metasearch engine') }}<br/>
<a href="{{ brand.GIT_URL }}">{{ _('Source code') }}</a> | <a href="{{ brand.GIT_URL }}">{{ _('Source code') }}</a> |
<a href="{{ brand.ISSUE_URL }}">{{ _('Issue tracker') }}</a> | <a href="{{ brand.ISSUE_URL }}">{{ _('Issue tracker') }}</a> |
<a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a> <a href="{{ brand.PUBLIC_INSTANCES }}">{{ _('Public instances') }}</a> |
<a href="{{ brand.CONTACT_URL }}">{{ _('Contact instance maintainer') }}</a>
</p> </p>
</footer> </footer>
<!--[if gte IE 9]>--> <!--[if gte IE 9]>-->

1
utils/brand.env
View File

@ -4,3 +4,4 @@ export ISSUE_URL='https://github.com/searx/searx/issues'
export SEARX_URL='https://searx.me' export SEARX_URL='https://searx.me'
export DOCS_URL='https://searx.github.io/searx' export DOCS_URL='https://searx.github.io/searx'
export PUBLIC_INSTANCES='https://searx.space' export PUBLIC_INSTANCES='https://searx.space'
export CONTACT_URL='mailto:contact@example.com'