From a71b326d9e210da2d4ed67fade819c0433fb95d3 Mon Sep 17 00:00:00 2001 From: dalf Date: Sun, 26 Oct 2014 11:14:05 +0100 Subject: [mod] default template modifications - more smartphone friendly - more text browser friendly - next button always on the right - in case of small screen supporting touch event, categories are displayed on one line with a scroll --- searx/templates/default/base.html | 8 ++++---- searx/templates/default/categories.html | 8 +++++--- searx/templates/default/index.html | 3 ++- searx/templates/default/infobox.html | 2 +- searx/templates/default/result_templates/default.html | 11 ++--------- searx/templates/default/result_templates/videos.html | 8 ++------ searx/templates/default/results.html | 6 ++++-- searx/templates/default/search.html | 2 +- 8 files changed, 21 insertions(+), 27 deletions(-) (limited to 'searx/templates/default') diff --git a/searx/templates/default/base.html b/searx/templates/default/base.html index da5ae905f..c231bf8cc 100644 --- a/searx/templates/default/base.html +++ b/searx/templates/default/base.html @@ -13,10 +13,6 @@ {% block head %} {% endblock %} -
@@ -26,6 +22,10 @@ {% endif %} +
diff --git a/searx/templates/default/categories.html b/searx/templates/default/categories.html index 57e63c85d..341e234a3 100644 --- a/searx/templates/default/categories.html +++ b/searx/templates/default/categories.html @@ -1,7 +1,9 @@
+
{% for category in categories %} -
- -
+
+ +
{% endfor %} +
diff --git a/searx/templates/default/index.html b/searx/templates/default/index.html index b4f55608b..72fbec8ca 100644 --- a/searx/templates/default/index.html +++ b/searx/templates/default/index.html @@ -1,6 +1,5 @@ {% extends "default/base.html" %} {% block content %} -{% include 'default/github_ribbon.html' %}

searx

{% include 'default/search.html' %} @@ -9,4 +8,6 @@ {{ _('preferences') }}

+{% include 'default/github_ribbon.html' %} {% endblock %} + diff --git a/searx/templates/default/infobox.html b/searx/templates/default/infobox.html index f963e898c..d03b008f9 100644 --- a/searx/templates/default/infobox.html +++ b/searx/templates/default/infobox.html @@ -2,7 +2,7 @@

{{ infobox.infobox }}

{% if infobox.img_src %}{% endif %}

{{ infobox.entity }}

-

{{ infobox.content }}

+

{{ infobox.content | safe }}

{% if infobox.attributes %}
diff --git a/searx/templates/default/result_templates/default.html b/searx/templates/default/result_templates/default.html index 78221aa01..d0e725ac5 100644 --- a/searx/templates/default/result_templates/default.html +++ b/searx/templates/default/result_templates/default.html @@ -1,13 +1,6 @@
- - {% if result['favicon'] %} - - {% endif %} - -
-

{{ result.title|safe }}

+

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

{{ result.pretty_url }} cached

- {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} + {% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %}

{% if result.img_src %}{% endif %}{% if result.content %}{{ result.content|safe }}
{% endif %}

-
diff --git a/searx/templates/default/result_templates/videos.html b/searx/templates/default/result_templates/videos.html index 8ceb0b180..233a6c021 100644 --- a/searx/templates/default/result_templates/videos.html +++ b/searx/templates/default/result_templates/videos.html @@ -1,12 +1,8 @@
- {% if result['favicon'] %} - - {% endif %} -

-

{{ result.title|safe }}

+

{% if result['favicon'] %}{% endif %}{{ result.title|safe }}

{% if result.publishedDate %}

{{ result.publishedDate }}

{% endif %} - {{ result.title }} + {{ result.title }}

{{ result.url }}

diff --git a/searx/templates/default/results.html b/searx/templates/default/results.html index b66d6e2af..541983532 100644 --- a/searx/templates/default/results.html +++ b/searx/templates/default/results.html @@ -1,7 +1,7 @@ {% extends "default/base.html" %} {% block title %}{{ q }} - {% endblock %} {% block content %} -
preferences
+
preferences
{% include 'default/search.html' %}
@@ -80,7 +80,7 @@ {% endif %} -
+
{% for category in selected_categories %} {% endfor %} @@ -89,6 +89,8 @@
+ +
{% endif %} diff --git a/searx/templates/default/search.html b/searx/templates/default/search.html index 8a9965582..75cfa41d6 100644 --- a/searx/templates/default/search.html +++ b/searx/templates/default/search.html @@ -1,6 +1,6 @@
- +
{% include 'default/categories.html' %} -- cgit v1.2.3