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

Fix styling of filter group headings

Browse Source
This commit is contained in:
Jeremy Stretch 2024-01-09 16:25:16 -05:00
parent 9b2c258e6a
commit ac2343f130
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/templates/generic/object_list.html
View File

@ -59,7 +59,7 @@ Context:
{% block content %} {% block content %}
{# Object list #} {# Object list tab #}
<div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab"> <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
{# Applied filters #} {# Applied filters #}
@ -102,17 +102,18 @@ Context:
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" /> <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
{# Object table #} {# Warn of any missing prerequisite objects #}
{% if prerequisite_model %}
{% if prerequisite_model %} {% include 'inc/missing_prerequisites.html' %}
{% include 'inc/missing_prerequisites.html' %} {% endif %}
{% endif %}
{# Objects table #}
<div class="card"> <div class="card">
<div class="htmx-container table-responsive" id="object_list"> <div class="htmx-container table-responsive" id="object_list">
{% include 'htmx/table.html' %} {% include 'htmx/table.html' %}
</div> </div>
</div> </div>
{# /Objects table #}
{# Form buttons #} {# Form buttons #}
<div class="btn-list d-print-none mt-2"> <div class="btn-list d-print-none mt-2">
@ -125,17 +126,20 @@ Context:
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</div> </div>
{# /Form buttons #}
</div> </div>
</form> </form>
</div> </div>
{# /Object list tab #}
{# Filter form #} {# Filters tab #}
{% if filter_form %} {% if filter_form %}
<div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab"> <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
{% include 'inc/filter_list.html' %} {% include 'inc/filter_list.html' %}
</div> </div>
{% endif %} {% endif %}
{# /Filters tab #}
{% endblock content %} {% endblock content %}

19
netbox/templates/inc/filter_list.html
View File

@ -12,7 +12,9 @@
{% for heading, fields in filter_form.fieldsets %} {% for heading, fields in filter_form.fieldsets %}
<div class="col col-12"> <div class="col col-12">
{% if heading %} {% if heading %}
<h6>{{ heading }}</h6> <div class="hr-text">
<span>{{ heading }}</span>
</div>
{% endif %} {% endif %}
{% for name in fields %} {% for name in fields %}
{% with field=filter_form|get_item:name %} {% with field=filter_form|get_item:name %}
@ -20,9 +22,6 @@
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
</div> </div>
{% if not forloop.last %}
<hr class="card-divider mt-0" />
{% endif %}
{% empty %} {% empty %}
{# List all non-customfield filters as declared in the form class #} {# List all non-customfield filters as declared in the form class #}
{% for field in filter_form.visible_fields %} {% for field in filter_form.visible_fields %}
@ -35,14 +34,16 @@
{% endfor %} {% endfor %}
{% if filter_form.custom_fields %} {% if filter_form.custom_fields %}
{# List all custom field filters #} {# List all custom field filters #}
<hr class="card-divider mt-0" /> <div class="col col-12">
{% for name in filter_form.custom_fields %} <div class="hr-text">
<div class="col col-12"> <span>{% trans "Custom Fields" %}</span>
</div>
{% for name in filter_form.custom_fields %}
{% with field=filter_form|get_item:name %} {% with field=filter_form|get_item:name %}
{% render_field field %} {% render_field field %}
{% endwith %} {% endwith %}
</div> {% endfor %}
{% endfor %} </div>
{% endif %} {% endif %}
</div> </div>
<div class="card-footer text-end noprint border-0"> <div class="card-footer text-end noprint border-0">