Merge pull request #176 from Cqoicebordel/courgette-UXUI

Courgette theme - UIUX

6 files changed, 45 insertions, 39 deletions

diff --git a/searx/templates/courgette/result_templates/code.html b/searx/templates/courgette/result_templates/code.html
index 616b7ea62..444366b85 100644
--- a/searx/templates/courgette/result_templates/code.html
+++ b/searx/templates/courgette/result_templates/code.html
@@ -1,9 +1,9 @@
 <div class="result {{ result.class }}">

-    <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

-    <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>

-    {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}

+    <h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>

+    {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}

     <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>

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

-

+    {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}

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

-</div>

+

+    <p class="url">{{ result.pretty_url }}</p>

+</div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/default.html b/searx/templates/courgette/result_templates/default.html
index 710b0a8e7..efd9778dc 100644
--- a/searx/templates/courgette/result_templates/default.html
+++ b/searx/templates/courgette/result_templates/default.html
@@ -1,13 +1,13 @@
 <div class="result {{ result.class }}">
 
-  {% if "icon_"~result.engine~".ico" in favicons %}
+    {% if "icon_"~result.engine~".ico" in favicons %}
     <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
-  {% endif %}
+    {% endif %}
 
-  <div>
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
-    <p class="url">{{ result.pretty_url }}</p>
-  </div>
-</div>
+    <div>
+        <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+        {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
+        <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+        <p class="url">{{ result.pretty_url }}</p>
+    </div>
+</div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/images.html b/searx/templates/courgette/result_templates/images.html
index ebda5380b..0ff887101 100644
--- a/searx/templates/courgette/result_templates/images.html
+++ b/searx/templates/courgette/result_templates/images.html
@@ -1,6 +1,6 @@
 <div class="image_result">
     <p>
         <a href="{{ result.img_src }}"><img src="{{ result.img_src }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
-        <span class="url"><a href="{{ result.url }}" class="small_font">original context</a></span>
+        <span class="url"><a href="{{ result.url }}" class="small_font">{{ _('original context') }}</a></span>
     </p>
-</div>
+</div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/map.html b/searx/templates/courgette/result_templates/map.html
index 4919954e0..efd9778dc 100644
--- a/searx/templates/courgette/result_templates/map.html
+++ b/searx/templates/courgette/result_templates/map.html
@@ -1,13 +1,13 @@
 <div class="result {{ result.class }}">
 
-  {% if "icon_"~result.engine~".ico" in favicons %}
-  <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
-  {% endif %}
+    {% if "icon_"~result.engine~".ico" in favicons %}
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
+    {% endif %}
 
-  <div>
-    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-	{% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-    <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
-    <p class="url">{{ result.pretty_url }}</p>
-  </div>
-</div>
+    <div>
+        <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+        {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
+        <p class="content">{% if result.content %}{{ result.content|safe }}<br />{% endif %}</p>
+        <p class="url">{{ result.pretty_url }}</p>
+    </div>
+</div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/torrent.html b/searx/templates/courgette/result_templates/torrent.html
index 6c62793a5..607c1de02 100644
--- a/searx/templates/courgette/result_templates/torrent.html
+++ b/searx/templates/courgette/result_templates/torrent.html
@@ -1,7 +1,13 @@
 <div class="result torrent_result">
+    {% if "icon_"~result.engine~".ico" in favicons %}
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
+    {% endif %}
     <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-    {% if result.content %}<p class="content">{{ result.content|safe }}</p>{% endif %}
-    <p class="stats">Seed: {{ result.seed }}, Leech: {{ result.leech }}</p>
-    <p><a href="{{ result.magnetlink }}" class="magnetlink">magnet link</a></p>
+    {% if result.content %}<span class="content">{{ result.content|safe }}</span><br />{% endif %}
+    <span class="stats">{{ _('Seeder') }} : {{ result.seed }}, {{ _('Leecher') }} : {{ result.leech }}</span><br />
+    <span>
+        {% if result.magnetlink %}<a href="{{ result.magnetlink }}" class="magnetlink">{{ _('magnet link') }}</a>{% endif %} 
+        {% if result.torrentfile %}<a href="{{ result.torrentfile }}" class="torrentfile">{{ _('torrent file') }}</a>{% endif %}
+    </span>
     <p class="url">{{ result.pretty_url }}</p>
-</div>
+</div>
\ No newline at end of file
diff --git a/searx/templates/courgette/result_templates/videos.html b/searx/templates/courgette/result_templates/videos.html
index bb711caab..ebb7af4e4 100644
--- a/searx/templates/courgette/result_templates/videos.html
+++ b/searx/templates/courgette/result_templates/videos.html
@@ -1,10 +1,10 @@
 <div class="result">
-  {% if "icon_"~result.engine~".ico" in favicons %}
-      <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
-  {% endif %}
+	{% if "icon_"~result.engine~".ico" in favicons %}
+    <img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />
+	{% endif %}
 
-      <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
-      {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
-      <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
-      <p class="url">{{ result.url }}</p>
-</div>
+    <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
+    {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
+    <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
+    <p class="url">{{ result.pretty_url }}</p>
+</div>
\ No newline at end of file