From b77d850b9d887bf23cd8f2dc13406a7b3a2197b2 Mon Sep 17 00:00:00 2001
From: AntoniaBK <antonia@cookfirst.de>
Date: Tue, 23 Apr 2024 12:00:13 +0200
Subject: [PATCH] Reposisioning and tooltips

---
 website/web/static/tree.css     |  42 ++---
 website/web/templates/tree.html | 320 ++++++++++++++++++--------------
 2 files changed, 194 insertions(+), 168 deletions(-)

diff --git a/website/web/static/tree.css b/website/web/static/tree.css
index 6d64387..706ca4b 100644
--- a/website/web/static/tree.css
+++ b/website/web/static/tree.css
@@ -65,20 +65,14 @@ hr {
   left: 5px;
   background: white;
   border: 2px solid;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
 
 #menu_container_vertical {
   position: fixed;
   top: 5px;
   left: 5px;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
 
 #menu_container_vertical .menu-header {
@@ -91,14 +85,13 @@ hr {
     padding: 10px 0;
 }
 
+
 #menu_container_vertical ul li a {
     padding: 5px;
     font-size: 1.1em;
     display: block;
 }
 
-#menu_container_vertical ul li a:hover {
-}
 
 /* menu horizontal */
 #menu_horizontal {
@@ -115,18 +108,16 @@ hr {
   left: 5px;
   left: 217px;
   padding: 5px;
+  width: 80%;
 }
 
 .hstack{
   height: 106.6px;
 }
 
-#menu_container_horizontal .container {
-  width: 80%;
-}
 
 #menu_container_horizontal ul.components {
-    padding: 5px;
+  padding: 5px;
 }
 
 #menu_container_horizontal ul li a {
@@ -150,7 +141,7 @@ hr {
   cursor: pointer;
   width: 180px;
   text-align: center;
-  height: 40px;
+  height: 50px;
 }
 
 /* Dropdown button on hover & focus */
@@ -182,14 +173,11 @@ hr {
   display: block;
 }
 
-.dropdown-content.show {
-  display: block;
-}
 
 /* Change color of dropdown links on hover */
 .dropdown-content a:hover {background-color: #f1f1f1;}
 
-/* Show the dropdown menu on hover */
+/* Show the dropdown menus on hover */
 #capture-menu:hover #capture-menu-content {
   display: block;
 }
@@ -202,10 +190,8 @@ hr {
 #admin-menu:hover #admin-menu-content {
   display: block;
 }
-
-/* Change the background color of the dropdown button when the dropdown content is shown */
-.dropdown:hover .dropbtn {
-  background-color: #2980b9;
+#extra-menu:hover #extra-menu-content {
+  display: block;
 }
 
 
@@ -214,10 +200,7 @@ hr {
   position: fixed;
   bottom: 5px;
   right: 5px;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
 
 #legend {
@@ -226,8 +209,5 @@ hr {
   right: 5px;
   background: white;
   border: 2px solid;
-  padding-top: 5px;
-  padding-right: 5px;
-  padding-bottom: 5px;
-  padding-left: 5px;
+  padding: 5px;
 }
\ No newline at end of file
diff --git a/website/web/templates/tree.html b/website/web/templates/tree.html
index 0f2efdb..401d033 100644
--- a/website/web/templates/tree.html
+++ b/website/web/templates/tree.html
@@ -248,103 +248,39 @@
       </a>
     </div>
     <hr/>
-    <div class="mx-auto" style="text-align: center">
-        <b>Legend</b>
-        <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#menu_vertical_content">
-            <span class="if-collapsed">
-                <img src="{{ url_for('static', filename='up.jpg') }}" class="arrow-down" alt="Maximize menu" height="25" width="25" title="Expand">
-            </span>
-            <span class="if-not-collapsed">
-                <img src="{{ url_for('static', filename='up.jpg') }}" alt="Minimize menu" height="25" width="25" title="Collapse">
-            </span>
-        </button>
+    <div class="mx-auto" style="width: 52px;">
+      <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#menu_vertical_content">
+          <span class="if-collapsed">
+            <img src="{{ url_for('static', filename='up.jpg') }}" class="arrow-down" alt="Maximize menu" height="25" width="25" title="Expand">
+          </span>
+          <span class="if-not-collapsed">
+            <img src="{{ url_for('static', filename='up.jpg') }}" alt="Minimize menu" height="25" width="25" title="Collapse">
+          </span>
+      </button>
     </div>
-
+    <hr/>
     <div id=menu_vertical_content class="collapse show">
-        <hr/>
-        <div title="The node contains at least one insecure (not HTTPS) request">
-            <img src="{{ url_for('static', filename='insecure.svg') }}" alt="Insecure requests"
-                height="20" width="20"> Unencrypted requests
-        </div>
-
-        <div title="This node contains only empty responses">
-            <img src="{{ url_for('static', filename='empty.svg') }}" alt="Empty responses"
-                height="20" width="20"> Empty responses
-        </div>
-      <div title="Number of cookies received in the responses of this node">
-        <img src="{{ url_for('static', filename='cookie_received.png') }}" alt="Cookie received"
-             height="20" width="20"> Cookie received
-      </div>
-      
-      <div title="Number of cookies sent in the requests of this node">
-        <img src="{{ url_for('static', filename='cookie_read.png') }}" alt="Cookie read"
-             height="20" width="20"> Cookie read
-      </div>
-
-      <div title="Number of redirects initiated by the responses of this node">
-        <img src="{{ url_for('static', filename='redirect.png') }}" alt="Redirect"
-             height="20" width="20"> Redirect
-      </div>
-
-      <div title="Number of resources loaded from iFrames in the responses in this node">
-        <img src="{{ url_for('static', filename='ifr.png') }}" alt="iFrame"
-            height="20" width="20"> iFrame
-      </div>
-
-      <div title="Number of JavaScript in the responses in this node">
-        <img src="{{ url_for('static', filename='javascript.png') }}" alt="JavaScript"
-             height="20" width="20"> Javascript
-      </div>
-
-      <div title="Number of fonts in the responses in this node">
-        <img src="{{ url_for('static', filename='font.png') }}" alt="Font"
-             height="20" width="20"> Font
-      </div>
-
-      <div title="Number of HTML in the responses in this node">
-        <img src="{{ url_for('static', filename='html.png') }}" alt="HTML"
-             height="20" width="20"> HTML
-      </div>
-
-      <div title="Number of JSON in the responses in this node">
-        <img src="{{ url_for('static', filename='json.png') }}" alt="JSON"
-             height="20" width="20"> JSON
-      </div>
-
-      <div title="Number of CSS in the responses in this node">
-        <img src="{{ url_for('static', filename='css.png') }}" alt="CSS"
-             height="20" width="20"> CSS
-      </div>
-
-      <div title="Number of executables in the responses in this node">
-        <img src="{{ url_for('static', filename='exe.png') }}" alt="EXE"
-            height="20" width="20"> EXE
-      </div>
-
-      <div title="Number of images in the responses in this node">
-        <img src="{{ url_for('static', filename='img.png') }}" alt="Image"
-            height="20" width="20"> Image
-      </div>
-
-      <div title="Number of videos in the responses in this node">
-        <img src="{{ url_for('static', filename='video.png') }}" alt="Video"
-            height="20" width="20"> Video
-      </div>
-
-      <div title="Number of unknown resources in the responses in this node">
-        <img src="{{ url_for('static', filename='wtf.png') }}" alt="Content type not set/unknown"
-            height="20" width="20"> Unknown content
-        </div>
-
-      <div title="The node contains a downloaded file">
-        <img src="{{ url_for('static', filename='download.png') }}" alt="Contains a downloaded file"
-            height="20" width="20"> Downloaded file
-
+        <ul class="list-group list-group-flush">
+          <li class="list-group-item">
+            <a href="{{ url_for('capture_web') }}" role="button">New capture</a>
+          </li>
+          {% if enable_monitoring %}
+          <li class="list-group-item">
+            <a href="#monitoringModal" data-bs-toggle="modal" data-bs-target="#monitoringModal" role="button" class="btn btn-outline-info">Monitor capture</a>
+          </li>
+          {% endif %}
+          {% if enable_mail_notification %}
+          <li class="list-group-item">
+            <a href="#emailModal" data-bs-toggle="modal" data-bs-target="#emailModal" role="button" class="btn btn-outline-danger">Report suspicious</br>capture</a>
+          </li>
+          {% endif %}
+        </ul>
       </div>
     </div>
   </div>
 </div>
 
+
 <div id="menu_container_horizontal" class="tree-panel-container">
   <div id=menu_horizontal class="d-flex">
     <div class="flex-shrink-1 align-self-center">
@@ -360,14 +296,18 @@
     <div id="menu_horizontal_content" class="collapse show flex-grow-1 ms-3 container">
         <div class="hstack gap-3">
           <div class="vr"></div>
+
           <div id="capture-menu" class="dropdown">
               <button class="dropbtn">Capture</button>
               <div id="capture-menu-content" class="dropdown-content">
-                <a href="#detailsModal" data-bs-toggle="modal" data-bs-target="#detailsModal" role="button">Capture Details</a>
-                <a href="#statsModal" data-remote="{{ url_for('stats', tree_uuid=tree_uuid) }}"
-                       data-bs-toggle="modal" data-bs-target="#statsModal" role="button">Statistics</a>
-                <a href="#screenshotModal" data-bs-toggle="modal"
-                       data-bs-target="#screenshotModal" role="button">Page Screenshot</a>
+                <a href="#detailsModal" data-bs-toggle="modal" data-bs-target="#detailsModal"
+                    role="button" title="Details about the capture configuration">Capture Details</a>
+
+                <a href="#statsModal" data-remote="{{ url_for('stats', tree_uuid=tree_uuid) }}" data-bs-toggle="modal" 
+                    data-bs-target="#statsModal" role="button" title="The capture in numbers">Statistics</a>
+
+                <a href="#screenshotModal" data-bs-toggle="modal" data-bs-target="#screenshotModal" 
+                    role="button" title="Contains the URL rendered in the browser">Page Screenshot</a>
               </div>
           </div>
 
@@ -375,19 +315,32 @@
             <button class="dropbtn">Analytical Tools</button>
             <div id="tools-menu-content" class="dropdown-content">
               <a href="#modulesModal" data-remote="{{ url_for('trigger_modules', tree_uuid=tree_uuid, force=False) }}"
-                    data-bs-toggle="modal" data-bs-target="#modulesModal" role="button">Third Party Reports</a>
+                  data-bs-toggle="modal" data-bs-target="#modulesModal" role="button"
+                  title="Lookups from supported 3rd party services">Third Party Reports</a>
+
               <a href="#historyModal" data-remote="{{ url_for('historical_lookups', tree_uuid=tree_uuid, force=False) }}"
-                    data-bs-toggle="modal" data-bs-target="#historyModal" role="button">Historical lookups</a>
+                  data-bs-toggle="modal" data-bs-target="#historyModal" role="button"
+                  title="Historical data and context about this capture ">Historical lookups</a>
+
               <a href="#hashlookupModal" data-remote="{{ url_for('hashlookup', tree_uuid=tree_uuid) }}"
-                    data-bs-toggle="modal" data-bs-target="#hashlookupModal" role="button">Hashlookup hits</a>
+                  data-bs-toggle="modal" data-bs-target="#hashlookupModal" role="button"
+                  title="Hits in Hashlookup ">Hashlookup hits</a>
+
               <a href="#bodyHashesModal" data-remote="{{ url_for('tree_body_hashes', tree_uuid=tree_uuid) }}"
-                  data-bs-toggle="modal" data-bs-target="#bodyHashesModal" role="button">Ressources Capture</a>
+                  data-bs-toggle="modal" data-bs-target="#bodyHashesModal" role="button"
+                  title="All ressources contained in the tree">Ressources Capture</a>
+
               <a href="#faviconsModal" data-remote="{{ url_for('tree_favicons', tree_uuid=tree_uuid) }}"
-                  data-bs-toggle="modal" data-bs-target="#faviconsModal" role="button">Favicons Capture</a>
+                  data-bs-toggle="modal" data-bs-target="#faviconsModal" role="button"
+                  title="Favicons found on the rendered page">Favicons Capture</a>
+
               <a href="#captureHashesTypesModal" data-remote="{{ url_for('tree_capture_hashes_types', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#captureHashesTypesModal" role="button">Capture hashes types</a>
+                  data-bs-toggle="modal" data-bs-target="#captureHashesTypesModal" role="button"
+                  title="Compare hashes of the rendered page">Capture hashes types</a>
+
               <a href="#identifiersModal" data-remote="{{ url_for('tree_identifiers', tree_uuid=tree_uuid) }}"
-                 data-bs-toggle="modal" data-bs-target="#identifiersModal" role="button">Identifiers Capture</a>
+                  data-bs-toggle="modal" data-bs-target="#identifiersModal" role="button"
+                  title="Identifiers found on the rendered page">Identifiers Capture</a>
             </div>
           </div>
 
@@ -395,14 +348,18 @@
             <button class="dropbtn">Actions</button>
             <div id="actions-menu-content" class="dropdown-content">
               <a href="#urlsInPageModal" data-remote="{{ url_for('urls_rendered_page', tree_uuid=tree_uuid) }}"
-                  data-bs-toggle="modal" data-bs-target="#urlsInPageModal" role="button">Subsequent Captures</a>
-              <a href="{{ url_for('recapture', tree_uuid=tree_uuid) }}" role="button">Re-Capture</a>
-                <a href="#downloadModal" data-bs-toggle="modal"
-                  data-bs-target="#downloadModal" role="button">Download elements</a>
+                  data-bs-toggle="modal" data-bs-target="#urlsInPageModal" role="button"
+                  title="Start a capture from one of the URLs rendered in the page">Subsequent Captures</a>
+
+              <a href="{{ url_for('recapture', tree_uuid=tree_uuid) }}" role="button"
+                  title="Submit the URL again">Re-Capture</a>
+
+              <a href="#downloadModal" data-bs-toggle="modal" data-bs-target="#downloadModal" role="button"
+                  title="Download specific elements of the capture">Download elements</a>
             </div>
           </div>
-          {% if current_user.is_authenticated %}
 
+          {% if current_user.is_authenticated %}
             <div id="admin-menu" class="dropdown">
               <button class="dropbtn">Admin only</button>
               <div id="admin-menu-content" class="dropdown-content">
@@ -423,35 +380,21 @@
           {% endif %}
 
           {%if enable_categorization or enable_bookmark or enable_context_by_users %}
-          <div class="vr"></div>
-          <div class="col-md">
-            <ul class="list-group list-group-flush">
-              {% if enable_categorization %}
-              <li class="list-group-item">
-                <a href="#categoriesModal" data-remote="{{ url_for('categories_capture', tree_uuid=tree_uuid) }}"
-                  data-bs-toggle="modal" data-bs-target="#categoriesModal" role="button">Manage categories</a>
-              </li>
-              {% endif %}
-              {% if enable_bookmark %}
-              <li class="list-group-item">
-                <a href="#/" role="button" onclick="UnbookmarkAllNodes();">Unbookmark all nodes</a>
-              </li>
-              {% endif %}
-              {% if enable_context_by_users %}
-              <li class="list-group-item">
-                <a href="#/" role="button" onclick="MarkAsKnown('{{ tree_uuid }}');">Mark all the captures' entries as known</a>
-              </li>
-              {% endif %}
-            </ul>
-          </div>
-          {% endif %}
-
-          {% if enable_monitoring %}
-          <a href="#monitoringModal" data-bs-toggle="modal" data-bs-target="#monitoringModal" role="button" class="btn btn-outline-info" title="Take regularily captures of the URL">Monitor capture</a>
-          {% endif %}
-
-          {% if enable_mail_notification %}
-          <a href="#emailModal" data-bs-toggle="modal" data-bs-target="#emailModal" role="button" class="btn btn-outline-danger">Report suspicious</br>capture</a>
+            <div id="extra-menu" class="dropdown">
+              <button class="dropbtn">Extras</button>
+              <div id="extra-menu-content" class="dropdown-content">
+                {% if enable_categorization %}
+                    <a href="#categoriesModal" data-remote="{{ url_for('categories_capture', tree_uuid=tree_uuid) }}"
+                    data-bs-toggle="modal" data-bs-target="#categoriesModal" role="button">Manage categories</a>
+                {% endif %}
+                {% if enable_bookmark %}
+                    <a href="#/" role="button" onclick="UnbookmarkAllNodes();">Unbookmark all nodes</a>
+                {% endif %}
+                {% if enable_context_by_users %}
+                    <a href="#/" role="button" onclick="MarkAsKnown('{{ tree_uuid }}');">Mark all the captures' entries as known</a>
+                {% endif %}
+              </div>
+            </div>
           {% endif %}
 
           <a id="help" href="https://www.lookyloo.eu/docs/main/usage.html#_investigate_a_capture" role="button" title="Lookyloo Manual">?</a>
@@ -461,6 +404,109 @@
   </div>
 </div>
 
+<div id="legend_container" class="tree-panel-container">
+  <div id=legend class="collapse show">
+    <center>
+      <div style="display: inline">
+        <b>Legend</b>
+      </div>
+      <div style="display: inline;">
+        <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#legend">
+            <img src="{{ url_for('static', filename='down.jpg') }}" alt="Minimize legend" height="25" width="25" title="Collapse">
+        </button>
+      </div>
+    </center>
+  <hr/>
+  <div title="The node contains at least one insecure (not HTTPS) request">
+    <img src="{{ url_for('static', filename='insecure.svg') }}" alt="Insecure requests"
+         height="20" width="20"> Unencrypted requests
+  </div>
+
+  <div title="This node contains only empty responses">
+    <img src="{{ url_for('static', filename='empty.svg') }}" alt="Empty responses"
+         height="20" width="20"> Empty responses
+  </div>
+
+  <div title="Number of cookies received in the responses of this node">
+    <img src="{{ url_for('static', filename='cookie_received.png') }}" alt="Cookie received"
+         height="20" width="20"> Cookie received
+  </div>
+
+  <div title="Number of cookies sent in the requests of this node">
+    <img src="{{ url_for('static', filename='cookie_read.png') }}" alt="Cookie read"
+         height="20" width="20"> Cookie read
+  </div>
+
+  <div title="Number of redirects initiated by the responses of this node">
+    <img src="{{ url_for('static', filename='redirect.png') }}" alt="Redirect"
+         height="20" width="20"> Redirect
+  </div>
+
+  <div title="Number of resources loaded from iFrames in the responses in this node">
+    <img src="{{ url_for('static', filename='ifr.png') }}" alt="iFrame"
+        height="20" width="20"> iFrame
+  </div>
+
+  <div title="Number of JavaScript in the responses in this node">
+    <img src="{{ url_for('static', filename='javascript.png') }}" alt="JavaScript"
+         height="20" width="20"> Javascript
+  </div>
+
+  <div title="Number of fonts in the responses in this node">
+    <img src="{{ url_for('static', filename='font.png') }}" alt="Font"
+         height="20" width="20"> Font
+  </div>
+
+  <div title="Number of HTML in the responses in this node">
+    <img src="{{ url_for('static', filename='html.png') }}" alt="HTML"
+         height="20" width="20"> HTML
+  </div>
+
+  <div title="Number of JSON in the responses in this node">
+    <img src="{{ url_for('static', filename='json.png') }}" alt="JSON"
+         height="20" width="20"> JSON
+  </div>
+
+  <div title="Number of CSS in the responses in this node">
+    <img src="{{ url_for('static', filename='css.png') }}" alt="CSS"
+         height="20" width="20"> CSS
+  </div>
+
+  <div title="Number of executables in the responses in this node">
+    <img src="{{ url_for('static', filename='exe.png') }}" alt="EXE"
+        height="20" width="20"> EXE
+  </div>
+
+  <div title="Number of images in the responses in this node">
+    <img src="{{ url_for('static', filename='img.png') }}" alt="Image"
+        height="20" width="20"> Image
+  </div>
+
+  <div title="Number of videos in the responses in this node">
+    <img src="{{ url_for('static', filename='video.png') }}" alt="Video"
+        height="20" width="20"> Video
+  </div>
+
+  <div title="Number of unknown resources in the responses in this node">
+    <img src="{{ url_for('static', filename='wtf.png') }}" alt="Content type not set/unknown"
+        height="20" width="20"> Unknown content
+    </div>
+
+  <div title="The node contains a downloaded file">
+    <img src="{{ url_for('static', filename='download.png') }}" alt="Contains a downloaded file"
+        height="20" width="20"> Downloaded file
+    </div>
+  </div>
+
+  <div style="width: 70px; float: right;">
+    <center>
+    <button type="button" class="btn btn-link" data-bs-toggle="collapse" data-bs-target="#legend">
+      <img src="{{ url_for('static', filename='up.jpg') }}" alt="Maximize legend" height="40" width="40" title="Expand">
+      <b>Legend</b>
+    </button>
+    </center>
+  </div>
+</div>
 
 
 <!-- Modals -->
@@ -791,7 +837,7 @@
       <div class="modal-content">
           <div class="modal-header">
               <h4 class="modal-title" id="historyModalLabel">
-                  Historical data and contex about this capture
+                  Historical data and context about this capture
               </h4>
               </br>
               <button type="button" class="btn btn-close" data-bs-dismiss="modal" aria-label="Close"></button>