From c21a907cacbbfa8ce8a135362067086063a805f6 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber 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/base.html | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 searx/templates/oscar/base.html (limited to 'searx/templates/oscar/base.html') 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 @@ + + + + + + + + + {% block title %}{% endblock %}searx + + + + + + + + + + {% block styles %} + {% endblock %} + {% block head %} + {% endblock %} + + + + + + +
+ {% include 'oscar/navbar.html' %} + + {% block site_alert_error %} + {% endblock %} + {% block site_alert_warning %} + {% endblock %} + {% block site_alert_warning_nojs %} + + {% endblock %} + + {% block content %} + {% endblock %} + +
+
+
+ {% block footer %} + {% endblock %} +

Powered by Searx - a privacy-respecting, hackable metasearch engine

+
+
+ + + + -- cgit v1.2.3 From 25919de6084599c3196622ed1c89648b2c11f78a Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Fri, 26 Sep 2014 22:43:54 +0200 Subject: oscar template: make the categories clickable --- searx/templates/oscar/base.html | 1 + 1 file changed, 1 insertion(+) (limited to 'searx/templates/oscar/base.html') 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 @@ + -- cgit v1.2.3 From ef1ead9c4bfb6a68cc6c0f8727c4af8d99206eb8 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber 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 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'searx/templates/oscar/base.html') 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 %} {% endblock %} + {% block site_alert_info %} + {% endblock %} + {% block site_alert_success %} + {% endblock %} {% block content %} {% endblock %} -- cgit v1.2.3 From 14b0604bc0a14a110c92457f43b3828fc22e7fc7 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber 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/oscar/base.html') 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 @@ {% block title %}{% endblock %}searx + {% if autocomplete %}{% endif %} @@ -28,6 +29,7 @@ @@ -62,6 +64,7 @@ + {% if autocomplete %}{% endif %} -- cgit v1.2.3 From f4457da0a171d45b8be6b9b2bc24f15b6bf4b337 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber 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/oscar/base.html') 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 @@ {% if autocomplete %}{% endif %} - + -- cgit v1.2.3 From 451586f09f819c5a099eac7389522acd8a554466 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber Date: Mon, 29 Sep 2014 16:31:32 +0200 Subject: oscar template: update translation files --- searx/templates/oscar/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'searx/templates/oscar/base.html') 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 @@
{% block footer %} {% endblock %} -

Powered by Searx - a privacy-respecting, hackable metasearch engine

+

{{ _('Powered by') }} Searx - {{ _('a privacy-respecting, hackable metasearch engine') }}

-- cgit v1.2.3 From 25312c53e170deb55bd48029e3b76b87692e1911 Mon Sep 17 00:00:00 2001 From: Thomas Pointhuber 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 ++++++ 1 file changed, 6 insertions(+) (limited to 'searx/templates/oscar/base.html') 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 %}; +
-- cgit v1.2.3