NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 16:48:16 -06:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

fixed #16849: Lists do not contain only li elements

Browse Source
This commit is contained in:
Andrew Gormley 2024-07-10 15:36:17 +01:00
parent e0bf25dea0
commit f77b1bb4ea
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/templates/account/base.html
View File

@ -2,24 +2,23 @@
{% load i18n %} {% load i18n %}
{% block tabs %} {% block tabs %}
<ul class="nav nav-tabs"> <ul class="nav nav-tabs" role="presentation">
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'account:profile' %}">{% trans "Profile" %}</a> <a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'account:profile' %}">{% trans "Profile" %}</a>
</li> </li>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link{% if active_tab == 'bookmarks' %} active{% endif %}" href="{% url 'account:bookmarks' %}">{% trans "Bookmarks" %}</a> <a class="nav-link{% if active_tab == 'bookmarks' %} active{% endif %}" href="{% url 'account:bookmarks' %}">{% trans "Bookmarks" %}</a>
</li> </li>
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'account:preferences' %}">{% trans "Preferences" %}</a> <a class="nav-link{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'account:preferences' %}">{% trans "Preferences" %}</a>
</li> </li>
{% if not request.user.ldap_username %} {% if not request.user.ldap_username %}
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link{% if active_tab == 'password' %} active{% endif %}" href="{% url 'account:change_password' %}">{% trans "Password" %}</a> <a class="nav-link{% if active_tab == 'password' %} active{% endif %}" href="{% url 'account:change_password' %}">{% trans "Password" %}</a>
</li> </li>
{% endif %} {% endif %}
<li role="presentation" class="nav-item"> <li class="nav-item">
<a class="nav-link{% if active_tab == 'api-tokens' %} active{% endif %}" href="{% url 'account:usertoken_list' %}">{% trans "API Tokens" %}</a> <a class="nav-link{% if active_tab == 'api-tokens' %} active{% endif %}" href="{% url 'account:usertoken_list' %}">{% trans "API Tokens" %}</a>
</li> </li>
</ul> </ul>
{% endblock %} {% endblock %}

2
netbox/templates/extras/customfield.html
View File

@ -128,7 +128,7 @@
</div> </div>
<div class="card"> <div class="card">
<h2 class="card-header h5">Related Objects</h2> <h2 class="card-header h5">Related Objects</h2>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush" role="presentation">
{% for qs in related_models %} {% for qs in related_models %}
<a class="list-group-item list-group-item-action d-flex justify-content-between"> <a class="list-group-item list-group-item-action d-flex justify-content-between">
{{ qs.model|meta:"verbose_name_plural"|bettertitle }} {{ qs.model|meta:"verbose_name_plural"|bettertitle }}

4
netbox/templates/generic/object.html
View File

@ -100,9 +100,9 @@ Context:
{% endblock controls %} {% endblock controls %}
{% block tabs %} {% block tabs %}
<ul class="nav nav-tabs"> <ul class="nav nav-tabs" role="presentation">
{# Primary tab #} {# Primary tab #}
<li class="nav-item" role="presentation"> <li class="nav-item">
<a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a> <a class="nav-link{% if not tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
</li> </li>

2
netbox/templates/inc/panels/related_objects.html
View File

@ -3,7 +3,7 @@
<div class="card"> <div class="card">
<h2 class="card-header h5">{% trans "Related Objects" %}</h2> <h2 class="card-header h5">{% trans "Related Objects" %}</h2>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush" role="presentation">
{% for qs, filter_param in related_models %} {% for qs, filter_param in related_models %}
{% with viewname=qs.model|viewname:"list" %} {% with viewname=qs.model|viewname:"list" %}
<a href="{% url viewname %}?{{ filter_param }}={{ object.pk }}" class="list-group-item list-group-item-action d-flex justify-content-between"> <a href="{% url viewname %}?{{ filter_param }}={{ object.pk }}" class="list-group-item list-group-item-action d-flex justify-content-between">