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/index.html | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 searx/templates/oscar/index.html

(limited to 'searx/templates/oscar/index.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 %}
-- 
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 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'searx/templates/oscar/index.html')

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 %}
-- 
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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'searx/templates/oscar/index.html')

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>
-- 
cgit v1.2.3