summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstef <stefan.marsiske@gmail.com>2013-10-19 22:20:09 +0200
committerstef <stefan.marsiske@gmail.com>2013-10-19 22:20:09 +0200
commite31a234551e2ced9551158cc5ac5d391b14e994e (patch)
treebfed1468ecf3b6a55e1101042705056f6168996d
parentb305af45418d5b4e1f7060a24d1eb3e2ec2e405d (diff)
parent567a44fcadfaf8d41462feb664de1eac97409375 (diff)
Merge branch 'master' of https://github.com/asciimoo/searx
-rw-r--r--examples/basic_engine.py2
-rw-r--r--searx/templates/search.html4
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/basic_engine.py b/examples/basic_engine.py
index 36fb62605..34c34d89d 100644
--- a/examples/basic_engine.py
+++ b/examples/basic_engine.py
@@ -1,4 +1,6 @@
+categories = ['general'] # optional
+
def request(query, params):
'''pre-request callback
params<dict>:
diff --git a/searx/templates/search.html b/searx/templates/search.html
index ab83d77ec..e9ec4bc3c 100644
--- a/searx/templates/search.html
+++ b/searx/templates/search.html
@@ -3,8 +3,8 @@
<input type="submit" value="search" />
<p>
{% for category in categories %}
- {{ category }}: <input type="checkbox" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />
+ <input type="checkbox" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ category }}
{% endfor %}
</p>
- <p>remember categories:<input type="checkbox" name="save" checked="checked" /></p>
+ <p><input type="checkbox" name="save" checked="checked" />remember categories</p>
</form>