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

Jump to bottom

Add hrefs to Basic Security overview (1.14) #2384

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Add hrefs to Basic Security overview (1.14) #2384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b7d5f5
Add hrefs to Basic Security overview (#2330)
madelondohmen Jan 19, 2024
c3aa6d3
Merge branch 'release-1.14' into backport-2330-1.14
underdarknl Jan 24, 2024
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
40 changes: 28 additions & 12 deletions rocky/reports/report_types/aggregate_organisation_report/basic_security.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,44 @@ <h3>{% translate "Overview of the basic security status" %}</h3>
{#For the multi report, "data.services|get_item:service" is a list to avoid deduplication #}
<td>{{ service }} {% translate "server" %} ({{ data.services|get_item:service|length }})</td>
<td>
{% if compliance.safe_connections.number_of_compliant != compliance.safe_connections.total %}
<span class="icon incomplete"></span>
{% if compliance.safe_connections.total == 0 %}
-
{% else %}
<span class="icon positive"></span>
{% if compliance.safe_connections.number_of_compliant != compliance.safe_connections.total %}
<span class="icon incomplete"></span>
{% else %}
<span class="icon positive"></span>
{% endif %}
{% if data.multi_data %}
{{ compliance.safe_connections.number_of_compliant }}/{{ compliance.safe_connections.total }}
{% else %}
<a href="#safe-connections-{{ service }}">{{ compliance.safe_connections.number_of_compliant }}/{{ compliance.safe_connections.total }}</a>
{% endif %}
{% endif %}
{{ compliance.safe_connections.number_of_compliant }}/{{ compliance.safe_connections.total }}
</td>
<td>
{% if compliance.system_specific.number_of_compliant != compliance.system_specific.total %}
<span class="icon incomplete"></span>
{% if compliance.system_specific.total == 0 %}
-
{% else %}
<span class="icon positive"></span>
{% if compliance.system_specific.number_of_compliant != compliance.system_specific.total %}
<span class="icon incomplete"></span>
{% else %}
<span class="icon positive"></span>
{% endif %}
<a href="#system-specific-{{ service }}">{{ compliance.system_specific.number_of_compliant }}/{{ compliance.system_specific.total }}</a>
{% endif %}
{{ compliance.system_specific.number_of_compliant }}/{{ compliance.system_specific.total }}
</td>
<td>
{% if compliance.rpki.number_of_compliant != compliance.rpki.total %}
<span class="icon incomplete"></span>
{% if compliance.rpki.total == 0 %}
-
{% else %}
<span class="icon positive"></span>
{% if compliance.rpki.number_of_compliant != compliance.rpki.total %}
<span class="icon incomplete"></span>
{% else %}
<span class="icon positive"></span>
{% endif %}
<a href="#rpki-{{ service }}">{{ compliance.rpki.number_of_compliant }}/{{ compliance.rpki.total }}</a>
{% endif %}
{{ compliance.rpki.number_of_compliant }}/{{ compliance.rpki.total }}
</td>
</tr>
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions rocky/reports/report_types/aggregate_organisation_report/system_specific.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ <h2>{% translate "System specific checks" %}</h2>
{% endblocktranslate %}
</p>
{% endif %}
<h4>{{ type }} {% translate "server" %}</h4>
<h4 id="system-specific-{{ type }}">{{ type }} {% translate "server" %}</h4>
<p>
{% blocktranslate trimmed %}
This table shows which checks were performed. Following that, the compliance
Expand All @@ -31,7 +31,7 @@ <h4>{{ type }} {% translate "server" %}</h4>
<tr>
<td>{{ check }}</td>
<td>
{% if value != m.total %}
{% if value != data.total %}
<span class="icon incomplete"></span>
{% else %}
<span class="icon positive"></span>
Expand Down
2 changes: 1 addition & 1 deletion rocky/reports/report_types/rpki_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h2>{% translate "Resource Public Key Infrastructure" %}</h2>
</p>
{% endif %}
{% if type %}
<h4>{{ type }} {% translate "server" %}</h4>
<h4 id="rpki-{{ type }}">{{ type }} {% translate "server" %}</h4>
<p>
{% blocktranslate trimmed %}
This table shows which checks were performed. Following that, the compliance
Expand Down
2 changes: 1 addition & 1 deletion rocky/reports/report_types/safe_connections_report/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h2>{% translate "Safe Connections" %}</h2>
</p>
{% endif %}
{% if type %}
<h4>{{ type }} {% translate "server" %}</h4>
<h4 id="safe-connections-{{ type }}">{{ type }} {% translate "server" %}</h4>
<p>
{% blocktranslate trimmed %}
This table shows which checks were performed. Following that, the compliance
Expand Down