From 4ab5d15ee6f7052be7a7fc1b12b45b61d21af5de Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sun, 14 Mar 2021 17:26:56 -0700 Subject: [PATCH] update templates to bootstrap 5 classes --- netbox/templates/dcim/device_list.html | 4 +- .../dcim/devicetype_component_add.html | 2 +- netbox/templates/dcim/interface.html | 282 ++++++++++-------- netbox/templates/dcim/rack_edit.html | 95 +++--- netbox/templates/generic/object.html | 12 +- netbox/templates/generic/object_list.html | 16 +- 6 files changed, 211 insertions(+), 200 deletions(-) diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html index 2ab4d9ef6..45a4ad92d 100644 --- a/netbox/templates/dcim/device_list.html +++ b/netbox/templates/dcim/device_list.html @@ -2,9 +2,9 @@ {% block bulk_buttons %} {% if perms.dcim.change_device %} -
+
    {% if perms.dcim.add_consoleport %} diff --git a/netbox/templates/dcim/devicetype_component_add.html b/netbox/templates/dcim/devicetype_component_add.html index 7d2cc9f92..a085b8d15 100644 --- a/netbox/templates/dcim/devicetype_component_add.html +++ b/netbox/templates/dcim/devicetype_component_add.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'layout.html' %} {% load form_helpers %} {% block title %}Add {{ component_type }} to {{ parent }}{% endblock %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index dbd66c7e7..2bfaad8a4 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -5,66 +5,67 @@ {% block content %}
    -
    -
    - Interface +
    +
    + Interface +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + {% if object.enabled %} + Enabled + {% else %} + Disabled + {% endif %} +
    Device + {{ object.device }} +
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    LAG + {% if object.lag%} + {{ object.lag }} + {% else %} + None + {% endif %} +
    Description{{ object.description|placeholder }}
    MTU{{ object.mtu|placeholder }}
    MAC Address{{ object.mac_address|placeholder }}
    802.1Q Mode{{ object.get_mode_display }}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Device - {{ object.device }} -
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Enabled - {% if object.enabled %} - - {% else %} - - {% endif %} -
    LAG - {% if object.lag%} - {{ object.lag }} - {% else %} - None - {% endif %} -
    Description{{ object.description|placeholder }}
    MTU{{ object.mtu|placeholder }}
    MAC Address{{ object.mac_address|placeholder }}
    802.1Q Mode{{ object.get_mode_display }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %} @@ -72,21 +73,33 @@
    {% if object.is_connectable %} -
    -
    - Connection -
    +
    +
    + Connection +
    +
    {% if object.mark_connected %} -
    - Marked as connected +
    + Marked as Connected
    {% elif object.cable %} - +
    + {% if object.connected_endpoint.device %} - + + + {% endif %} + + @@ -94,33 +107,23 @@ {% if object.connected_endpoint.device %} {% with iface=object.connected_endpoint %} - + - + - + - - - - - + - + - + - + - + {% endwith %} {% elif object.connected_endpoint.circuit %} {% with ct=object.connected_endpoint %} - + - + - + {% endwith %} {% endif %} - +
    Cable + {% if object.connected_endpoint.enabled %} + Enabled + {% else %} + Disabled + {% endif %} +
    Cable {{ object.cable }} - +
    DeviceDevice {{ iface.device }}
    NameName {{ iface.name }}
    TypeType {{ iface.get_type_display }}
    Enabled - {% if iface.enabled %} - - {% else %} - - {% endif %} -
    LAGLAG {% if iface.lag%} {{ iface.lag }} @@ -130,100 +133,119 @@
    DescriptionDescription {{ iface.description|placeholder }}
    MTUMTU {{ iface.mtu|placeholder }}
    MAC AddressMAC Address {{ iface.mac_address|placeholder }}
    802.1Q Mode802.1Q Mode {{ iface.get_mode_display }}
    ProviderProvider {{ ct.circuit.provider }}
    CircuitCircuit {{ ct.circuit }}
    SideSide {{ ct.term_side }}
    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 %}
    {% endif %} +
    {% endif %} {% if object.is_lag %} -
    -
    LAG Members
    - - - - - - - - - - {% for member in object.member_interfaces.all %} +
    +
    LAG Members
    +
    +
    ParentInterfaceType
    + - - - + + + - {% empty %} - - - - {% endfor %} - -
    - {{ member.device }} - - {{ member }} - - {{ member.get_type_display }} - ParentInterfaceType
    No member interfaces
    + + + {% for member in object.member_interfaces.all %} + + + {{ member.device }} + + + {{ member }} + + + {{ member.get_type_display }} + + + {% empty %} + + No member interfaces + + {% endfor %} + + +
    {% endif %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 6f52649d7..5b1a72b63 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -2,66 +2,57 @@ {% load form_helpers %} {% block form %} -
    -
    Rack
    -
    - {% render_field form.region %} - {% render_field form.site %} - {% render_field form.group %} - {% render_field form.name %} - {% render_field form.status %} - {% render_field form.role %} - {% render_field form.tags %} -
    +
    +

    Rack

    + {% render_field form.region %} + {% render_field form.site %} + {% render_field form.group %} + {% render_field form.name %} + {% render_field form.status %} + {% render_field form.role %} + {% render_field form.tags %}
    -
    -
    Inventory Control
    -
    - {% render_field form.facility_id %} - {% render_field form.serial %} - {% render_field form.asset_tag %} -
    +
    +

    Inventory Control

    + {% render_field form.facility_id %} + {% render_field form.serial %} + {% render_field form.asset_tag %}
    -
    -
    Tenancy
    -
    - {% render_field form.tenant_group %} - {% render_field form.tenant %} -
    +
    +

    Tenancy

    + {% render_field form.tenant_group %} + {% render_field form.tenant %}
    -
    -
    Dimensions
    -
    - {% render_field form.type %} - {% render_field form.width %} - {% render_field form.u_height %} -
    - -
    - {{ form.outer_width }} -
    -
    - {{ form.outer_depth }} -
    -
    - {{ form.outer_unit }} -
    +
    +

    Dimensions

    + {% render_field form.type %} + {% render_field form.width %} + {% render_field form.u_height %} +
    + +
    + {{ form.outer_width }} +
    Width
    +
    +
    + {{ form.outer_depth }} +
    Depth
    +
    +
    + {{ form.outer_unit }} +
    Unit
    - {% render_field form.desc_units %}
    + {% render_field form.desc_units %}
    {% if form.custom_fields %} -
    -
    Custom Fields
    -
    - {% render_custom_fields form %} -
    +
    +

    Custom Fields

    + {% render_custom_fields form %}
    {% endif %} -
    -
    Comments
    -
    - {% render_field form.comments %} -
    +
    +

    Comments

    + {% render_field form.comments %}
    {% endblock %} diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index b56e81058..99b3b8868 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -6,7 +6,7 @@ {% load plugins %} -{% block title %}{{ object }}{% endblock %} +{% block title %}{{ object }}{% endblock %} {% block breadcrumb_main %}
    {% endif %} {% include table_template|default:'responsive_table.html' %} -
    +
    {% block bulk_buttons %}{% endblock %} -
    {% if bulk_edit_url and permissions.change %} - + {% endif %} {% if bulk_delete_url and permissions.delete %} - + {% endif %} -