From 4c60a602b958a4e342406be9d460c5d3a635b1eb Mon Sep 17 00:00:00 2001 From: checktheroads Date: Sat, 13 Mar 2021 11:16:29 -0700 Subject: [PATCH] bootstrap 5 template updates --- netbox/templates/dcim/cable.html | 18 +- netbox/templates/dcim/connections_list.html | 5 +- netbox/templates/dcim/consoleport.html | 125 +++--- netbox/templates/dcim/consoleserverport.html | 131 +++--- netbox/templates/dcim/device/base.html | 398 ++++++++++++------ netbox/templates/dcim/device/config.html | 6 +- netbox/templates/dcim/device_component.html | 8 +- .../templates/dcim/device_component_add.html | 28 +- .../dcim/inc/device_napalm_tabs.html | 18 +- netbox/templates/generic/object.html | 16 +- netbox/templates/ipam/ipaddress.html | 2 - netbox/templates/ipam/ipaddress_bulk_add.html | 41 +- netbox/templates/ipam/ipaddress_edit.html | 9 +- netbox/templates/layout.html | 1 + 14 files changed, 485 insertions(+), 321 deletions(-) diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 376271802..456300224 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -5,8 +5,8 @@ {% load plugins %} {% block breadcrumbs %} -
  • Cables
    • -
  • {{ object }}
    • +
  • Cables
    • +
  • {{ object }}
    • {% endblock %} {% block buttons %} @@ -28,21 +28,21 @@
    - + - + - + - + - +
    TypeType {{ object.get_type_display|placeholder }}
    StatusStatus {{ object.get_status_display }}
    LabelLabel {{ object.label|placeholder }}
    ColorColor {% if object.color %}   @@ -52,7 +52,7 @@
    LengthLength {% if object.length %} {{ object.length }} {{ object.get_length_unit_display }} @@ -73,13 +73,17 @@
    Termination A
    +
    {% include 'dcim/inc/cable_termination.html' with termination=object.termination_a %} +
    Termination B
    +
    {% include 'dcim/inc/cable_termination.html' with termination=object.termination_b %} +
    {% plugin_right_page object %} diff --git a/netbox/templates/dcim/connections_list.html b/netbox/templates/dcim/connections_list.html index 80d76e7d1..f1146e276 100644 --- a/netbox/templates/dcim/connections_list.html +++ b/netbox/templates/dcim/connections_list.html @@ -1,11 +1,12 @@ {% extends 'base.html' %} {% load buttons %} +{% block title %}{{ title }}{% endblock %} + {% block content %} -
    +
    {% export_button content_type %}
    -

    {% block title %}{{ title }}{% endblock %}

    diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index 701fc6ef6..fcefc9fab 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -5,52 +5,53 @@ {% block content %}
    -
    -
    - Console Port +
    +
    + Console Port +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Device + {{ object.device }} +
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    - - - - - - - - - - - - - - - - - - - - - -
    Device - {{ object.device }} -
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %} {% plugin_left_page object %}
    -
    -
    - Connection -
    - {% if object.mark_connected %} -
    - Marked as connected -
    - {% elif object.cable %} - +
    +
    + Connection +
    +
    + {% if object.mark_connected %} + Marked as connected + {% elif object.cable %} +
    - + {% if object.connected_endpoint %} - + - + - + - + - +
    CableCable {{ object.cable }} @@ -60,27 +61,27 @@
    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 @@ -92,23 +93,45 @@ {% endif %}
    {% else %} -
    - Not connected +
    + Not Connected {% if perms.dcim.add_cable %} - - - +
    {% endif %}
    {% endif %}
    +
    {% plugin_right_page object %}
    diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index b4e6d6ab9..fb4c0982a 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -5,52 +5,53 @@ {% block content %}
    -
    -
    - Console Server Port +
    +
    + Console Server Port +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Device + {{ object.device }} +
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    - - - - - - - - - - - - - - - - - - - - - -
    Device - {{ object.device }} -
    Name{{ object.name }}
    Label{{ object.label|placeholder }}
    Type{{ object.get_type_display }}
    Description{{ object.description|placeholder }}
    {% include 'inc/custom_fields_panel.html' %} {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %} {% plugin_left_page object %}
    -
    -
    - Connection -
    - {% if object.mark_connected %} -
    - Marked as connected -
    - {% elif object.cable %} - +
    +
    + Connection +
    +
    + {% if object.mark_connected %} + Marked as connected + {% elif object.cable %} +
    - + {% if object.connected_endpoint %} - + - + - + - + - + {% endif %}
    CableCable {{ object.cable }} @@ -60,54 +61,76 @@
    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 %}
    {% endif %} +
    {% plugin_right_page object %}
    diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html index 608b1e85c..73b8ab19d 100644 --- a/netbox/templates/dcim/device/base.html +++ b/netbox/templates/dcim/device/base.html @@ -15,142 +15,270 @@
  • {{ object }}
    • {% endblock %} -{% block buttons %} - {% if perms.dcim.change_device %} -
    - -
      - {% if perms.dcim.add_consoleport %} -
    • Console Ports
      • - {% endif %} - {% if perms.dcim.add_consoleserverport %} -
    • Console Server Ports
      • - {% endif %} - {% if perms.dcim.add_powerport %} -
    • Power Ports
      • - {% endif %} - {% if perms.dcim.add_poweroutlet %} -
    • Power Outlets
      • - {% endif %} - {% if perms.dcim.add_interface %} -
    • Interfaces
      • - {% endif %} - {% if perms.dcim.add_frontport %} -
    • Front Ports
      • - {% endif %} - {% if perms.dcim.add_rearport %} -
    • Rear Ports
      • - {% endif %} - {% if perms.dcim.add_devicebay %} -
    • Device Bays
      • - {% endif %} - {% if perms.dcim.add_inventoryitem %} -
    • Inventory Items
      • - {% endif %} -
    -
    - {% endif %} - {% if perms.dcim.add_device %} - {% clone_button object %} - {% endif %} - {% if perms.dcim.change_device %} - {% edit_button object %} - {% endif %} - {% if perms.dcim.delete_device %} - {% delete_button object %} - {% endif %} +{% block extra_controls %} +{% if perms.dcim.change_device %} +
    + + +
    +{% endif %} {% endblock %} -{% block tabs %} -
      - +{% with interface_count=object.vc_interfaces.count %} + {% if interface_count %} + - {% with interface_count=object.vc_interfaces.count %} - {% if interface_count %} - - {% endif %} - {% endwith %} - {% with frontport_count=object.frontports.count %} - {% if frontport_count %} - - {% endif %} - {% endwith %} - {% with rearport_count=object.rearports.count %} - {% if rearport_count %} - - {% endif %} - {% endwith %} - {% with consoleport_count=object.consoleports.count %} - {% if consoleport_count %} - - {% endif %} - {% endwith %} - {% with consoleserverport_count=object.consoleserverports.count %} - {% if consoleserverport_count %} - - {% endif %} - {% endwith %} - {% with powerport_count=object.powerports.count %} - {% if powerport_count %} - - {% endif %} - {% endwith %} - {% with poweroutlet_count=object.poweroutlets.count %} - {% if poweroutlet_count %} - - {% endif %} - {% endwith %} - {% with devicebay_count=object.devicebays.count %} - {% if devicebay_count %} - - {% endif %} - {% endwith %} - {% with inventoryitem_count=object.inventoryitems.count %} - {% if inventoryitem_count %} - - {% endif %} - {% endwith %} - {% if perms.dcim.napalm_read_device %} - {% if object.status != 'active' %} - {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='Device must be in active status' %} - {% elif not object.platform %} - {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No platform assigned to this device' %} - {% elif not object.platform.napalm_driver %} - {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No NAPALM driver assigned for this platform' %} - {% else %} - {% include 'dcim/inc/device_napalm_tabs.html' %} - {% endif %} - {% endif %} - {% if perms.extras.view_configcontext %} - - {% endif %} - {% if perms.extras.view_objectchange %} - - {% endif %} -
    + {% endif %} +{% endwith %} +{% with frontport_count=object.frontports.count %} + {% if frontport_count %} + + {% endif %} +{% endwith %} +{% with rearport_count=object.rearports.count %} + {% if rearport_count %} + + {% endif %} +{% endwith %} +{% with consoleport_count=object.consoleports.count %} + {% if consoleport_count %} + + {% endif %} +{% endwith %} +{% with consoleserverport_count=object.consoleserverports.count %} + {% if consoleserverport_count %} + + {% endif %} +{% endwith %} +{% with powerport_count=object.powerports.count %} + {% if powerport_count %} + + {% endif %} +{% endwith %} +{% with poweroutlet_count=object.poweroutlets.count %} + {% if poweroutlet_count %} + + {% endif %} +{% endwith %} +{% with devicebay_count=object.devicebays.count %} + {% if devicebay_count %} + + {% endif %} +{% endwith %} +{% with inventoryitem_count=object.inventoryitems.count %} + {% if inventoryitem_count %} + + {% endif %} +{% endwith %} +{% if perms.dcim.napalm_read_device %} + {% if object.status != 'active' %} + {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='Device must be in active status' %} + {% elif not object.platform %} + {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No platform assigned to this device' %} + {% elif not object.platform.napalm_driver %} + {% include 'dcim/inc/device_napalm_tabs.html' with disabled_message='No NAPALM driver assigned for this platform' %} + {% else %} + {% include 'dcim/inc/device_napalm_tabs.html' %} + {% endif %} +{% endif %} +{% if perms.extras.view_configcontext %} + +{% endif %} +{% if perms.extras.view_objectchange %} + +{% endif %} {% endblock %} diff --git a/netbox/templates/dcim/device/config.html b/netbox/templates/dcim/device/config.html index 4b73a2577..e8ca0da10 100644 --- a/netbox/templates/dcim/device/config.html +++ b/netbox/templates/dcim/device/config.html @@ -7,9 +7,9 @@ {% include 'inc/ajax_loader.html' %}
    -
    -
    Device Configuration
    -
    +
    +
    Device Configuration
    +
    • Startup
      • diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html index 4abd36a4d..998551838 100644 --- a/netbox/templates/dcim/device_component.html +++ b/netbox/templates/dcim/device_component.html @@ -6,10 +6,10 @@ {% block title %}{{ object.device }} / {{ object }}{% endblock %} {% block breadcrumbs %} -
    • Devices
      • -
    • {{ object.device }}
      • +
    • Devices
      • +
    • {{ object.device }}
      • {% if breadcrumb_url %} -
    • {{ object|meta:"verbose_name_plural"|bettertitle }}
      • +
    • {{ object|meta:"verbose_name_plural"|bettertitle }}
      • {% endif %} -
    • {{ object }}
      • +
    • {{ object }}
      • {% endblock %} diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html index 0b7200c1f..11fd977ca 100644 --- a/netbox/templates/dcim/device_component_add.html +++ b/netbox/templates/dcim/device_component_add.html @@ -4,33 +4,29 @@ {% block title %}Create {{ component_type }}{% endblock %} {% block content %} -
      + {% csrf_token %}
      {% if form.non_field_errors %} -
      -
      Errors
      -
      +
      +
      Errors
      +
      {{ form.non_field_errors }}
      {% endif %} -
      -
      - {{ component_type|title }} -
      -
      +
      +
      {{ component_type|title }}
      +
      {% render_form form %}
      -
      -
      - - - Cancel -
      -
      +
      + + + Cancel +
      diff --git a/netbox/templates/dcim/inc/device_napalm_tabs.html b/netbox/templates/dcim/inc/device_napalm_tabs.html index f402d94ef..56d069304 100644 --- a/netbox/templates/dcim/inc/device_napalm_tabs.html +++ b/netbox/templates/dcim/inc/device_napalm_tabs.html @@ -1,15 +1,15 @@ {% if not disabled_message %} - - - {% else %} - - - + + + {% endif %} diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index c026fff36..a0a22cb5e 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -35,21 +35,23 @@
      {% endblock %} -{% block content %} {% block tabs %} -
        + {% endblock %} -{% endblock %} + +{% block content %}{% endblock %} {% block header %}
        diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 5abd610d7..2a7c8c77f 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -3,7 +3,6 @@ {% load plugins %} {% load render_table from django_tables2 %} -{% block header %} {% block breadcrumbs %}
      • IP Addresses
        • {% if object.vrf %} @@ -11,7 +10,6 @@ {% endif %}
      • {{ object }}
        • {% endblock %} -{% endblock %} {% block content %}
        diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html index f4ef50167..b38a85e2e 100644 --- a/netbox/templates/ipam/ipaddress_bulk_add.html +++ b/netbox/templates/ipam/ipaddress_bulk_add.html @@ -4,35 +4,26 @@ {% block title %}Bulk Add IP Addresses{% endblock %} -{% block tabs %} - {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='bulk_add' %} -{% endblock %} - {% block form %} -
        -
        IP Addresses
        -
        - {% render_field form.pattern %} - {% render_field model_form.status %} - {% render_field model_form.role %} - {% render_field model_form.vrf %} - {% render_field model_form.description %} - {% render_field model_form.tags %} -
        +{% include 'ipam/inc/ipadress_edit_header.html' with active_tab='bulk_add' %} +
        +

        IP Addresses

        + {% render_field form.pattern %} + {% render_field model_form.status %} + {% render_field model_form.role %} + {% render_field model_form.vrf %} + {% render_field model_form.description %} + {% render_field model_form.tags %}
        -
        -
        Tenancy
        -
        - {% render_field model_form.tenant_group %} - {% render_field model_form.tenant %} -
        +
        +

        Tenancy

        + {% render_field model_form.tenant_group %} + {% render_field model_form.tenant %}
        {% if model_form.custom_fields %} -
        -
        Custom Fields
        -
        - {% render_custom_fields model_form %} -
        +
        +

        Custom Fields

        + {% render_custom_fields model_form %}
        {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html index 04faa5676..4609d32d7 100644 --- a/netbox/templates/ipam/ipaddress_edit.html +++ b/netbox/templates/ipam/ipaddress_edit.html @@ -3,13 +3,10 @@ {% load form_helpers %} {% load helpers %} -{% block tabs %} - {% if not obj.pk %} - {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='add' %} - {% endif %} -{% endblock %} - {% block form %} +{% if not obj.pk %} + {% include 'ipam/inc/ipadress_edit_header.html' with active_tab='add' %} +{% endif %}

        IP Address

        {% render_field form.address %} diff --git a/netbox/templates/layout.html b/netbox/templates/layout.html index 5c41e85f5..5013a4b10 100644 --- a/netbox/templates/layout.html +++ b/netbox/templates/layout.html @@ -49,6 +49,7 @@ {% block controls %}{% endblock %}
        + {% block tabs %}{% endblock %} {% block content %}{% endblock %}