From 125965b5596ec584c4c2571c6c820a95c1f88f4f Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sun, 18 Apr 2021 11:35:42 -0700 Subject: [PATCH] migrate templates to bootstrap 5 --- netbox/templates/40x.html | 22 +- netbox/templates/dcim/connections_list.html | 21 +- netbox/templates/dcim/device.html | 12 +- netbox/templates/dcim/manufacturer.html | 62 +++--- netbox/templates/dcim/poweroutlet.html | 121 +++++------ netbox/templates/dcim/powerport.html | 131 ++++++------ .../dcim/virtualchassis_add_member.html | 31 ++- netbox/templates/extras/journalentry.html | 78 +++---- .../templates/generic/object_bulk_import.html | 194 ++++++++++-------- .../templates/generic/object_bulk_remove.html | 36 ++-- .../templates/generic/object_bulk_rename.html | 71 +++---- netbox/templates/ipam/rir.html | 84 ++++---- netbox/templates/ipam/role.html | 72 ++++--- netbox/templates/ipam/service.html | 94 +++++---- netbox/templates/ipam/service_edit.html | 57 +++-- netbox/templates/ipam/vlan/base.html | 20 +- netbox/templates/ipam/vlan_edit.html | 80 ++++---- netbox/templates/ipam/vlangroup.html | 82 ++++---- netbox/templates/utilities/render_field.html | 12 -- 19 files changed, 650 insertions(+), 630 deletions(-) diff --git a/netbox/templates/40x.html b/netbox/templates/40x.html index d923d001e..b27a157cf 100644 --- a/netbox/templates/40x.html +++ b/netbox/templates/40x.html @@ -1,17 +1,19 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} + +{% block title %}{% endblock %} {% block content %} -
-
-
-
- {% block icon %}{% endblock %} {% block title %}{% endblock %} -
-
+
+
+
+
+ {{ request_path }} +
+
{% block message %}{% endblock %}
-
- Home Page +
+ Home Page
diff --git a/netbox/templates/dcim/connections_list.html b/netbox/templates/dcim/connections_list.html index f1146e276..806b39a3c 100644 --- a/netbox/templates/dcim/connections_list.html +++ b/netbox/templates/dcim/connections_list.html @@ -1,19 +1,22 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load buttons %} {% block title %}{{ title }}{% endblock %} +{% block extra_controls %}{% export_button content_type %}{% endblock %} + {% block content %} -
- {% export_button content_type %} -
-
-
-
- {% include 'inc/search_panel.html' %} +
+
+
+
+ {% include 'responsive_table.html' %} +
- {% include 'responsive_table.html' %} {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
+
+ {% include 'inc/search_panel.html' %} +
{% endblock %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index e4947c1a4..1db885e0b 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -285,7 +285,7 @@ {% if perms.secrets.add_secret %}
- Add secret + Add Secret
{% endif %} @@ -311,7 +311,7 @@ {% if perms.ipam.add_service %}
- Assign service + Assign Service
{% endif %} @@ -326,8 +326,8 @@ {% if perms.extras.add_imageattachment %}
- - Attach an image + + Attach an Image
{% endif %} @@ -379,7 +379,3 @@
{% include 'secrets/inc/private_key_modal.html' %} {% endblock %} - -{% block javascript %} - -{% endblock %} diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index b2ecacbb1..2e0e553bd 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -3,33 +3,35 @@ {% load plugins %} {% block breadcrumbs %} -
  • Manufacturers
    • -
  • {{ object }}
    • +
  • Manufacturers
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - Manufacturer +
    +
    + Manufacturer +
    +
    + + + + + + + + + + + + + +
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Device types + {{ devicetypes_table.rows|length }} +
    - - - - - - - - - - - - - -
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Device types - {{ devicetypes_table.rows|length }} -
    {% plugin_left_page object %}
    @@ -38,16 +40,18 @@ {% plugin_right_page object %}
    -
    +
    -
    -
    - Device Types +
    +
    + Device Types +
    +
    + {% include 'inc/table.html' with table=devicetypes_table %}
    - {% include 'inc/table.html' with table=devicetypes_table %} {% if perms.dcim.add_devicetype %} -
    - +
    + Add device type
    diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 9a11628c8..fe8f7c002 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -3,123 +3,126 @@ {% load plugins %} {% block breadcrumbs %} - {{ block.super }} -
  • Power Outlets
    • -
  • {{ object }}
    • +
  • Power Outlets
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - Power Outlet +
    +
    + Power Outlet +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Device + {{ object.device }} +
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    Power Port{{ object.power_port }}
    Feed Leg{{ object.get_feed_leg_display }}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Device - {{ object.device }} -
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    Power Port{{ object.power_port }}
    Feed Leg{{ object.get_feed_leg_display }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %} {% plugin_left_page object %}
    -
    -
    - Connection -
    +
    +
    + Connection +
    +
    {% if object.mark_connected %} -
    - Marked as connected +
    + Marked as Connected
    {% elif object.cable %} - +
    - + {% if object.connected_endpoint %} - + - + - + - + - + {% endif %}
    CableCable {{ object.cable }} - +
    DeviceDevice {{ object.connected_endpoint.device }}
    NameName {{ object.connected_endpoint.name }}
    TypeType {{ object.connected_endpoint.get_type_display|placeholder }}
    DescriptionDescription {{ object.connected_endpoint.description|placeholder }}
    Path StatusPath Status {% if object.path.is_active %} - Reachable + Reachable {% else %} - Not Reachable + Not Reachable {% endif %}
    {% else %} -
    - Not connected +
    + Not Connected {% if perms.dcim.add_cable %} - + Connect {% endif %}
    {% endif %} +
    {% plugin_right_page object %}
    -
    +
    {% plugin_full_width_page object %}
    diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index 1a7cc24e7..de71971ea 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -3,124 +3,131 @@ {% load plugins %} {% block breadcrumbs %} - {{ block.super }} -
  • Power Ports
    • -
  • {{ object }}
    • +
  • Power Ports
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - Power Port +
    +
    + Power Port +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Device + {{ object.device }} +
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    Maximum Draw{{ object.maximum_draw|placeholder }}
    Allocated Draw{{ object.allocated_draw|placeholder }}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Device - {{ object.device }} -
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    Maximum Draw{{ object.maximum_draw|placeholder }}
    Allocated Draw{{ object.allocated_draw|placeholder }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %} {% plugin_left_page object %}
    -
    -
    - Connection -
    +
    +
    + Connection +
    +
    {% if object.mark_connected %} -
    - Marked as connected +
    + Marked as Connected
    {% elif object.cable %} - +
    - + {% if object.connected_endpoint %} - + - + - + - + - + {% endif %}
    CableCable {{ object.cable }} - +
    DeviceDevice {{ object.connected_endpoint.device }}
    NameName {{ object.connected_endpoint.name }}
    TypeType {{ object.connected_endpoint.get_type_display|placeholder }}
    DescriptionDescription {{ object.connected_endpoint.description|placeholder }}
    Path StatusPath Status {% if object.path.is_active %} - Reachable + Reachable {% else %} - Not Reachable + Not Reachable {% endif %}
    {% else %} -
    - Not connected +
    + Not Connected {% if perms.dcim.add_cable %} - - -
    {% endif %} +
    {% plugin_right_page object %}
    diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html index 5b3a92208..e89f912fa 100644 --- a/netbox/templates/dcim/virtualchassis_add_member.html +++ b/netbox/templates/dcim/virtualchassis_add_member.html @@ -1,34 +1,27 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load form_helpers %} +{% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %} + {% block content %}
    {% csrf_token %} -
    -
    -

    {% block title %}Add New Member to Virtual Chassis {{ virtual_chassis }}{% endblock %}

    - {% if membership_form.non_field_errors %} -
    -
    Errors
    -
    - {{ membership_form.non_field_errors }} -
    -
    - {% endif %} -
    -
    Add New Member
    -
    +
    +
    +
    +
    Add New Member
    +
    {% render_form member_select_form %} {% render_form membership_form %}
    -
    -
    +
    +
    + Cancel + - - Cancel
    diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html index f64741f36..4cbfcb729 100644 --- a/netbox/templates/extras/journalentry.html +++ b/netbox/templates/extras/journalentry.html @@ -3,52 +3,54 @@ {% load static %} {% block breadcrumbs %} -
  • Journal Entries
    • -
  • {{ object.assigned_object }}
    • -
  • {{ object }}
    • +
  • Journal Entries
    • +
  • {{ object.assigned_object }}
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - Journal Entry +
    +
    + Journal Entry +
    +
    + + + + + + + + + + + + + + + + + +
    Object + {{ object.assigned_object }} +
    Created + {{ object.created }} +
    Created By + {{ object.created_by }} +
    Kind + {{ object.get_kind_display }} +
    - - - - - - - - - - - - - - - - - -
    Object - {{ object.assigned_object }} -
    Created - {{ object.created }} -
    Created By - {{ object.created_by }} -
    Kind - {{ object.get_kind_display }} -
    -
    -
    - Comments -
    -
    +
    +
    + Comments +
    +
    {{ object.comments|render_markdown }}
    diff --git a/netbox/templates/generic/object_bulk_import.html b/netbox/templates/generic/object_bulk_import.html index 170cf3665..f24e9f0e2 100644 --- a/netbox/templates/generic/object_bulk_import.html +++ b/netbox/templates/generic/object_bulk_import.html @@ -1,22 +1,16 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load helpers %} {% load form_helpers %} +{% block title %}{{ obj_type|bettertitle }} Bulk Import{% endblock %} + {% block content %} -{% block tabs %}{% endblock %}
    -

    {% block title %}{{ obj_type|bettertitle }} Bulk Import{% endblock %}

    - {% if form.non_field_errors %} -
    -
    Errors
    -
    - {{ form.non_field_errors }} -
    -
    - {% endif %} -
      - +
      @@ -24,93 +18,111 @@ {% csrf_token %} {% render_form form %}
      -
      - +
      {% if return_url %} - Cancel + Cancel {% endif %} +
      -
      -

      {% if fields %} -
      -
      - CSV Field Options -
      - - - - - - - - {% for name, field in fields.items %} - - - - - + + {% endfor %} +
      FieldRequiredAccessorDescription
      - {{ name }} - - {% if field.required %} - - {% else %} - — - {% endif %} - - {% if field.to_field_name %} - {{ field.to_field_name }} - {% else %} - — - {% endif %} - - {% if field.STATIC_CHOICES %} - -
      +
      +
      -

      - Required fields must be specified for all - objects. -

      -

      - Related objects may be referenced by any unique attribute. - For example, vrf.rd would identify a VRF by its route distinguisher. -

      - {% endif %} +
      +

      + Required fields must be specified for all + objects. +

      +

      + Related objects may be referenced by any unique attribute. + For example, vrf.rd would identify a VRF by its route distinguisher. +

      + {% endif %}
    diff --git a/netbox/templates/generic/object_bulk_remove.html b/netbox/templates/generic/object_bulk_remove.html index 57af19e3d..3aacd897f 100644 --- a/netbox/templates/generic/object_bulk_remove.html +++ b/netbox/templates/generic/object_bulk_remove.html @@ -1,36 +1,38 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load helpers %} {% block title %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %} {% block content %} -
    -
    -
    -
    Confirm Bulk Removal
    -
    - Warning: The following operation will remove {{ table.rows|length }} {{ obj_type_plural }} from {{ parent_obj }}. Please carefully review the {{ obj_type_plural }} to be removed and confirm below. +
    +
    + +
    +
    +
    +
    +
    +
    + {% include 'inc/table.html' %}
    -
    -
    -
    - {% include 'inc/table.html' %} -
    -
    -
    -
    -
    +
    +
    {% csrf_token %} {% for field in form.hidden_fields %} {{ field }} {% endfor %}
    + Cancel - Cancel
    diff --git a/netbox/templates/generic/object_bulk_rename.html b/netbox/templates/generic/object_bulk_rename.html index 90456ed97..1fded14e3 100644 --- a/netbox/templates/generic/object_bulk_rename.html +++ b/netbox/templates/generic/object_bulk_rename.html @@ -1,53 +1,48 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load helpers %} {% load form_helpers %} +{% block title %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblock %} + {% block content %} -

    {% block title %}Renaming {{ selected_objects|length }} {{ obj_type_plural|bettertitle }}{% endblock %}

    -
    +
    - - - - - - - - - {% for obj in selected_objects %} - - - - - {% endfor %} - -
    Current NameNew Name
    {{ obj.name }}{{ obj.new_name }}
    +
    +
    + + + + + + + + + {% for obj in selected_objects %} + + + + + {% endfor %} + +
    Current NameNew Name
    {{ obj.name }}{{ obj.new_name }}
    +
    +
    {% csrf_token %} - {% if form.non_field_errors %} -
    -
    Errors
    -
    - {{ form.non_field_errors }} -
    -
    - {% endif %} -
    -
    Rename
    -
    +
    +
    Rename
    +
    {% render_form form %}
    -
    -
    - - {% if '_preview' in request.POST and not form.errors %} - - {% endif %} - Cancel -
    +
    + Cancel + + {% if '_preview' in request.POST and not form.errors %} + + {% endif %}
    diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html index 332c90da7..e0776a137 100644 --- a/netbox/templates/ipam/rir.html +++ b/netbox/templates/ipam/rir.html @@ -3,43 +3,45 @@ {% load plugins %} {% block breadcrumbs %} -
  • RIRs
    • -
  • {{ object }}
    • +
  • RIRs
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - RIR +
    +
    + RIR +
    +
    + + + + + + + + + + + + + + + + + +
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Private + {% if object.is_private %} + + {% else %} + + {% endif %} +
    Aggregates + {{ aggregates_table.rows|length }} +
    - - - - - - - - - - - - - - - - - -
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Private - {% if object.is_private %} - - {% else %} - - {% endif %} -
    Aggregates - {{ aggregates_table.rows|length }} -
    {% plugin_left_page object %}
    @@ -48,17 +50,19 @@ {% plugin_right_page object %}
    -
    +
    -
    -
    - Aggregates +
    +
    + Aggregates +
    +
    + {% include 'inc/table.html' with table=aggregates_table %}
    - {% include 'inc/table.html' with table=aggregates_table %} {% if perms.ipam.add_aggregate %} -
    - - Add aggregate +
    + + Add Aggregate
    {% endif %} diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html index 307e6e21a..248ceb84f 100644 --- a/netbox/templates/ipam/role.html +++ b/netbox/templates/ipam/role.html @@ -3,37 +3,39 @@ {% load plugins %} {% block breadcrumbs %} -
  • Roles
    • -
  • {{ object }}
    • +
  • Roles
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - Role +
    +
    + Role +
    +
    + + + + + + + + + + + + + + + + + +
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Weight{{ object.weight }}
    Prefixes + {{ prefixes_table.rows|length }} +
    - - - - - - - - - - - - - - - - - -
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Weight{{ object.weight }}
    Prefixes - {{ prefixes_table.rows|length }} -
    {% plugin_left_page object %}
    @@ -42,17 +44,19 @@ {% plugin_right_page object %}
    -
    +
    -
    -
    - Prefixes +
    +
    + Prefixes +
    +
    + {% include 'inc/table.html' with table=prefixes_table %}
    - {% include 'inc/table.html' with table=prefixes_table %} {% if perms.ipam.add_prefix %} -
    - - Add prefix +
    + + Add Prefix
    {% endif %} diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index 0dbd48789..94066f024 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -5,61 +5,69 @@ {% load plugins %} {% block breadcrumbs %} -
  • Services
    • -
  • {{ object.parent }}
    • -
  • {{ object }}
    • +
  • Services
    • +
  • {{ object.parent }}
    • +
  • {{ object }}
    • {% endblock %} -{% block buttons %} +{% block controls %} +{% plugin_buttons object %} +
    +
    + {% block extra_controls %}{% endblock %} {% if request.user|can_change:object %} {% edit_button object %} {% endif %} {% if request.user|can_delete:object %} {% delete_button object %} {% endif %} +
    +
    {% endblock %} {% block content %} -
    +
    -
    -
    - Service +
    +
    + Service +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Name{{ object.name }}
    Parent + {{ object.parent }} +
    Protocol{{ object.get_protocol_display }}
    Ports{{ object.port_list }}
    IP Addresses + {% for ipaddress in object.ipaddresses.all %} + {{ ipaddress }}
    + {% empty %} + None + {% endfor %} +
    Description{{ object.description|placeholder }}
    - - - - - - - - - - - - - - - - - - - - - - - - - -
    Name{{ object.name }}
    Parent - {{ object.parent }} -
    Protocol{{ object.get_protocol_display }}
    Ports{{ object.port_list }}
    IP Addresses - {% for ipaddress in object.ipaddresses.all %} - {{ ipaddress }}
    - {% empty %} - None - {% endfor %} -
    Description{{ object.description|placeholder }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:service_list' %} @@ -69,7 +77,7 @@ {% plugin_right_page object %}
    -
    +
    {% plugin_full_width_page object %}
    diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html index a014d5f60..529b71b60 100644 --- a/netbox/templates/ipam/service_edit.html +++ b/netbox/templates/ipam/service_edit.html @@ -2,37 +2,36 @@ {% load form_helpers %} {% block form %} -
    -
    Service
    -
    - {% if obj.device %} -
    - -
    -

    {{ obj.device }}

    -
    -
    - {% else %} -
    - -
    -

    {{ obj.virtual_machine }}

    -
    -
    - {% endif %} - {% render_field form.name %} -
    - -
    - {{ form.protocol }} - {{ form.ports }} - {{ form.ports.help_text }} -
    +
    +

    Service

    + {% if obj.device %} +
    + + +
    + {% else %} +
    + + +
    + {% endif %} + {% render_field form.name %} +
    + +
    +
    + {{ form.protocol }} +
    +
    + {{ form.ports }} +
    +
    {{ form.ports.help_text }}
    - {% render_field form.ipaddresses %} - {% render_field form.description %} - {% render_field form.tags %}
    + + {% render_field form.ipaddresses %} + {% render_field form.description %} + {% render_field form.tags %}
    {% if form.custom_fields %}
    diff --git a/netbox/templates/ipam/vlan/base.html b/netbox/templates/ipam/vlan/base.html index f97cc5c31..758b8a6da 100644 --- a/netbox/templates/ipam/vlan/base.html +++ b/netbox/templates/ipam/vlan/base.html @@ -25,23 +25,23 @@ {% block tabs %} diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html index 123b52d98..c856026c0 100644 --- a/netbox/templates/ipam/vlan_edit.html +++ b/netbox/templates/ipam/vlan_edit.html @@ -4,54 +4,48 @@ {% load helpers %} {% block form %} -
    -
    VLAN
    -
    - {% render_field form.vid %} - {% render_field form.name %} - {% render_field form.status %} - {% render_field form.role %} - {% render_field form.description %} - {% render_field form.tags %} -
    +
    +

    VLAN

    + {% render_field form.vid %} + {% render_field form.name %} + {% render_field form.status %} + {% render_field form.role %} + {% render_field form.description %} + {% render_field form.tags %}
    -
    -
    Tenancy
    -
    - {% render_field form.tenant_group %} - {% render_field form.tenant %} -
    +
    +

    Tenancy

    + {% render_field form.tenant_group %} + {% render_field form.tenant %}
    -
    -
    - Assignment -
    -
    - {% with site_tab_active=form.initial.site %} - -
    -
    - {% render_field form.scope_type %} - {% render_field form.group %} -
    -
    - {% render_field form.region %} - {% render_field form.sitegroup %} - {% render_field form.site %} -
    +
    +

    Assignment

    + {% with site_tab_active=form.initial.site %} + +
    +
    + {% render_field form.scope_type %} + {% render_field form.group %}
    - {% endwith %} -
    +
    + {% render_field form.region %} + {% render_field form.sitegroup %} + {% render_field form.site %} +
    +
    + {% endwith %}
    {% if form.custom_fields %} -
    -
    Custom Fields
    -
    - {% render_custom_fields form %} -
    +
    +

    Custom Fields

    + {% render_custom_fields form %}
    {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html index 3118c1796..939224b8b 100644 --- a/netbox/templates/ipam/vlangroup.html +++ b/netbox/templates/ipam/vlangroup.html @@ -3,45 +3,47 @@ {% load plugins %} {% block breadcrumbs %} -
  • VLAN Groups
    • +
  • VLAN Groups
    • {% if object.scope %} -
  • {{ object.scope }}
    • +
  • {{ object.scope }}
    • {% endif %} -
  • {{ object }}
    • +
  • {{ object }}
    • {% endblock %} {% block content %} -
    +
    -
    -
    - VLAN Group +
    +
    + VLAN Group +
    +
    + + + + + + + + + + + + + + + + +
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Scope + {% if object.scope %} + {{ object.scope }} + {% else %} + — + {% endif %} +
    VLANs + {{ vlans_count }} +
    - - - - - - - - - - - - - - - - -
    Name{{ object.name }}
    Description{{ object.description|placeholder }}
    Scope - {% if object.scope %} - {{ object.scope }} - {% else %} - — - {% endif %} -
    VLANs - {{ vlans_count }} -
    {% plugin_left_page object %}
    @@ -50,16 +52,18 @@ {% plugin_right_page object %}
    -
    +
    -
    -
    - VLANs +
    +
    + VLANs +
    +
    + {% include 'inc/table.html' with table=vlans_table %}
    - {% include 'inc/table.html' with table=vlans_table %} {% if perms.ipam.add_vlan %} -
    - +
    + Add VLAN
    diff --git a/netbox/templates/utilities/render_field.html b/netbox/templates/utilities/render_field.html index d5a5a39e4..e783dfb3a 100644 --- a/netbox/templates/utilities/render_field.html +++ b/netbox/templates/utilities/render_field.html @@ -127,15 +127,3 @@ {% endif %} {% endif %} - -{% comment %}
    -{% if field.errors %} -
      - {% for error in field.errors %} - {# Embed an HTML comment indicating the error for extraction by tests #} - -
    • {{ error }}
      • - {% endfor %} -
    -{% endif %} -
    {% endcomment %}