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,34 +28,32 @@
       <a href="#report" role="tab" data-bs-toggle="tab" class="nav-link active">Report</a>
     </li>
   </ul>
-{% endblock %}
+{% endblock tabs %}
 
-{% block content-wrapper %}
-  <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">
-            <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">
-                    {% if report.result %}
-                        <i class="mdi mdi-replay"></i> Run Again
-                    {% else %}
-                        <i class="mdi mdi-play"></i> Run Report
-                    {% endif %}
-                </button>
-            </form>
-        </div>
-      {% endif %}
-      <div class="row px-3">
-          <div class="col col-md-12">
-              {% if report.result %}
-                  Last run: <a href="{% url 'extras:report_result' job_result_pk=report.result.pk %}">
-                      <strong>{{ report.result.created|annotated_date }}</strong>
-                  </a>
-              {% endif %}
-          </div>
+{% block content %}
+  <div role="tabpanel" class="tab-pane active" id="report">
+    {% if perms.extras.run_report %}
+      <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">
+                  {% if report.result %}
+                      <i class="mdi mdi-replay"></i> Run Again
+                  {% else %}
+                      <i class="mdi mdi-play"></i> Run Report
+                  {% endif %}
+              </button>
+          </form>
       </div>
+    {% endif %}
+    <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 %}">
+                    <strong>{{ report.result.created|annotated_date }}</strong>
+                </a>
+            {% endif %}
+        </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/extras/script.html

@@ -7,69 +7,67 @@
 
 {% 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">
-  <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>
-{% endblock %}
+  <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>
+{% endblock tabs %}
 
-{% block content-wrapper %}
-  <div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="run">
-      <div class="row">
-        <div class="col">
-          {% if not perms.extras.run_script %}
-            <div class="alert alert-warning">
-              <i class="mdi mdi-alert"></i>
-              You do not have permission to run scripts.
-            </div>
-          {% endif %}
-          <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
-            {% csrf_token %}
-            <div class="field-group my-4">
-              {% if form.requires_input %}
-                <div class="row mb-2">
-                  <h5 class="offset-sm-3">Script Data</h5>
-                </div>
-              {% else %}
-                <div class="alert alert-info">
-                  <i class="mdi mdi-information"></i>
-                  This script does not require any input to run.
-                </div>
-              {% endif %}
-              {% render_form form %}
-            </div>
-            <div class="float-end">
-              <a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">Cancel</a>
-              <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> Run Script</button>
-            </div>
-          </form>
-        </div>
+{% block content %}
+  <div role="tabpanel" class="tab-pane active" id="run">
+    <div class="row">
+      <div class="col">
+        {% if not perms.extras.run_script %}
+          <div class="alert alert-warning">
+            <i class="mdi mdi-alert"></i>
+            You do not have permission to run scripts.
+          </div>
+        {% endif %}
+        <form action="" method="post" enctype="multipart/form-data" class="form form-horizontal">
+          {% csrf_token %}
+          <div class="field-group my-4">
+            {% if form.requires_input %}
+              <div class="row mb-2">
+                <h5 class="offset-sm-3">Script Data</h5>
+              </div>
+            {% else %}
+              <div class="alert alert-info">
+                <i class="mdi mdi-information"></i>
+                This script does not require any input to run.
+              </div>
+            {% endif %}
+            {% render_form form %}
+          </div>
+          <div class="float-end">
+            <a href="{% url 'extras:script_list' %}" class="btn btn-outline-danger">Cancel</a>
+            <button type="submit" name="_run" class="btn btn-primary"{% if not perms.extras.run_script %} disabled="disabled"{% endif %}><i class="mdi mdi-play"></i> Run Script</button>
+          </div>
+        </form>
       </div>
     </div>
-    <div role="tabpanel" class="tab-pane" id="source">
-      <code class="h6 my-3 d-block">{{ script.filename }}</code>
-      <pre class="block">{{ script.source }}</pre>
-    </div>
   </div>
-{% endblock content-wrapper %}
+  <div role="tabpanel" class="tab-pane" id="source">
+    <code class="h6 my-3 d-block">{{ script.filename }}</code>
+    <pre class="block">{{ script.source }}</pre>
+  </div>
+{% endblock content %}

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 %}