[enh] remove repeating codeparts inside the oscar template

7 files changed, 48 insertions, 47 deletions

diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
index f61de2015..1dc696341 100644
--- a/searx/templates/oscar/macros.html
+++ b/searx/templates/oscar/macros.html
@@ -1,3 +1,28 @@
+<!-- Draw glyphicon icon from bootstrap-theme -->

 {% macro icon(action) -%}

     <span class="glyphicon glyphicon-{{ action }}"></span>

 {%- endmacro %}

+

+<!-- Draw favicon -->

+<!-- TODO: using url_for methode -->

+{% macro draw_favicon(favicon) -%}

+    <img width="32" height="32" class="favicon" src="static/oscar/img/icons/{{ favicon }}.png" alt="{{ favicon }}" />

+{%- endmacro %}

+

+<!-- Draw result header -->

+{% macro result_header(result) -%}

+    <h4 class="result_header">{% if result.favicon %}{{ draw_favicon(result.favicon) }} {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

+{%- endmacro %}

+

+<!-- Draw result sub header -->

+{% macro result_sub_header(result) -%}

+    {% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

+    <small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{%- endmacro %}

+

+<!-- Draw result footer -->

+{% macro result_footer(result) -%}

+    <div class="clearfix"></div>

+    <span class="label label-default pull-right">{{ result.engine }}</span>

+    <p class="text-muted">{{ result.pretty_url }}</p>

+{%- endmacro %}

diff --git a/searx/templates/oscar/result_templates/code.html b/searx/templates/oscar/result_templates/code.html
index d9079a464..236834d0a 100644
--- a/searx/templates/oscar/result_templates/code.html
+++ b/searx/templates/oscar/result_templates/code.html
@@ -1,9 +1,7 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}

 

-<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result) }}

+{{ result_sub_header(result) }}

 

 {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

 

@@ -11,7 +9,4 @@
 

 {{ result.codelines|code_highlighter(result.code_language)|safe }}

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}

diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
index 0f090d862..bc967f01e 100644
--- a/searx/templates/oscar/result_templates/default.html
+++ b/searx/templates/oscar/result_templates/default.html
@@ -1,13 +1,8 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %}

 

-<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result) }}

+{{ result_sub_header(result) }}

 

 {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}

diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
index 7689f9f58..69c2e6fff 100644
--- a/searx/templates/oscar/result_templates/images.html
+++ b/searx/templates/oscar/result_templates/images.html
@@ -1,3 +1,5 @@
+{% from 'oscar/macros.html' import draw_favicon %}

+

 <a href="{{ result.img_src }}" data-toggle="modal" data-target="#modal-{{ index }}">

     <img src="{{ result.img_src }}" alt="{{ result.title|striptags }}" title="{{ result.title|striptags }}" class="img-thumbnail">

 </a>

@@ -7,7 +9,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">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}{{ result.title|striptags }}</h4>

+                <h4 class="modal-title">{% if result['favicon'] %}{{ draw_favicon(result['favicon']) }} {% endif %}{{ result.title|striptags }}</h4>

             </div>

             <div class="modal-body">

                 <img class="img-responsive center-block" src="{{ result.img_src }}" alt="{{ result.title }}">

diff --git a/searx/templates/oscar/result_templates/map.html b/searx/templates/oscar/result_templates/map.html
index 343e713c8..6dfee52ba 100644
--- a/searx/templates/oscar/result_templates/map.html
+++ b/searx/templates/oscar/result_templates/map.html
@@ -1,10 +1,7 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}

 

-<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.pretty_url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result) }}

+{{ result_sub_header(result) }}

 

 {% if (result.latitude and result.longitude) or result.boundingbox %}

     <small> &bull; <a class="text-info btn-collapse collapsed searx_init_map cursor-pointer" data-toggle="collapse" data-target="#result-map-{{ index }}" data-leaflet-target="osm-map-{{ index }}" data-map-lon="{{ result.longitude }}" data-map-lat="{{ result.latitude }}" {% if result.boundingbox %}data-map-boundingbox='{{ result.boundingbox|tojson|safe }}'{% endif %} {% if result.geojson %}data-map-geojson='{{ result.geojson|tojson|safe }}'{% endif %} data-btn-text-collapsed="{{ _('show map') }}" data-btn-text-not-collapsed="{{ _('hide map') }}">{{ icon('globe') }} {{ _('show map') }}</a></small>

@@ -68,7 +65,4 @@
     </div>

 {% endif %}

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}

diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
index 1e133e3c4..da745c7ab 100644
--- a/searx/templates/oscar/result_templates/torrent.html
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -1,9 +1,7 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer, icon %}

 

-<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result) }}

+{{ result_sub_header(result) }}

 

 <p class="result-content">{{ icon('transfer') }} {{ _('Seeder') }} <span class="badge">{{ result.seed }}</span>, {{ _('Leecher') }} <span class="badge">{{ result.leech }}</span>

 <br/>

@@ -11,7 +9,4 @@
 

 {% if result.content %}<p class="result-content">{{ result.content|safe }}</p>{% endif %}

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}

diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
index 06275b86a..83d065e4c 100644
--- a/searx/templates/oscar/result_templates/videos.html
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -1,9 +1,7 @@
-{% from 'oscar/macros.html' import icon %}

+{% from 'oscar/macros.html' import result_header, result_sub_header, result_footer %}

 

-<h4 class="result_header">{% if result['favicon'] %}<img width="32" height="32" class="favicon" src="static/{{ theme }}/img/icons/{{ result['favicon'] }}.png" alt="{{ result['favicon'] }}" /> {% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h4>

-    

-{% if result.publishedDate %}<time class="text-muted" datetime="{{ result.pubdate }}" >{{ result.publishedDate }}</time>{% endif %}

-<small><a class="text-info" href="https://web.archive.org/web/{{ result.url }}">{{ icon('link') }} {{ _('cached') }}</a></small>

+{{ result_header(result) }}

+{{ result_sub_header(result) }}

 

 <div class="container-fluid">

     <div class="row">

@@ -12,7 +10,4 @@
     </div>

 </div>

 

-<div class="clearfix"></div>

-

-<span class="label label-default pull-right">{{ result.engine }}</span>

-<p class="text-muted">{{ result.pretty_url }}</p>

+{{ result_footer(result) }}