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

Commit aba65369 authored by Thomas Pointhuber's avatar Thomas Pointhuber
Browse files

[enh] make version of searx readable

parent b1234ee8

searx/settings.yml

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ server: 
    themes_path : "" # Custom ui themes path

    default_theme : default # ui theme

    https_rewrite : True # Force rewrite result urls. See searx/https_rewrite.py

    useragent_suffix : "" # suffix of searx_useragent, could contain informations like an email address to the administrator



engines:

  - name : wikipedia

searx/templates/courgette/base.html

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
    <meta charset="UTF-8" />

    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />

    <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />

    <meta name="generator" content="searx/{{ searx_version }}">

    <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />

    <title>{% block title %}{% endblock %}searx</title>

    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />

searx/templates/default/base.html

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
    <meta charset="UTF-8" />

    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />

    <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />

    <meta name="generator" content="searx/{{ searx_version }}">

    <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1" />

    <title>{% block title %}{% endblock %}searx</title>

    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css" media="screen" />

searx/templates/oscar/base.html

+2 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />

    <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />

    <meta http-equiv="X-UA-Compatible" content="IE=edge">

    <meta name="generator" content="searx/{{ searx_version }}">

    <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />

    <title>{% block title %}{% endblock %}searx</title>
@@ -64,7 +65,7 @@ 
        <div class="container">

            {% block footer %}

            {% endblock %}

            <p class="text-muted">{{ _('Powered by') }} <a href="https://github.com/asciimoo/searx">Searx</a> - {{ _('a privacy-respecting, hackable metasearch engine') }}</p>

            <p class="text-muted">{{ _('Powered by') }} <a href="https://github.com/asciimoo/searx">searx</a> - {{ searx_version }} - {{ _('a privacy-respecting, hackable metasearch engine') }}</p>

        </div>

    </div>

    <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>

searx/utils.py

+5 −1
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ from codecs import getincrementalencoder 
from HTMLParser import HTMLParser

from random import choice



from searx.version import VERSION_STRING

from searx import settings



import cStringIO

import csv

import os
@@ -21,7 +24,8 @@ def gen_useragent(): 




def searx_useragent():

    return 'searx'

    return 'searx/{searx_version} {suffix}'.format(searx_version=VERSION_STRING,

                                          suffix=settings['server'].get('useragent_suffix', ''))





def highlight_content(content, query):