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

Adjusted number fields in tables #11677

Merged
merged 3 commits into from
Feb 6, 2025
Merged

Adjusted number fields in tables #11677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62ad045
Adjusted number fields in tables
littlesvensson Jan 27, 2025
c232d55
Removed text-right from th not necessary and its overridden anyway
littlesvensson Jan 27, 2025
34e3872
Fixed no empty new line at the end of file
littlesvensson Jan 27, 2025
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
9 changes: 8 additions & 1 deletion dojo/static/dojo/css/dojo.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1854,4 +1854,11 @@ input[type=number]::-webkit-inner-spin-button,
input[type=number]::-webkit-outer-spin-button {
-webkit-appearance: none;
margin: 0;
}
}

.table th, .table td {
border-right: 1px solid #ddd;
}
.table th:last-child, .table td:last-child {
border-right: none;
}
13 changes: 7 additions & 6 deletions dojo/templates/dojo/components.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
{% load static %}
{% block content %}
{{ block.super }}

<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
Expand All @@ -28,9 +29,9 @@ <h3 class="has-filters">
<tr>
<th>Name</th>
<th>Version</th>
<th class="text-center">Active</th>
<th class="text-center">Duplicate</th>
<th class="text-center">Total</th>
<th>Active</th>
<th>Duplicate</th>
<th>Total</th>
</tr>
</thead>
<tbody>
Expand All @@ -45,7 +46,7 @@ <h3 class="has-filters">
</td>

<td>{{result.component_version}} </td>
<td class="text-center">
<td class="text-right">
{% if result.active and result.component_name == none %}
<a href="{% url 'open_findings' %}?has_component=false"><b>{{ result.active }}</b></a>
{% elif result.active%}
Expand All @@ -54,7 +55,7 @@ <h3 class="has-filters">
0
{% endif %}
</td>
<td class="text-center">
<td class="text-right">
{% if result.duplicate and result.component_name == none %}
<a href="{% url 'all_findings' %}?has_component=false&duplicate=1"><b>{{ result.duplicate }}</b></a>
{% elif result.duplicate %}
Expand All @@ -63,7 +64,7 @@ <h3 class="has-filters">
0
{% endif %}
</td>
<td class="text-center">
<td class="text-right">
{% if result.total and result.component_name == none %}
<a href="{% url 'all_findings' %}?has_component=false"><b>{{ result.total }}</b></a>
{% elif result.total %}
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/endpoint_pdf_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ <h5>
{% endif %}
</span>
</td>
<td>
<td class="text-right">
{{ finding.epss_score|format_epss }}
/
{{ finding.epss_percentile|format_epss }}
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/engagement_pdf_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ <h5>
{% endif %}
</span>
</td>
<td>
<td class="text-right">
{{ finding.epss_score|format_epss }}
/
{{ finding.epss_percentile|format_epss }}
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/finding_pdf_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ <h5>
{% endif %}
</span>
</td>
<td>
<td class="text-right">
{{ finding.epss_score|format_epss }}
/
{{ finding.epss_percentile|format_epss }}
Expand Down
8 changes: 4 additions & 4 deletions dojo/templates/dojo/findings_list_snippet.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,10 @@ <h3 class="has-filters">
{% endif %}
{% endwith %}
</td>
<td class="nowrap">
<td class="nowrap text-right">
{{ finding.epss_score|format_epss }}
</td>
<td class="nowrap">
<td class="nowrap text-right">
{{ finding.epss_percentile|format_epss }}
</td>
{% if filter_name == 'Closed' %}
Expand All @@ -624,11 +624,11 @@ <h3 class="has-filters">
{{ finding.date }}
{% endif %}
</td>
<td>
<td class="text-right">
{{ finding.age }}
</td>
{% if system_settings.enable_finding_sla %}
<td>
<td class="text-right">
{{ finding|finding_sla }}
</td>
{% endif %}
Expand Down
Loading
Loading