Split object list and filters into tabs

netbox/templates/dcim/connections_list.html

@@ -1,24 +1,56 @@
 {% extends 'base/layout.html' %}
 {% load buttons %}
+{% load helpers %}
 {% load render_table from django_tables2 %}
 
 {% block title %}{{ title }}{% endblock %}
 
 {% block extra_controls %}{% export_button content_type %}{% endblock %}
 
-{% block content %}
+{% block tabs %}
-    <div class="row mb-3">
+  <ul class="nav nav-tabs px-3">
-        <div class="col col-md-7 col-lg-8 col-xl-9 col-xxl-10">
+    {% block tab_items %}
+      <li class="nav-item" role="presentation">
+        <button class="nav-link active" id="connections-list-tab" data-bs-toggle="tab" data-bs-target="#connections-list" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
+          {{ title }}
+          {% badge table.page.paginator.count %}
+        </button>
+      </li>
+      {% if filter_form %}
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="object-list" aria-selected="false">
+            Filters
+          </button>
+        </li>
+      {% endif %}
+    {% endblock tab_items %}
+  </ul>
+{% endblock tabs %}
+
+{% block content-wrapper %}
+  <div class="tab-content">
+
+    {# Conncetions list #}
+    <div class="tab-pane show active" id="connections-list" role="tabpanel" aria-labelledby="connections-list-tab">
       {% include 'inc/table_controls.html' %}
 
+      <div class="card">
+        <div class="card-body">
           <div class="table-responsive">
             {% render_table table 'inc/table.html' %}
           </div>
+        </div>
+      </div>
 
       {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     </div>
+
+    {# Filter form #}
     {% if filter_form %}
+      <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
         {% include 'inc/filter_list.html' %}
-        {% endif %}
       </div>
-{% endblock %}
+    {% endif %}
+
+  </div>
+{% endblock content-wrapper %}

netbox/templates/dcim/rack_elevation_list.html

@@ -22,9 +22,31 @@
     </div>
 {% endblock %}
 
-{% block content %}
+{% block tabs %}
-    <div class="row">
+  <ul class="nav nav-tabs px-3">
-        <div class="col col-md-7 col-lg-8 col-xl-9 col-xxl-10">
+    {% block tab_items %}
+      <li class="nav-item" role="presentation">
+        <button class="nav-link active" id="rack-elevations-tab" data-bs-toggle="tab" data-bs-target="#rack-elevations" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
+          Rack Elevations
+          {% badge page.paginator.count %}
+        </button>
+      </li>
+      {% if filter_form %}
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="object-list" aria-selected="false">
+            Filters
+          </button>
+        </li>
+      {% endif %}
+    {% endblock tab_items %}
+  </ul>
+{% endblock tabs %}
+
+{% block content-wrapper %}
+  <div class="tab-content">
+
+    {# Rack elevations #}
+    <div class="tab-pane show active" id="rack-elevations" role="tabpanel" aria-labelledby="rack-elevations-tab">
       {% if page %}
           <div style="white-space: nowrap; overflow-x: scroll;">
               {% for rack in page %}
@@ -57,6 +79,13 @@
           <p>No Racks Found</p>
       {% endif %}
     </div>
+
+    {# Filter form #}
+    {% if filter_form %}
+      <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
         {% include 'inc/filter_list.html' %}
       </div>
-{% endblock %}
+    {% endif %}
+
+  </div>
+{% endblock content-wrapper %}

netbox/templates/generic/object_list.html

@@ -23,9 +23,35 @@
 </div>
 {% endblock controls %}
 
-{% block content %}
+{% block tabs %}
-{% if table.paginator.num_pages > 1 %}
+  <ul class="nav nav-tabs px-3">
-{% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
+    {% block tab_items %}
+      <li class="nav-item" role="presentation">
+        <button class="nav-link active" id="object-list-tab" data-bs-toggle="tab" data-bs-target="#object-list" type="button" role="tab" aria-controls="edit-form" aria-selected="true">
+          {{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}
+          {% badge table.page.paginator.count %}
+        </button>
+      </li>
+      {% if filter_form %}
+        <li class="nav-item" role="presentation">
+          <button class="nav-link" id="filters-form-tab" data-bs-toggle="tab" data-bs-target="#filters-form" type="button" role="tab" aria-controls="object-list" aria-selected="false">
+            Filters
+          </button>
+        </li>
+      {% endif %}
+    {% endblock tab_items %}
+  </ul>
+{% endblock tabs %}
+
+{% block content-wrapper %}
+  <div class="tab-content">
+
+    {# Object list #}
+    <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
+      {% if table.paginator.num_pages > 1 %}
+
+        {# "Select all" form #}
+        {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
           <div id="select-all-box" class="d-none card noprint">
             <form method="post" class="form col-md-12">
               {% csrf_token %}
@@ -51,15 +77,15 @@
               </div>
             </form>
           </div>
-{% endwith %}
+        {% endwith %}
-{% endif %}
+      {% endif %}
 
-{# Object table #}
+      {# Object table controls #}
-<div class="row">
-  <div class="col {% if filter_form %}col-md-7 col-lg-8 col-xl-9 col-xxl-10{% else %}col-12{% endif %}">
-    {# Object list filter, table config #}
       {% include 'inc/table_controls.html' with table_modal="ObjectTable_config" %}
 
+      {# Object table #}
+      <div class="card">
+        <div class="card-body">
           {% with bulk_edit_url=content_type.model_class|validated_viewname:"bulk_edit" bulk_delete_url=content_type.model_class|validated_viewname:"bulk_delete" %}
             {% if permissions.change or permissions.delete %}
               <form method="post" class="form form-horizontal">
@@ -90,11 +116,19 @@
               </div>
             {% endif %}
           {% endwith %}
+        </div>
+      </div>
       {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     </div>
+
+    {# Filter form #}
     {% if filter_form %}
+      <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
         {% include 'inc/filter_list.html' %}
+      </div>
     {% endif %}
-</div>
+  </div>
-{% table_config_form table table_name="ObjectTable" %}
+
-{% endblock content %}
+  {# Table config form #}
+  {% table_config_form table table_name="ObjectTable" %}
+{% endblock content-wrapper %}

netbox/templates/inc/filter_list.html

@@ -1,12 +1,8 @@
 {% load form_helpers %}
 {% load helpers %}
 
-<div class="col col-md-5 col-lg-4 col-xl-3 col-xxl-2 noprint">
+<form action="." method="get">
-    <form action="." method="get">
+  <div class="card">
-        <div class="card small">
-            <h5 class="card-header">
-                Field Filters
-            </h5>
     <div class="card-body overflow-visible d-flex flex-wrap justify-content-between py-3">
           {% for field in filter_form.hidden_fields %}
               {{ field }}
@@ -61,5 +57,4 @@
         </button>
     </div>
   </div>
-    </form>
+</form>
-</div>