diff options
Diffstat (limited to 'searx/templates')
| -rw-r--r-- | searx/templates/__common__/opensearch.xml | 2 | ||||
| -rw-r--r-- | searx/templates/oscar/infobox.html | 18 | ||||
| -rw-r--r-- | searx/templates/oscar/results.html | 16 |
3 files changed, 25 insertions, 11 deletions
diff --git a/searx/templates/__common__/opensearch.xml b/searx/templates/__common__/opensearch.xml index 27634245f..7fdc1f7d8 100644 --- a/searx/templates/__common__/opensearch.xml +++ b/searx/templates/__common__/opensearch.xml @@ -13,6 +13,6 @@ </Url> {% endif %} {% if autocomplete %} - <Url rel="suggestions" type="application/json" template="{{ host }}autocompleter"/> + <Url rel="suggestions" type="application/x-suggestions+json" template="{{ host }}autocompleter?q={searchTerms}"/> {% endif %} </OpenSearchDescription> diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html index 6ae7965b6..5ba4aa5f0 100644 --- a/searx/templates/oscar/infobox.html +++ b/searx/templates/oscar/infobox.html @@ -1,10 +1,18 @@ {% from 'oscar/macros.html' import result_link with context %} <div class="panel panel-default infobox"> <div class="panel-heading">{{- "" -}} - <h4 class="panel-title infobox_part"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}} - {% for u in infobox.urls %}{% if u.official %} <a href="{{ u.url }}">{{ u.domain }}</a>{% endif %}{% endfor %} + <div class="infobox_part"> + <div class="{% if not rtl %}pull-right{% endif %}"> + {% for engine in infobox.engines %} + <span class="label label-default">{{ engine }}</span> + {% endfor %} + </div> + <h4 class="panel-title"><bdi>{{ infobox.infobox }}</bdi></h4>{{- "" -}} + {% for u in infobox.urls %}{% if u.official %} <a class="header_url" href="{{ u.url }}">{{ u.url }}</a>{% endif %}{% endfor %} + </div> </div> - <div class="panel-body"> + <input type="checkbox" class="infobox_checkbox" id="expand_infobox_{{ infobox.engine }}" hidden> + <div class="panel-body infobox_body"> {% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ image_proxify(infobox.img_src) }}" />{% endif %} {% if infobox.content %}<bdi><p class="infobox_part">{{ infobox.content | safe }}</p></bdi>{% endif %} @@ -38,4 +46,8 @@ </div> {% endif %} </div> + <label for="expand_infobox_{{ infobox.engine }}" class="infobox_toggle panel-footer"> + <span class="infobox_label_down glyphicon glyphicon-chevron-down"></span> + <span class="infobox_label_up glyphicon glyphicon-chevron-up"></span> + </label> </div> diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html index 7a444d19f..313f5843b 100644 --- a/searx/templates/oscar/results.html +++ b/searx/templates/oscar/results.html @@ -83,13 +83,15 @@ {% if corrections -%} <div class="result"> - <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span> - {% for correction in corrections -%} - <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">{{- "" -}} - <input type="hidden" name="q" value="{{ correction.url }}">{{- "" -}} - <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>{{- "" -}} - </form> - {% endfor %} + <div class="clearfix"> + <span class="result_header text-muted form-inline pull-left suggestion_item">{{ _('Try searching for:') }}</span> + {% for correction in corrections -%} + <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">{{- "" -}} + <input type="hidden" name="q" value="{{ correction.url }}">{{- "" -}} + <button type="submit" class="btn btn-default btn-xs">{{ correction.title }}</button>{{- "" -}} + </form> + {% endfor %} + </div> </div> {%- endif %} |