diff options
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/courgette/opensearch.xml | 4 | ||||
| -rw-r--r-- | searx/templates/default/infobox.html | 9 | ||||
| -rw-r--r-- | searx/templates/default/opensearch.xml | 4 | ||||
| -rw-r--r-- | searx/templates/oscar/base.html | 4 | ||||
| -rw-r--r-- | searx/templates/oscar/infobox.html | 6 | ||||
| -rw-r--r-- | searx/templates/oscar/navbar.html | 4 | ||||
| -rw-r--r-- | searx/templates/oscar/opensearch.xml | 4 | ||||
| -rw-r--r-- | searx/templates/oscar/preferences.html | 4 |
8 files changed, 25 insertions, 14 deletions
diff --git a/searx/templates/courgette/opensearch.xml b/searx/templates/courgette/opensearch.xml index b85c3a7f5..15d3eb792 100644 --- a/searx/templates/courgette/opensearch.xml +++ b/searx/templates/courgette/opensearch.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>searx</ShortName> + <ShortName>{{ instance_name }}</ShortName> <Description>a privacy-respecting, hackable metasearch engine</Description> <InputEncoding>UTF-8</InputEncoding> - <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> + <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html index 1733f7753..178a27e6d 100644 --- a/searx/templates/default/infobox.html +++ b/searx/templates/default/infobox.html @@ -7,7 +7,14 @@ <div class="attributes"> <table> {% for attribute in infobox.attributes %} - <tr><td>{{ attribute.label }}</td><td>{{ attribute.value }}</td></tr> + <tr> + <td>{{ attribute.label }}</td> + {% if attribute.image %} + <td><img src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td> + {% else %} + <td>{{ attribute.value }}</td> + {% endif %} + </tr> {% endfor %} </table> </div> diff --git a/searx/templates/default/opensearch.xml b/searx/templates/default/opensearch.xml index b85c3a7f5..15d3eb792 100644 --- a/searx/templates/default/opensearch.xml +++ b/searx/templates/default/opensearch.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>searx</ShortName> + <ShortName>{{ instance_name }}</ShortName> <Description>a privacy-respecting, hackable metasearch engine</Description> <InputEncoding>UTF-8</InputEncoding> - <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> + <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html index 9c15f5a71..4d48537e1 100644 --- a/searx/templates/oscar/base.html +++ b/searx/templates/oscar/base.html @@ -9,7 +9,7 @@ <meta name="referrer" content="no-referrer"> <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" /> {% block meta %}{% endblock %} - <title>{% block title %}{% endblock %}searx</title> + <title>{% block title %}{% endblock %}{{ instance_name }}</title> <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" /> <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" /> @@ -31,7 +31,7 @@ {% block head %} {% endblock %} - <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> + <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> <script type="text/javascript"> searx = {}; diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html index 2abdbf0ec..d87d98453 100644 --- a/searx/templates/oscar/infobox.html +++ b/searx/templates/oscar/infobox.html @@ -1,6 +1,6 @@ <div class="panel panel-default infobox"> <div class="panel-heading"> - <h4 class="panel-title">{{ infobox.infobox }}</h4> + <h4 class="panel-title infobox_part">{{ infobox.infobox }}</h4> </div> <div class="panel-body"> {% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" alt="{{ infobox.infobox }}" />{% endif %} @@ -11,7 +11,11 @@ {% for attribute in infobox.attributes %} <tr> <td>{{ attribute.label }}</td> + {% if attribute.image %} + <td><img class="img-responsive" src="{{ image_proxify(attribute.image.src) }}" alt="{{ attribute.image.alt }}" /></td> + {% else %} <td>{{ attribute.value }}</td> + {% endif %} </tr> {% endfor %} </table> diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html index 0c92b09dd..c59bcda3d 100644 --- a/searx/templates/oscar/navbar.html +++ b/searx/templates/oscar/navbar.html @@ -16,7 +16,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{{ url_for('index') }}">searx</a> + <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a> </div> {% else %} <div class="navbar-header"> @@ -26,7 +26,7 @@ <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="{{ url_for('index') }}">searx</a> + <a class="navbar-brand" href="{{ url_for('index') }}">{{ instance_name }}</a> </div> <div class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> <!-- results.html --> diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml index b85c3a7f5..15d3eb792 100644 --- a/searx/templates/oscar/opensearch.xml +++ b/searx/templates/oscar/opensearch.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>searx</ShortName> + <ShortName>{{ instance_name }}</ShortName> <Description>a privacy-respecting, hackable metasearch engine</Description> <InputEncoding>UTF-8</InputEncoding> - <Image>{{ host }}{{ url_for('static', filename='img/favicon.png') | replace("/", "", 1) }}</Image> + <Image>{{ urljoin(host, url_for('static', filename='img/favicon.png')) }}</Image> <LongName>searx metasearch</LongName> {% if opensearch_method == 'get' %} <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/> diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html index ea36a14b9..c677a0c66 100644 --- a/searx/templates/oscar/preferences.html +++ b/searx/templates/oscar/preferences.html @@ -191,10 +191,10 @@ {% for plugin in plugins %} <div class="panel panel-default"> <div class="panel-heading"> - <h3 class="panel-title">{{ plugin.name }}</h3> + <h3 class="panel-title">{{ _(plugin.name) }}</h3> </div> <div class="panel-body"> - <div class="col-xs-6 col-sm-4 col-md-6">{{ plugin.description }}</div> + <div class="col-xs-6 col-sm-4 col-md-6">{{ _(plugin.description) }}</div> <div class="col-xs-6 col-sm-4 col-md-6"> {{ checkbox_toggle('plugin_' + plugin.id, plugin.id not in allowed_plugins) }} </div> |