refactored bulk_controls view

netbox/templates/dcim/device/consoleports.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_consoleport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:consoleport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleports' pk=object.pk %}"

netbox/templates/dcim/device/consoleserverports.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_consoleserverport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:consoleserverport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}"

netbox/templates/dcim/device/devicebays.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_devicebay %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_devicebays' pk=object.pk %}"

netbox/templates/dcim/device/frontports.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_frontport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:frontport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_frontports' pk=object.pk %}"

netbox/templates/dcim/device/interfaces.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_interface %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:interface_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}"

netbox/templates/dcim/device/inventory.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_inventoryitem %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_inventory' pk=object.pk %}"

netbox/templates/dcim/device/modulebays.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_modulebay %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:modulebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_modulebays' pk=object.pk %}"

netbox/templates/dcim/device/poweroutlets.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_poweroutlet %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:poweroutlet_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_poweroutlets' pk=object.pk %}"

netbox/templates/dcim/device/powerports.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_powerport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:powerport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_powerports' pk=object.pk %}"

netbox/templates/dcim/device/rearports.html

@@ -1,6 +1,7 @@
 {% extends 'generic/object_tab.html' %}
 
-{% block extra_contols_bottom %}
+{% block bulk_controls %}
+    {{ block.super }}
     {% if perms.dcim.add_rearport %}
         <div class="bulk-button-group">
             <a href="{% url 'dcim:rearport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_rearports' pk=object.pk %}"

netbox/templates/generic/object_tab.html

@@ -11,8 +11,8 @@
             </div>
         </div>
 
-        {% block bulk_controls %}
+        <div class="noprint bulk-buttons">
-            <div class="noprint bulk-buttons">
+            {% block bulk_controls %}
                 <div class="bulk-button-group">
                     {% if 'bulk_edit' in actions %}
                         <div class="btn-group" role="group">
@@ -59,10 +59,8 @@
                         {% endif %}
                     </div>
                 </div>
-                {% block extra_contols_bottom %}
+            {% endblock %}
-                {% endblock %}
+        </div>
-            </div>
-        {% endblock %}
     </form>
 {% endblock content %}