Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc137ff0 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'fix-footer' into 'master' 

remove searx version

Closes backlog#995

See merge request !148
parents b4b10c60 3d27032a

searx/settings.yml

+0 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,6 @@ brand: 
    public_instances: https://searx.space

    public_instances: https://searx.space

    wiki_url: https://gitlab.e.foundation/e/infra/spot/wiki

    wiki_url: https://gitlab.e.foundation/e/infra/spot/wiki

    twitter_url: https://twitter.com/e_mydata

    twitter_url: https://twitter.com/e_mydata

    searx_version: 1.0.0





search:

search:

    safe_search : 1 # Filter results. 0: None, 1: Moderate, 2: Strict

    safe_search : 1 # Filter results. 0: None, 1: Moderate, 2: Strict

searx/templates/etheme/base.html

+4 −4
Original line number Original line Diff line number Diff line
@@ -90,13 +90,13 @@ 
        {% endblock %}

        {% endblock %}

        <p class="text-muted">

        <p class="text-muted">

            <small>

            <small>

                e Foundation 2018-{{ year }},

                {{ _('Powered by') }} <a href="{{ repo_url }}">Spot</a> {{ version[0] }}<br/>

                An open-source metasearch engine forked from <a href="https://searx.github.io/searx/">Searx</a> {{ searx_version }}.

                <span class="links">

                <span class="links">

                    <a href="{{url_for('about')}}">{{ _('About') }}</a>

                    <a href="{{url_for('about')}}">{{ _('About') }}</a>

                    <a href="https://e.foundation/legal-notice-privacy">{{ _('Privacy') }}</a>

                    <a href="https://e.foundation/legal-notice-privacy">{{ _('Privacy') }}</a>

                </span>

                </span></br>

                e Foundation 2018-{{ year }},

                {{ _('Powered by') }} <a href="{{ repo_url }}">Spot</a> {{ version[0] }}<br/>

                An open-source metasearch engine forked from <a href="https://searx.github.io/searx/">Searx</a>

            </small>

            </small>

        </p>

        </p>

    </footer>

    </footer>

searx/webapp.py

+0 −2
Original line number Original line Diff line number Diff line
@@ -425,8 +425,6 @@ def render(template_name, override_theme=None, **kwargs): 




    kwargs['spot_version'] = VERSION_STRING

    kwargs['spot_version'] = VERSION_STRING





    kwargs['searx_version'] = settings.get('brand').get('searx_version')



    kwargs['year'] = datetime.today().year

    kwargs['year'] = datetime.today().year





    kwargs['repo_url'] = settings['brand']['git_url']

    kwargs['repo_url'] = settings['brand']['git_url']