Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix report tables overflowing whole page (1.13) #1947

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Fix report tables overflowing whole page (1.13) #1947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 105 additions & 99 deletions rocky/reports/report_types/dns_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,117 +1,123 @@
{% load i18n %}

<h2>{% translate "IP address lookup" %}</h2>
<div class="column-2">
{% if data.ipv4 %}
<table>
<thead>
<tr>
<th scope="col">IPv4</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv4 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
{% if not data.enough_ipv6_webservers %}
<div class="warning" role="group" aria-label="{% translate "warning" %}">
<span>IPv6 {% translate "Warning" %}:</span>
<p>
{% blocktranslate trimmed %}
<div class="horizontal-scroll">
<div class="column-2">
{% if data.ipv4 %}
<table>
<thead>
<tr>
<th scope="col">IPv4</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv4 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
{% if not data.enough_ipv6_webservers %}
<div class="warning" role="group" aria-label="{% translate "warning" %}">
<span>IPv6 {% translate "Warning" %}:</span>
<p>
{% blocktranslate trimmed %}
You have less than one webserver that is reachable over IPv6,
which is <strong>not</strong> in compliance to internet.nl standards.
{% endblocktranslate %}
</p>
</div>
{% else %}
<table class="summary">
<thead>
<tr>
<th scope="col">IPv6</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv6 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
{% endblocktranslate %}
</p>
</div>
{% else %}
<table class="summary">
<thead>
<tr>
<th scope="col">IPv6</th>
</tr>
</thead>
<tbody>
<tr>
{% for ip in data.ipv6 %}<td>{{ ip }}</td>{% endfor %}
</tr>
</tbody>
</table>
{% endif %}
</div>
</div>
{% if data.other_records %}
<h2>{% translate "Other records found" %}</h2>
<table>
<thead>
<tr>
<th>{% translate "Record" %}</th>
<th>{% translate "Value" %}</th>
<th>{% translate "Found by" %}</th>
</tr>
</thead>
<tbody>
{% for ooi in data.other_records %}
<tr>
<td>{{ ooi.human_readable }}</td>
<td>{{ ooi.content }}</td>
<td>{{ ooi.origin }}</td>
</tr>
{% endfor %}
</tbody>
</table>
<h2>{% translate "Security measures" %}</h2>
<div class="column-3">
<div class="horizontal-scroll">
<table>
<thead>
<tr>
<th>{% translate "Enabled" %}</th>
<th>{% translate "Type" %}</th>
<th>{% translate "Record" %}</th>
<th>{% translate "Value" %}</th>
<th>{% translate "Found by" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>
{% if data.security.spf %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>SPF</td>
</tr>
<tr>
<td>
{% if data.security.dmarc %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DMARC</td>
</tr>
<tr>
<td>
{% if data.security.dkim %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DKIM</td>
</tr>
<tr>
<td>
{% if data.security.dnssec %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DNSSEC</td>
</tr>
{% for ooi in data.other_records %}
<tr>
<td>{{ ooi.human_readable }}</td>
<td>{{ ooi.content }}</td>
<td>{{ ooi.origin }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<h2>{% translate "Security measures" %}</h2>
<div class="horizontal-scroll">
<div class="column-3">
<table>
<thead>
<tr>
<th>{% translate "Enabled" %}</th>
<th>{% translate "Type" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>
{% if data.security.spf %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>SPF</td>
</tr>
<tr>
<td>
{% if data.security.dmarc %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DMARC</td>
</tr>
<tr>
<td>
{% if data.security.dkim %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DKIM</td>
</tr>
<tr>
<td>
{% if data.security.dnssec %}
<i class="icon positive"></i>{% translate "Yes" %}
{% else %}
<i class="icon negative"></i>{% translate "No" %}
{% endif %}
</td>
<td>DNSSEC</td>
</tr>
</tbody>
</table>
</div>
</div>
{% endif %}
68 changes: 35 additions & 33 deletions rocky/reports/report_types/tls_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,44 @@

<h3>Ciphers</h3>
{% if data.suites %}
<table>
<thead>
<tr>
<th>{% translate "Status" %}</th>
<th>{% translate "Protocol" %}</th>
<th>{% translate "Name" %}</th>
<th>{% translate "Encryption Algorithm" %}</th>
<th>{% translate "Bits" %}</th>
<th>{% translate "Key Size" %}</th>
<th>{% translate "Code" %}</th>
</tr>
</thead>
<tbody>
{% for protocol, suites in data.suites.items %}
{% for suite in suites %}
<div class="horizontal-scroll">
<table>
<thead>
<tr>
<td>
{% if suite.cipher_suite_name in data.suites_with_findings %}
<i class="icon negative"></i> {% translate "Phase out" %}
{% else %}
<i class="icon positive"></i> {% translate "Good" %}
{% endif %}
</td>
<td>{{ protocol }}</td>
<td>{{ suite.cipher_suite_alias }}</td>
<td>{{ suite.encryption_algorithm }}</td>
<td>{{ suite.bits }}</td>
<td>{{ suite.key_size }}</td>
<td>{{ suite.cipher_suite_code }}</td>
<th>{% translate "Status" %}</th>
<th>{% translate "Protocol" %}</th>
<th>{% translate "Name" %}</th>
<th>{% translate "Encryption Algorithm" %}</th>
<th>{% translate "Bits" %}</th>
<th>{% translate "Key Size" %}</th>
<th>{% translate "Code" %}</th>
</tr>
{% endfor %}
{% endfor %}
</tbody>
</table>
</thead>
<tbody>
{% for protocol, suites in data.suites.items %}
{% for suite in suites %}
<tr>
<td>
{% if suite.cipher_suite_name in data.suites_with_findings %}
<i class="icon negative"></i> {% translate "Phase out" %}
{% else %}
<i class="icon positive"></i> {% translate "Good" %}
{% endif %}
</td>
<td>{{ protocol }}</td>
<td>{{ suite.cipher_suite_alias }}</td>
<td>{{ suite.encryption_algorithm }}</td>
<td>{{ suite.bits }}</td>
<td>{{ suite.key_size }}</td>
<td>{{ suite.cipher_suite_code }}</td>
</tr>
{% endfor %}
{% endfor %}
</tbody>
</table>
</div>
{% else %}
<p>{% translate "No ciphers found for this IPService" %}</p>
<p>{% translate "No ciphers found for this IPService" %}</p>
{% endif %}
{% if data.findings %}
<h3>{% translate "Findings" %}</h3>
Expand Down