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

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

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/stats.html | 9 +++++++++
 1 file changed, 9 insertions(+)

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

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/oscar/stats.html')

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 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/stats.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

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