Attach names to endblock template tags

netbox/templates/generic/object.html

@@ -34,15 +34,15 @@
   {% endif %}
   </div>
 </div>
-{% endblock %}
+{% endblock controls %}
 
 {% block tabs %}
 <ul class="nav nav-tabs mb-3">
   {% block tab_items %}
-  <li class="nav-item" role="presentation">
-    <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
-  </li>
-  {% endblock %}
+    <li class="nav-item" role="presentation">
+      <a class="nav-link{% if not active_tab %} active{% endif %}" href="{{ object.get_absolute_url }}">{{ object|meta:"verbose_name"|bettertitle }}</a>
+    </li>
+  {% endblock tab_items %}
   {% if perms.extras.view_journalentry %}
     {% with journal_viewname=object|viewname:'journal' %}
     {% url journal_viewname pk=object.pk as journal_url %}
@@ -62,7 +62,7 @@
     {% endwith %}
   {% endif %}
 </ul>
-{% endblock %}
+{% endblock tabs %}
 
 {% block content %}
 <p>
@@ -72,5 +72,5 @@
   </small>
   <span class="badge bg-primary">{{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}:{{ object.pk }}</span>
 </p>
-{% endblock %}
+{% endblock content %}
 {% block components %}{% endblock %}

netbox/templates/generic/object_bulk_add_component.html

@@ -37,4 +37,4 @@
         </div>
     </div>
 </form>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_bulk_delete.html

@@ -39,4 +39,4 @@
             </form>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_bulk_edit.html

@@ -42,4 +42,4 @@
         </div>
     </div>
 </form>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_bulk_import.html

@@ -127,4 +127,4 @@
             </div>
         </div>
     </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_bulk_remove.html

@@ -37,4 +37,4 @@
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_bulk_rename.html

@@ -47,4 +47,4 @@
         </form>
     </div>
 </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_delete.html

@@ -4,6 +4,6 @@
 {% block title %}Delete {{ obj_type }}?{% endblock %}
 
 {% block message %}
-    <p>Are you sure you want to delete {{ obj_type }} <strong>{{ obj }}</strong>?</p>
-    {% block message_extra %}{% endblock %}
-{% endblock %}
+  <p>Are you sure you want to delete {{ obj_type }} <strong>{{ obj }}</strong>?</p>
+  {% block message_extra %}{% endblock %}
+{% endblock message %}

netbox/templates/generic/object_edit.html

@@ -8,7 +8,7 @@
     <i class="mdi mdi-help-circle"></i>
   </button>
   {% endif %}
-{% endblock %}
+{% endblock controls %}
 
 {% block content %}
 <form action="" method="post" enctype="multipart/form-data">
@@ -47,7 +47,7 @@
         {% block form_fields %}{% render_form form %}{% endblock %}
       </div>
       {% endif %}
-      {% endblock %}
+      {% endblock form %}
     </div>
   </div>
   <div class="row my-3">
@@ -66,11 +66,11 @@
         Create
       </button>
       {% endif %}
-      {% endblock %}
+      {% endblock buttons %}
     </div>
   </div>
 </form>
 {% if obj and settings.DOCS_ROOT %} 
   {% include 'inc/modal.html' with name='docs' content=obj|get_docs %}
 {% endif %}
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_import.html

@@ -22,4 +22,4 @@
 		</form>
 	</div>
 </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/generic/object_list.html

@@ -21,7 +21,7 @@
     {% endif %}
   </div>
 </div>
-{% endblock %}
+{% endblock controls %}
 
 {% block content %}
 {% if table.paginator.num_pages > 1 %}
@@ -111,4 +111,4 @@
     {% endif %}
 </div>
 {% table_config_form table table_name="ObjectTable" %}
-{% endblock %}
+{% endblock content %}

netbox/templates/home.html

@@ -97,4 +97,4 @@
       </div>
     </div>
   </div>
-{% endblock %}
+{% endblock content %}

netbox/templates/import_success.html

@@ -11,4 +11,4 @@
         <span class="mdi mdi-database-import-outline" aria-hidden="true"></span>
         Import More
     </a>
-{% endblock %}
+{% endblock content %}

netbox/templates/layout.html

@@ -101,7 +101,7 @@
               {% block controls %}{% endblock %}
 
             </div>
-          {% endblock %}
+          {% endblock header %}
 
           {# Page content #}
           <div id="content" class="container-fluid p-0 m-0">
@@ -125,4 +125,4 @@
       </main>
     </div>
   </div>
-{% endblock %}
+{% endblock layout %}

netbox/templates/login.html

@@ -67,4 +67,4 @@
     </div>
   </footer>
 
-{% endblock %}
+{% endblock layout %}

netbox/templates/search.html

@@ -65,4 +65,4 @@
             </div>
         </div>
     {% endif %}
-{% endblock %}
+{% endblock content %}