From 603303560aa9f17cef1f531637b5c0dec5ddcd8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Thu, 10 Dec 2020 11:56:44 +0100
Subject: [PATCH] chg: shorten_string can return a div with title

---
 website/web/templates/index.html   |  2 +-
 website/web/templates/macros.html  | 11 ++++++++++-
 website/web/templates/modules.html | 13 +++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/website/web/templates/index.html b/website/web/templates/index.html
index 1f355043..a00c7e50 100644
--- a/website/web/templates/index.html
+++ b/website/web/templates/index.html
@@ -64,7 +64,7 @@ $(document).ready(function () {
       <tr>
         <td>
           <p title="{{ page_title }}"><a href="{{ url_for('tree', tree_uuid=uuid) }}">{{ page_title }}</a></p>
-          <p title="{{ url }}">{{ shorten_string(url, 150) }}</p>
+          {{ shorten_string(url, 50, with_title=True) }}
         </td>
         <td>{{ datetime }}</td>
         <td>
diff --git a/website/web/templates/macros.html b/website/web/templates/macros.html
index e84d06e8..be2ef023 100644
--- a/website/web/templates/macros.html
+++ b/website/web/templates/macros.html
@@ -281,10 +281,19 @@
 </div>
 {% endmacro %}
 
-{% macro shorten_string(string, cut_length) %}
+{% macro shorten_string(string, cut_length, with_title=False) %}
+{% if with_title %}
+<div title={{string}}>
+{%endif%}
+
 {% if string|length > cut_length %}
   {{ string[:cut_length] }} [...]
 {% else %}
   {{ string }}
 {%endif%}
+
+{% if with_title %}
+</div>
+{%endif%}
+
 {% endmacro %}
diff --git a/website/web/templates/modules.html b/website/web/templates/modules.html
index 19c8f0a5..712c74c8 100644
--- a/website/web/templates/modules.html
+++ b/website/web/templates/modules.html
@@ -1,9 +1,15 @@
+{% from "macros.html" import shorten_string %}
+
 <div>
 {% if vt %}
     <center><h1 class="display-4">Virus Total</h1></center>
     {% for url, entries in vt.items() %}
         <div class="border-top my-3"></div>
-        <center><h3><small class="text-muted">URL</small><br>{{ url }}</h3></center>
+        <center>
+          <h3><small class="text-muted">URL</small>
+            {{ shorten_string(url, 50, with_title=True) }}
+          </h3>
+        </center>
         {% if entries['malicious'] %}
             <center>
             <p class="lead">Detected as malicious by the following vendors</p>
@@ -23,7 +29,10 @@
 {% if pi%}
   <center><h1 class="display-4">Phishing Initiative</h1></center>
   {% for url, tag in pi.items() %}
-    <center><h3><small class="text-muted">URL</small><br>{{ url }}</h3>
+    <center>
+      <h3><small class="text-muted">URL</small>
+        {{ shorten_string(url, 50, with_title=True) }}
+      </h3>
       <div>This URL is tagged as <b>{{ tag }}</b> on Phishing Initiative</div>
     </center>
   {% endfor %}