From d9932610ae179e52bbdfe113a9e2fb5e30d6fb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Tue, 26 Oct 2021 13:31:42 -0400 Subject: [PATCH] chg: Hide capture config, fix capture buttons, improve css Related: #279 --- config/generic.json.sample | 2 +- website/web/sri.txt | 4 +- website/web/static/generic.css | 45 +++++++--- website/web/static/tree.css | 13 --- website/web/templates/capture.html | 133 ++++++++++++++++------------- website/web/templates/index.html | 4 +- 6 files changed, 116 insertions(+), 85 deletions(-) diff --git a/config/generic.json.sample b/config/generic.json.sample index e0b4617c..ce331af8 100644 --- a/config/generic.json.sample +++ b/config/generic.json.sample @@ -55,7 +55,7 @@ "website_listen_ip": "IP Flask will listen on. Defaults to 0.0.0.0, meaning all interfaces.", "website_listen_port": "Port Flask will listen on.", "systemd_service_name": "(Optional) Name of the systemd service if your project has one.", - "default_public": "If true, the capture is public and will be visible on the index page by default (can be unticked on the capture page)." + "default_public": "If true, the capture is public and will be visible on the index page by default (can be unticked on the capture page).", "splash_url": "URL to connect to splash", "default_user_agent": "Ultimate fallback if the capture form, or the asynchronous submission, doesn't provide a user agent.", "users": "It is some kind of an admin accounts. Format: {username: password}", diff --git a/website/web/sri.txt b/website/web/sri.txt index 6d4c06fa..7d316fc3 100644 --- a/website/web/sri.txt +++ b/website/web/sri.txt @@ -17,7 +17,7 @@ "exe.png": "pWwo9nBLtEss/UJ173zHa6/RpySUyz/XMdNhWc6aRIvwwHMO6a+fLmu2K6TbvO3Jbg4VYL2Af4yhHPyhH3ZeTw==", "favicon.ico": "KOmrfwRbOQqhhwSeBkNpMRAxSVMmmLg+2kRMg9iSv7OWjE9spJc7x4MKB4AE/hi0knaV7UBVctAU6XZ7AC72ZA==", "font.png": "RwoQkj9dT9SLUL2F7cAA16Nat9t2hDb58eQlHF9ThUar829p0INUXG+5XuDaFOC8SsmCZK5vw2f+YAQ6mLC1Qw==", - "generic.css": "tOle/VKgBbxUUWM9T9xnp5WI4a4aP8ZX+3RZ1K02yKlRauegJxV+en5TJZZmIBuIYuB4rQoVzP5m0ykhS3Noaw==", + "generic.css": "7mLlV74V0FRHyyM/JbfK3sUhzfLNeQLwpyyXFLTO7UG9veJvK2g4YRcpU0emN2Sd1N2b8kcDC5YUDEaznSrywQ==", "generic.js": "c/p+6Dk2kcwd9T9kf/IfoCX/ZU+VbtlUGYBo3qNSzwoUYC1soWwdIwM5rFxwxz9a1tORc/Wu0EFCPRw4ZwbqkQ==", "html.png": "T7pZrb8MMDsA/JV/51hu+TOglTqlxySuEVY0rpDjTuAEyhzk2v+W4kYrj7vX+Tp3n2d2lvVD08PwhCG62Yfbzg==", "ifr.png": "rI5YJypmz1QcULRf9UaOYSqV4tPUSxUdLAycoYzCwywt4Pw4eWzBg9SUr769VyIimoiIyJR+aNuoIA4p5WO2fQ==", @@ -32,7 +32,7 @@ "secure.svg": "H8ni7t0d60nCJDVGuZpuxC+RBy/ipAjWT627D12HlZGg6LUmjSwPTQTUekm3UJupEP7TUkhXyq6WHc5gy7QBjg==", "stats.css": "/kY943FwWBTne4IIyf7iBROSfbGd82TeBicEXqKkRwawMVRIvM/Pk5MRa7okUyGIxaDjFQGmV/U1vy+PhN6Jbw==", "stats_graph.js": "0OEouA6NAxLG2wMd7D2vtGoMrXKna7My98Euc6ecyfdO4/6mIJS87vzISOS4zSZ8u4ehpa+p7E0nWhsXXE7H/Q==", - "tree.css": "ma+WfBfjVZpKH9KDg+LayyBac2r95VgqG4jll75Xc1e0zwBXe2/ZxI6Y9AeGCNK5YvtcFNd6oH3c+2KxV8iT0A==", + "tree.css": "EPxR2uiIptWYOo7OVp2FcoVAzOJ7RVOIJu86tMIsnD84fhXmTiAkZYFGdNiXf2jVe+Th5qpCECscTqVo4634Xg==", "tree.js": "JeCMrFdQDrSYAXaJZE/tCOnfusbQI68rzFhyo0ojBCHt2FAs/DDBdYwCpkFNZ7J+n05NpfbegrrKVqd06PCNXA==", "up.jpg": "d1ljZJ9f5JekyM6RLFFH2Ua44j6neiQBdUIXOenRTjGppQr3JaeglpQIH6BjPCJL177+TH52U3UIRNS5YAyKIg==", "up_right.jpg": "OMmz+n+MxR34P8/fn5t4DkqKqdJRzQbXQ7fAi2lhkZIJGhVs2vIyY1f2hpYoBxDAX1OcYsSE2lqIR2vXNDGZsA==", diff --git a/website/web/static/generic.css b/website/web/static/generic.css index 6ed3456c..3bc09fb8 100644 --- a/website/web/static/generic.css +++ b/website/web/static/generic.css @@ -12,17 +12,7 @@ transition: all 0.3s ease 0s; cursor: pointer; outline: none; - padding-right: 15px; - padding-left: 15px; - padding-bottom: 20px; - padding-top: 15px; -} - -.new-capture-button:hover { - background-color: #007070; - box-shadow: 0px 15px 20px rgba(0, 0, 0, 0.1); - color: #fff; - transform: translateY(-7px); + align-items: center; } /* CSS collapse thing */ @@ -95,3 +85,36 @@ table td p { width: 0; z-index: -1; } + +/* Arrows */ +.arrow-down { + transform: rotate(180deg); +} + +.arrow-right { + transform: rotate(90deg); +} + +.arrow-left { + transform: rotate(270deg); +} + +/* help Tooltip */ +.help-tip{ + text-align: center; + background-color: #BCDBEA; + border-radius: 50%; + width: 24px; + height: 24px; + font-size: 14px; + line-height: 26px; + cursor: default; + position: relative; + display:inline-block; +} + +.help-tip:before{ + content:'?'; + font-weight: bold; + color:#fff; +} diff --git a/website/web/static/tree.css b/website/web/static/tree.css index 7a9be28c..6e6cd429 100644 --- a/website/web/static/tree.css +++ b/website/web/static/tree.css @@ -28,19 +28,6 @@ scroll-margin: 50px; } -/* Arrows */ -.arrow-down { - transform: rotate(180deg); -} - -.arrow-right { - transform: rotate(90deg); -} - -.arrow-left { - transform: rotate(270deg); -} - /* Generic parts of menus */ hr { display: block; diff --git a/website/web/templates/capture.html b/website/web/templates/capture.html index 471139ac..fb718f87 100644 --- a/website/web/templates/capture.html +++ b/website/web/templates/capture.html @@ -40,50 +40,70 @@ -
- -
- +
+ +
+ +
+
+ +
+ +
+
+
+
+ {% if max_depth >= 2 %} +
+ +
+ +
+
+ {%endif%} + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
- {% if max_depth >= 2 %} -
- -
- -
-
- {%endif%} +
-
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
-

Browser Configuration (Lookyloo uses an emulated browser for all captures)

+

Browser Configuration (Lookyloo uses an emulated browser for all captures)

+
{% if personal_ua %}
@@ -95,7 +115,6 @@
-
Or pick the user agent of your choice:

{% endif %} @@ -112,7 +131,7 @@
- {% for os, browsers in user_agents.items() %} + {% for os, browsers in user_agents.items() %}
@@ -126,7 +145,7 @@
- {% for browser, user_agents in browsers.items()%} + {% for browser, user_agents in browsers.items()%} - {% endfor%} {% endfor%} -
-
- - {% if default_public %} - By default, the capture is public. If you do not want that, untick the box at the top of the form. - {% else %} - By default, the capture is private (not visible on the index page). If you want it to be public tick the box at the top of the form. - {% endif %} - -
-
- -
+ {% endfor%} + +
+ + {% if default_public %} + By default, the capture is public. If you do not want that, untick the box at the top of the form. + {% else %} + By default, the capture is private (not visible on the index page). If you want it to be public tick the box at the top of the form. + {% endif %} + +
+
+ +
{% endblock %} diff --git a/website/web/templates/index.html b/website/web/templates/index.html index faa213c5..fb738282 100644 --- a/website/web/templates/index.html +++ b/website/web/templates/index.html @@ -72,7 +72,9 @@ $(document).ready(function () {

Web forensics tool


- Start a new capture + + +

{{ render_messages(container=True, dismissible=True) }}