Clean up template blocks

netbox/templates/extras/report.html

@@ -10,7 +10,7 @@
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}">Reports</a></li>
   <li class="breadcrumb-item"><a href="{% url 'extras:report_list' %}#module.{{ report.module }}">{{ report.module|bettertitle }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block subtitle %}
   {% if report.description %}
@@ -18,7 +18,7 @@
       <div class="text-muted">{{ report.description|render_markdown }}</div>
     </div>
   {% endif %}
-{% endblock %}
+{% endblock subtitle %}
 
 {% block controls %}{% endblock %}
 
@@ -28,13 +28,12 @@
       <a href="#report" role="tab" data-bs-toggle="tab" class="nav-link active">Report</a>
     </li>
   </ul>
-{% endblock %}
+{% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   <div role="tabpanel" class="tab-pane active" id="report">
     {% if perms.extras.run_report %}
-        <div class="px-3 float-end noprint">
+      <div class="float-end noprint">
           <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
               {% csrf_token %}
               <button type="submit" name="_run" class="btn btn-primary">
@@ -47,7 +46,7 @@
           </form>
       </div>
     {% endif %}
-      <div class="row px-3">
+    <div class="row">
         <div class="col col-md-12">
             {% if report.result %}
                 Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
@@ -57,5 +56,4 @@
         </div>
     </div>
   </div>
-  </div>
+{% endblock content %}
-{% endblock %}

netbox/templates/extras/script.html

@@ -7,34 +7,33 @@
 
 {% block object_identifier %}
   {{ script.full_name }}
-{% endblock %}
+{% endblock object_identifier %}
 
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}">Scripts</a></li>
   <li class="breadcrumb-item"><a href="{% url 'extras:script_list' %}#module.{{ module }}">{{ module|bettertitle }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block subtitle %}
   <div class="object-subtitle">
     <div class="text-muted">{{ script.Meta.description|render_markdown }}</div>
   </div>
-{% endblock %}
+{% endblock subtitle %}
 
 {% block controls %}{% endblock %}
 
 {% block tabs %}
-<ul class="nav nav-tabs px-3">
+  <ul class="nav nav-tabs px-3">
     <li class="nav-item" role="presentation">
       <a href="#run" role="tab" data-bs-toggle="tab" class="nav-link active">Run</a>
     </li>
     <li class="nav-item" role="presentation">
       <a href="#source" role="tab" data-bs-toggle="tab" class="nav-link">Source</a>
     </li>
-</ul>
+  </ul>
-{% endblock %}
+{% endblock tabs %}
 
-{% block content-wrapper %}
+{% block content %}
-  <div class="tab-content">
   <div role="tabpanel" class="tab-pane active" id="run">
     <div class="row">
       <div class="col">
@@ -71,5 +70,4 @@
     <code class="h6 my-3 d-block">{{ script.filename }}</code>
     <pre class="block">{{ script.source }}</pre>
   </div>
-  </div>
+{% endblock content %}
-{% endblock content-wrapper %}

netbox/templates/ipam/vlan/base.html

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