zaclys/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng synced 2024-01-01 19:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

[enh] search input design mods according to #226

Browse source
This commit is contained in:
Adam Tauber 2017-01-26 21:12:41 +01:00
parent e7aa98902f
commit 30695265c2
8 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
searx/templates/oscar/advanced.html
View file

@ -4,7 +4,13 @@
{{ _('Advanced settings') }}
</label>
<div id="advanced-search-container">
{% include 'oscar/categories.html' %}
{% include 'oscar/time-range.html' %}
{% include 'oscar/languages.html' %}
{% include 'oscar/categories.html' %}
<div class="row">
<div class="col-xs-6">
{% include 'oscar/time-range.html' %}
</div>
<div class="col-xs-6">
{% include 'oscar/languages.html' %}
</div>
</div>
</div>

2
searx/templates/oscar/languages.html
View file

@ -1,7 +1,7 @@
{% if preferences %}
<select class="form-control" name='language'>
{% else %}
<select class="time_range" id='language' name='language'>
<select class="time_range custom-select form-control" id='language' name='language'>
{% endif %}
<option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Default language') }}</option>
{% for lang_id,lang_name,country_name,english_name in language_codes | sort(attribute=1) %}

2
searx/templates/oscar/results.html
View file

@ -11,10 +11,10 @@
{% block title %}{{ q|e }} - {% endblock %}
{% block meta %}<link rel="alternate" type="application/rss+xml" title="Searx search: {{ q|e }}" href="{{ search_url() }}&amp;format=rss">{% endblock %}
{% block content %}
{% include 'oscar/search.html' %}
<div class="row">
<div class="col-sm-8" id="main_results">
<h1 class="sr-only">{{ _('Search results') }}</h1>
{% include 'oscar/search.html' %}
{% if corrections %}
<div class="result">

18
searx/templates/oscar/search.html
View file

@ -1,12 +1,24 @@
{% from 'oscar/macros.html' import icon %}
<form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form" role="search">
<div class="input-group col-sm-12">
<div class="row">
<div class="col-xs-12 col-md-8">
<div class="input-group search-margin">
<input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
<span class="input-group-btn">
<button type="submit" class="btn btn-default"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
</span>
</div>
</div>
<div class="input-group col-sm-12 advanced">
{% include 'oscar/advanced.html' %}
<div class="col-xs-6 col-md-2 search-margin">
{% include 'oscar/time-range.html' %}
</div>
<div class="col-xs-6 col-md-2 search-margin">
{% include 'oscar/languages.html' %}
</div>
</div>
<div class="row">
<div class="col-sm-12">
{% include 'oscar/categories.html' %}
</div>
</div>
</form><!-- / #search_form_full -->

2
searx/templates/oscar/time-range.html
View file

@ -1,4 +1,4 @@
<select name="time_range" id="time-range">
<select name="time_range" id="time-range" class="custom-select form-control">
<option id="time-range-anytime" value="" {{ "selected" if time_range=="" or not time_range else ""}}>
{{ _('Anytime') }}
</option>