Remove obsolete content-wrapper template block

netbox/templates/account/base.html

@@ -23,8 +23,3 @@
   </ul>
 {% endblock %}
 
-{% block content-wrapper %}
-  <div class="tab-content">
-    {% block content %}{% endblock %}
-  </div>
-{% endblock %}

netbox/templates/base/layout.html

@@ -171,17 +171,13 @@ Blocks:
       </div>
       {# /Page header #}
 
-
       {# Page body #}
       {% block page %}
         <div class="page-body">
           <div class="container-xl tab-content py-3">
 
             {# Page content #}
-            {# TODO: Remove content-wrapper block #}
-            {% block content-wrapper %}
             {% block content %}{% endblock %}
-            {% endblock %}
             {# /Page content #}
 
             {# Bottom banner #}

netbox/templates/dcim/connections_list.html

@@ -5,8 +5,7 @@
 
 {% block title %}{{ title }}{% endblock %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
 
     {# Connections list #}
     <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
@@ -25,5 +24,4 @@
       </div>
     {% endif %}
 
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}

netbox/templates/dcim/rack_elevation_list.html

@@ -36,8 +36,7 @@
   </div>
 {% endblock %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
 
   {% if filter_form %}
     {% applied_filters model filter_form request.GET %}
@@ -85,7 +84,6 @@
     </div>
   {% endif %}
 
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}
 
 {% block modals %}{% endblock %}

netbox/templates/dcim/virtualchassis_edit.html

@@ -9,8 +9,7 @@
   {% endblocktrans %}
 {% endblock %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
     <form action="" method="post" enctype="multipart/form-data" class="form-object-edit">
       {% for form in formset %}
@@ -110,5 +109,4 @@
       </div>
     </form>
   </div>
-  </div>
+{% endblock content %}
-{% endblock %}

netbox/templates/extras/objectchange_list.html

@@ -3,9 +3,9 @@
 
 {% block title %}{% trans "Change Log" %}{% endblock %}
 
-{% block content-wrapper %}
+{% block content %}
   {{ block.super }}
   <div class="text-muted px-3">
     {% trans "Change log retention" %}: {% if config.CHANGELOG_RETENTION %}{{ config.CHANGELOG_RETENTION }} {% trans "days" %}{% else %}{% trans "Indefinite" %}{% endif %}
   </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/extras/report_list.html

@@ -23,8 +23,7 @@
   </div>
 {% endblock controls %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   {% for module in report_modules %}
     <div class="card">
       <h5 class="card-header" id="module{{ module.pk }}">
@@ -131,5 +130,4 @@
       {% endif %}
     </div>
   {% endfor %}
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}

netbox/templates/extras/report_result.html

@@ -2,13 +2,13 @@
 {% load buttons %}
 {% load perms %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="row p-3">
+  <div class="row">
     <div class="col col-md-12"{% if not job.completed %} hx-get="{% url 'extras:report_result' job_pk=job.pk %}" hx-trigger="load delay:0.5s, every 5s"{% endif %}>
       {% include 'extras/htmx/report_result.html' %}
     </div>
   </div>
-{% endblock %}
+{% endblock content %}
 
 {% block controls %}
   <div class="controls">

netbox/templates/extras/script_list.html

@@ -22,8 +22,7 @@
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   {% for module in script_modules %}
     <div class="card">
       <h5 class="card-header" id="module{{ module.pk }}">
@@ -97,5 +96,4 @@
       {% endif %}
     </div>
   {% endfor %}
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}

netbox/templates/extras/script_result.html

@@ -36,7 +36,7 @@
   </div>
 {% endblock controls %}
 
-{% block content-wrapper %}
+{% block tabs %}
   <ul class="nav nav-tabs px-3" role="tablist">
     <li class="nav-item" role="presentation">
       <a href="#log" role="tab" data-bs-toggle="tab" class="nav-link active">{% trans "Log" %}</a>
@@ -45,7 +45,9 @@
       <a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">{% trans "Source" %}</a>
     </li>
   </ul>
-  <div class="tab-content mb-3">
+{% endblock %}
+
+{% block content %}
   <div role="tabpanel" class="tab-pane active" id="log">
     <div class="row">
       <div class="col col-md-12"{% if not job.completed %} hx-get="{% url 'extras:script_result' job_pk=job.pk %}" hx-trigger="load delay:0.5s, every 5s"{% endif %}>
@@ -57,8 +59,7 @@
     <p><code>{{ script.filename }}</code></p>
     <pre class="block">{{ script.source }}</pre>
   </div>
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}
 
 {% block modals %}
   {% include 'inc/htmx_modal.html' %}

netbox/templates/generic/bulk_add_component.html

@@ -24,9 +24,7 @@
   </ul>
 {% endblock %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
-    {% block content %}
 
   {# Component creation form #}
   <div class="tab-pane show active" id="component-form" role="tabpanel" aria-labelledby="component-form-tab">
@@ -71,6 +69,4 @@
     </div>
   </div>
 
-    {% endblock %}
+{% endblock content %}
-  </div>
-{% endblock %}

netbox/templates/generic/bulk_edit.html

@@ -32,9 +32,7 @@ Context:
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
-    {% block content %}
 
   {# Edit form #}
   <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="edit-form-tab">
@@ -131,6 +129,4 @@ Context:
     </div>
   </div>
 
-    {% endblock content %}
+{% endblock content %}
-  </div>
-{% endblock content-wrapper %}

netbox/templates/generic/bulk_import.html

@@ -33,8 +33,7 @@ Context:
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
 
   {# Data Import Form #}
   <div class="tab-pane show active" id="import-form" role="tabpanel" aria-labelledby="import-form-tab">
@@ -204,5 +203,4 @@ Context:
   </p>
   {% endif %}
 
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}

netbox/templates/generic/object_edit.html

@@ -45,8 +45,7 @@ Context:
   </ul>
 {% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   <div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
 
     {# Warn about missing prerequisite objects #}
@@ -82,9 +81,7 @@ Context:
       </div>
     </form>
   </div>
-  </div>
+{% endblock content %}
-
-{% endblock content-wrapper %}
 
 {% block modals %}
   {% include 'inc/htmx_modal.html' with size='lg' %}