From 8653b0f3d0b6864e0c3175668197d86f71db9b2b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Fri, 6 Aug 2021 16:11:02 -0400 Subject: [PATCH] Tabify object add/edit views --- netbox/templates/generic/object_edit.html | 145 ++++++++++-------- .../ipam/inc/ipadress_edit_header.html | 56 +++---- netbox/templates/ipam/ipaddress_assign.html | 4 + netbox/templates/ipam/ipaddress_bulk_add.html | 5 +- netbox/templates/ipam/ipaddress_edit.html | 7 +- 5 files changed, 119 insertions(+), 98 deletions(-) diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index 43425e060..60fdb1032 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -18,79 +18,92 @@ {% endif %} {% endblock controls %} -{% block content %} -
- {% csrf_token %} - {% for field in form.hidden_fields %}{{ field }}{% endfor %} +{% block tabs %} + +{% endblock tabs %} -
-
- {% block tabs %}{% endblock %} - {% block form %} - {% if form.Meta.fieldsets %} +{% block content-wrapper %} +
+
+ + {% csrf_token %} + {% for field in form.hidden_fields %}{{ field }}{% endfor %} - {# Render grouped fields according to Form #} - {% for group, fields in form.Meta.fieldsets %} -
-
{{ group }}
- {% for name in fields %} - {% render_field form|getfield:name %} +
+
+ {% block form %} + {% if form.Meta.fieldsets %} + + {# Render grouped fields according to Form #} + {% for group, fields in form.Meta.fieldsets %} +
+
{{ group }}
+ {% for name in fields %} + {% render_field form|getfield:name %} + {% endfor %} +
{% endfor %} -
- {% endfor %} - {% if form.custom_fields %} -
-
Custom Fields
- {% render_custom_fields form %} -
- {% endif %} + {% if form.custom_fields %} +
+
Custom Fields
+ {% render_custom_fields form %} +
+ {% endif %} - {% if form.comments %} -
- {% render_field form.comments label='Comments' %} -
- {% endif %} + {% if form.comments %} +
+ {% render_field form.comments label='Comments' %} +
+ {% endif %} - {% else %} - {# Render all fields in a single group #} -
-
{{ obj_type|capfirst }}
- {% block form_fields %}{% render_form form %}{% endblock %} -
- {% endif %} + {% else %} + {# Render all fields in a single group #} +
+
{{ obj_type|capfirst }}
+ {% block form_fields %}{% render_form form %}{% endblock %} +
+ {% endif %} - {% endblock form %} -
+ {% endblock form %} +
+
+ +
+
+ {% block buttons %} + Cancel + + {% if obj.pk %} + + + {% else %} + + + + {% endif %} + + {% endblock buttons %} +
+
+
+
-
-
- {% block buttons %} - Cancel + {% if obj and settings.DOCS_ROOT %} + {% include 'inc/modal.html' with name='docs' content=obj|get_docs %} + {% endif %} - {% if obj.pk %} - - - {% else %} - - - - {% endif %} - - {% endblock buttons %} -
-
- - -{% if obj and settings.DOCS_ROOT %} - {% include 'inc/modal.html' with name='docs' content=obj|get_docs %} -{% endif %} - -{% endblock content %} +{% endblock content-wrapper %} diff --git a/netbox/templates/ipam/inc/ipadress_edit_header.html b/netbox/templates/ipam/inc/ipadress_edit_header.html index e9c8ba3c3..de50000f0 100644 --- a/netbox/templates/ipam/inc/ipadress_edit_header.html +++ b/netbox/templates/ipam/inc/ipadress_edit_header.html @@ -1,31 +1,31 @@ {% load helpers %} -