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.

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

Added labels for checkbox column headers #11819

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions dojo/templates/dojo/endpoints.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,25 +70,25 @@ <h3 class="has-filters">
class="tablesorter-bootstrap table table-condensed table-striped table-hover">
<tr>
{% if not product_tab or product_tab and product_tab.product|has_object_permission:"Endpoint_Edit" %}
<th class="centered" title="Select all visible endpoint." id="bulk_edit">
<th class="centered" title="Select all visible endpoints." aria-label="Select all visible endpoints." id="bulk_edit" scope="col">
<form class="inline-form centered" action="#">
<input type="checkbox" title="Select All" name="select_all" id="select_all"></input>
<input aria-label="Select all visible endpoints checkbox" type="checkbox" title="Select All" name="select_all" id="select_all"></input>
</form>
</th>
{% endif %}
{% if host_view %}
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
<th>{% dojo_sort request 'Host' 'host' %}</th>
<th scope="col">{% dojo_sort request 'Host' 'host' %}</th>
{% else %}
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
<th>{% dojo_sort request 'Endpoint' 'endpoint' %}</th>
<th scope="col">{% dojo_sort request 'Endpoint' 'endpoint' %}</th>
{% endif %}
{% if not product_tab %}
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
<th>{% dojo_sort request 'Product' 'product' 'asc' %}</th>
<th scope="col">{% dojo_sort request 'Product' 'product' 'asc' %}</th>
{% endif %}
<th class="text-center" nowrap="nowrap">Active (Verified) Findings</th>
<th>Status</th>
<th class="text-center" nowrap="nowrap" scope="col">Active (Verified) Findings</th>
<th scope="col">Status</th>
</tr>

{% for e in endpoints %}
Expand Down
46 changes: 23 additions & 23 deletions dojo/templates/dojo/findings_list_snippet.html
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,17 @@ <h3 class="has-filters">
<tr>
{% block header %}
{% if not product_tab or product_tab and product_tab.product|has_object_permission:"Finding_Edit" %}
<th class="centered" title="Select all visible findings.">
<th class="centered" title="Select all visible findings." scope="col" aria-label="Select all visible findings">
<div class="dropdown">
<button class="btn btn-primary dropdown-toggle"
type="button"
id="dropdownMenu1"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="true"
aria-label="Select all findings dropdown">
aria-label="Select findings by severity dropdown">
<form class="inline-form" action="#">
<input type="checkbox" name="select_all" id="select_all" aria-label="select-all"/>
<input type="checkbox" name="select_all" id="select_all" aria-label="select all findings checkbox"/>
</form>
<span class="caret"></span>
</button>
Expand Down Expand Up @@ -317,26 +317,26 @@ <h3 class="has-filters">
</th>
{% endif %}
<th></th>
<th class="nowrap centered severity-sort">
<th class="nowrap centered severity-sort" scope="col">
{% trans "Severity" %}
</th>
<th class="nowrap">
<th class="nowrap" scope="col">
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
{% dojo_sort request 'Name' 'title' %}
</th>
<th>
<th scope="col">
{% trans "CWE" %}
</th>
<th>
<th scope="col">
{% trans "Vulnerability Id" %}
</th>
<th>
<th scope="col">
{% trans "EPSS Score" %}
</th>
<th>
<th scope="col">
{% trans "EPSS Percentile" %}
</th>
<th class="nowrap">
<th class="nowrap" scope="col">
{% if filter_name == 'Closed' %}
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
{% dojo_sort request 'Closed Date' 'mitigated' %}
Expand All @@ -345,55 +345,55 @@ <h3 class="has-filters">
{% dojo_sort request 'Date' 'date' %}
{% endif %}
</th>
<th class="nowrap">
<th class="nowrap" scope="col">
{% trans "Age" %}
</th>
{% if system_settings.enable_finding_sla %}
<th>
<th scope="col">
{% trans "SLA" %}
</th>
{% endif %}
<th>
<th scope="col">
{% trans "Reporter" %}
</th>
<th>
<th scope="col">
{% trans "Found By" %}
</th>
<th>
<th scope="col">
{% trans "Status" %}
</th>
{% if system_settings.enable_jira %}
{% if jira_project and product_tab or not product_tab %}
<th>
<th scope="col">
{% trans "Jira" %}
</th>
<th>
<th scope="col">
{% trans "JIRA Age" %}
</th>
<th>
<th scope="col">
{% trans "JIRA Change" %}
</th>
{% endif %}
{% endif %}
{% if 'is_finding_groups_enabled'|system_setting_enabled %}
<th>
<th scope="col">
{% trans "Group" %}
</th>
{% endif %}
{% if show_product_column and product_tab is None %}
<th class="nowrap">
<th class="nowrap" scope="col">
{% comment %} The display field is translated in the function. No need to translate here as well{% endcomment %}
{% dojo_sort request 'Product' 'test__engagement__product__name' %}
</th>
{% endif %}
<th>
<th scope="col">
{% trans "Service" %}
</th>
<th>
<th scope="col">
{% trans "Planned Remediation" %}
</th>
{% if filter_name != 'Closed' %}
<th>
<th scope="col">
{% trans "Reviewers" %}
</th>
{% endif %}
Expand Down