add optional request with GET method for search and results pages

This commit is contained in:
Matej Cotman 2014-03-29 16:45:22 +01:00
parent 879bac8adb
commit 32e98967b7
4 changed files with 21 additions and 5 deletions

View File

@ -43,6 +43,15 @@
</select> </select>
</p> </p>
</fieldset> </fieldset>
<fieldset>
<legend>{{ _('Method') }}</legend>
<p>
<select name='method'>
<option value="POST" {% if method == 'POST' %}selected="selected"{% endif %}>POST</option>
<option value="GET" {% if method == 'GET' %}selected="selected"{% endif %}>GET</option>
</select>
</p>
</fieldset>
<fieldset> <fieldset>
<legend>{{ _('Currently used search engines') }}</legend> <legend>{{ _('Currently used search engines') }}</legend>

View File

@ -10,7 +10,7 @@
{% if suggestions %} {% if suggestions %}
<div id="suggestions"><span>{{ _('Suggestions') }}</span> <div id="suggestions"><span>{{ _('Suggestions') }}</span>
{% for suggestion in suggestions %} {% for suggestion in suggestions %}
<form method="post" action="{{ url_for('index') }}"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<input type="hidden" name="q" value="{{ suggestion }}"> <input type="hidden" name="q" value="{{ suggestion }}">
<input type="submit" value="{{ suggestion }}" /> <input type="submit" value="{{ suggestion }}" />
</form> </form>
@ -25,7 +25,7 @@
<div id="apis"> <div id="apis">
{{ _('Download results') }} {{ _('Download results') }}
{% for output_type in ('csv', 'json', 'rss') %} {% for output_type in ('csv', 'json', 'rss') %}
<form method="post" action="{{ url_for('index') }}"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<div class="left"> <div class="left">
<input type="hidden" name="q" value="{{ q }}" /> <input type="hidden" name="q" value="{{ q }}" />
<input type="hidden" name="format" value="{{ output_type }}" /> <input type="hidden" name="format" value="{{ output_type }}" />
@ -52,7 +52,7 @@
{% if paging %} {% if paging %}
<div id="pagination"> <div id="pagination">
{% if pageno > 1 %} {% if pageno > 1 %}
<form method="post" action="{{ url_for('index') }}"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<div class="left"> <div class="left">
<input type="hidden" name="q" value="{{ q }}" /> <input type="hidden" name="q" value="{{ q }}" />
{% for category in selected_categories %} {% for category in selected_categories %}
@ -63,7 +63,7 @@
</div> </div>
</form> </form>
{% endif %} {% endif %}
<form method="post" action="{{ url_for('index') }}"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}">
<div class="left"> <div class="left">
{% for category in selected_categories %} {% for category in selected_categories %}
<input type="hidden" name="category_{{ category }}" value="1"/> <input type="hidden" name="category_{{ category }}" value="1"/>

View File

@ -1,4 +1,4 @@
<form method="post" action="{{ url_for('index') }}" id="search_form"> <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" id="search_form">
<div id="search_wrapper"> <div id="search_wrapper">
<input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/> <input type="text" placeholder="{{ _('Search for...') }}" id="q" class="q" name="q" tabindex="1" autocomplete="off" {% if q %}value="{{ q }}"{% endif %}/>
<input type="submit" value="search" id="search_submit" /> <input type="submit" value="search" id="search_submit" />

View File

@ -123,6 +123,8 @@ def render(template_name, **kwargs):
if not 'autocomplete' in kwargs: if not 'autocomplete' in kwargs:
kwargs['autocomplete'] = autocomplete kwargs['autocomplete'] = autocomplete
kwargs['method'] = request.cookies.get('method', 'POST')
return render_template(template_name, **kwargs) return render_template(template_name, **kwargs)
@ -295,6 +297,7 @@ def preferences():
selected_categories = [] selected_categories = []
locale = None locale = None
autocomplete = '' autocomplete = ''
method = 'POST'
for pd_name, pd in request.form.items(): for pd_name, pd in request.form.items():
if pd_name.startswith('category_'): if pd_name.startswith('category_'):
category = pd_name[9:] category = pd_name[9:]
@ -309,6 +312,8 @@ def preferences():
pd in (x[0] for pd in (x[0] for
x in language_codes)): x in language_codes)):
lang = pd lang = pd
elif pd_name == 'method':
method = pd
elif pd_name.startswith('engine_'): elif pd_name.startswith('engine_'):
engine_name = pd_name.replace('engine_', '', 1) engine_name = pd_name.replace('engine_', '', 1)
if engine_name in engines: if engine_name in engines:
@ -348,6 +353,8 @@ def preferences():
max_age=cookie_max_age max_age=cookie_max_age
) )
resp.set_cookie('method', method, max_age=cookie_max_age)
return resp return resp
return render('preferences.html', return render('preferences.html',
locales=settings['locales'], locales=settings['locales'],