diff options
Diffstat (limited to 'searx/templates/simple')
| -rw-r--r-- | searx/templates/simple/base.html | 27 | ||||
| -rw-r--r-- | searx/templates/simple/infobox.html | 5 | ||||
| -rw-r--r-- | searx/templates/simple/preferences.html | 14 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/key-value.html | 11 | ||||
| -rw-r--r-- | searx/templates/simple/result_templates/torrent.html | 2 | ||||
| -rw-r--r-- | searx/templates/simple/results.html | 20 | ||||
| -rw-r--r-- | searx/templates/simple/search.html | 1 |
7 files changed, 50 insertions, 30 deletions
diff --git a/searx/templates/simple/base.html b/searx/templates/simple/base.html index f0dea57bb..92597b654 100644 --- a/searx/templates/simple/base.html +++ b/searx/templates/simple/base.html @@ -10,30 +10,27 @@ <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=1"> <meta name="HandheldFriendly" content="True"> <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1"> - <title>{% block title %}{% endblock %}searx</title> + <title>{% block title %}{% endblock %}{{ instance_name }}</title> + {% block meta %}{% endblock %} {% if rtl %} <link rel="stylesheet" href="{{ url_for('static', filename='css/searx-rtl.min.css') }}" type="text/css" media="screen" /> {% else %} <link rel="stylesheet" href="{{ url_for('static', filename='css/searx.min.css') }}" type="text/css" media="screen" /> {% endif %} {% block styles %}{% endblock %} - {% block meta %}{% endblock %} + <!--[if gte IE 9]>--> + <script src="{{ url_for('static', filename='js/searx.head.min.js') }}" + data-method="{{ method or 'POST' }}" + data-autocompleter="{% if autocomplete %}true{% else %}false{% endif %}" + data-search-on-category-select="{{ 'true' if 'plugins/js/search_on_category_select.js' in scripts else 'false'}}" + data-infinite-scroll="{{ 'true' if 'plugins/js/infinite_scroll.js' in scripts else 'false' }}" + data-static-path="{{ url_for('static', filename='themes/simple') }}/" + data-no-item-found="{{ _('No item found') }}"></script> + <!--<![endif]--> {% block head %} <link title="{{ instance_name }}" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/> {% endblock %} <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" /> - <script type="text/javascript"> - var searx = { - autocompleter: {% if autocomplete %}true{% else %}false{% endif %}, - method: "{{ method or 'POST' }}", - touch: (("ontouchstart" in window) || window.DocumentTouch && document instanceof DocumentTouch) || false, - staticPath: "{{ url_for('static', filename='themes/simple') }}/", - noItemFound: "{{ _('No item found') }}", - search_on_category_select: {{ 'true' if 'plugins/js/search_on_category_select.js' in scripts else 'false'}}, - infinite_scroll: {{ 'true' if 'plugins/js/infinite_scroll.js' in scripts else 'false' }} - }; - document.getElementsByTagName("html")[0].className = (searx.touch)?"js touch":"js"; - </script> </head> <body> <main id="main_{{ self._TemplateReference__context.name|replace("simple/", "")|replace(".html", "") }}"> @@ -60,7 +57,7 @@ </p> </footer> <!--[if gte IE 9]>--> - <script src="{{ url_for('static', filename='js/searx.min.js') }}" ></script> + <script src="{{ url_for('static', filename='js/searx.min.js') }}"></script> <!--<![endif]--> </body> </html> diff --git a/searx/templates/simple/infobox.html b/searx/templates/simple/infobox.html index d99806ac4..50b568919 100644 --- a/searx/templates/simple/infobox.html +++ b/searx/templates/simple/infobox.html @@ -36,6 +36,11 @@ {% for suggestion in topic.suggestions %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> <input type="hidden" name="q" value="{{ suggestion }}"> + <input type="hidden" name="time_range" value="{{ time_range }}"> + <input type="hidden" name="language" value="{{ current_language }}"> + <input type="hidden" name="safesearch" value="{{ safesearch }}"> + <input type="hidden" name="theme" value="{{ theme }}"> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} <input type="submit" value="{{ suggestion }}" /> </form> {% endfor %} diff --git a/searx/templates/simple/preferences.html b/searx/templates/simple/preferences.html index 049af5e33..7437ed422 100644 --- a/searx/templates/simple/preferences.html +++ b/searx/templates/simple/preferences.html @@ -68,7 +68,7 @@ <option value="0" {% if safesearch == '0' %}selected="selected"{% endif %}>{{ _('None') }}</option> </select> </p> - <div class="description">{{ _('Filter content') }}</p> + <p class="description">{{ _('Filter content') }}</p> </fieldset> {{ plugin_preferences('general') }} <fieldset> @@ -122,7 +122,7 @@ {% endif %} {% endfor %} </table> - <div> + </div> {{ tab_footer() }} {% endfor %} {{ tabs_close() }} @@ -171,7 +171,7 @@ {{ _('With that list, you can assess searx transparency.') }}<br /> </p> - {% if cookies %} + {% if cookies %} <table class="cookies"> <tr> <th>{{ _('Cookie name') }}</th> @@ -186,14 +186,14 @@ </table> {% else %} {% include 'oscar/messages/no_cookies.html' %} - {% endif %} + {% endif %} <h4>{{ _('Search URL of the currently saved preferences') }} :</h4> <div class="selectable_url"> <pre>{{ url_for('index', _external=True) }}?preferences={{ preferences_url_params|e }}{% raw %}&q=%s{% endraw %}</pre> </div> <p class="small_font">{{ _('Note: specifying custom settings in the search URL can reduce privacy by leaking data to the clicked result sites.') }}</p> - + {{ tab_footer() }} {{ tab_header('maintab', 'privacy', _('Privacy')) }} @@ -218,7 +218,7 @@ <div class="description">{{ _('Proxying image results through searx') }}</div> </fieldset> {{ plugin_preferences('privacy') }} - + {{ tab_footer() }} {{ tabs_close() }} @@ -226,7 +226,7 @@ <p class="small_font">{{ _('These settings are stored in your cookies, this allows us not to store this data about you.') }} <br /> {{ _("These cookies serve your sole convenience, we don't use these cookies to track you.") }} - </p> + </p> <input type="submit" value="{{ _('save') }}" /> <div class="{% if rtl %}left{% else %}right{% endif %} preferences_back"><a href="{{ url_for('clear_cookies') }}">{{ _('Reset defaults') }}</a></div> diff --git a/searx/templates/simple/result_templates/key-value.html b/searx/templates/simple/result_templates/key-value.html new file mode 100644 index 000000000..eebaa2c85 --- /dev/null +++ b/searx/templates/simple/result_templates/key-value.html @@ -0,0 +1,11 @@ +<table> + {% for key, value in result.items() %} + {% if key in ['engine', 'engines', 'template', 'score', 'category', 'positions'] %} + {% continue %} + {% endif %} + <tr> + <td><b>{{ key|upper }}</b>: {{ value }}</td> + </tr> + {% endfor %} +</table> +<div class="engines">{% for engine in result.engines %}<span>{{ engine }}</span>{% endfor %}</div>{{- '' -}} diff --git a/searx/templates/simple/result_templates/torrent.html b/searx/templates/simple/result_templates/torrent.html index 3c7fd15e8..71c775bc9 100644 --- a/searx/templates/simple/result_templates/torrent.html +++ b/searx/templates/simple/result_templates/torrent.html @@ -6,7 +6,7 @@ {% if result.magnetlink %}<p class="altlink"> • {{ result_link(result.magnetlink, icon('magnet') + _('magnet link'), "magnetlink") }}</p>{% endif %} {% if result.torrentfile %}<p class="altlink"> • {{ result_link(result.torrentfile, icon('download-alt') + _('torrent file'), "torrentfile") }}</p>{% endif %} -{% if result.seed %}<p class="stat"> • {{ icon('arrow-swap') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> • {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>{% endif %} +{% if result.seed is defined %}<p class="stat"> • {{ icon('arrow-swap') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span> • {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>{% endif %} {%- if result.filesize %}<p class="stat">{{ icon('floppy-disk') }} {{ _('Filesize') }}<span class="badge"> {%- if result.filesize < 1024 %}{{ result.filesize }} {{ _('Bytes') }} diff --git a/searx/templates/simple/results.html b/searx/templates/simple/results.html index 195c478db..8885abc30 100644 --- a/searx/templates/simple/results.html +++ b/searx/templates/simple/results.html @@ -50,11 +50,13 @@ <div class="wrapper"> {% for suggestion in suggestions %} <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"> - <input type="hidden" name="q" value="{{ suggestion }}"> + <input type="hidden" name="q" value="{{ suggestion.url }}"> + <input type="hidden" name="time_range" value="{{ time_range }}"> <input type="hidden" name="language" value="{{ current_language }}"> <input type="hidden" name="safesearch" value="{{ safesearch }}"> <input type="hidden" name="theme" value="{{ theme }}"> - <input type="submit" class="suggestion" value="• {{ suggestion }}"> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} + <input type="submit" class="suggestion" value="• {{ suggestion.title }}"> </form> {% endfor %} </div> @@ -63,7 +65,7 @@ <div id="search_url"> <h4 class="title">{{ _('Search URL') }} :</h4> - <div class="selectable_url"><pre>{{ base_url }}?q={{ q|urlencode }}&language={{ current_language }}&time_range={{ time_range }}&safesearch={{ safesearch }}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}</pre></div> + <div class="selectable_url"><pre>{{ base_url }}?q={{ q|urlencode }}&language={{ current_language }}&time_range={{ time_range }}&safesearch={{ safesearch }}{% if pageno > 1 %}&pageno={{ pageno }}{% endif %}{% if selected_categories %}&categories={{ selected_categories|join(",") | replace(' ','+') }}{% endif %}{% if timeout_limit %}&timeout_limit={{ timeout_limit|urlencode }}{% endif %}</pre></div> </div> <div id="apis"> <h4 class="title">{{ _('Download results') }}</h4> @@ -79,6 +81,7 @@ <input type="hidden" name="language" value="{{ current_language }}"> <input type="hidden" name="safesearch" value="{{ safesearch }}"> <input type="hidden" name="format" value="{{ output_type }}"> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} <input type="submit" value="{{ output_type }}"> </form> </div> @@ -92,12 +95,13 @@ {% for correction in corrections %} <div class="left"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation"> - <input type="hidden" name="q" value="{{ correction }}"> + <input type="hidden" name="q" value="{{ correction.url }}"> <input type="hidden" name="time_range" value="{{ time_range }}"> <input type="hidden" name="language" value="{{ current_language }}"> <input type="hidden" name="safesearch" value="{{ safesearch }}"> <input type="hidden" name="theme" value="{{ theme }}"> - <input type="submit" value="{{ correction }}"> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit }}" >{% endif %} + <input type="submit" value="{{ correction.title }}"> </form> </div> {% endfor %} @@ -134,7 +138,8 @@ <input type="hidden" name="language" value="{{ current_language }}" > <input type="hidden" name="safesearch" value="{{ safesearch }}" > <input type="hidden" name="theme" value="{{ theme }}" > - <button type="submit">{{ icon_small('chevron-left') }} {{ _('previous page') }}</button> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} + <button type="submit">{{ icon_small('chevron-left') }} {{ _('previous page') }}</button> </div> </form> {% endif %} @@ -149,7 +154,8 @@ <input type="hidden" name="language" value="{{ current_language }}" > <input type="hidden" name="safesearch" value="{{ safesearch }}" > <input type="hidden" name="theme" value="{{ theme }}" > - <button type="submit">{{ _('next page') }} {{ icon_small('chevron-right') }}</button> + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} + <button type="submit">{{ _('next page') }} {{ icon_small('chevron-right') }}</button> </div> </form> </nav> diff --git a/searx/templates/simple/search.html b/searx/templates/simple/search.html index 9c4a99b68..e9023b420 100644 --- a/searx/templates/simple/search.html +++ b/searx/templates/simple/search.html @@ -14,4 +14,5 @@ {% include 'simple/categories.html' %} <input type="hidden" name="safesearch" value="{{ safesearch }}" > <input type="hidden" name="theme" value="{{ theme }}" > + {% if timeout_limit %}<input type="hidden" name="timeout_limit" value="{{ timeout_limit|e }}" >{% endif %} </form> |