From c21a907cacbbfa8ce8a135362067086063a805f6 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 22 Sep 2014 22:42:29 +0200
Subject: initial commit of the new template 'oscar'

* base.html mostly implemented
* stats.html implemented
* about.html implemented
* most of preferences.html implemented
* using bootstrap.js
---
 searx/templates/oscar/about.html                  |  66 ++++++++++++
 searx/templates/oscar/base.html                   |  65 ++++++++++++
 searx/templates/oscar/index.html                  |   6 ++
 searx/templates/oscar/navbar.html                 |  21 ++++
 searx/templates/oscar/opensearch.xml              |  27 +++++
 searx/templates/oscar/opensearch_response_rss.xml |  23 +++++
 searx/templates/oscar/preferences.html            | 120 ++++++++++++++++++++++
 searx/templates/oscar/stats.html                  |  27 +++++
 8 files changed, 355 insertions(+)
 create mode 100644 searx/templates/oscar/about.html
 create mode 100644 searx/templates/oscar/base.html
 create mode 100644 searx/templates/oscar/index.html
 create mode 100644 searx/templates/oscar/navbar.html
 create mode 100644 searx/templates/oscar/opensearch.xml
 create mode 100644 searx/templates/oscar/opensearch_response_rss.xml
 create mode 100644 searx/templates/oscar/preferences.html
 create mode 100644 searx/templates/oscar/stats.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
new file mode 100644
index 000000000..c0353e29f
--- /dev/null
+++ b/searx/templates/oscar/about.html
@@ -0,0 +1,66 @@
+{% extends "oscar/base.html" %}
+{% block site_alert_warning_nojs %} {% endblock %}
+{% block content %}
+<div>
+    <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
+
+    <p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>, aggregating the results of other <a href="{{ url_for('preferences') }}">search engines</a> while not storing information about its users.
+    </p>
+    <h2>Why use Searx?</h2>
+    <ul>
+        <li>Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you</li>
+        <li>Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you</li>
+        <li>Searx is free software, the code is 100% open and you can help to make it better. See more on <a href="https://github.com/asciimoo/searx">github</a></li>
+    </ul>
+    <p>If you do care about privacy, want to be a conscious user, or otherwise believe
+    in digital freedom, make Searx your default search engine or run it on your own server</p>
+
+<h2>Technical details - How does it work?</h2>
+
+<p>Searx is a <a href="https://en.wikipedia.org/wiki/Metasearch_engine">metasearch engine</a>,
+inspired by the <a href="http://seeks-project.info/">seeks project</a>.<br />
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.<br />
+Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
+</p>
+
+<h2>How can I make it my own?</h2>
+
+<p>Searx appreciates your concern regarding logs, so take the <a href="https://github.com/asciimoo/searx">code</a> and run it yourself! <br />Add your Searx to this <a href="https://github.com/asciimoo/searx/wiki/Searx-instances">list</a> to help other people reclaim their privacy and make the Internet freer!
+<br />The more decentralized the Internet, is the more freedom we have!</p>
+
+
+<h2>More about searx</h2>
+
+<ul>
+    <li><a href="https://github.com/asciimoo/searx">github</a></li>
+    <li><a href="https://www.ohloh.net/p/searx/">ohloh</a></li>
+    <li><a href="https://twitter.com/Searx_engine">twitter</a></li>
+    <li>IRC: #searx @ freenode (<a href="https://kiwiirc.com/client/irc.freenode.com/searx">webclient</a>)</li>
+    <li><a href="https://www.transifex.com/projects/p/searx/">transifex</a></li>
+</ul>
+
+
+<hr />
+
+<h2 id="faq">FAQ</h2>
+
+<h3>How to add to firefox?</h3>
+<p><a href="#" onclick="window.external.AddSearchProvider(window.location.protocol + '//' + window.location.host + '{{ url_for('opensearch') }}');">Install</a> searx as a search engine on any version of Firefox! (javascript required)</p>
+
+<h2 id="dev_faq">Developer FAQ</h2>
+
+<h3>New engines?</h3>
+<ul>
+    <li>Edit your <a href="https://raw.github.com/asciimoo/searx/master/searx/settings.yml">settings.yml</a></li>
+    <li>Create your custom engine module, check the <a href="https://github.com/asciimoo/searx/blob/master/examples/basic_engine.py">example engine</a></li>
+</ul>
+<p>Don't forget to restart searx after config edit!</p>
+
+<h3>Installation/WSGI support?</h3>
+<p>See the <a href="https://github.com/asciimoo/searx/wiki/Installation">installation and setup</a> wiki page</p>
+
+<h3>How to debug engines?</h3>
+<p><a href="{{ url_for('stats') }}">Stats page</a> contains some useful data about the engines used.</p>
+
+</div>
+{% endblock %}
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
new file mode 100644
index 000000000..c15d8f83c
--- /dev/null
+++ b/searx/templates/oscar/base.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <meta name="description" content="Searx - a privacy-respecting, hackable metasearch engine" />
+    <meta name="keywords" content="searx, search, search engine, metasearch, meta search" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1 , maximum-scale=1.0, user-scalable=1" />
+    <title>{% block title %}{% endblock %}searx</title>
+    
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.css') }}" type="text/css" />  
+    
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="{{ url_for('static', filename='js/html5shiv.min.js') }}"></script>
+      <script src="{{ url_for('static', filename='js/respond.min.js') }}"></script>
+    <![endif]-->
+    
+    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
+
+    {% block styles %}
+    {% endblock %}
+    {% block head %}
+    {% endblock %}
+
+    <link title="searx" type="application/opensearchdescription+xml" rel="search" href="{{ url_for('opensearch') }}"/>
+    
+    <script type="text/javascript">
+        searx = {};
+        searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
+    </script>
+</head>
+<body>
+    <div class="container">
+    {% include 'oscar/navbar.html' %}
+  
+    {% block site_alert_error %}
+    {% endblock %}
+    {% block site_alert_warning %}
+    {% endblock %}
+    {% block site_alert_warning_nojs %}
+    <noscript>
+        <div class="alert alert-warning" role="alert">
+            <strong>{{ _('Warning!') }}</strong>
+            {{ _('Please enable JavaScript to use full functionality of this site.') }}
+        </div>
+    </noscript>
+    {% endblock %}
+    
+    {% block content %}
+    {% endblock %}
+
+    </div>
+    <div class="footer">
+        <div class="container">
+            {% block footer %}
+            {% endblock %}
+            <p class="text-muted">Powered by <a href="https://github.com/asciimoo/searx">Searx</a> - a privacy-respecting, hackable metasearch engine</p>
+        </div>
+    </div>
+    <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+</body>
+</html>
diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html
new file mode 100644
index 000000000..0c9a73060
--- /dev/null
+++ b/searx/templates/oscar/index.html
@@ -0,0 +1,6 @@
+{% extends "oscar/base.html" %}
+{% block content %}
+<div class="center">
+    <div class="title"><h1>searx</h1></div>
+</div>
+{% endblock %}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
new file mode 100644
index 000000000..8262fc949
--- /dev/null
+++ b/searx/templates/oscar/navbar.html
@@ -0,0 +1,21 @@
+<!-- Static navbar -->
+<div class="navbar navbar-default" role="navigation">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="{{ url_for('index') }}">searx</a>
+        </div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav navbar-right"> <!-- results.html -->
+                <li{% if template_name == 'index.html' %} class="active"{% endif %}><a href="{{ url_for('index') }}" class="hmarg">{{ _('home') }}</a></li>
+                <li{% if template_name == 'about.html' %} class="active"{% endif %}><a href="{{ url_for('about') }}" class="hmarg">{{ _('about') }}</a></li>
+                <li{% if template_name == 'preferences.html' %} class="active"{% endif %}><a href="{{ url_for('preferences') }}" class="hmarg">{{ _('preferences') }}</a></li>
+            </ul>
+        </div><!--/.nav-collapse -->
+    </div><!--/.container-fluid -->
+</div>
diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml
new file mode 100644
index 000000000..f39283f99
--- /dev/null
+++ b/searx/templates/oscar/opensearch.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
+  <ShortName>searx</ShortName>
+  <Description>Search searx</Description>
+  <InputEncoding>UTF-8</InputEncoding>
+  <LongName>searx metasearch</LongName>
+  {% if opensearch_method == 'get' %}
+    <Url type="text/html" method="get" template="{{ host }}search?q={searchTerms}"/>
+    {% if autocomplete %}
+    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
+        <Param name="format" value="x-suggestions" />
+        <Param name="q" value="{searchTerms}" />
+    </Url>
+    {% endif %}
+  {% else %}
+    <Url type="text/html" method="post" template="{{ host }}">
+        <Param name="q" value="{searchTerms}" />
+    </Url>
+    {% if autocomplete %}
+    <!-- TODO, POST REQUEST doesn't work -->
+    <Url type="application/x-suggestions+json" method="get" template="{{ host }}autocompleter">
+        <Param name="format" value="x-suggestions" />
+        <Param name="q" value="{searchTerms}" />
+    </Url>
+    {% endif %}
+  {% endif %}
+</OpenSearchDescription>
diff --git a/searx/templates/oscar/opensearch_response_rss.xml b/searx/templates/oscar/opensearch_response_rss.xml
new file mode 100644
index 000000000..5673eb2e1
--- /dev/null
+++ b/searx/templates/oscar/opensearch_response_rss.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rss version="2.0"
+     xmlns:opensearch="http://a9.com/-/spec/opensearch/1.1/"
+     xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>Searx search: {{ q }}</title>
+    <link>{{ base_url }}?q={{ q }}</link>
+    <description>Search results for "{{ q }}" - searx</description>
+    <opensearch:totalResults>{{ number_of_results }}</opensearch:totalResults>
+    <opensearch:startIndex>1</opensearch:startIndex>
+    <opensearch:itemsPerPage>{{ number_of_results }}</opensearch:itemsPerPage>
+    <atom:link rel="search" type="application/opensearchdescription+xml" href="{{ base_url }}opensearch.xml"/>
+    <opensearch:Query role="request" searchTerms="{{ q }}" startPage="1" />
+    {% for r in results %}
+    <item>
+      <title>{{ r.title }}</title>
+      <link>{{ r.url }}</link>
+      <description>{{ r.content }}</description>
+      {% if r.pubdate %}<pubDate>{{ r.pubdate }}</pubDate>{% endif %}
+    </item>
+    {% endfor %}
+  </channel>
+</rss>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
new file mode 100644
index 000000000..fa0799b28
--- /dev/null
+++ b/searx/templates/oscar/preferences.html
@@ -0,0 +1,120 @@
+{% extends "oscar/base.html" %}
+{% block content %}
+<div>
+
+    <h1>{{ _('Preferences') }}</h1>
+    <form method="post" action="{{ url_for('preferences') }}" id="search_form">
+
+    <!-- Nav tabs -->
+    <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+      <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
+      <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
+    </ul>
+
+    <!-- Tab panes -->
+    <div class="tab-content">
+        <div class="tab-pane active" id="tab_general">
+            <fieldset>
+                <legend>{{ _('Default categories') }}</legend>
+                <p>
+                {% include 'default/categories.html' %}
+                </p>
+            </fieldset>
+
+            <fieldset>
+            <div class="container-fluid">
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" name='language'>
+                            <option value="all" {% if current_language == 'all' %}selected="selected"{% endif %}>{{ _('Automatic') }}</option>
+                            {% for lang_id,lang_name,country_name in language_codes %}
+                            <option value="{{ lang_id }}" {% if lang_id == current_language %}selected="selected"{% endif %}>{{ lang_name }} ({{ country_name }}) - {{ lang_id }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                
+                
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" name='locale'>
+                            {% for locale_id,locale_name in locales.items() %}
+                            <option value="{{ locale_id }}" {% if locale_id == current_locale %}selected="selected"{% endif %}>{{ locale_name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        
+                        <select class="form-control" name="autocomplete">
+                            <option value=""> - </option>
+                            {% for backend in autocomplete_backends %}
+                            <option value="{{ backend }}" {% if backend == autocomplete %}selected="selected"{% endif %}>{{ backend }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Find stuff as you type') }}</span>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Method') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" 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>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change how forms are submited, <a href="http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods" rel="external">learn more about request methods</a>') }}</span>
+                </div>
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Themes') }}</label>
+                    <div class="col-sm-4 col-md-4">
+                        <select class="form-control" name="theme">
+                            {% for name in themes %}
+                            <option value="{{ name }}" {% if name == theme %}selected="selected"{% endif %}>{{ name }}</option>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change searx layout') }}</span>
+                </div>
+            </div>
+            </fieldset>
+        </div>
+        <div class="tab-pane" id="tab_engine">
+            <fieldset>
+            {% for (categ,search_engines) in categs %}
+                <legend>{{ _(categ) }}</legend>
+                <div class="container-fluid">
+                {% for search_engine in search_engines %}
+                    {% if not search_engine.private %}
+                        <div class="row">
+                            <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                            <div class="col-sm-4 col-md-4">
+                                <div class="checkbox">
+                                <input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
+                                <label class="allow btn btn-success" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                                <label class="deny btn btn-danger" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
+                {% endfor %}
+                </div>
+            {% endfor %}   
+            </fieldset>     
+        </div>
+    </div>
+
+    <p class="text-muted" style="margin:20px 0;">{{ _('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>
+
+    <input type="submit" class="btn btn-primary" value="{{ _('save') }}" />
+	<a href="{{ url_for('index') }}"><div class="btn btn-default">{{ _('back') }}</div></a>
+    </form>    
+</div>
+{% endblock %}
diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
new file mode 100644
index 000000000..b78caaa93
--- /dev/null
+++ b/searx/templates/oscar/stats.html
@@ -0,0 +1,27 @@
+{% extends "oscar/base.html" %}
+{% block content %}
+<div class="container-fluid">
+    <h1>{{ _('Engine stats') }}</h1>
+    <div class="row">
+        {% for stat_name,stat_category in stats %}
+        <div class="col-xs-12 col-sm-12 col-md-6">
+            <h3>{{ stat_name }}</h3>
+            <div class="container-fluid">
+                {% for engine in stat_category %}
+                <div class="row">
+                    <div class="col-sm-4 col-md-4">{{ engine.name }}</div>
+                    <div class="col-sm-8 col-md-8">
+                        <div class="progress">
+                            <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="{{ '%i'|format(engine.avg) }}" aria-valuemin="0" aria-valuemax="100" style="width: {{ engine.percentage }}%;">
+                                {{ '%.02f'|format(engine.avg) }}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {% endfor %}
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+{% endblock %}
-- 
cgit v1.2.3


From a88ce4bd336e470900d138dcc19af7efaad40573 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 18:26:46 +0200
Subject: little enhancement of oscar template

* improve site-titles
* add message which tell you if no data is availabe yet
---
 searx/templates/oscar/about.html       | 1 +
 searx/templates/oscar/preferences.html | 1 +
 searx/templates/oscar/stats.html       | 9 +++++++++
 3 files changed, 11 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
index c0353e29f..6f9572546 100644
--- a/searx/templates/oscar/about.html
+++ b/searx/templates/oscar/about.html
@@ -1,5 +1,6 @@
 {% extends "oscar/base.html" %}
 {% block site_alert_warning_nojs %} {% endblock %}
+{% block title %}{{ _('about') }} - {% endblock %}
 {% block content %}
 <div>
     <h1>About <a href="{{ url_for('index') }}">searx</a></h1>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index fa0799b28..840e9513a 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -1,4 +1,5 @@
 {% extends "oscar/base.html" %}
+{% block title %}{{ _('preferences') }} - {% endblock %}
 {% block content %}
 <div>
 
diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index b78caaa93..dee304063 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -1,4 +1,5 @@
 {% extends "oscar/base.html" %}
+{% block title %}{{ _('stats') }} - {% endblock %}
 {% block content %}
 <div class="container-fluid">
     <h1>{{ _('Engine stats') }}</h1>
@@ -19,6 +20,14 @@
                     </div>
                 </div>
                 {% endfor %}
+                {% if not stat_category %}
+                <div class="col-sm-12 col-md-12">
+                    <div class="alert alert-info" role="alert">
+                        <strong>{{ _('Heads up!') }}</strong>
+                        {{ _('There is currently no data available.') }}
+                    </div>
+                </div>
+                {% endif %}
             </div>
         </div>
         {% endfor %}
-- 
cgit v1.2.3


From d0913f894ad6229962bb728e31da669206ab2c69 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 20:05:08 +0200
Subject: remove text from alert-info in /stats

---
 searx/templates/oscar/stats.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index dee304063..bf877c38b 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -23,7 +23,6 @@
                 {% if not stat_category %}
                 <div class="col-sm-12 col-md-12">
                     <div class="alert alert-info" role="alert">
-                        <strong>{{ _('Heads up!') }}</strong>
                         {{ _('There is currently no data available.') }}
                     </div>
                 </div>
-- 
cgit v1.2.3


From 8c6e63402ae304fc4aa889911ee20f48ea4d9a09 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 20:12:46 +0200
Subject: add more tooltips to preferences

---
 searx/templates/oscar/preferences.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 840e9513a..d0bbbc820 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -34,6 +34,7 @@
                             {% endfor %}
                         </select>
                     </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span>
                 </div>
                 
                 
@@ -46,6 +47,7 @@
                             {% endfor %}
                         </select>
                     </div>
+                    <span class="col-sm-5 col-md-6 help-block">{{ _('Change the language of the layout') }}</span>
                 </div>
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Autocomplete') }}</label>
-- 
cgit v1.2.3


From afcfa04e30af048c63d12bdbe3e281582a917b91 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 21:18:45 +0200
Subject: oscar template: improve style for check and uncheck of engines

---
 searx/templates/oscar/preferences.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index d0bbbc820..38f874e51 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -97,9 +97,9 @@
                             <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
                             <div class="col-sm-4 col-md-4">
                                 <div class="checkbox">
-                                <input type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
-                                <label class="allow btn btn-success" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
-                                <label class="deny btn btn-danger" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                <input class="hidden" type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
+                                <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
                                 </div>
                             </div>
                         </div>
-- 
cgit v1.2.3


From 5568fbd89d9c0f8c7f6530c6f0826a35d01c83a8 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 21:43:12 +0200
Subject: oscar template: using tab to seperate engines in preferences

---
 searx/templates/oscar/preferences.html | 49 +++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 18 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 38f874e51..6803a02e5 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -87,27 +87,40 @@
             </fieldset>
         </div>
         <div class="tab-pane" id="tab_engine">
-            <fieldset>
-            {% for (categ,search_engines) in categs %}
-                <legend>{{ _(categ) }}</legend>
-                <div class="container-fluid">
-                {% for search_engine in search_engines %}
-                    {% if not search_engine.private %}
-                        <div class="row">
-                            <div class="col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
-                            <div class="col-sm-4 col-md-4">
-                                <div class="checkbox">
-                                <input class="hidden" type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
-                                <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
-                                <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+        
+            <!-- Nav tabs -->
+            <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+                {% for (categ,search_engines) in categs %}
+                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                {% endfor %}
+            </ul>
+        
+        
+            <!-- Tab panes -->
+            <div class="tab-content">
+                {% for (categ,search_engines) in categs %}
+                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '') }}">
+                    <div class="container-fluid">
+                    <fieldset>
+                    {% for search_engine in search_engines %}
+                        {% if not search_engine.private %}
+                            <div class="row">
+                                <div class="col-xs-6 col-sm-4 col-md-4">{{ search_engine.name }} ({{ shortcuts[search_engine.name] }})</div>
+                                <div class="col-xs-6 col-sm-4 col-md-4">
+                                    <div class="checkbox">
+                                    <input class="hidden" type="checkbox" id="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}" name="engine_{{ search_engine.name }}"{% if search_engine.name in blocked_engines %} checked="checked"{% endif %} />
+                                    <label class="btn btn-success label_hide_if_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Block') }}</label>
+                                    <label class="btn btn-danger label_hide_if_not_checked" for="engine_{{ categ }}_{{ search_engine.name|replace(' ', '_') }}">{{ _('Allow') }}</label>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                    {% endif %}
-                {% endfor %}
+                        {% endif %}
+                    {% endfor %}
+                    </fieldset>
+                    </div>
                 </div>
-            {% endfor %}   
-            </fieldset>     
+                {% endfor %}
+            </div>
         </div>
     </div>
 
-- 
cgit v1.2.3


From 25919de6084599c3196622ed1c89648b2c11f78a Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 22:43:54 +0200
Subject: oscar template: make the categories clickable

---
 searx/templates/oscar/base.html        |  1 +
 searx/templates/oscar/categories.html  |  6 ++++++
 searx/templates/oscar/preferences.html | 19 ++++++++-----------
 3 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 searx/templates/oscar/categories.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index c15d8f83c..22df11f00 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -61,5 +61,6 @@
     </div>
     <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+    <script src="{{ url_for('static', filename='js/scripts.js') }}"></script>
 </body>
 </html>
diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html
new file mode 100644
index 000000000..82ddcf686
--- /dev/null
+++ b/searx/templates/oscar/categories.html
@@ -0,0 +1,6 @@
+<div id="categories" class="btn-group btn-toggle" data-toggle="buttons">
+{% for category in categories %}
+    <label class="btn btn-sm {% if category in selected_categories %}btn-primary active{% else %}btn-default{% endif %}" data-btn-class="primary">
+        <input class="hidden" type="checkbox" id="checkbox_{{ category|replace(' ', '_') }}" name="category_{{ category }}" {% if category in selected_categories %}checked="checked"{% endif %} />{{ _(category) }}</label>
+{% endfor %}
+</div>
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 6803a02e5..3d66d1963 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -15,15 +15,14 @@
     <!-- Tab panes -->
     <div class="tab-content">
         <div class="tab-pane active" id="tab_general">
-            <fieldset>
-                <legend>{{ _('Default categories') }}</legend>
-                <p>
-                {% include 'default/categories.html' %}
-                </p>
-            </fieldset>
-
             <fieldset>
             <div class="container-fluid">
+                <div class="row form-group">
+                    <label class="col-sm-3 col-md-2">{{ _('Default categories') }}</label>
+                    <div class="col-sm-11 col-md-10">
+                        {% include 'oscar/categories.html' %}
+                    </div>
+                </div>
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Search language') }}</label>
                     <div class="col-sm-4 col-md-4">
@@ -36,8 +35,6 @@
                     </div>
                     <span class="col-sm-5 col-md-6 help-block">{{ _('What language do you prefer for search?') }}</span>
                 </div>
-                
-                
                 <div class="row form-group">
                     <label class="col-sm-3 col-md-2">{{ _('Interface language') }}</label>
                     <div class="col-sm-4 col-md-4">
@@ -91,7 +88,7 @@
             <!-- Nav tabs -->
             <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
                 {% for (categ,search_engines) in categs %}
-                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
+                <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
                 {% endfor %}
             </ul>
         
@@ -99,7 +96,7 @@
             <!-- Tab panes -->
             <div class="tab-content">
                 {% for (categ,search_engines) in categs %}
-                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '') }}">
+                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '_') }}">
                     <div class="container-fluid">
                     <fieldset>
                     {% for search_engine in search_engines %}
-- 
cgit v1.2.3


From ef1ead9c4bfb6a68cc6c0f8727c4af8d99206eb8 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 26 Sep 2014 23:29:14 +0200
Subject: oscar template: add directory in which are messages stored

---
 searx/templates/oscar/base.html                               | 9 +++++----
 searx/templates/oscar/messages/js_disabled.html               | 4 ++++
 searx/templates/oscar/messages/save_settings_successfull.html | 8 ++++++++
 searx/templates/oscar/messages/unknow_error.html              | 8 ++++++++
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 searx/templates/oscar/messages/js_disabled.html
 create mode 100644 searx/templates/oscar/messages/save_settings_successfull.html
 create mode 100644 searx/templates/oscar/messages/unknow_error.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 22df11f00..119533933 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -41,12 +41,13 @@
     {% endblock %}
     {% block site_alert_warning_nojs %}
     <noscript>
-        <div class="alert alert-warning" role="alert">
-            <strong>{{ _('Warning!') }}</strong>
-            {{ _('Please enable JavaScript to use full functionality of this site.') }}
-        </div>
+        {% include 'oscar/messages/js_disabled.html' %}
     </noscript>
     {% endblock %}
+    {% block site_alert_info %}
+    {% endblock %}
+    {% block site_alert_success %}
+    {% endblock %}
     
     {% block content %}
     {% endblock %}
diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
new file mode 100644
index 000000000..e160edc1c
--- /dev/null
+++ b/searx/templates/oscar/messages/js_disabled.html
@@ -0,0 +1,4 @@
+<div class="alert alert-warning" role="alert">
+    <strong>{{ _('Warning!') }}</strong>
+    {{ _('Please enable JavaScript to use full functionality of this site.') }}
+</div>
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
new file mode 100644
index 000000000..f9a421f0c
--- /dev/null
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -0,0 +1,8 @@
+<div class="alert alert-success fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong>{{ _('Well done!') }}</strong>
+    {{ _('Settings saved successfully.') }}
+</div>
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
new file mode 100644
index 000000000..e4736b1ea
--- /dev/null
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -0,0 +1,8 @@
+<div class="alert alert-danger fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong>{{ _('Oh snap!') }}</strong>
+    {{ _('Something went wrong.') }}
+</div>
-- 
cgit v1.2.3


From a538bed745a688d17c98372785dd2c0644e6019b Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 10:23:05 +0200
Subject: oscar template: implement search input, index page,...

---
 searx/templates/oscar/index.html  | 13 +++++++++++--
 searx/templates/oscar/macros.html |  3 +++
 searx/templates/oscar/search.html | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 searx/templates/oscar/macros.html
 create mode 100644 searx/templates/oscar/search.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html
index 0c9a73060..adb535d9b 100644
--- a/searx/templates/oscar/index.html
+++ b/searx/templates/oscar/index.html
@@ -1,6 +1,15 @@
 {% extends "oscar/base.html" %}
 {% block content %}
-<div class="center">
-    <div class="title"><h1>searx</h1></div>
+<div class="container-fluid">
+    <div class="row">
+        <div class="text-center col-sm-12 col-md-12">
+            <h1 class="text-hide center-block"><img class="center-block img-responsive" src="{{ url_for('static', filename='img/searx_logo.png') }}" alt="searx logo"/>searx</h1>
+        </div>
+    </div>
+    <div class="row">
+        <div class="text-center col-sm-12 col-md-12">
+            {% include 'oscar/search.html' %}
+        </div>
+    </div>
 </div>
 {% endblock %}
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
new file mode 100644
index 000000000..f61de2015
--- /dev/null
+++ b/searx/templates/oscar/macros.html
@@ -0,0 +1,3 @@
+{% macro icon(action) -%}
+    <span class="glyphicon glyphicon-{{ action }}"></span>
+{%- endmacro %}
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
new file mode 100644
index 000000000..f44d48adf
--- /dev/null
+++ b/searx/templates/oscar/search.html
@@ -0,0 +1,17 @@
+{% 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-md-8 col-md-offset-2">
+        <input type="search" name="q" class="form-control input-lg" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
+        <span class="input-group-btn">
+            <button type="submit" class="btn btn-default input-lg">{{ icon('search') }}<span class="sr-only">{{ _('Start search') }}</span></button>
+        </span>
+    </div>
+
+    <button type="button" class="btn btn-link btn-collapse center-block collapsed" data-toggle="collapse" data-target="#search_categories" data-btn-text-collapsed="{{ _('Show search filters') }}" data-btn-text-not-collapsed="{{ _('Hide search filters') }}">{{ _('Show search filters') }}</button>
+    <div class="row collapse" id="search_categories">
+        <div class="col-md-12 text-center">
+            {% include 'oscar/categories.html' %}
+        </div>
+    </div><!-- / #search_categories -->
+</form><!-- / #search_form_full -->
-- 
cgit v1.2.3


From 915857105997357f24db86b9fcc6739fd816e98e Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 11:51:31 +0200
Subject: oscar template: update messages

---
 searx/templates/oscar/messages/first_time.html                | 8 ++++++++
 searx/templates/oscar/messages/js_disabled.html               | 2 +-
 searx/templates/oscar/messages/no_data_available.html         | 5 +++++
 searx/templates/oscar/messages/save_settings_successfull.html | 3 ++-
 searx/templates/oscar/messages/unknow_error.html              | 3 ++-
 searx/templates/oscar/stats.html                              | 4 +---
 6 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 searx/templates/oscar/messages/first_time.html
 create mode 100644 searx/templates/oscar/messages/no_data_available.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html
new file mode 100644
index 000000000..34e7e8956
--- /dev/null
+++ b/searx/templates/oscar/messages/first_time.html
@@ -0,0 +1,8 @@
+<div class="alert alert-info fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">Close</span>
+    </button>
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
+    {{ _('It look like you are using searx first time.') }}
+</div>
diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
index e160edc1c..8baaf1e4c 100644
--- a/searx/templates/oscar/messages/js_disabled.html
+++ b/searx/templates/oscar/messages/js_disabled.html
@@ -1,4 +1,4 @@
 <div class="alert alert-warning" role="alert">
-    <strong>{{ _('Warning!') }}</strong>
+    <strong class="lead">{{ _('Warning!') }}</strong>
     {{ _('Please enable JavaScript to use full functionality of this site.') }}
 </div>
diff --git a/searx/templates/oscar/messages/no_data_available.html b/searx/templates/oscar/messages/no_data_available.html
new file mode 100644
index 000000000..aee791766
--- /dev/null
+++ b/searx/templates/oscar/messages/no_data_available.html
@@ -0,0 +1,5 @@
+{% from 'oscar/macros.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
+    {{ _('There is currently no data available. ') }}
+</div>
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
index f9a421f0c..0771440e8 100644
--- a/searx/templates/oscar/messages/save_settings_successfull.html
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -1,8 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
 <div class="alert alert-success fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
         <span class="sr-only">Close</span>
     </button>
-    <strong>{{ _('Well done!') }}</strong>
+    <strong class="lead">{{ icon('ok-sign') }} {{ _('Well done!') }}</strong>
     {{ _('Settings saved successfully.') }}
 </div>
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
index e4736b1ea..40f323f42 100644
--- a/searx/templates/oscar/messages/unknow_error.html
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -1,8 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
 <div class="alert alert-danger fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
         <span class="sr-only">Close</span>
     </button>
-    <strong>{{ _('Oh snap!') }}</strong>
+    <strong class="lead">{{ icon('exclamation-sign') }} {{ _('Oh snap!') }}</strong>
     {{ _('Something went wrong.') }}
 </div>
diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
index bf877c38b..0fb104210 100644
--- a/searx/templates/oscar/stats.html
+++ b/searx/templates/oscar/stats.html
@@ -22,9 +22,7 @@
                 {% endfor %}
                 {% if not stat_category %}
                 <div class="col-sm-12 col-md-12">
-                    <div class="alert alert-info" role="alert">
-                        {{ _('There is currently no data available.') }}
-                    </div>
+                    {% include 'oscar/messages/no_data_available.html' %}
                 </div>
                 {% endif %}
             </div>
-- 
cgit v1.2.3


From f3b565e17ecd4c875381a3a212d73fb065f9a89d Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 12:33:22 +0200
Subject: oscar template: implement first version of results page

* implement results page
* improve search form template
* implement all result_templates
* fix youtube engine
---
 searx/templates/oscar/index.html                   |  2 +-
 .../templates/oscar/result_templates/default.html  |  8 ++++++++
 searx/templates/oscar/result_templates/images.html | 21 +++++++++++++++++++++
 .../templates/oscar/result_templates/torrent.html  | 14 ++++++++++++++
 searx/templates/oscar/result_templates/videos.html | 13 +++++++++++++
 searx/templates/oscar/results.html                 | 22 ++++++++++++++++++++++
 searx/templates/oscar/search.html                  | 13 ++++---------
 searx/templates/oscar/search_full.html             | 17 +++++++++++++++++
 8 files changed, 100 insertions(+), 10 deletions(-)
 create mode 100644 searx/templates/oscar/result_templates/default.html
 create mode 100644 searx/templates/oscar/result_templates/images.html
 create mode 100644 searx/templates/oscar/result_templates/torrent.html
 create mode 100644 searx/templates/oscar/result_templates/videos.html
 create mode 100644 searx/templates/oscar/results.html
 create mode 100644 searx/templates/oscar/search_full.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html
index adb535d9b..e58aa073a 100644
--- a/searx/templates/oscar/index.html
+++ b/searx/templates/oscar/index.html
@@ -8,7 +8,7 @@
     </div>
     <div class="row">
         <div class="text-center col-sm-12 col-md-12">
-            {% include 'oscar/search.html' %}
+            {% include 'oscar/search_full.html' %}
         </div>
     </div>
 </div>
diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
new file mode 100644
index 000000000..2ea246542
--- /dev/null
+++ b/searx/templates/oscar/result_templates/default.html
@@ -0,0 +1,8 @@
+<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+
+{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+
+{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
+
+<span class="label label-default pull-right">{{ result.engine }}</span>
+<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
new file mode 100644
index 000000000..07b427d78
--- /dev/null
+++ b/searx/templates/oscar/result_templates/images.html
@@ -0,0 +1,21 @@
+<a href="#" data-toggle="modal" data-target="#modal-{{ index }}">
+    <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
+</a>
+
+<div class="modal fade" id="modal-{{ index }}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+                <h4 class="modal-title">{{ result.title|striptags }}</h4>
+            </div>
+            <div class="modal-body">
+                <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
+            </div>
+            <div class="modal-footer">
+                <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
+                <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
new file mode 100644
index 000000000..14ac63232
--- /dev/null
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -0,0 +1,14 @@
+{% from 'oscar/macros.html' import icon %}
+
+<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+
+{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+
+<p>{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span>, {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span></p>
+
+<p><a href="{{ result.magnetlink }}" class="magnetlink">{{ icon('magnet') }} magnet link</a></p>
+
+{% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
+
+<span class="label label-default pull-right">{{ result.engine }}</span>
+<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
new file mode 100644
index 000000000..32112472e
--- /dev/null
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -0,0 +1,13 @@
+<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    
+{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
+    
+<div class="container-fluid">
+    <div class="row">
+        <img class="thumbnail col-xs-6 col-sm-4 col-md-4" src="{{ result.thumbnail|safe }}" />
+        {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
+    </div>
+</div>
+    
+<span class="label label-default pull-right">{{ result.engine }}</span>
+<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
new file mode 100644
index 000000000..fde65c883
--- /dev/null
+++ b/searx/templates/oscar/results.html
@@ -0,0 +1,22 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ q }} - {% endblock %}
+{% block content %}
+    <div class="row">
+        <div class="col-sm-8" id="main_results">
+            <h1 class="sr-only">{{ _('Search results') }}</h1>
+            {% include 'oscar/search.html' %}
+            
+            {% for result in results %}
+            <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
+                {% set index = loop.index %}
+                {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
+            </div>
+            {% endfor %}
+            
+            <div class="clearfix"></div>
+    
+        </div>
+        <div class="col-sm-4" id="sidebar_results">
+        </div>
+    </div>
+{% endblock %}
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index f44d48adf..4b1f8b6a1 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -1,17 +1,12 @@
 {% 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-md-8 col-md-offset-2">
-        <input type="search" name="q" class="form-control input-lg" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
+    <div class="input-group col-sm-12">
+        <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 input-lg">{{ icon('search') }}<span class="sr-only">{{ _('Start search') }}</span></button>
+            <button type="submit" class="btn btn-default">{{ icon('search') }}<span class="sr-only">{{ _('Start search') }}</span></button>
         </span>
     </div>
-
-    <button type="button" class="btn btn-link btn-collapse center-block collapsed" data-toggle="collapse" data-target="#search_categories" data-btn-text-collapsed="{{ _('Show search filters') }}" data-btn-text-not-collapsed="{{ _('Hide search filters') }}">{{ _('Show search filters') }}</button>
-    <div class="row collapse" id="search_categories">
-        <div class="col-md-12 text-center">
+    <div class="search_categories">
             {% include 'oscar/categories.html' %}
-        </div>
     </div><!-- / #search_categories -->
 </form><!-- / #search_form_full -->
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
new file mode 100644
index 000000000..f44d48adf
--- /dev/null
+++ b/searx/templates/oscar/search_full.html
@@ -0,0 +1,17 @@
+{% 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-md-8 col-md-offset-2">
+        <input type="search" name="q" class="form-control input-lg" id="q" placeholder="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}">
+        <span class="input-group-btn">
+            <button type="submit" class="btn btn-default input-lg">{{ icon('search') }}<span class="sr-only">{{ _('Start search') }}</span></button>
+        </span>
+    </div>
+
+    <button type="button" class="btn btn-link btn-collapse center-block collapsed" data-toggle="collapse" data-target="#search_categories" data-btn-text-collapsed="{{ _('Show search filters') }}" data-btn-text-not-collapsed="{{ _('Hide search filters') }}">{{ _('Show search filters') }}</button>
+    <div class="row collapse" id="search_categories">
+        <div class="col-md-12 text-center">
+            {% include 'oscar/categories.html' %}
+        </div>
+    </div><!-- / #search_categories -->
+</form><!-- / #search_form_full -->
-- 
cgit v1.2.3


From 6fa5f02d0b6a5cdd65216b689f217a42beb7070f Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 13:25:12 +0200
Subject: oscar template: improve image results

---
 searx/templates/oscar/result_templates/images.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 07b427d78..48ed5dece 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -11,8 +11,12 @@
             </div>
             <div class="modal-body">
                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
+                {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
             </div>
             <div class="modal-footer">
+                <span class="label label-default pull-right">{{ result.engine }}</span>
+                <p class="text-muted pull-left">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
+                <div class="clearfix"></div>
                 <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
                 <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
             </div>
-- 
cgit v1.2.3


From b91b77e335c0b0f2dca2b261c64414c96fdb2412 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 14:44:34 +0200
Subject: oscar template: improve result page

* add paging support
* add suggestion panel
* add links panel
---
 searx/templates/oscar/results.html | 80 +++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 5 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index fde65c883..f4364ed48 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -5,18 +5,88 @@
         <div class="col-sm-8" id="main_results">
             <h1 class="sr-only">{{ _('Search results') }}</h1>
             {% include 'oscar/search.html' %}
-            
+
             {% for result in results %}
             <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
                 {% set index = loop.index %}
                 {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
             </div>
             {% endfor %}
-            
+
             <div class="clearfix"></div>
-    
-        </div>
+
+            {% if paging %}
+            <div id="pagination">
+                <div class="pull-left">
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
+                        <input type="hidden" name="q" value="{{ q }}" />
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+                        <input type="hidden" name="pageno" value="{{ pageno-1 }}" />
+                        <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-backward"></span> {{ _('previous page') }}</button>
+                    </form>
+                </div>
+                <div class="pull-right">
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}"  class="pull-left">
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
+                        <input type="hidden" name="q" value="{{ q }}" />
+                        <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
+                        <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-forward"></span> {{ _('next page') }}</button>
+                    </form>
+                </div>
+            </div><!-- /#pagination -->
+            <div class="clearfix"></div>
+            {% endif %}
+        </div><!-- /#main_results -->
+
         <div class="col-sm-4" id="sidebar_results">
-        </div>
+
+            {% if suggestions %}
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#suggestions">{{ _('Suggestions') }}</a>
+                    </h4>
+                </div>
+                <div class="panel-body">
+                    {% for suggestion in suggestions %}
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" role="navigation" class="form-inline pull-left suggestion_item">
+                        <input type="hidden" name="q" value="{{ suggestion }}">
+                        <button type="submit" class="btn btn-default btn-xs">{{ suggestion }}</button>
+                    </form>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
+
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h4 class="panel-title">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#links">{{ _('Links') }}</a>
+                    </h4>
+                </div>
+                <div class="panel-body">
+                    <form role="form">
+                        <div class="form-group">
+                            <label for="search_url">{{ _('Search URL') }}</label>
+                            <input type="url" class="form-control" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}">
+                        </div>
+                    </form>
+                    
+                    <label>{{ _('Download results') }}</label>
+                    <div class="clearfix"></div>
+                    {% for output_type in ('csv', 'json', 'rss') %}
+                    <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-left result_download">
+                        <input type="hidden" name="q" value="{{ q }}">
+                        <input type="hidden" name="format" value="{{ output_type }}">
+                        {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1">{% endfor %}
+                        <input type="hidden" name="pageno" value="{{ pageno }}">
+                        <button type="submit" class="btn btn-default">{{ output_type }}</button>
+                    </form>
+                    {% endfor %} 
+                    <div class="clearfix"></div>
+                </div>
+            </div>
+        
+        </div><!-- /#sidebar_results -->
     </div>
 {% endblock %}
-- 
cgit v1.2.3


From dc2c1362205ea90dae75872b316dc1d693c9a750 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sat, 27 Sep 2014 15:46:57 +0200
Subject: oscar template: little style improvements

---
 searx/templates/oscar/results.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index f4364ed48..91070777b 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -68,7 +68,7 @@
                     <form role="form">
                         <div class="form-group">
                             <label for="search_url">{{ _('Search URL') }}</label>
-                            <input type="url" class="form-control" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}">
+                            <input type="url" class="form-control select-all-on-click cursor-text" name="search_url" value="{{ base_url }}?q={{ q|urlencode }}&pageno={{ pageno }}{% if selected_categories %}&category_{{ selected_categories|join("&category_") }}{% endif %}" readonly>
                         </div>
                     </form>
                     
-- 
cgit v1.2.3


From 14b0604bc0a14a110c92457f43b3828fc22e7fc7 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 29 Sep 2014 09:44:29 +0200
Subject: oscar template: implement autocompleter

---
 searx/templates/oscar/base.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 119533933..7507fcab1 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -9,6 +9,7 @@
     <title>{% block title %}{% endblock %}searx</title>
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
+    {% if autocomplete %}<link rel="stylesheet" href="{{ url_for('static', filename='css/typeahead.css') }}" type="text/css" />{% endif %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.css') }}" type="text/css" />  
     
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
@@ -28,6 +29,7 @@
     
     <script type="text/javascript">
         searx = {};
+        searx.method = "{{ method or 'POST' }}";
         searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
     </script>
 </head>
@@ -62,6 +64,7 @@
     </div>
     <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+    {% if autocomplete %}<script src="{{ url_for('static', filename='js/typeahead.bundle.min.js') }}"></script>{% endif %}
     <script src="{{ url_for('static', filename='js/scripts.js') }}"></script>
 </body>
 </html>
-- 
cgit v1.2.3


From f4457da0a171d45b8be6b9b2bc24f15b6bf4b337 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 29 Sep 2014 10:27:19 +0200
Subject: oscar template: using less to generate oscar.min.css

---
 searx/templates/oscar/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 7507fcab1..e2d481845 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -10,7 +10,7 @@
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     {% if autocomplete %}<link rel="stylesheet" href="{{ url_for('static', filename='css/typeahead.css') }}" type="text/css" />{% endif %}
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.css') }}" type="text/css" />  
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-- 
cgit v1.2.3


From 55b9b10d2e39fb52d566441d44c1c132b7ff06fe Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 29 Sep 2014 15:47:05 +0200
Subject: oscar template: include typeahead.css into bootstrap.min.css

---
 searx/templates/oscar/base.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index e2d481845..6138404a2 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -9,7 +9,6 @@
     <title>{% block title %}{% endblock %}searx</title>
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
-    {% if autocomplete %}<link rel="stylesheet" href="{{ url_for('static', filename='css/typeahead.css') }}" type="text/css" />{% endif %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-- 
cgit v1.2.3


From 451586f09f819c5a099eac7389522acd8a554466 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 29 Sep 2014 16:31:32 +0200
Subject: oscar template: update translation files

---
 searx/templates/oscar/base.html                               | 2 +-
 searx/templates/oscar/messages/first_time.html                | 2 +-
 searx/templates/oscar/messages/save_settings_successfull.html | 2 +-
 searx/templates/oscar/messages/unknow_error.html              | 2 +-
 searx/templates/oscar/navbar.html                             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 6138404a2..544820060 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -58,7 +58,7 @@
         <div class="container">
             {% block footer %}
             {% endblock %}
-            <p class="text-muted">Powered by <a href="https://github.com/asciimoo/searx">Searx</a> - a privacy-respecting, hackable metasearch engine</p>
+            <p class="text-muted">{{ _('Powered by') }} <a href="https://github.com/asciimoo/searx">Searx</a> - {{ _('a privacy-respecting, hackable metasearch engine') }}</p>
         </div>
     </div>
     <script src="{{ url_for('static', filename='js/jquery-1.11.1.min.js') }}"></script>
diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html
index 34e7e8956..38db62bdf 100644
--- a/searx/templates/oscar/messages/first_time.html
+++ b/searx/templates/oscar/messages/first_time.html
@@ -1,7 +1,7 @@
 <div class="alert alert-info fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('info-sign') }} {{ _('Heads up!') }}</strong>
     {{ _('It look like you are using searx first time.') }}
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
index 0771440e8..63e578c70 100644
--- a/searx/templates/oscar/messages/save_settings_successfull.html
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -2,7 +2,7 @@
 <div class="alert alert-success fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('ok-sign') }} {{ _('Well done!') }}</strong>
     {{ _('Settings saved successfully.') }}
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
index 40f323f42..3c4c9c15d 100644
--- a/searx/templates/oscar/messages/unknow_error.html
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -2,7 +2,7 @@
 <div class="alert alert-danger fade in" role="alert">
     <button class="close" data-dismiss="alert" type="button">
         <span aria-hidden="true">×</span>
-        <span class="sr-only">Close</span>
+        <span class="sr-only">{{ _('Close') }}</span>
     </button>
     <strong class="lead">{{ icon('exclamation-sign') }} {{ _('Oh snap!') }}</strong>
     {{ _('Something went wrong.') }}
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
index 8262fc949..db0d7818f 100644
--- a/searx/templates/oscar/navbar.html
+++ b/searx/templates/oscar/navbar.html
@@ -3,7 +3,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".navbar-collapse">
-                <span class="sr-only">Toggle navigation</span>
+                <span class="sr-only">{{ _('Toggle navigation') }}</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
-- 
cgit v1.2.3


From c25aab73b72087a9a56d86c155a166bfcf018822 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Wed, 1 Oct 2014 19:46:29 +0200
Subject: oscar template: add no result message

---
 searx/templates/oscar/messages/no_results.html | 9 +++++++++
 searx/templates/oscar/results.html             | 4 ++++
 2 files changed, 13 insertions(+)
 create mode 100644 searx/templates/oscar/messages/no_results.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html
new file mode 100644
index 000000000..ac3705eb8
--- /dev/null
+++ b/searx/templates/oscar/messages/no_results.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+<div class="alert alert-info fade in" role="alert">
+    <button class="close" data-dismiss="alert" type="button">
+        <span aria-hidden="true">×</span>
+        <span class="sr-only">{{ _('Close') }}</span>
+    </button>
+    <strong class="lead">{{ icon('info-sign') }} {{ _('Sorry!') }}</strong>
+    {{ _('we didn\'t find any results. Please use another query or search in more categories.') }}
+</div>
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 91070777b..6b02dc7bd 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -12,6 +12,10 @@
                 {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
             </div>
             {% endfor %}
+            
+            {% if not results %}
+                {% include 'oscar/messages/no_results.html' %}
+            {% endif %}
 
             <div class="clearfix"></div>
 
-- 
cgit v1.2.3


From 517e57b996aaeceda08afd0e80bfd30ad6192971 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Fri, 3 Oct 2014 13:16:30 +0200
Subject: oscar template: improve result icons

---
 searx/templates/oscar/result_templates/default.html | 4 ++--
 searx/templates/oscar/result_templates/images.html  | 4 ++--
 searx/templates/oscar/result_templates/torrent.html | 4 ++--
 searx/templates/oscar/result_templates/videos.html  | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 2ea246542..3b0963816 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -1,8 +1,8 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
 
 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 48ed5dece..5570a3143 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -7,7 +7,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-                <h4 class="modal-title">{{ result.title|striptags }}</h4>
+                <h4 class="modal-title">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}{{ result.title|striptags }}</h4>
             </div>
             <div class="modal-body">
                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">
@@ -15,7 +15,7 @@
             </div>
             <div class="modal-footer">
                 <span class="label label-default pull-right">{{ result.engine }}</span>
-                <p class="text-muted pull-left">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
+                <p class="text-muted pull-left">{{ result.pretty_url }}</p>
                 <div class="clearfix"></div>
                 <a href="{{ result.img_src }}" class="btn btn-default">{{ _('Get image') }}</a>
                 <a href="{{ result.url }}" class="btn btn-default">{{ _('View source') }}</a>
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
index 14ac63232..903d304eb 100644
--- a/searx/templates/oscar/result_templates/torrent.html
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -1,6 +1,6 @@
 {% from 'oscar/macros.html' import icon %}
 
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
 
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
 
@@ -11,4 +11,4 @@
 {% if result.content %}<p>{{ result.content|safe }}</p>{% endif %}
 
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{ theme }}/img/icon_{{ result['favicon'] }}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
index 32112472e..1a9b60717 100644
--- a/searx/templates/oscar/result_templates/videos.html
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -1,4 +1,4 @@
-<h3><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+<h3>{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
     
 {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.publishedDate }}" pubdate>{{ result.publishedDate }}</time>{% endif %}
     
@@ -8,6 +8,6 @@
         {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8">{{ result.content|safe }}</p>{% endif %}
     </div>
 </div>
-    
+
 <span class="label label-default pull-right">{{ result.engine }}</span>
-<p class="text-muted">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" />{% endif %} {{ result.pretty_url }}</p>
+<p class="text-muted">{{ result.pretty_url }}</p>
-- 
cgit v1.2.3


From c36c935b03cc87ddfcac5ce3ded333be73387a7a Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 5 Oct 2014 15:29:21 +0200
Subject: oscar template: add infobox

---
 searx/templates/oscar/infobox.html | 28 ++++++++++++++++++++++++++++
 searx/templates/oscar/results.html | 14 ++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 searx/templates/oscar/infobox.html

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html
new file mode 100644
index 000000000..541da8ba7
--- /dev/null
+++ b/searx/templates/oscar/infobox.html
@@ -0,0 +1,28 @@
+<div class="panel panel-default infobox">
+    <div class="panel-heading">
+        <h4 class="panel-title">{{ infobox.infobox }}</h4>
+    </div>
+    <div class="panel-body">
+        {% if infobox.img_src %}<img class="img-responsive center-block infobox_part" src="{{ infobox.img_src }}" />{% endif %}
+        {% if infobox.content %}<p class="infobox_part">{{ infobox.content }}</p>{% endif %}
+
+        {% if infobox.attributes %}
+        <table class="table table-striped infobox_part">
+            {% for attribute in infobox.attributes %}
+            <tr>
+                <td>{{ attribute.label }}</td>
+                <td>{{ attribute.value }}</td>
+            </tr>
+            {% endfor %}
+        </table>
+        {% endif %}
+
+        {% if infobox.urls %}
+        <div class="infobox_part">
+            {% for url in infobox.urls %}
+            <p class="btn btn-default btn-xs"><a href="{{ url.url }}">{{ url.title }}</a></p>
+            {% endfor %}
+        </div>
+        {% endif %}
+    </div>
+</div>
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 6b02dc7bd..0bf4914b4 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -47,9 +47,7 @@
             {% if suggestions %}
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#suggestions">{{ _('Suggestions') }}</a>
-                    </h4>
+                    <h4 class="panel-title">{{ _('Suggestions') }}</h4>
                 </div>
                 <div class="panel-body">
                     {% for suggestion in suggestions %}
@@ -64,9 +62,7 @@
 
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <h4 class="panel-title">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#links">{{ _('Links') }}</a>
-                    </h4>
+                    <h4 class="panel-title">{{ _('Links') }}</h4>
                 </div>
                 <div class="panel-body">
                     <form role="form">
@@ -91,6 +87,12 @@
                 </div>
             </div>
         
+        {% if infoboxes %}
+            {% for infobox in infoboxes %}
+                {% include 'oscar/infobox.html' %}
+            {% endfor %}
+        {% endif %}    
+        
         </div><!-- /#sidebar_results -->
     </div>
 {% endblock %}
-- 
cgit v1.2.3


From a697a1eaa56d05e3b95240cc2f6bd8954b378812 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Sun, 26 Oct 2014 19:20:20 +0100
Subject: oscar template: display answers

---
 searx/templates/oscar/results.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
index 0bf4914b4..deda276fa 100644
--- a/searx/templates/oscar/results.html
+++ b/searx/templates/oscar/results.html
@@ -6,6 +6,14 @@
             <h1 class="sr-only">{{ _('Search results') }}</h1>
             {% include 'oscar/search.html' %}
 
+            {% if answers %}
+            {% for answer in answers %}
+            <div class="result well">
+                <span>{{ answer }}</span>
+            </div>
+            {% endfor %}
+            {% endif %}
+
             {% for result in results %}
             <div class="result {% if result['template'] %}result-{{ result.template|replace('.html', '') }}{% else %}result-default{% endif %}">
                 {% set index = loop.index %}
-- 
cgit v1.2.3


From 25312c53e170deb55bd48029e3b76b87692e1911 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 3 Nov 2014 22:18:40 +0100
Subject: [enh] add no-js support

* image results have url, which can be clicked
* preferences full functionable without js
---
 searx/templates/oscar/base.html                    |  6 ++++++
 searx/templates/oscar/preferences.html             | 16 ++++++++++++----
 searx/templates/oscar/result_templates/images.html |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'searx/templates')

diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
index 544820060..a023db415 100644
--- a/searx/templates/oscar/base.html
+++ b/searx/templates/oscar/base.html
@@ -31,6 +31,12 @@
         searx.method = "{{ method or 'POST' }}";
         searx.autocompleter = {% if autocomplete %}true{% else %}false{% endif %};
     </script>
+    <noscript>
+        <style type="text/css">
+            .tab-content > .active_if_nojs {display: block;}
+            .hide_if_nojs {display: none !important;overflow:none !important;}
+        </style>
+    </noscript>
 </head>
 <body>
     <div class="container">
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
index 3d66d1963..2868adecc 100644
--- a/searx/templates/oscar/preferences.html
+++ b/searx/templates/oscar/preferences.html
@@ -7,12 +7,15 @@
     <form method="post" action="{{ url_for('preferences') }}" id="search_form">
 
     <!-- Nav tabs -->
-    <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+    <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
       <li class="active"><a href="#tab_general" role="tab" data-toggle="tab">{{ _('General') }}</a></li>
       <li><a href="#tab_engine" role="tab" data-toggle="tab">{{ _('Engines') }}</a></li>
     </ul>
 
     <!-- Tab panes -->
+    <noscript>
+        <h3>{{ _('General') }}</h3>
+    </noscript>
     <div class="tab-content">
         <div class="tab-pane active" id="tab_general">
             <fieldset>
@@ -83,20 +86,25 @@
             </div>
             </fieldset>
         </div>
-        <div class="tab-pane" id="tab_engine">
+        <div class="tab-pane active_if_nojs" id="tab_engine">
         
             <!-- Nav tabs -->
-            <ul class="nav nav-tabs" role="tablist" style="margin-bottom:20px;">
+            <ul class="nav nav-tabs hide_if_nojs" role="tablist" style="margin-bottom:20px;">
                 {% for (categ,search_engines) in categs %}
                 <li{% if loop.first %} class="active"{% endif %}><a href="#tab_engine_{{ categ|replace(' ', '_') }}" role="tab" data-toggle="tab">{{ _(categ) }}</a></li>
                 {% endfor %}
             </ul>
         
+            <noscript>
+                <h3>{{ _('Engines') }}</h3>
+            </noscript>
         
             <!-- Tab panes -->
             <div class="tab-content">
                 {% for (categ,search_engines) in categs %}
-                <div class="tab-pane{% if loop.first %} active{% endif %}" id="tab_engine_{{ categ|replace(' ', '_') }}">
+                <noscript><label>{{ _(categ) }}</label>
+                </noscript>
+                <div class="tab-pane{% if loop.first %} active{% endif %} active_if_nojs" id="tab_engine_{{ categ|replace(' ', '_') }}">
                     <div class="container-fluid">
                     <fieldset>
                     {% for search_engine in search_engines %}
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 5570a3143..3ad48352a 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -1,4 +1,4 @@
-<a href="#" data-toggle="modal" data-target="#modal-{{ index }}">
+<a href="{{ result.img_src }}" data-toggle="modal" data-target="#modal-{{ index }}">
     <img src="{{ result.img_src }}" alt="{{ result.title|e }}" class="img-thumbnail">
 </a>
 
-- 
cgit v1.2.3